From 24c438a01ea910d69a48a75f45f169766fd2d252 Mon Sep 17 00:00:00 2001 From: Lobo Date: Sat, 17 Jan 2026 10:27:35 +0100 Subject: [PATCH] refactored projects site --- .../dialog/project-dialog.component.html | 61 ++++++++++ .../dialog/project-dialog.component.scss | 60 ++++++++++ .../dialog/project-dialog.component.ts | 35 ++++++ .../pages/projects/projects.component.html | 109 ++++++++---------- .../pages/projects/projects.component.scss | 82 ++++++++----- src/app/pages/projects/projects.component.ts | 92 +++++++++------ src/assets/i18n/de.json | 27 ++++- src/assets/i18n/en.json | 27 ++++- 8 files changed, 360 insertions(+), 133 deletions(-) create mode 100644 src/app/pages/projects/dialog/project-dialog.component.html create mode 100644 src/app/pages/projects/dialog/project-dialog.component.scss create mode 100644 src/app/pages/projects/dialog/project-dialog.component.ts diff --git a/src/app/pages/projects/dialog/project-dialog.component.html b/src/app/pages/projects/dialog/project-dialog.component.html new file mode 100644 index 0000000..3423c9f --- /dev/null +++ b/src/app/pages/projects/dialog/project-dialog.component.html @@ -0,0 +1,61 @@ +

{{ project.title | translate }}

+ +

{{ project.introduction | translate }}

