diff --git a/.changeset/moody-rules-stop.md b/.changeset/moody-rules-stop.md new file mode 100644 index 00000000..edacf930 --- /dev/null +++ b/.changeset/moody-rules-stop.md @@ -0,0 +1,5 @@ +--- +'openscript-ch-website': patch +--- + +Add strengths collection as interlude between references and services diff --git a/.devcontainer.json b/.devcontainer.json index 3bd91c5a..0d640be6 100644 --- a/.devcontainer.json +++ b/.devcontainer.json @@ -19,6 +19,7 @@ } }, "containerEnv": { - "ASTRO_TELEMETRY_DISABLED": "1" + "ASTRO_TELEMETRY_DISABLED": "1", + "ASTRO_DEV_BACKGROUND": "0" } } diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 00000000..93f95856 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,5 @@ +# Agents + +## Verification + +1. Fix, format, and linting issues with `pnpm run fix && pnpm run check`. diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md new file mode 100644 index 00000000..205c4cc4 --- /dev/null +++ b/docs/ARCHITECTURE.md @@ -0,0 +1,17 @@ +# Architecture + +## Folders + +- `src/`: Contains the source code of the project. + - `components/`: Contains reusable and atomic UI components. + - `content/`: Contains static content fitting the content collections defined in `content.config.ts`. + - `integrations/`: Contains integration code for external or additional services. + - `layouts/`: Contains unique, specific and non-reusable components. + - `groups/`: Contains non-content components that represent a specific common area of each page (e.g., header, footer, sidebar). + - `sections/`: Contains content layout components that represent specific sections of a layout. + - `templates/`: Contains content wrapping components that define the overall structure of a page or layout. + - `views/`: Contains page-level components that represent entire views or pages within the application. + - `pages/`: Contains the top-level page components that serve as entry points for different routes within the application. + - `translations/`: Contains translation files for user interface text and messages. + - `types/`: Contains TypeScript type definitions used throughout the project. + - `utils/`: Contains utility functions and helper modules used throughout the project. diff --git a/package.json b/package.json index eaf706c2..884300ab 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "@nanostores/i18n": "^1.3.3", "@openscript/svg-sprite-ng": "^4.0.0", "astro": "^7.4.2", - "astro-loader-i18n": "^1.0.2", - "astro-nanostores-i18n": "^1.0.2", + "astro-loader-i18n": "^1.1.0", + "astro-nanostores-i18n": "^1.0.3", "embla-carousel": "^8.6.0", "embla-carousel-autoplay": "^8.6.0", "embla-carousel-class-names": "^8.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7c399e2b..0735c667 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -206,10 +206,10 @@ importers: specifier: ^7.4.2 version: 7.4.12(@astrojs/markdown-remark@7.3.9)(@types/node@26.6.6)(jiti@2.7.0)(yaml@2.9.1) astro-loader-i18n: - specifier: ^1.0.2 + specifier: ^1.1.0 version: 1.1.0(astro@7.4.12(@astrojs/markdown-remark@7.3.9)(@types/node@26.6.6)(jiti@2.7.0)(yaml@2.9.1)) astro-nanostores-i18n: - specifier: ^1.0.2 + specifier: ^1.0.3 version: 1.0.3(@nanostores/i18n@1.3.3(nanostores@1.5.5))(astro@7.4.12(@astrojs/markdown-remark@7.3.9)(@types/node@26.6.6)(jiti@2.7.0)(yaml@2.9.1))(nanostores@1.5.5) embla-carousel: specifier: ^8.6.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 6aeb0ef8..09056aae 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,5 +1,8 @@ +# yaml-language-server: $schema=https://json.schemastore.org/pnpm-workspace.json allowBuilds: esbuild: true sharp: true minimumReleaseAgeExclude: - '@openscript/svg-sprite-ng' + - 'astro-loader-i18n' + - 'astro-nanostores-i18n' diff --git a/src/components/Divider.astro b/src/components/Divider.astro index be78a5bc..09aa14d6 100644 --- a/src/components/Divider.astro +++ b/src/components/Divider.astro @@ -20,18 +20,31 @@ const { firstSegmentColor = '', secondSegmentColor = '', height = '', + ...attributes } = Astro.props; const style = `transform: scaleX(${flipHorizontal ? -1 : 1}) scaleY(${flipVertical ? -1 : 1})${fixAntialiasingTop ? '; margin-block-start: -1.1px;' : ''}${fixAntialiasingBottom ? '; margin-block-end: -1.1px;' : ''}`; --- {kind === 'single' ? ( - + ) : null} {kind === 'multi' ? ( - + ; const { class: className, ...rest } = Astro.props; --- diff --git a/src/components/TabsList.astro b/src/components/TabsList.astro index f9d82ab5..5c8b4007 100644 --- a/src/components/TabsList.astro +++ b/src/components/TabsList.astro @@ -1,4 +1,6 @@ --- +import type { HTMLAttributes } from 'astro/types'; + /** * TabsList Component * @@ -13,8 +15,7 @@ type Props = { /** * HTML attributes to spread on the tabs list */ - [key: string]: string | number | boolean | undefined; -}; +} & HTMLAttributes<'div'>; const { class: className, ...rest } = Astro.props; --- diff --git a/src/components/TabsPanel.astro b/src/components/TabsPanel.astro index b09082cc..91eb6b64 100644 --- a/src/components/TabsPanel.astro +++ b/src/components/TabsPanel.astro @@ -1,4 +1,6 @@ --- +import type { HTMLAttributes } from 'astro/types'; + /** * TabsPanel Component * @@ -26,8 +28,7 @@ type Props = { /** * HTML attributes to spread on the panel */ - [key: string]: string | number | boolean | undefined; -}; +} & HTMLAttributes<'div'>; const { class: className, id, labelledby, selected = false, ...rest } = Astro.props; --- diff --git a/src/components/TabsTab.astro b/src/components/TabsTab.astro index 999ba27d..d9d49249 100644 --- a/src/components/TabsTab.astro +++ b/src/components/TabsTab.astro @@ -1,4 +1,6 @@ --- +import type { HTMLAttributes } from 'astro/types'; + /** * TabsTab Component * @@ -26,8 +28,7 @@ type Props = { /** * HTML attributes to spread on the tab */ - [key: string]: string | number | boolean | undefined; -}; +} & HTMLAttributes<'button'>; const { class: className, id, controls, selected = false, ...rest } = Astro.props; --- diff --git a/src/content.config.ts b/src/content.config.ts index 158e90cf..b0b9c79e 100644 --- a/src/content.config.ts +++ b/src/content.config.ts @@ -3,6 +3,7 @@ import { i18nContentLoader, i18nFileLoader, i18nLoader, + i18nReference, localized as localizedSchema, } from 'astro-loader-i18n'; import { defineCollection, type ImageFunction } from 'astro:content'; @@ -30,7 +31,38 @@ const createNavigationItem = (image: ImageFunction) => { }); }; -const navigationCollection = defineCollection({ +const formation = defineCollection({ + loader: i18nContentLoader({ pattern: '**/[^_]*.yaml', base: './src/content/formation' }), + schema: extendI18nLoaderSchema( + z.object({ + items: localized( + z.array( + z.object({ + title: z.string(), + text: z.string(), + }), + ), + ), + }), + ), +}); + +const galleries = defineCollection({ + loader: i18nContentLoader({ pattern: '**/[^_]*.yaml', base: './src/content/galleries' }), + schema: ({ image }) => + extendI18nLoaderSchema( + z.object({ + items: z.array( + z.object({ + photo: image(), + label: localized(z.string()), + }), + ), + }), + ), +}); + +const navigation = defineCollection({ loader: i18nContentLoader({ pattern: '**/[^_]*.yaml', base: './src/content/navigation' }), schema: ({ image }) => extendI18nLoaderSchema( @@ -40,7 +72,7 @@ const navigationCollection = defineCollection({ ), }); -const pagesCollection = defineCollection({ +const pages = defineCollection({ loader: i18nLoader({ pattern: '**/[^_]*.{md,mdx}', base: './src/content/pages' }), schema: extendI18nLoaderSchema( z.object({ @@ -51,17 +83,43 @@ const pagesCollection = defineCollection({ ), }); -const sectionsCollection = defineCollection({ - loader: glob({ pattern: '**/[^_]*.{md,mdx}', base: './src/content/sections' }), - schema: z.object({}), +const products = defineCollection({ + loader: i18nLoader({ pattern: '**/[^_]*.{md,mdx}', base: './src/content/products' }), + schema: ({ image }) => + extendI18nLoaderSchema( + z.object({ + projectName: z.string(), + title: z.string(), + summary: z.string(), + logo: image(), + path: z.url().optional(), + featured: z.boolean().optional().default(false), + }), + ), +}); + +const questions = defineCollection({ + loader: i18nContentLoader({ pattern: '**/[^_]*.yaml', base: './src/content/questions' }), + schema: extendI18nLoaderSchema( + z.object({ + author: z.string(), + items: localized( + z.array( + z.object({ + question: z.string(), + answer: z.string(), + }), + ), + ), + }), + ), }); -const referenceCompaniesCollection = defineCollection({ +const referenceCompanies = defineCollection({ loader: i18nLoader({ pattern: '**/[^_]*.{md,mdx}', base: './src/content/references/companies' }), schema: ({ image }) => extendI18nLoaderSchema( z.object({ - id: z.string(), companyName: z.string(), logo: image(), url: z.url().optional(), @@ -71,51 +129,52 @@ const referenceCompaniesCollection = defineCollection({ ), }); -const referenceProjectsCollection = defineCollection({ +const referenceProjects = defineCollection({ loader: i18nLoader({ pattern: '**/[^_]*.{md,mdx}', base: './src/content/references/projects' }), schema: ({ image }) => extendI18nLoaderSchema( z.object({ - softwareName: z.string(), + projectName: z.string(), title: z.string(), summary: z.string(), - logo: image(), + logo: image().optional(), path: z.url().optional(), featured: z.boolean().optional().default(false), + company: i18nReference('referenceCompanies'), + strengths: z.array(i18nReference('strengths')).default([]), }), ), }); -const questionsCollection = defineCollection({ - loader: i18nContentLoader({ pattern: '**/[^_]*.yaml', base: './src/content/questions' }), +const sections = defineCollection({ + loader: glob({ pattern: '**/[^_]*.{md,mdx}', base: './src/content/sections' }), + schema: z.object({}), +}); + +const services = defineCollection({ + loader: i18nLoader({ pattern: '**/[^_]*.{md,mdx}', base: './src/content/services' }), schema: extendI18nLoaderSchema( z.object({ - author: z.string(), - items: localized( - z.array( - z.object({ - question: z.string(), - answer: z.string(), - }), - ), - ), + serviceName: z.string(), + sprite: z.string(), + description: z.string(), + order: z.number().int().nonnegative(), }), ), }); -const technologiesCollection = defineCollection({ - loader: i18nFileLoader('./src/content/technologies/index.yaml'), +const strengths = defineCollection({ + loader: i18nLoader({ pattern: '**/[^_]*.{md,mdx}', base: './src/content/strengths' }), schema: extendI18nLoaderSchema( z.object({ - id: z.string(), - label: localized(z.string()), - logo: z.string(), - url: z.url(), + strengthName: z.string(), + sprite: z.string(), + service: i18nReference('services'), }), ), }); -const teamCollection = defineCollection({ +const team = defineCollection({ loader: i18nFileLoader('./src/content/team/index.yaml'), schema: ({ image }) => extendI18nLoaderSchema( @@ -128,46 +187,30 @@ const teamCollection = defineCollection({ ), }); -const galleriesCollection = defineCollection({ - loader: i18nContentLoader({ pattern: '**/[^_]*.yaml', base: './src/content/galleries' }), - schema: ({ image }) => - extendI18nLoaderSchema( - z.object({ - items: z.array( - z.object({ - photo: image(), - label: localized(z.string()), - }), - ), - }), - ), -}); - -const formationCollection = defineCollection({ - loader: i18nContentLoader({ pattern: '**/[^_]*.yaml', base: './src/content/formation' }), +const technologies = defineCollection({ + loader: i18nFileLoader('./src/content/technologies/index.yaml'), schema: extendI18nLoaderSchema( z.object({ - items: localized( - z.array( - z.object({ - title: z.string(), - text: z.string(), - }), - ), - ), + id: z.string(), + label: localized(z.string()), + logo: z.string(), + url: z.url(), }), ), }); export const collections = { - navigation: navigationCollection, - pages: pagesCollection, - sections: sectionsCollection, - referenceCompanies: referenceCompaniesCollection, - referenceProjects: referenceProjectsCollection, - questions: questionsCollection, - technologies: technologiesCollection, - team: teamCollection, - galleries: galleriesCollection, - formation: formationCollection, + formation, + galleries, + navigation, + pages, + products, + questions, + referenceCompanies, + referenceProjects, + sections, + services, + strengths, + team, + technologies, }; diff --git a/src/content/pages/de/future/services.mdx b/src/content/pages/de/future/services.mdx index 0eeded4a..0b6cc513 100644 --- a/src/content/pages/de/future/services.mdx +++ b/src/content/pages/de/future/services.mdx @@ -2,3 +2,7 @@ path: dienstleistungen title: Dienstleistungen --- + +import ServicesView from '../../../../layouts/views/ServicesView.astro'; + + diff --git a/src/content/pages/de/present/strengths.mdx b/src/content/pages/de/present/strengths.mdx index 7418f873..95d5019c 100644 --- a/src/content/pages/de/present/strengths.mdx +++ b/src/content/pages/de/present/strengths.mdx @@ -2,3 +2,7 @@ path: staerken title: Stärken --- + +import StrengthsView from '../../../../layouts/views/StrengthsView.astro'; + + diff --git a/src/content/pages/en/future/services.mdx b/src/content/pages/en/future/services.mdx index 8fef532e..5f8dc563 100644 --- a/src/content/pages/en/future/services.mdx +++ b/src/content/pages/en/future/services.mdx @@ -2,3 +2,7 @@ path: services title: Services --- + +import ServicesView from '../../../../layouts/views/ServicesView.astro'; + + diff --git a/src/content/pages/en/present/strengths.mdx b/src/content/pages/en/present/strengths.mdx index deacaaf5..efe12690 100644 --- a/src/content/pages/en/present/strengths.mdx +++ b/src/content/pages/en/present/strengths.mdx @@ -2,3 +2,7 @@ path: strengths title: Strengths --- + +import StrengthsView from '../../../../layouts/views/StrengthsView.astro'; + + diff --git a/src/content/products/heimv.de.mdx b/src/content/products/heimv.de.mdx new file mode 100644 index 00000000..137c8cd4 --- /dev/null +++ b/src/content/products/heimv.de.mdx @@ -0,0 +1,31 @@ +--- +projectName: HeimV +title: Das Verwaltungswerkzeug für Pfadi- und Gruppenhäuser +logo: ./heimv.svg +summary: HeimV vereinfacht die Verwaltung von Reservationen und Abrechnungen für Schweizer Pfadi- und Gruppenhäuser, von der Anfrage bis zur Zahlung. +featured: true +--- + +import { Image } from 'astro:assets'; +import image from './placeholder.png'; + +

