Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,268 changes: 1,910 additions & 3,358 deletions package-lock.json

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "astro dev",
"build": "astro build",
Expand All @@ -13,26 +12,26 @@
"dependencies": {
"@fontsource/poppins": "^5.2.7",
"@jop-software/astro-cookieconsent": "^3.0.1",
"@tailwindcss/vite": "^4.2.4",
"astro": "^6.2.2",
"@tailwindcss/vite": "^4.3.2",
"astro": "^7.0.9",
"astro-icon": "^1.1.5",
"astro-pagefind": "^1.8.6",
"astro-pagefind": "^2.0.1",
"maplibre-gl": "^5.24.0",
"preline": "^4.1.3",
"sass": "^1.99.0",
"preline": "^4.2.0",
"sass": "^1.101.0",
"scrollama": "^3.2.0",
"tailwindcss": "^4.2.4",
"tailwindcss": "^4.3.2",
"vanilla-cookieconsent": "^3.1.0"
},
"devDependencies": {
"@iconify-json/gis": "^1.2.5",
"@iconify-json/mdi": "^1.2.3",
"@typescript-eslint/eslint-plugin": "^8.59.2",
"@typescript-eslint/parser": "^8.59.2",
"eslint": "^10.3.0",
"@typescript-eslint/eslint-plugin": "^8.64.0",
"@typescript-eslint/parser": "^8.64.0",
"eslint": "^10.7.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-astro": "^1.7.0",
"prettier": "^3.8.3",
"eslint-plugin-astro": "^3.0.0",
"prettier": "^3.9.5",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-tailwindcss": "^0.8.0"
}
Expand Down
1 change: 1 addition & 0 deletions public/geoengine-black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/geoengine-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 8 additions & 6 deletions src/components/NavBar.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import {getRelativeLocaleUrl} from 'astro:i18n';
import {currentLanguage, useTranslations, useLocalePages} from '../i18n/utils';
import {Icon} from 'astro-icon/components';
import Search from 'astro-pagefind/components/Search';
import Search from 'astro-pagefind/components/Search.astro';

import Logo from '../images/GeoEngine_Mainlogo_Line_Schutzraum_4c_weiss.svg';

Expand All @@ -21,6 +21,9 @@ const p = useLocalePages(Astro.currentLocale);
background-color: var(--color-white);
overflow-y: auto;
}
:global(pagefind-searchbox) {
text-align: right !important;
}
</style>

<header class="sticky top-0 z-50 flex w-full flex-wrap bg-black md:flex-nowrap md:justify-start">
Expand Down Expand Up @@ -136,7 +139,7 @@ const p = useLocalePages(Astro.currentLocale);

<!-- Button Group -->
<div
class="relative mt-1 flex flex-wrap items-center gap-x-1.5 before:absolute before:-start-px before:top-1/2 before:block before:h-4 before:w-px before:-translate-y-1/2 before:bg-white/30 md:ms-1.5 md:mt-0 md:ps-2.5"
class="relative mt-1 flex flex-wrap items-center gap-x-1.5 before:absolute before:-inset-s-px before:top-1/2 before:block before:h-4 before:w-px before:-translate-y-1/2 before:bg-white/30 md:ms-1.5 md:mt-0 md:ps-2.5"
>
<button
class="flex w-full cursor-pointer items-center p-2 text-sm text-white/80 hover:text-white focus:text-white focus:outline-hidden"
Expand All @@ -158,8 +161,7 @@ const p = useLocalePages(Astro.currentLocale);
</div>
<!-- End Collapse -->
</nav>
<aside class="pagefind-ui absolute top-full right-0 left-0 hidden">
<Search className="fixed w-full" searchboxOptions={{showImages: false}} />
</aside>
</header>

<aside class="pagefind-ui hidden">
<Search id="search" className="fixed w-full" uiOptions={{showImages: false}} />
</aside>
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
---
export {default as Footer} from './Footer.astro';
export {default as FooterGridColumn} from './FooterGridColumn.astro';
export {default as FooterGridLink} from './FooterGridLink.astro';
---
2 changes: 1 addition & 1 deletion src/components/services/Services.astro
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
import {getCollection} from 'astro:content';
import {useLocalePages, useTranslations} from '../../i18n/utils';
import {Service} from './index.astro';
import Service from './Service.astro';

const t = useTranslations(Astro.currentLocale);
const p = useLocalePages(Astro.currentLocale);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
---
export {default as Service} from './Service.astro';
export {default as Services} from './Services.astro';
---
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
---
export {default as SolutionTabContent} from './SolutionTabContent.astro';
export {default as Solutions} from './Solutions.astro';
export {default as SolutionsTab} from './SolutionTab.astro';
---
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
---
export {default as Team} from './team.astro';
export {default as Person} from './person.astro';
---
7 changes: 5 additions & 2 deletions src/layouts/Layout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import '../styles/global.css';

import NavBar from '../components/NavBar.astro';
import PageHeader from '../components/PageHeader.astro';
import {Footer} from '../components/footer/index.astro';
import {Footer} from '../components/footer';
import {useTranslations} from '../i18n/utils';

interface Props {
Expand Down Expand Up @@ -45,13 +45,16 @@ const pageTitle = `${title} - Geo Engine`;
}
<!-- Preline UI -->
<script>
import {HSStaticMethods} from 'preline/dist/preline.js';
import {HSStaticMethods} from 'preline';

// Explicitly calling a method from the import prevents tree-shaking
const init = () => {
HSStaticMethods.autoInit();
};

// Run once on initial load.
init();

// Standard Astro lifecycle event
document.addEventListener('astro:page-load', init);

Expand Down
6 changes: 3 additions & 3 deletions src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import geoEngineArchitecture from '../images/geoengine-architecture.svg';

import Hero from '../components/Hero.astro';
import Section from '../components/Section.astro';
import {Solutions} from '../components/solutions/index.astro';
import {Services} from '../components/services/index.astro';
import {Solutions} from '../components/solutions';
import {Services} from '../components/services';
import {Image} from 'astro:assets';
import Logos from '../components/Logos.astro';
import News from '../components/News.astro';
Expand Down Expand Up @@ -80,7 +80,7 @@ const p = useLocalePages(Astro.currentLocale);
</div>
<div class="w-full">
<h2 class="text-3xl font-semibold">{t('team.title')}</h2>
<hr class="border-main-green my-8 w-16 border-1" />
<hr class="border-main-green my-8 w-16 border" />
<p class="mx-auto pb-8">{t('team.shortSlogan')}</p>
<p class="mx-auto">
<a
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ueber-uns.astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Layout from '../layouts/Layout.astro';
import deIntro from '../components/about/about-de.md';
import enIntro from '../components/about/about-en.md';
import Section from '../components/Section.astro';
import {Team, Person} from '../components/team/index.astro';
import {Team, Person} from '../components/team';
import Spacer from '../components/Spacer.astro';

import beilschmidt from '../images/team/Beilschmidt.png';
Expand Down
4 changes: 3 additions & 1 deletion src/styles/global.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'tailwindcss';
@import 'preline/variants.css'; /* Preline UI */
@import '../../node_modules/preline/variants.css'; /* Preline UI */
@import '@fontsource/poppins';

@theme {
Expand All @@ -14,6 +14,8 @@

--font-sans: 'Poppins', sans-serif;
--font-serif: var(--font-sans); /* no serif font */

--max-w-85rem: 85rem; /* prevent Tailwind CSS IntelliSense from throwing `suggestCanonicalClasses` warning */
}

/* disable dark theme */
Expand Down
2 changes: 2 additions & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/** @type {import('tailwindcss').Config} */
export default {};
Loading