+ + + + @if (project.images.length > 0) + { + + @for (img of project.images; track img) { + + + + } + + } + + + @for(tech of project.technologies; track tech) { + {{tech}} + } + + +
+ @if (project.link) + { + + open_in_new + {{ 'PROJECTS.LINK_TO_PROJECT' | translate }} + + } + + @if(project.assets) + { + + download + {{ 'PROJECTS.DOWNLOAD' | translate}} + + } +
+ + + + + diff --git a/src/app/pages/projects/dialog/project-dialog.component.scss b/src/app/pages/projects/dialog/project-dialog.component.scss new file mode 100644 index 0000000..e494d7a --- /dev/null +++ b/src/app/pages/projects/dialog/project-dialog.component.scss @@ -0,0 +1,60 @@ +.my-swiper::part(button-prev), +.my-swiper::part(button-next) { + width: 35px; + height: 35px; + padding: 5px; + border-radius: 999px; + background: rgba(0,0,0,.5); + color: white; + + display: flex; + align-items: center; + justify-content: center; +} + +.my-swiper::part(button-prev):hover, +.my-swiper::part(button-next):hover { + background: rgba(0,0,0,.75); +} + +.my-swiper::part(pagination) { + bottom: 12px; +} + +.slide-img { + width: 100%; + height: auto; + max-height: 512px !important; + object-fit: cover; + border-radius: 12px; + display: block; +} + +ul { + padding-left: 20px; + margin-bottom: 1.5rem; +} + +li { + margin-bottom: 0.5rem; +} + +mat-chip-set { + margin-top: 1.5rem; + margin-bottom: 1.5rem; +} + +.link-section { + display: flex; + gap: 1rem; + margin-top: 1.5rem; + flex-wrap: wrap; + + a { + text-decoration: none; + } +} + +mat-dialog-actions { + justify-content: flex-end; +} diff --git a/src/app/pages/projects/dialog/project-dialog.component.ts b/src/app/pages/projects/dialog/project-dialog.component.ts new file mode 100644 index 0000000..8a7f561 --- /dev/null +++ b/src/app/pages/projects/dialog/project-dialog.component.ts @@ -0,0 +1,35 @@ +import {Component, inject, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; +import { + MAT_DIALOG_DATA, + MatDialogActions, + MatDialogClose, + MatDialogContent, + MatDialogTitle +} from '@angular/material/dialog'; +import {Projects} from '../projects.component'; +import {TranslatePipe} from '@ngx-translate/core'; +import {MatIcon} from '@angular/material/icon'; +import {MatChip, MatChipSet} from '@angular/material/chips'; +import {MatButton} from '@angular/material/button'; + +@Component({ + selector: 'app-project-dialog', + templateUrl: './project-dialog.component.html', + styleUrls: ['./project-dialog.component.scss'], + standalone: true, + imports: [ + MatDialogTitle, + MatDialogContent, + TranslatePipe, + MatIcon, + MatChip, + MatChipSet, + MatDialogActions, + MatButton, + MatDialogClose + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] +}) +export class ProjectDialogComponent { + project: Projects = inject(MAT_DIALOG_DATA); +} diff --git a/src/app/pages/projects/projects.component.html b/src/app/pages/projects/projects.component.html index ed1bacd..137328e 100644 --- a/src/app/pages/projects/projects.component.html +++ b/src/app/pages/projects/projects.component.html @@ -1,63 +1,54 @@ - - @for (project of allProjects; track project) { - - - {{ project.title | translate }} - - {{ project.shortDescription | translate}} - {{ project.icon }} - - -

{{ project.introduction | translate }}

- - @if (project.link) - { -
- - open_in_new - {{project.link}} - +
+ @if (featuredProject(); as project) { + + + {{ project.title | translate }} + {{ project.shortDescription | translate }} + + @if(project.images.length > 0) { + + } @else { +
+ {{ project.icon }}
} - - @if(project.assets) - { -
- - download - {{ 'PROJECTS.DOWNLOAD' | translate}} - -
- } - - @if (project.images.length > 0) - { - - @for (img of project.images; track img) { - - - + +

{{ project.introduction | translate }}

+ + @for(tech of project.technologies; track tech) { + {{tech}} } - - } - + + + + + + } - + + @for (project of otherProjects(); track project) { + + + {{ project.title | translate }} + + @if(project.images.length > 0) { + + } @else { +
+ {{ project.icon }} +
+ } + +

{{ project.shortDescription | translate }}

+ + @for(tech of project.technologies; track tech) { + {{tech}} + } + + + + + + + } +
diff --git a/src/app/pages/projects/projects.component.scss b/src/app/pages/projects/projects.component.scss index 5f2be76..a151818 100644 --- a/src/app/pages/projects/projects.component.scss +++ b/src/app/pages/projects/projects.component.scss @@ -1,40 +1,60 @@ -.project-headers-align .mat-expansion-panel-header-description { - justify-content: space-between; - align-items: center; +.project-grid { + display: grid; + gap: 1.5rem; + grid-template-columns: repeat(auto-fill, minmax(350px, 1fr)); } -.project-headers-align .mat-mdc-form-field + .mat-mdc-form-field { - margin-left: 8px; -} - -.slide-img { - width: 100%; - height: auto; - max-height: 512px !important; - object-fit: cover; - border-radius: 12px; - display: block; - cursor: pointer; -} - -.my-swiper::part(button-prev), -.my-swiper::part(button-next) { - width: 35px; - height: 35px; - padding: 5px; - border-radius: 999px; - background: rgba(0,0,0,.5); - +.project-card { + transition: transform 0.2s ease-in-out, box-shadow 0.2s ease-in-out; + display: flex; + flex-direction: column; + + &:hover { + transform: translateY(-5px); + box-shadow: 0 4px 20px rgba(0,0,0,0.15); + } + + &.featured { + grid-column: 1 / -1; // Span full width + } + + mat-card-header { + padding-bottom: 1rem; + } + + mat-card-content { + flex-grow: 1; // Ensure content area expands + padding-top: 1rem; + padding-bottom: 1rem; + } + + mat-chip-set { + padding-top: 1rem; + } + + mat-card-actions { + margin-top: auto; // Push actions to the bottom + } +} + +.icon-container { display: flex; - align-items: center; justify-content: center; + align-items: center; + height: 200px; /* Or a height that fits your design */ + background-color: #f0f0f0; /* A light background for the icon */ } -.my-swiper::part(button-prev):hover, -.my-swiper::part(button-next):hover { - background: rgba(0,0,0,.75); +.fallback-icon { + font-size: 4rem; + width: 4rem; + height: 4rem; + color: #666; } -.my-swiper::part(pagination) { - bottom: 12px; +// Ensure images don't exceed the card width and maintain aspect ratio +img[mat-card-image] { + width: 100%; + height: 250px; + object-fit: cover; } diff --git a/src/app/pages/projects/projects.component.ts b/src/app/pages/projects/projects.component.ts index a591fdc..31cd825 100644 --- a/src/app/pages/projects/projects.component.ts +++ b/src/app/pages/projects/projects.component.ts @@ -1,11 +1,13 @@ -import {Component, inject, signal, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import {MatAccordion, MatExpansionPanel, MatExpansionPanelDescription, MatExpansionPanelHeader, MatExpansionPanelTitle} from '@angular/material/expansion'; +import {Component, computed, inject, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; +import {MatCardModule} from '@angular/material/card'; +import {MatChipsModule} from '@angular/material/chips'; import {MatIcon} from '@angular/material/icon'; import {TranslatePipe, TranslateService} from '@ngx-translate/core'; import {ActivatedRoute} from '@angular/router'; import {AssetsConstants} from '../../constants/AssetsConstants'; import {MatDialog} from '@angular/material/dialog'; -import {ImageDialogComponent} from '../../layout/imageDialog/image.component'; +import {MatButtonModule} from '@angular/material/button'; +import {ProjectDialogComponent} from './dialog/project-dialog.component'; export interface Projects { @@ -18,18 +20,18 @@ export interface Projects { assets: string, link: string, bulletPoints: string[], + isFeatured: boolean, + technologies: string[] } @Component({ selector: 'app-projects', imports: [ - MatAccordion, - MatExpansionPanel, - MatExpansionPanelHeader, - MatExpansionPanelTitle, - MatExpansionPanelDescription, + MatCardModule, + MatChipsModule, MatIcon, - TranslatePipe + TranslatePipe, + MatButtonModule ], templateUrl: './projects.component.html', styleUrl: './projects.component.scss', @@ -41,8 +43,6 @@ export class ProjectsComponent { private readonly dialog = inject(MatDialog); private readonly translateService = inject(TranslateService); - selectedKey = signal(null); - allProjects: Projects[] = [ { identifier: "playground", @@ -53,7 +53,14 @@ export class ProjectsComponent { icon: 'web', assets: '', link: 'https://andreas-dahm.eu', - bulletPoints: [] + bulletPoints: [ + 'PROJECTS.PLAYGROUND.BULLET_1', + 'PROJECTS.PLAYGROUND.BULLET_2', + 'PROJECTS.PLAYGROUND.BULLET_3', + 'PROJECTS.PLAYGROUND.BULLET_4', + ], + isFeatured: false, + technologies: ['Angular', 'TypeScript', 'SCSS', 'HTML', 'GitHub Actions', 'Docker'] }, { identifier: "elmucho", @@ -63,8 +70,15 @@ export class ProjectsComponent { images: [AssetsConstants.EL_MUCHO_1, AssetsConstants.EL_MUCHO_2, AssetsConstants.EL_MUCHO_3, AssetsConstants.EL_MUCHO_4], icon: 'sports_esports', assets: '', - link: 'https://store.steampowered.com/app/1532640/El_Mucho/', - bulletPoints: [] + link: 'https.store.steampowered.com/app/1532640/El_Mucho/', + bulletPoints: [ + 'PROJECTS.EL_MUCHO.BULLET_1', + 'PROJECTS.EL_MUCHO.BULLET_2', + 'PROJECTS.EL_MUCHO.BULLET_3', + 'PROJECTS.EL_MUCHO.BULLET_4', + ], + isFeatured: true, + technologies: ['Unity', 'C#', 'Steamworks', 'Git'] }, { identifier: "gamejams", @@ -74,8 +88,15 @@ export class ProjectsComponent { images: [AssetsConstants.GAME_JAMS_1, AssetsConstants.GAME_JAMS_2, AssetsConstants.GAME_JAMS_3], icon: 'videogame_asset', assets: '', - link: 'https://itch.io/c/6628860/lobos-collection', - bulletPoints: [] + link: 'https.itch.io/c/6628860/lobos-collection', + bulletPoints: [ + 'PROJECTS.GAME_JAMS.BULLET_1', + 'PROJECTS.GAME_JAMS.BULLET_2', + 'PROJECTS.GAME_JAMS.BULLET_3', + 'PROJECTS.GAME_JAMS.BULLET_4', + ], + isFeatured: false, + technologies: ['Unity', 'C#', 'Git'] }, { identifier: "diploma", @@ -85,32 +106,33 @@ export class ProjectsComponent { images: [AssetsConstants.DIPLOMA_1, AssetsConstants.DIPLOMA_2, AssetsConstants.DIPLOMA_3, AssetsConstants.DIPLOMA_4, AssetsConstants.DIPLOMA_5, AssetsConstants.DIPLOMA_6], icon: 'history_edu', assets: AssetsConstants.DIPLOMA, - link: 'https://www.th-bingen.de', - bulletPoints: [] + link: 'https.www.th-bingen.de', + bulletPoints: [ + 'PROJECTS.DIPLOMA.BULLET_1', + 'PROJECTS.DIPLOMA.BULLET_2', + 'PROJECTS.DIPLOMA.BULLET_3', + 'PROJECTS.DIPLOMA.BULLET_4', + ], + isFeatured: false, + technologies: ['C++', 'OpenGL', 'Qt', '3D-Scanner'] } ] + featuredProject = computed(() => this.allProjects.find(p => p.isFeatured)); + otherProjects = computed(() => this.allProjects.filter(p => !p.isFeatured)); + + constructor() { this.route.queryParamMap.subscribe(params => { - this.selectedKey.set(params.get('project')); + // this.selectedKey.set(params.get('project')); }); } - isExpanded(projectKey: string): boolean { - return this.selectedKey() === projectKey; - } - - openImage(title: string, src: string) { - const translatedTitle = this.translateService.instant(title); - this.dialog.open(ImageDialogComponent, { - data: { title: translatedTitle, src }, - width: '96vw', - height: '96vh', - maxWidth: '96vw', - maxHeight: '96vh', - panelClass: 'image-dialog-panel', - autoFocus: false, - restoreFocus: true, - }); + openProjectDialog(project: Projects) { + this.dialog.open(ProjectDialogComponent, { + data: project, + width: '90vw', + maxWidth: '900px', + }); } } diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 35ef058..7bc45a4 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -228,25 +228,44 @@ }, "PROJECTS": { "DOWNLOAD": "Herunterladen", + "READ_MORE": "Mehr erfahren", + "LINK_TO_PROJECT": "Zum Projekt", + "CLOSE": "Schließen", "PLAYGROUND": { "TITLE": "Playground Website", "SHORT_DESCRIPTION": "Hier geht es um diese Webseite.", - "INTRODUCTION": "Dieses Projekt ist hauptsächlich als eine Art 'Spielwiese' gestartet, daher der Name. Es ist geplant, die Seite mit der Zeit weiter auszubauen. Dabei werden hier neue Projekte auftauchen, oder ich werde die Seite an für sich weiter ausbauen, weil ich neue Sachen im Rahmen von Web Technologien ausprobieren möchte." + "INTRODUCTION": "Dieses Projekt ist hauptsächlich als eine Art 'Spielwiese' gestartet, daher der Name. Es ist geplant, die Seite mit der Zeit weiter auszubauen. Dabei werden hier neue Projekte auftauchen, oder ich werde die Seite an für sich weiter ausbauen, weil ich neue Sachen im Rahmen von Web Technologien ausprobieren möchte.", + "BULLET_1": "Verwendung moderner Technologien und CI/CD-Pipelines (Angular 20+, Spring Boot 4, GitHub).", + "BULLET_2": "Präsentation persönlicher Projekte und kontinuierliche Verbesserung algorithmischer Fähigkeiten.", + "BULLET_3": "Vertiefung von JavaScript/TypeScript-, Angular- und Spring-Boot-Kenntnissen durch praktisches Arbeiten.", + "BULLET_4": "Die Seite ist Open Source und auf GitHub verfügbar." }, "EL_MUCHO": { "TITLE": "El Mucho", "SHORT_DESCRIPTION": "Hier geht es um mein ersten Spiel auf Steam.", - "INTRODUCTION": "El Mucho ist ein rundenbasiertes taktisches RPG in einer fiktiven Welt namens Liberika. Es ist angelehnt an alte Klassiker wie Langrisser aka Warsong. In El Mucho geht es darum, die Welt gegen die Angriffe der fiesen Monster zu verteidigen." + "INTRODUCTION": "El Mucho ist ein rundenbasiertes taktisches RPG in einer fiktiven Welt namens Liberika. Es ist angelehnt an alte Klassiker wie Langrisser aka Warsong. In El Mucho geht es darum, die Welt gegen die Angriffe der fiesen Monster zu verteidigen.", + "BULLET_1": "Veröffentlichung eines Spiels auf Steam und Integration der Steam-API.", + "BULLET_2": "Konzeption, Planung und vollständige Entwicklung eines eigenen Spiels.", + "BULLET_3": "Implementierung komplexer Algorithmen wie einer eigenen A*-Pfadfindungslogik und Spiel-KI.", + "BULLET_4": "Das Spiel wurde mit Unity und C# entwickelt." }, "GAME_JAMS": { "TITLE": "Game Jams", "SHORT_DESCRIPTION": "Hier geht es meine Teilnahme an mehreren Game Jams.", - "INTRODUCTION": "Da ich mich für die Entwicklung von Spielen interessiert, sind Game Jams für mich optimal, um fokussiert an neuen Ideen zu arbeiten und dabei Prototypen zu entwickeln, um zu sehen, ob Spielideen funktionieren oder nicht. In den letzten Jahren habe ich an einigen Game Jams teilgenommen und fasse das hier zusammen." + "INTRODUCTION": "Da ich mich für die Entwicklung von Spielen interessiert, sind Game Jams für mich optimal, um fokussiert an neuen Ideen zu arbeiten und dabei Prototypen zu entwickeln, um zu sehen, ob Spielideen funktionieren oder nicht. In den letzten Jahren habe ich an einigen Game Jams teilgenommen und fasse das hier zusammen.", + "BULLET_1": "Planung eines realistischen Projektumfangs mit einem Team, der innerhalb von 48 Stunden umsetzbar ist.", + "BULLET_2": "Lernen, fokussiert und effizient unter strengen Zeitvorgaben zu arbeiten.", + "BULLET_3": "Die Freude zu erleben, in kurzer Zeit ein spielbares Projekt zu erstellen und andere damit spielen zu sehen.", + "BULLET_4": "Alle Projekte sind auf Itch.io verfügbar und spielbar." }, "DIPLOMA": { "TITLE": "Diplomarbeit", "SHORT_DESCRIPTION": "Kollisionserkennung und Behandlung von komplexen Kleidungsstücken.", - "INTRODUCTION": "Die Diplomarbeit handelt von der Erkennung und der Behandlung von Kollisionen zwischen, sowie innerhalb, einzelnen Kleidungsstücken in Echtzeit. Das ist gerade aufgrund der Flexibilität von Stoffen und deren unterschiedlichen Eigenschaften besonders herausfordernd." + "INTRODUCTION": "Die Diplomarbeit handelt von der Erkennung und der Behandlung von Kollisionen zwischen, sowie innerhalb, einzelnen Kleidungsstücken in Echtzeit. Das ist gerade aufgrund der Flexibilität von Stoffen und deren unterschiedlichen Eigenschaften besonders herausfordernd.", + "BULLET_1": "Echtzeit behandlung von Kollisionserkennung und Behandlung.", + "BULLET_2": "Verstehen und Einschätzen von wissenschaftlichen Arbeiten.", + "BULLET_3": "Adaption und Weiterentwicklung von vorausgegangenen Forschungsarbeiten.", + "BULLET_4": "Die Arbeit wurde mit C++ und OpenGL geschrieben und in die Vidya-Software integriert." } }, "IMPRINT": { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index ba1757a..10b9d29 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -228,25 +228,44 @@ }, "PROJECTS": { "DOWNLOAD": "Download", + "READ_MORE": "Read More", + "LINK_TO_PROJECT": "To the project", + "CLOSE": "Close", "PLAYGROUND": { "TITLE": "Playground Website", "SHORT_DESCRIPTION": "This is about this website.", - "INTRODUCTION": "This project was mainly started as a kind of “playground”, hence the name. The plan is to expand the site over time. New projects will appear here, or I will continue to expand the site itself because I want to try out new things in the field of web technologies." + "INTRODUCTION": "This project was mainly started as a kind of “playground”, hence the name. The plan is to expand the site over time. New projects will appear here, or I will continue to expand the site itself because I want to try out new things in the field of web technologies.", + "BULLET_1": "Using modern technologies and CI/CD pipelines (Angular 20+, Spring Boot 4, GitHub).", + "BULLET_2": "Showcasing personal projects and improving algorithmic skills over time.", + "BULLET_3": "Deepening knowledge in JavaScript/TypeScript, Angular, Spring Boot and related technologies through hands-on practice.", + "BULLET_4": "The site is open source and available on GitHub." }, "EL_MUCHO": { "TITLE": "El Mucho", "SHORT_DESCRIPTION": "This is about my first game on steam.", - "INTRODUCTION": "El Mucho is a turn-based tactical RPG set in a fictional world called Liberika. It is inspired by old classics such as Langrisser, also known as Warsong. El Mucho is about defending the world against attacks from nasty monsters." + "INTRODUCTION": "El Mucho is a turn-based tactical RPG set in a fictional world called Liberika. It is inspired by old classics such as Langrisser, also known as Warsong. El Mucho is about defending the world against attacks from nasty monsters.", + "BULLET_1": "Publishing a game on Steam and integrating the Steam API.", + "BULLET_2": "Designing, planning and developing a complete game from scratch.", + "BULLET_3": "Implementing complex algorithms, including a custom A* pathfinding system and game AI logic.", + "BULLET_4": "The game was developed with Unity and C#." }, "GAME_JAMS": { "TITLE": "Game Jams", "SHORT_DESCRIPTION": "This is about my participation at several game jams.", - "INTRODUCTION": "Since I am interested in game development, game jams are ideal for me to focus on new ideas and develop prototypes to see whether game ideas work or not. I have participated in several game jams over the past few years and summarise my experiences here." + "INTRODUCTION": "Since I am interested in game development, game jams are ideal for me to focus on new ideas and develop prototypes to see whether game ideas work or not. I have participated in several game jams over the past few years and summarise my experiences here.", + "BULLET_1": "Planning a realistic project scope with a team that can be built within 48 hours.", + "BULLET_2": "Learning to stay focused and work effectively under strict time constraints.", + "BULLET_3": "Experiencing the joy of creating a playable game in a short timeframe and seeing others enjoy it.", + "BULLET_4": "All projects are available and playable on Itch.io." }, "DIPLOMA": { "TITLE": "Diploma thesis", "SHORT_DESCRIPTION": "Collision detection and handling of complex garments.", - "INTRODUCTION": "The thesis deals with the detection and handling of collisions between and within individual items of clothing in real time. This is particularly challenging due to the flexibility of fabrics and their varying properties." + "INTRODUCTION": "The thesis deals with the detection and handling of collisions between and within individual items of clothing in real time. This is particularly challenging due to the flexibility of fabrics and their varying properties.", + "BULLET_1": "Real-time handling of collision detection and response.", + "BULLET_2": "Understanding and evaluating scientific papers.", + "BULLET_3": "Adaptation and further development of previous research work.", + "BULLET_4": "The thesis was written with C++ and OpenGL and integrated into the Vidya software." } }, "IMPRINT": {