+ HeimV ist ein Verwaltungswerkzeug für Schweizer Pfadi- und Gruppenhäuser. Es unterstützt den + gesamten Reservations- und Abrechnungsprozess, von Reservationsanfragen über Buchungen und + Verträge bis zu Rechnungen und Zahlungseingängen. Individuelle Buchungsregeln, anpassbare + Textvorlagen sowie Integrationen mit Webseiten und Kalendern helfen, die Verwaltung im Alltag zu + vereinfachen. +

+ +

+ HeimV wird in der Schweiz entwickelt und betrieben; die Daten werden auf Servern in der Schweiz + gehostet. Vereine können die Software für den Eigengebrauch selbst hosten und den Quellcode auf + GitHub nutzen. Für gehostete Angebote gibt es Tarife für Pfadiheime und weitere Mietobjekte. +

+ +HeimV diff --git a/src/content/products/heimv.en.mdx b/src/content/products/heimv.en.mdx new file mode 100644 index 00000000..72fc4d5c --- /dev/null +++ b/src/content/products/heimv.en.mdx @@ -0,0 +1,30 @@ +--- +projectName: HeimV +title: The management tool for scout and group houses +logo: ./heimv.svg +summary: HeimV simplifies reservation and billing management for Swiss scout and group houses, from inquiry to payment. +featured: true +--- + +import { Image } from 'astro:assets'; +import image from './placeholder.png'; + +

