diff --git a/.gitignore b/.gitignore index 6f64b0bfe..3d58dc39f 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,7 @@ next-env.d.ts # turborepo .turbo .turbo-test + +# scratch +scratch/ + diff --git a/content/de/team.mdx b/content/de/team.mdx index cda83a51a..0c8aba6cb 100644 --- a/content/de/team.mdx +++ b/content/de/team.mdx @@ -9,7 +9,7 @@ layout: "fullBleed" badge="Unternehmen" title="Unser Team" subtitle="Die Experten hinter der E-TIB Gruppe" - backgroundImage={{ url: '/assets/photos/DJI_0048.JPG' }} + backgroundImage={{ url: '/assets/photos/E-TIB_Gruppenfoto.jpg', focalY: 25 }} alignment="center" /> @@ -68,15 +68,15 @@ layout: "fullBleed" name: "Kerstin Joseph", position: "Buchhaltung / Controlling", email: "k.joseph@e-tib.com", - phone: "+49 3561 6857733", - image: "/assets/photos/team/kerstin.jpg" + phone: "+49 3561 6857733" }, { id: "katrin-haigold", name: "Katrin Haigold", position: "Buchhaltung / Personalwesen", email: "k.haigold@e-tib.com", - phone: "+49 3561 6851692" + phone: "+49 3561 6851692", + image: "/assets/photos/team/katrin-heigold.jpg" }, { id: "maik-weichert", diff --git a/content/en/team.mdx b/content/en/team.mdx index 87919acd1..d70c1c9c6 100644 --- a/content/en/team.mdx +++ b/content/en/team.mdx @@ -9,7 +9,7 @@ layout: "fullBleed" badge="Company" title="Our Team" subtitle="The Experts behind the E-TIB Group" - backgroundImage={{ url: '/assets/photos/DJI_0048.JPG' }} + backgroundImage={{ url: '/assets/photos/E-TIB_Gruppenfoto.jpg', focalY: 25 }} alignment="center" /> @@ -68,15 +68,15 @@ layout: "fullBleed" name: "Kerstin Joseph", position: "Accounting / Controlling", email: "k.joseph@e-tib.com", - phone: "+49 3561 6857733", - image: "/assets/photos/team/kerstin.jpg" + phone: "+49 3561 6857733" }, { id: "katrin-haigold", name: "Katrin Haigold", position: "Accounting / Human Resources", email: "k.haigold@e-tib.com", - phone: "+49 3561 6851692" + phone: "+49 3561 6851692", + image: "/assets/photos/team/katrin-heigold.jpg" }, { id: "maik-weichert", diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 114d929b6..8afbb9cf7 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -8,7 +8,7 @@ services: - infra - default labels: - - "caddy=http://${TRAEFIK_HOST:-etib.localhost}" + - "caddy=http://${TRAEFIK_HOST:-etib.localhost}, http://e-tib.localhost" - "caddy.reverse_proxy=http://etib-app:3001" extra_hosts: - "host.docker.internal:host-gateway" @@ -77,7 +77,7 @@ services: networks: default: - name: ${PROJECT_NAME:-e-tib}-internal + name: ${COMPOSE_PROJECT_NAME:-etib}-dev-internal infra: external: true diff --git a/lib/placeholders.json b/lib/placeholders.json index dc1180a30..83dfd058e 100644 --- a/lib/placeholders.json +++ b/lib/placeholders.json @@ -1,7 +1,8 @@ { - "/assets/photos/DJI_0048.JPG": "data:image/webp;base64,UklGRjIAAABXRUJQVlA4ICYAAADwAQCdASoKAAcABUB8JYwCdH8AGDNIbaAA92kbyv6vgOVMTIAAAA==", - "/assets/videos/web/hero-bahnkreuzung-poster.jpg": "data:image/webp;base64,UklGRiQAAABXRUJQVlA4IBgAAAAwAQCdASoKAAYABUB8JaQAA3AA/vDUoAA=", - "/assets/videos/web/hero-bohrung-poster.jpg": "data:image/webp;base64,UklGRjIAAABXRUJQVlA4ICYAAACwAQCdASoKAAYABUB8JZACdAEOO2gAAN5Rr3co8j7CDYNKNCAAAA==", - "/assets/videos/web/hero-kabelpflug-poster.jpg": "data:image/webp;base64,UklGRiQAAABXRUJQVlA4IBgAAAAwAQCdASoKAAYABUB8JaQAA3AA/vDUoAA=", - "/assets/videos/web/hero-messe-poster.jpg": "data:image/webp;base64,UklGRiQAAABXRUJQVlA4IBgAAAAwAQCdASoKAAYABUB8JaQAA3AA/vDUoAA=" + "/assets/photos/DJI_0048.JPG": "data:image/webp;base64,UklGRjIAAABXRUJQVlA4ICYAAADwAQCdASoKAAcABUB8JYwCdH8AGDXtwwAA92kbyv6vgOVMTIAAAA==", + "/assets/photos/E-TIB_Gruppenfoto.jpg": "data:image/webp;base64,UklGRiwAAABXRUJQVlA4ICAAAACQAQCdASoKAAUABUB8JZQCdAEOgwAA4XqSiWtFZ0AAAA==", + "/assets/videos/web/hero-bahnkreuzung-poster.jpg": "data:image/webp;base64,UklGRi4AAABXRUJQVlA4ICIAAACQAQCdASoKAAYABUB8JQAAXKXv4AAA/UZNt5FbP3v64AAA", + "/assets/videos/web/hero-bohrung-poster.jpg": "data:image/webp;base64,UklGRjIAAABXRUJQVlA4ICYAAACwAQCdASoKAAYABUB8JZACdAEOI+oAAN5Rr3co8j7CDYNKNCAAAA==", + "/assets/videos/web/hero-kabelpflug-poster.jpg": "data:image/webp;base64,UklGRjIAAABXRUJQVlA4ICYAAADQAQCdASoKAAYABUB8JagCw7EOwCTyAAD9QIvsqI74a4qbWwAAAA==", + "/assets/videos/web/hero-messe-poster.jpg": "data:image/webp;base64,UklGRi4AAABXRUJQVlA4ICIAAABQAQCdASoKAAYABUB8JQBOgC6gAP7hJjEBwUoIEPzDKgAA" } \ No newline at end of file diff --git a/package.json b/package.json index 08f6337eb..5013ed814 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "xlsx-cli": "^1.1.3" }, "scripts": { - "dev": "bash -c 'bash scripts/registry-auth.sh && [ -f .env ] || (cp .env.example .env && sed -i.bak \"s/TRAEFIK_HOST=e-tib.com/TRAEFIK_HOST=etib.localhost/\" .env && rm -f .env.bak && echo \"✅ Created .env from .env.example\"); trap \"COMPOSE_PROJECT_NAME=etib docker compose -f docker-compose.dev.yml down\" EXIT INT TERM; docker network create infra 2>/dev/null || true && COMPOSE_PROJECT_NAME=etib docker compose -f docker-compose.dev.yml down && COMPOSE_PROJECT_NAME=etib docker compose -f docker-compose.dev.yml up etib-app etib-proxy --remove-orphans'", + "dev": "bash -c 'bash scripts/registry-auth.sh && [ -f .env ] || (cp .env.example .env && sed -i.bak \"s/TRAEFIK_HOST=e-tib.com/TRAEFIK_HOST=etib.localhost/\" .env && rm -f .env.bak && echo \"✅ Created .env from .env.example\"); trap \"COMPOSE_PROJECT_NAME=etib docker compose -f docker-compose.dev.yml down\" EXIT INT TERM; docker network create infra 2>/dev/null || true && COMPOSE_PROJECT_NAME=etib docker compose -f docker-compose.dev.yml down && COMPOSE_PROJECT_NAME=etib docker compose -f docker-compose.dev.yml up --build etib-app etib-proxy --remove-orphans'", "dev:local": "bash -c 'bash scripts/registry-auth.sh && next dev --webpack --port 3100 --hostname 0.0.0.0'", "dev:infra": "COMPOSE_PROJECT_NAME=etib docker compose -f docker-compose.dev.yml up -d etib-proxy", "build": "next build", @@ -140,7 +140,7 @@ "prepare": "husky", "preinstall": "npx only-allow pnpm" }, - "version": "2.4.46", + "version": "2.4.47", "pnpm": { "onlyBuiltDependencies": [ "@parcel/watcher", diff --git a/public/assets/photos/E-TIB_Gruppenfoto.jpg b/public/assets/photos/E-TIB_Gruppenfoto.jpg new file mode 100644 index 000000000..aab31cd72 Binary files /dev/null and b/public/assets/photos/E-TIB_Gruppenfoto.jpg differ diff --git a/public/assets/photos/team/danny.jpg b/public/assets/photos/team/danny.jpg index b0940e9c8..5d35bc715 100644 Binary files a/public/assets/photos/team/danny.jpg and b/public/assets/photos/team/danny.jpg differ diff --git a/public/assets/photos/team/dirk.jpg b/public/assets/photos/team/dirk.jpg index 7450dd3ef..23a90e4a3 100644 Binary files a/public/assets/photos/team/dirk.jpg and b/public/assets/photos/team/dirk.jpg differ diff --git a/public/assets/photos/team/kathrin.jpg b/public/assets/photos/team/kathrin.jpg index 9a1d023be..fb0c591b3 100644 Binary files a/public/assets/photos/team/kathrin.jpg and b/public/assets/photos/team/kathrin.jpg differ diff --git a/public/assets/photos/team/katrin-heigold.jpg b/public/assets/photos/team/katrin-heigold.jpg new file mode 100644 index 000000000..0fb1fc4e3 Binary files /dev/null and b/public/assets/photos/team/katrin-heigold.jpg differ diff --git a/public/assets/photos/team/maik.jpg b/public/assets/photos/team/maik.jpg index 751081f45..c858bab31 100644 Binary files a/public/assets/photos/team/maik.jpg and b/public/assets/photos/team/maik.jpg differ diff --git a/public/assets/photos/team/martin.jpg b/public/assets/photos/team/martin.jpg index 45aff7973..8911b39e4 100644 Binary files a/public/assets/photos/team/martin.jpg and b/public/assets/photos/team/martin.jpg differ diff --git a/public/assets/photos/team/oliver.jpg b/public/assets/photos/team/oliver.jpg index 320216ba4..753bddf8a 100644 Binary files a/public/assets/photos/team/oliver.jpg and b/public/assets/photos/team/oliver.jpg differ diff --git a/public/assets/photos/team/sven.jpg b/public/assets/photos/team/sven.jpg index 30ca158df..875cf2188 100644 Binary files a/public/assets/photos/team/sven.jpg and b/public/assets/photos/team/sven.jpg differ diff --git a/scripts/generate-placeholders.ts b/scripts/generate-placeholders.ts index 133626106..df93b4d3b 100644 --- a/scripts/generate-placeholders.ts +++ b/scripts/generate-placeholders.ts @@ -5,6 +5,7 @@ import sharp from 'sharp'; const PUBLIC_DIR = path.join(process.cwd(), 'public'); const IMAGES_TO_PROCESS = [ '/assets/photos/DJI_0048.JPG', + '/assets/photos/E-TIB_Gruppenfoto.jpg', '/assets/videos/web/hero-bahnkreuzung-poster.jpg', '/assets/videos/web/hero-bohrung-poster.jpg', '/assets/videos/web/hero-kabelpflug-poster.jpg', diff --git a/tests/team-images.test.ts b/tests/team-images.test.ts new file mode 100644 index 000000000..ffb02053e --- /dev/null +++ b/tests/team-images.test.ts @@ -0,0 +1,61 @@ +import { describe, it, expect } from 'vitest'; +import fs from 'fs'; +import path from 'path'; + +describe('Team Images and Team Page Content', () => { + const publicTeamPhotosDir = path.join(process.cwd(), 'public', 'assets', 'photos', 'team'); + const publicPhotosDir = path.join(process.cwd(), 'public', 'assets', 'photos'); + const deTeamPath = path.join(process.cwd(), 'content', 'de', 'team.mdx'); + const enTeamPath = path.join(process.cwd(), 'content', 'en', 'team.mdx'); + + it('should verify all required team photos exist in public/assets/photos/team/', () => { + const requiredMemberImages = [ + 'danny.jpg', + 'dirk.jpg', + 'kathrin.jpg', + 'katrin-heigold.jpg', + 'maik.jpg', + 'martin.jpg', + 'oliver.jpg', + 'sven.jpg', + ]; + + for (const imgName of requiredMemberImages) { + const imgPath = path.join(publicTeamPhotosDir, imgName); + expect(fs.existsSync(imgPath), `Expected image ${imgName} to exist`).toBe(true); + } + }); + + it('should verify team group photo exists in public/assets/photos/', () => { + const groupPhotoPath = path.join(publicPhotosDir, 'E-TIB_Gruppenfoto.jpg'); + expect(fs.existsSync(groupPhotoPath), 'Expected E-TIB_Gruppenfoto.jpg to exist').toBe(true); + }); + + it('should verify DE and EN team.mdx use E-TIB_Gruppenfoto.jpg in HeroSection', () => { + const deContent = fs.readFileSync(deTeamPath, 'utf8'); + const enContent = fs.readFileSync(enTeamPath, 'utf8'); + + expect(deContent).toContain("url: '/assets/photos/E-TIB_Gruppenfoto.jpg'"); + expect(enContent).toContain("url: '/assets/photos/E-TIB_Gruppenfoto.jpg'"); + }); + + it('should verify Frau Joseph (Kerstin Joseph) has no image property in team.mdx', () => { + const deContent = fs.readFileSync(deTeamPath, 'utf8'); + const enContent = fs.readFileSync(enTeamPath, 'utf8'); + + // Parse kerstin-joseph block and ensure no image line exists for kerstin-joseph + const deKerstinBlock = deContent.match(/id:\s*"kerstin-joseph"[\s\S]*?\}/)?.[0] || ''; + const enKerstinBlock = enContent.match(/id:\s*"kerstin-joseph"[\s\S]*?\}/)?.[0] || ''; + + expect(deKerstinBlock).not.toContain('image:'); + expect(enKerstinBlock).not.toContain('image:'); + }); + + it('should verify Katrin Heigold has image set in team.mdx', () => { + const deContent = fs.readFileSync(deTeamPath, 'utf8'); + const enContent = fs.readFileSync(enTeamPath, 'utf8'); + + expect(deContent).toContain('/assets/photos/team/katrin-heigold.jpg'); + expect(enContent).toContain('/assets/photos/team/katrin-heigold.jpg'); + }); +});