+ HeimV is a management tool for Swiss scout and group houses. It supports the entire reservation + and billing process, from inquiries and bookings to contracts, invoices and payment tracking. + Custom booking rules, reusable text templates, and website and calendar integrations help make + day-to-day administration easier. +

+ +

+ HeimV is developed and operated in Switzerland, and data is hosted on servers in Switzerland. + Clubs can self-host the software for their own use, with the source code available on GitHub. + Hosted plans are available for scout homes and other rental properties. +

+ +HeimV diff --git a/src/content/products/heimv.svg b/src/content/products/heimv.svg new file mode 100644 index 00000000..8abe30d3 --- /dev/null +++ b/src/content/products/heimv.svg @@ -0,0 +1,24 @@ + + Logo + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/content/products/placeholder.png b/src/content/products/placeholder.png new file mode 100644 index 00000000..0458f612 Binary files /dev/null and b/src/content/products/placeholder.png differ diff --git a/src/content/references/projects/timelet.de.mdx b/src/content/products/timelet.de.mdx similarity index 97% rename from src/content/references/projects/timelet.de.mdx rename to src/content/products/timelet.de.mdx index 1e60fc84..beee20b1 100644 --- a/src/content/references/projects/timelet.de.mdx +++ b/src/content/products/timelet.de.mdx @@ -1,5 +1,5 @@ --- -softwareName: Timelet +projectName: Timelet title: Minimales Open-Source Zeiterfassungstool logo: ./timelet.svg summary: Dieses Produkt ist ein minimalistisches, einfach zu bedienendes Open-Source-Tool zur effizienten Zeiterfassung. Da es völlig kostenlos ist, bietet es jedem die Möglichkeit, sein Zeitmanagement professionell zu gestalten. diff --git a/src/content/references/projects/timelet.en.mdx b/src/content/products/timelet.en.mdx similarity index 97% rename from src/content/references/projects/timelet.en.mdx rename to src/content/products/timelet.en.mdx index 02e1a01a..77867c66 100644 --- a/src/content/references/projects/timelet.en.mdx +++ b/src/content/products/timelet.en.mdx @@ -1,5 +1,5 @@ --- -softwareName: Timelet +projectName: Timelet title: Minimal opensource time tracking tool logo: ./timelet.svg summary: This product is a minimalist, easy-to-use, opensource tool to track time efficiently. By it being completely free to use it gives everyone the change to handle their time management professionally. diff --git a/src/content/references/projects/timelet.svg b/src/content/products/timelet.svg similarity index 100% rename from src/content/references/projects/timelet.svg rename to src/content/products/timelet.svg diff --git a/src/content/references/companies/astra.de.md b/src/content/references/companies/astra.de.md index 0e5ce7c6..a33cfce1 100644 --- a/src/content/references/companies/astra.de.md +++ b/src/content/references/companies/astra.de.md @@ -1,5 +1,4 @@ --- -id: astra companyName: Bundesamt für Strassen ASTRA logo: ./astra.svg url: https://www.astra.admin.ch diff --git a/src/content/references/companies/astra.en.md b/src/content/references/companies/astra.en.md index 7fa05409..13293c0d 100644 --- a/src/content/references/companies/astra.en.md +++ b/src/content/references/companies/astra.en.md @@ -1,5 +1,4 @@ --- -id: astra companyName: Bundesamt für Strassen ASTRA logo: ./astra.svg url: https://www.astra.admin.ch diff --git a/src/content/references/companies/dogli.de.md b/src/content/references/companies/dogli.de.md index 53f23566..8b08f09e 100644 --- a/src/content/references/companies/dogli.de.md +++ b/src/content/references/companies/dogli.de.md @@ -1,5 +1,4 @@ --- -id: dogli companyName: DOGLi GmbH logo: ./dogli.svg url: https://dogli.app diff --git a/src/content/references/companies/dogli.en.md b/src/content/references/companies/dogli.en.md index 3ff72d2e..38175095 100644 --- a/src/content/references/companies/dogli.en.md +++ b/src/content/references/companies/dogli.en.md @@ -1,5 +1,4 @@ --- -id: dogli companyName: DOGLi GmbH logo: ./dogli.svg url: https://dogli.app diff --git a/src/content/references/companies/haslerrail.de.md b/src/content/references/companies/haslerrail.de.md index 365706c6..39e8e2ca 100644 --- a/src/content/references/companies/haslerrail.de.md +++ b/src/content/references/companies/haslerrail.de.md @@ -1,5 +1,4 @@ --- -id: haslerrail companyName: HaslerRail AG logo: ./haslerrail.svg url: https://www.haslerrail.com diff --git a/src/content/references/companies/haslerrail.en.md b/src/content/references/companies/haslerrail.en.md index 56198ee3..52d568b2 100644 --- a/src/content/references/companies/haslerrail.en.md +++ b/src/content/references/companies/haslerrail.en.md @@ -1,5 +1,4 @@ --- -id: haslerrail companyName: HaslerRail AG logo: ./haslerrail.svg url: https://www.haslerrail.com diff --git a/src/content/references/companies/hydrowatt.de.md b/src/content/references/companies/hydrowatt.de.md index 9c4cf5d3..d86553e5 100644 --- a/src/content/references/companies/hydrowatt.de.md +++ b/src/content/references/companies/hydrowatt.de.md @@ -1,5 +1,4 @@ --- -id: hydrowatt companyName: Hydrowatt AG logo: ./hydrowatt.svg url: https://www.hydrowatt.com diff --git a/src/content/references/companies/hydrowatt.en.md b/src/content/references/companies/hydrowatt.en.md index 4092ebb7..c58deeb4 100644 --- a/src/content/references/companies/hydrowatt.en.md +++ b/src/content/references/companies/hydrowatt.en.md @@ -1,5 +1,4 @@ --- -id: hydrowatt companyName: Hydrowatt AG logo: ./hydrowatt.svg url: https://www.hydrowatt.com diff --git a/src/content/references/companies/schalthalle.de.md b/src/content/references/companies/schalthalle.de.md index d35e1dfc..27bb673c 100644 --- a/src/content/references/companies/schalthalle.de.md +++ b/src/content/references/companies/schalthalle.de.md @@ -1,5 +1,4 @@ --- -id: schalthalle companyName: Verein Schalthalle logo: ./schalthalle.svg url: https://www.schalthalle.ch diff --git a/src/content/references/companies/schalthalle.en.md b/src/content/references/companies/schalthalle.en.md index d35e1dfc..27bb673c 100644 --- a/src/content/references/companies/schalthalle.en.md +++ b/src/content/references/companies/schalthalle.en.md @@ -1,5 +1,4 @@ --- -id: schalthalle companyName: Verein Schalthalle logo: ./schalthalle.svg url: https://www.schalthalle.ch diff --git a/src/content/references/companies/innenausbau.de.md b/src/content/references/companies/sto.de.md similarity index 93% rename from src/content/references/companies/innenausbau.de.md rename to src/content/references/companies/sto.de.md index 00849aa0..df4afb07 100644 --- a/src/content/references/companies/innenausbau.de.md +++ b/src/content/references/companies/sto.de.md @@ -1,5 +1,4 @@ --- -id: sto companyName: STO Innenausbau AG logo: ./sto.svg url: https://sto-innenausbau.ch diff --git a/src/content/references/companies/innenausbau.en.md b/src/content/references/companies/sto.en.md similarity index 93% rename from src/content/references/companies/innenausbau.en.md rename to src/content/references/companies/sto.en.md index 00849aa0..df4afb07 100644 --- a/src/content/references/companies/innenausbau.en.md +++ b/src/content/references/companies/sto.en.md @@ -1,5 +1,4 @@ --- -id: sto companyName: STO Innenausbau AG logo: ./sto.svg url: https://sto-innenausbau.ch diff --git a/src/content/references/companies/uzh.de.md b/src/content/references/companies/uzh.de.md index 4f0afd64..5695b01e 100644 --- a/src/content/references/companies/uzh.de.md +++ b/src/content/references/companies/uzh.de.md @@ -1,5 +1,4 @@ --- -id: uzh companyName: Universität Zürich logo: ./uzh.svg url: https://www.uzh.ch diff --git a/src/content/references/companies/uzh.en.md b/src/content/references/companies/uzh.en.md index bd51f2e5..5ab7a110 100644 --- a/src/content/references/companies/uzh.en.md +++ b/src/content/references/companies/uzh.en.md @@ -1,5 +1,4 @@ --- -id: uzh companyName: Universität Zürich logo: ./uzh.svg url: https://www.uzh.ch diff --git a/src/content/references/companies/wagner.de.md b/src/content/references/companies/wagner.de.md index b4904b29..79146105 100644 --- a/src/content/references/companies/wagner.de.md +++ b/src/content/references/companies/wagner.de.md @@ -1,5 +1,4 @@ --- -id: wagner companyName: Wagner Unternehmungen AG logo: ./wagner.svg url: https://wagner-rohbau.ch diff --git a/src/content/references/companies/wagner.en.md b/src/content/references/companies/wagner.en.md index 2546ba41..28ca3927 100644 --- a/src/content/references/companies/wagner.en.md +++ b/src/content/references/companies/wagner.en.md @@ -1,5 +1,4 @@ --- -id: wagner companyName: Wagner Unternehmungen AG logo: ./wagner.svg url: https://wagner-rohbau.ch diff --git a/src/content/references/companies/wiegand.de.md b/src/content/references/companies/wiegand.de.md index 1fc1e844..d2e131ba 100644 --- a/src/content/references/companies/wiegand.de.md +++ b/src/content/references/companies/wiegand.de.md @@ -1,5 +1,4 @@ --- -id: wiegand companyName: Wiegand AG logo: ./wiegand.png url: https://wiegand.ch diff --git a/src/content/references/companies/wiegand.en.md b/src/content/references/companies/wiegand.en.md index 1fc1e844..d2e131ba 100644 --- a/src/content/references/companies/wiegand.en.md +++ b/src/content/references/companies/wiegand.en.md @@ -1,5 +1,4 @@ --- -id: wiegand companyName: Wiegand AG logo: ./wiegand.png url: https://wiegand.ch diff --git a/src/content/references/companies/yaver.de.md b/src/content/references/companies/yaver.de.md index 1b95ec86..34fd932e 100644 --- a/src/content/references/companies/yaver.de.md +++ b/src/content/references/companies/yaver.de.md @@ -1,5 +1,4 @@ --- -id: yaver companyName: YAVER Infrastructure & Services GmbH logo: ./yaver.svg url: https://yaver.ch diff --git a/src/content/references/companies/yaver.en.md b/src/content/references/companies/yaver.en.md index 1b95ec86..34fd932e 100644 --- a/src/content/references/companies/yaver.en.md +++ b/src/content/references/companies/yaver.en.md @@ -1,5 +1,4 @@ --- -id: yaver companyName: YAVER Infrastructure & Services GmbH logo: ./yaver.svg url: https://yaver.ch diff --git a/src/content/references/companies/zli.de.md b/src/content/references/companies/zli.de.md index 69b55215..ff334809 100644 --- a/src/content/references/companies/zli.de.md +++ b/src/content/references/companies/zli.de.md @@ -1,5 +1,4 @@ --- -id: zli companyName: Zürcher Lehrbetriebsverband ICT logo: ./zli.svg url: https://zli.ch diff --git a/src/content/references/companies/zli.en.md b/src/content/references/companies/zli.en.md index f5c95ab1..3933a2c3 100644 --- a/src/content/references/companies/zli.en.md +++ b/src/content/references/companies/zli.en.md @@ -1,5 +1,4 @@ --- -id: zli companyName: Zürcher Lehrbetriebsverband ICT logo: ./zli.svg url: https://zli.ch diff --git a/src/content/references/projects/certification.de.mdx b/src/content/references/projects/certification.de.mdx index fa4cb4b2..95da4aae 100644 --- a/src/content/references/projects/certification.de.mdx +++ b/src/content/references/projects/certification.de.mdx @@ -1,9 +1,12 @@ --- -softwareName: Zertifizierungstool +projectName: Zertifizierungstool title: Unbeaufsichtigtes Online-Zertifizierungstool für eine internationale Organisation logo: ./certification.svg summary: Mit diesem Tool können Sie Ihren Zertifizierungsprozess organisieren. Es ermöglicht Personen periodisch zur Zertifizierung einzuladen, es führt den Zertifizierungsprozess durch und übergibt Ihnen nach erfolgreicher Zertifizierung schön formatierte PDF-Dokumente. featured: true +company: haslerrail +strengths: + - web-applications --- import { Image } from 'astro:assets'; diff --git a/src/content/references/projects/certification.en.mdx b/src/content/references/projects/certification.en.mdx index 8fe56372..79e353a0 100644 --- a/src/content/references/projects/certification.en.mdx +++ b/src/content/references/projects/certification.en.mdx @@ -1,9 +1,12 @@ --- -softwareName: Certification Tool +projectName: Certification Tool title: Unattended online certification tool for an international organization logo: ./certification.svg summary: With this tool you can organize your certification process. It lets you invite people periodically to get certified, runs the certification process and hands you nicely designed PDF documents upon successful certification. featured: true +company: haslerrail +strengths: + - web-applications --- import { Image } from 'astro:assets'; diff --git a/src/content/references/projects/docportal.de.mdx b/src/content/references/projects/docportal.de.mdx new file mode 100644 index 00000000..84ee5039 --- /dev/null +++ b/src/content/references/projects/docportal.de.mdx @@ -0,0 +1,25 @@ +--- +projectName: DocPortal +title: Kommunikationsportal für ein kantonales Ausbildungszentrum +summary: Im Basislehrjahr unterstützt das Kommunikationsportal den Informationsaustausch zwischen Ausbildungszentrum, Lernenden und Ausbildnern. Es ermöglicht eine strukturierte Kommunikation, das Erfassen von Ausbildungsberichten und die Nachverfolgung von Ereignissen. +featured: false +company: zli +strengths: + - web-applications +--- + +import { Image } from 'astro:assets'; +import image from './placeholder.png'; + +

+ Das Kommunikationsportal unterstützt die Lernenden und Ausbildner im Basislehrjahr. Es ermöglicht + eine strukturierte Kommunikation, das Erfassen von Ausbildungsberichten und die Nachverfolgung von + Ereignissen. +

+ +Kommunikationsportal diff --git a/src/content/references/projects/docportal.en.mdx b/src/content/references/projects/docportal.en.mdx new file mode 100644 index 00000000..32db59a1 --- /dev/null +++ b/src/content/references/projects/docportal.en.mdx @@ -0,0 +1,25 @@ +--- +projectName: DocPortal +title: Communication portal for a cantonal training center +summary: During the foundational apprenticeship year, the communication portal supports information exchange between the training center, apprentices, and instructors. It enables structured communication, the recording of training reports, and the tracking of events. +featured: false +company: zli +strengths: + - web-applications +--- + +import { Image } from 'astro:assets'; +import image from './placeholder.png'; + +

+ The communication portal supports apprentices and instructors during the foundational + apprenticeship year. It enables structured communication, the recording of training reports, and + the tracking of events. +

+ +Communication portal diff --git a/src/content/references/projects/dogli.de.mdx b/src/content/references/projects/dogli.de.mdx new file mode 100644 index 00000000..16aadd50 --- /dev/null +++ b/src/content/references/projects/dogli.de.mdx @@ -0,0 +1,25 @@ +--- +projectName: DOGLi +title: Android und iOS App für Enrichment und Beschäftigung von Hunden +logo: ./dogli.svg +summary: Die DOGLi App bietet Zugang zu einer Vielzahl von Beschäftigungsideen für Hunde, sowie einen Austausch innerhalb der Community. +featured: true +company: dogli +strengths: + - mobile-applications +--- + +import { Image } from 'astro:assets'; +import image from './placeholder.png'; + +

+ Die DOGLi App bietet Zugang zu einer Vielzahl von Beschäftigungsideen für Hunde, sowie einen + Austausch innerhalb der Community. +

+ +DOGLi App diff --git a/src/content/references/projects/dogli.en.mdx b/src/content/references/projects/dogli.en.mdx new file mode 100644 index 00000000..48b8b2d8 --- /dev/null +++ b/src/content/references/projects/dogli.en.mdx @@ -0,0 +1,25 @@ +--- +projectName: DOGLi +title: Android and iOS app for dog enrichment and activities +logo: ./dogli.svg +summary: The DOGLi app offers a wide range of activity ideas for dogs, along with a space to connect with the community. +featured: true +company: dogli +strengths: + - mobile-applications +--- + +import { Image } from 'astro:assets'; +import image from './placeholder.png'; + +

+ The DOGLi app offers a wide range of activity ideas for dogs, along with a space to connect with + the community. +

+ +DOGLi app diff --git a/src/content/references/projects/dogli.svg b/src/content/references/projects/dogli.svg new file mode 100644 index 00000000..42529e11 --- /dev/null +++ b/src/content/references/projects/dogli.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/content/references/projects/vialibera.de.mdx b/src/content/references/projects/vialibera.de.mdx index ebfa8d03..a76ebb46 100644 --- a/src/content/references/projects/vialibera.de.mdx +++ b/src/content/references/projects/vialibera.de.mdx @@ -1,9 +1,12 @@ --- -softwareName: ViaLibera +projectName: ViaLibera title: Mobiles Protokollmanagement-Tool für eine Regierungsorganisation logo: ./vialibera.svg summary: Es handelt sich um eine progressive Webanwendung, die offlinefähig ist. Nachdem das Gerät, auf dem die Anwendung läuft, wieder online ist, werden die Daten synchronisiert. Es hilft dabei, den Strassenzustand zu protokollieren und daraus Statistiken zu erstellen. featured: true +company: astra +strengths: + - web-applications --- import { Image } from 'astro:assets'; diff --git a/src/content/references/projects/vialibera.en.mdx b/src/content/references/projects/vialibera.en.mdx index b841980a..e10a0e5f 100644 --- a/src/content/references/projects/vialibera.en.mdx +++ b/src/content/references/projects/vialibera.en.mdx @@ -1,9 +1,12 @@ --- -softwareName: ViaLibera +projectName: ViaLibera title: Mobile protocol management tool for a government organization logo: ./vialibera.svg summary: It's a progressive web application, which has offline capabilities. After the device which runs the application comes back online the data is synchronized. It helps you to log street condition and makes statistics out of it. featured: true +company: astra +strengths: + - web-applications --- import { Image } from 'astro:assets'; diff --git a/src/content/sections/de/Services.mdx b/src/content/sections/de/Services.mdx deleted file mode 100644 index 5dfd17b7..00000000 --- a/src/content/sections/de/Services.mdx +++ /dev/null @@ -1,118 +0,0 @@ -import ServicesSection from '../../../layouts/sections/ServicesSection.astro'; -import Tabs from '../../../components/Tabs.astro'; -import TabsList from '../../../components/TabsList.astro'; -import TabsTab from '../../../components/TabsTab.astro'; -import TabsPanel from '../../../components/TabsPanel.astro'; -import Sprite from '../../../components/Sprite.astro'; - - - -

Was wir anbieten

- - - - - -

Softwareentwicklung

-
- - -

Bildung

-
- - -

Beratung

-
-
- - -

Wir entwickeln robuste Softwarelösungen, die auf unterschiedliche Bedürfnisse zugeschnitten sind.

- -
- -

Wir teilen unser Wissen, um Ihre Lernreise zu unterstützen.

- -
- -

Wir begleiten Sie mit praxisnahen Ratschlägen durch technische Herausforderungen.

- -
- -
- -
diff --git a/src/content/sections/en/Services.mdx b/src/content/sections/en/Services.mdx deleted file mode 100644 index 33e4f0ff..00000000 --- a/src/content/sections/en/Services.mdx +++ /dev/null @@ -1,118 +0,0 @@ -import ServicesSection from '../../../layouts/sections/ServicesSection.astro'; -import Tabs from '../../../components/Tabs.astro'; -import TabsList from '../../../components/TabsList.astro'; -import TabsTab from '../../../components/TabsTab.astro'; -import TabsPanel from '../../../components/TabsPanel.astro'; -import Sprite from '../../../components/Sprite.astro'; - - - -

What we offer

- - - - - -

Software development

-
- - -

Education

-
- - -

Consulting

-
-
- - -

We build robust software solutions tailored to diverse needs.

- -
- -

We share our expertise to empower your learning journey.

- -
- -

We guide you through technical challenges with practical advice.

- -
- -
- -
diff --git a/src/content/services/consulting.de.md b/src/content/services/consulting.de.md new file mode 100644 index 00000000..891797d6 --- /dev/null +++ b/src/content/services/consulting.de.md @@ -0,0 +1,6 @@ +--- +serviceName: Beratung +description: Wir begleiten Sie mit praxisnahen Ratschlägen durch technische Herausforderungen. +order: 2 +sprite: consulting +--- diff --git a/src/content/services/consulting.en.md b/src/content/services/consulting.en.md new file mode 100644 index 00000000..c4fbb0c3 --- /dev/null +++ b/src/content/services/consulting.en.md @@ -0,0 +1,6 @@ +--- +serviceName: Consulting +description: We guide you through technical challenges with practical advice. +order: 2 +sprite: consulting +--- diff --git a/src/content/services/education.de.md b/src/content/services/education.de.md new file mode 100644 index 00000000..1b9442eb --- /dev/null +++ b/src/content/services/education.de.md @@ -0,0 +1,6 @@ +--- +serviceName: Bildung +description: Wir teilen unser Wissen, um Ihre Lernreise zu unterstützen. +order: 1 +sprite: education +--- diff --git a/src/content/services/education.en.md b/src/content/services/education.en.md new file mode 100644 index 00000000..2c0718e0 --- /dev/null +++ b/src/content/services/education.en.md @@ -0,0 +1,6 @@ +--- +serviceName: Education +description: We share our expertise to empower your learning journey. +order: 1 +sprite: education +--- diff --git a/src/content/services/software-development.de.md b/src/content/services/software-development.de.md new file mode 100644 index 00000000..d7eb0820 --- /dev/null +++ b/src/content/services/software-development.de.md @@ -0,0 +1,6 @@ +--- +serviceName: Softwareentwicklung +description: Wir entwickeln robuste Softwarelösungen, die auf unterschiedliche Bedürfnisse zugeschnitten sind. +order: 0 +sprite: software-development +--- diff --git a/src/content/services/software-development.en.md b/src/content/services/software-development.en.md new file mode 100644 index 00000000..0ad94fba --- /dev/null +++ b/src/content/services/software-development.en.md @@ -0,0 +1,6 @@ +--- +serviceName: Software development +description: We build robust software solutions tailored to diverse needs. +order: 0 +sprite: software-development +--- diff --git a/src/content/strengths/calendaring-solutions.de.md b/src/content/strengths/calendaring-solutions.de.md new file mode 100644 index 00000000..aef58076 --- /dev/null +++ b/src/content/strengths/calendaring-solutions.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Kalenderlösungen +sprite: calendar +service: software-development +--- diff --git a/src/content/strengths/calendaring-solutions.en.md b/src/content/strengths/calendaring-solutions.en.md new file mode 100644 index 00000000..f8dfde51 --- /dev/null +++ b/src/content/strengths/calendaring-solutions.en.md @@ -0,0 +1,5 @@ +--- +strengthName: Calendaring solutions +sprite: calendar +service: software-development +--- diff --git a/src/content/strengths/code-reviews.de.md b/src/content/strengths/code-reviews.de.md new file mode 100644 index 00000000..da421499 --- /dev/null +++ b/src/content/strengths/code-reviews.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Code-Reviews +sprite: review +service: consulting +--- diff --git a/src/content/strengths/code-reviews.en.md b/src/content/strengths/code-reviews.en.md new file mode 100644 index 00000000..43355edc --- /dev/null +++ b/src/content/strengths/code-reviews.en.md @@ -0,0 +1,5 @@ +--- +strengthName: Code reviews +sprite: review +service: consulting +--- diff --git a/src/content/strengths/courses.de.md b/src/content/strengths/courses.de.md new file mode 100644 index 00000000..378ab39b --- /dev/null +++ b/src/content/strengths/courses.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Kurse +sprite: course +service: education +--- diff --git a/src/content/strengths/courses.en.md b/src/content/strengths/courses.en.md new file mode 100644 index 00000000..3b575889 --- /dev/null +++ b/src/content/strengths/courses.en.md @@ -0,0 +1,5 @@ +--- +strengthName: Courses +sprite: course +service: education +--- diff --git a/src/content/strengths/custom-apis.de.md b/src/content/strengths/custom-apis.de.md new file mode 100644 index 00000000..32b4fa43 --- /dev/null +++ b/src/content/strengths/custom-apis.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Individuelle APIs +sprite: api +service: software-development +--- diff --git a/src/content/strengths/custom-apis.en.md b/src/content/strengths/custom-apis.en.md new file mode 100644 index 00000000..1acf0c4e --- /dev/null +++ b/src/content/strengths/custom-apis.en.md @@ -0,0 +1,5 @@ +--- +strengthName: Custom APIs +sprite: api +service: software-development +--- diff --git a/src/content/strengths/devops-and-hosting.de.md b/src/content/strengths/devops-and-hosting.de.md new file mode 100644 index 00000000..5207c35b --- /dev/null +++ b/src/content/strengths/devops-and-hosting.de.md @@ -0,0 +1,5 @@ +--- +strengthName: DevOps- und Hosting-Lösungen +sprite: server +service: software-development +--- diff --git a/src/content/strengths/devops-and-hosting.en.md b/src/content/strengths/devops-and-hosting.en.md new file mode 100644 index 00000000..92784dcc --- /dev/null +++ b/src/content/strengths/devops-and-hosting.en.md @@ -0,0 +1,5 @@ +--- +strengthName: DevOps and hosting solutions +sprite: server +service: software-development +--- diff --git a/src/content/strengths/identity-and-access-management.de.md b/src/content/strengths/identity-and-access-management.de.md new file mode 100644 index 00000000..fb5b5871 --- /dev/null +++ b/src/content/strengths/identity-and-access-management.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Identity- und Access-Management-Systeme +sprite: iam +service: software-development +--- diff --git a/src/content/strengths/identity-and-access-management.en.md b/src/content/strengths/identity-and-access-management.en.md new file mode 100644 index 00000000..da9782ed --- /dev/null +++ b/src/content/strengths/identity-and-access-management.en.md @@ -0,0 +1,5 @@ +--- +strengthName: Identity and access management systems +sprite: iam +service: software-development +--- diff --git a/src/content/strengths/mobile-applications.de.md b/src/content/strengths/mobile-applications.de.md new file mode 100644 index 00000000..fe5d32f4 --- /dev/null +++ b/src/content/strengths/mobile-applications.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Mobile Anwendungen +sprite: mobile +service: software-development +--- diff --git a/src/content/strengths/mobile-applications.en.md b/src/content/strengths/mobile-applications.en.md new file mode 100644 index 00000000..c2da4160 --- /dev/null +++ b/src/content/strengths/mobile-applications.en.md @@ -0,0 +1,5 @@ +--- +strengthName: Mobile applications +sprite: mobile +service: software-development +--- diff --git a/src/content/strengths/presentations.de.md b/src/content/strengths/presentations.de.md new file mode 100644 index 00000000..92558a12 --- /dev/null +++ b/src/content/strengths/presentations.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Präsentationen +sprite: presentation +service: education +--- diff --git a/src/content/strengths/presentations.en.md b/src/content/strengths/presentations.en.md new file mode 100644 index 00000000..f19c5e55 --- /dev/null +++ b/src/content/strengths/presentations.en.md @@ -0,0 +1,5 @@ +--- +strengthName: Presentations +sprite: presentation +service: education +--- diff --git a/src/content/strengths/system-architecture.de.md b/src/content/strengths/system-architecture.de.md new file mode 100644 index 00000000..7adb507e --- /dev/null +++ b/src/content/strengths/system-architecture.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Systemarchitektur +sprite: architecture +service: consulting +--- diff --git a/src/content/strengths/system-architecture.en.md b/src/content/strengths/system-architecture.en.md new file mode 100644 index 00000000..722300a0 --- /dev/null +++ b/src/content/strengths/system-architecture.en.md @@ -0,0 +1,5 @@ +--- +strengthName: System architecture +sprite: architecture +service: consulting +--- diff --git a/src/content/strengths/technical-strategy.de.md b/src/content/strengths/technical-strategy.de.md new file mode 100644 index 00000000..4d15a696 --- /dev/null +++ b/src/content/strengths/technical-strategy.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Technische Strategie +sprite: strategy +service: consulting +--- diff --git a/src/content/strengths/technical-strategy.en.md b/src/content/strengths/technical-strategy.en.md new file mode 100644 index 00000000..02a6123f --- /dev/null +++ b/src/content/strengths/technical-strategy.en.md @@ -0,0 +1,5 @@ +--- +strengthName: Technical strategy +sprite: strategy +service: consulting +--- diff --git a/src/content/strengths/web-applications.de.md b/src/content/strengths/web-applications.de.md new file mode 100644 index 00000000..ff94550b --- /dev/null +++ b/src/content/strengths/web-applications.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Webanwendungen +sprite: web +service: software-development +--- diff --git a/src/content/strengths/web-applications.en.md b/src/content/strengths/web-applications.en.md new file mode 100644 index 00000000..d22ee102 --- /dev/null +++ b/src/content/strengths/web-applications.en.md @@ -0,0 +1,5 @@ +--- +strengthName: Web applications +sprite: web +service: software-development +--- diff --git a/src/content/strengths/workshops.de.md b/src/content/strengths/workshops.de.md new file mode 100644 index 00000000..6b25673e --- /dev/null +++ b/src/content/strengths/workshops.de.md @@ -0,0 +1,5 @@ +--- +strengthName: Workshops +sprite: workshop +service: education +--- diff --git a/src/content/strengths/workshops.en.md b/src/content/strengths/workshops.en.md new file mode 100644 index 00000000..6b25673e --- /dev/null +++ b/src/content/strengths/workshops.en.md @@ -0,0 +1,5 @@ +--- +strengthName: Workshops +sprite: workshop +service: education +--- diff --git a/src/layouts/Shell.astro b/src/layouts/Shell.astro index a68d0d01..78fb0d30 100644 --- a/src/layouts/Shell.astro +++ b/src/layouts/Shell.astro @@ -29,7 +29,12 @@ const { translations, bodyClasses, mainClasses } = Astro.props;
- +
diff --git a/src/layouts/Shell.css b/src/layouts/Shell.css index 256e0246..c8569e8d 100644 --- a/src/layouts/Shell.css +++ b/src/layouts/Shell.css @@ -140,6 +140,10 @@ body > :is(header, footer) { z-index: 10; } +::view-transition-group(header-divider) { + z-index: 5; +} + #ribbon ::selection, body > :is(header, footer) ::selection { background-color: var(--color-white); diff --git a/src/layouts/sections/CompaniesSection.astro b/src/layouts/sections/CompaniesSection.astro index 845bb744..9802beeb 100644 --- a/src/layouts/sections/CompaniesSection.astro +++ b/src/layouts/sections/CompaniesSection.astro @@ -13,7 +13,7 @@ const companies = await getCollection(
{companies.map((c) => ( - +
{c.data.companyName} diff --git a/src/layouts/sections/FeaturedSection.astro b/src/layouts/sections/FeaturedSection.astro index e72bc353..4cebc0c1 100644 --- a/src/layouts/sections/FeaturedSection.astro +++ b/src/layouts/sections/FeaturedSection.astro @@ -22,7 +22,7 @@ const projects = await getCollection(
{projects.map((p) => (
- {p.data.softwareName} + {p.data.logo && {p.data.projectName}}

{p.data.title}

{p.data.summary}

@@ -30,12 +30,12 @@ const projects = await getCollection(
{companies.map((c) => ( - + {c.data.companyName} diff --git a/src/layouts/sections/ReferencesSection.astro b/src/layouts/sections/ReferencesSection.astro index f186d5cd..ddcc794c 100644 --- a/src/layouts/sections/ReferencesSection.astro +++ b/src/layouts/sections/ReferencesSection.astro @@ -26,18 +26,18 @@ const projects = await Promise.all( {projects.map(({ id, data, Content }, i) => ( - +
- {data.softwareName} + {data.projectName}
- {data.softwareName} + {data.logo && {data.projectName}}
{data.summary}
- {data.softwareName} + {data.logo && {data.projectName}}
diff --git a/src/layouts/sections/ServicesSection.astro b/src/layouts/sections/ServicesSection.astro index 8c0414da..d596947e 100644 --- a/src/layouts/sections/ServicesSection.astro +++ b/src/layouts/sections/ServicesSection.astro @@ -1,8 +1,62 @@ +--- +import { currentLocale, useI18n } from 'astro-nanostores-i18n:runtime'; +import { getCollection } from 'astro:content'; +import type { ComponentProps } from 'astro/types'; +import Tabs from '../../components/Tabs.astro'; +import TabsList from '../../components/TabsList.astro'; +import TabsTab from '../../components/TabsTab.astro'; +import TabsPanel from '../../components/TabsPanel.astro'; +import Sprite from '../../components/Sprite.astro'; +import { getContentAnchor, resolveSimplePath } from '../../utils/paths'; + +type SpriteName = ComponentProps['name']; + +const locale = currentLocale.get(); +const translations = useI18n('services.section', { title: 'Was wir anbieten' }); +const services = await getCollection('services', (entry) => entry.data.locale === locale); +const strengths = await getCollection('strengths', (entry) => entry.data.locale === locale); +const strengthsPath = await resolveSimplePath('main', '/present/strengths', locale); +strengths.sort((first, second) => + first.data.strengthName.localeCompare(second.data.strengthName, locale), +); +const tabs = services + .sort((first, second) => first.data.order - second.data.order) + .map((service) => ({ + id: service.data.sprite === 'software-development' ? 'software' : service.data.sprite, + service: service.data, + strengths: strengths.filter((strength) => strength.data.service.id === service.id), + })); +--- +
- +

{translations.title}

- + + + {tabs.map(({ id, service }, index) => ( + + +

{service.serviceName}

+
+ ))} +
+ {tabs.map(({ id, service, strengths: serviceStrengths }, index) => ( + +

{service.description}

+
+ + ))} +
diff --git a/src/pages/[...locale]/index.astro b/src/pages/[...locale]/index.astro index fab6a98d..df701754 100644 --- a/src/pages/[...locale]/index.astro +++ b/src/pages/[...locale]/index.astro @@ -5,6 +5,7 @@ import { generateGetStaticIndexPaths } from '../../utils/paths'; import { render } from 'astro:content'; import { getEntry } from 'astro:content'; import Divider from '../../components/Divider.astro'; +import ServicesSection from '../../layouts/sections/ServicesSection.astro'; export const getStaticPaths = generateGetStaticIndexPaths('[...locale]'); @@ -13,9 +14,6 @@ const { translations } = Astro.props; const { Content: SpotlightSection } = await render( await getEntry('sections', `${locale}/spotlight`)!, ); -const { Content: ServicesSection } = await render( - await getEntry('sections', `${locale}/services`)!, -); const { Content: TechnologiesSection } = await render( await getEntry('sections', `${locale}/technologies`)!, ); diff --git a/src/translations/de.json b/src/translations/de.json index 81fe188a..b7badfa9 100644 --- a/src/translations/de.json +++ b/src/translations/de.json @@ -1,4 +1,10 @@ { + "services.section": { + "title": "Was wir anbieten" + }, + "strengths.view": { + "references": "Passende Referenzen" + }, "accordion.item": { "more": "Mehr anzeigen", "less": "Weniger anzeigen" diff --git a/src/translations/en.json b/src/translations/en.json index c2173412..65c4b48b 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1,4 +1,10 @@ { + "services.section": { + "title": "What we offer" + }, + "strengths.view": { + "references": "Related references" + }, "accordion.item": { "more": "Show more", "less": "Show less" diff --git a/src/utils/paths.ts b/src/utils/paths.ts index fbab59e6..65c9ec6c 100644 --- a/src/utils/paths.ts +++ b/src/utils/paths.ts @@ -7,10 +7,14 @@ import { C, localeSlugs, type Locale } from '../site.config'; import { getEntry, type CollectionKey, type DataEntryMap } from 'astro:content'; import type { ImageMetadata } from 'astro'; import { parseLocale } from './i18n'; +import { basename, extname } from 'node:path'; const PROTOCOL_DELIMITER = '://'; const ID_DELIMITER = '#'; +export const getContentAnchor = (translationId: string) => + basename(translationId, extname(translationId)); + export const defaultPropsAndParamsOptions = { defaultLocale: C.DEFAULT_LOCALE, segmentTranslations: C.SEGMENT_TRANSLATIONS,