diff --git a/angular.json b/angular.json index 9cf25c1..92eb223 100644 --- a/angular.json +++ b/angular.json @@ -23,7 +23,7 @@ "assets": [ { "glob": "**/*", - "input": "public", + "input": "assets", "output": "/" } ], @@ -90,7 +90,7 @@ "assets": [ { "glob": "**/*", - "input": "public", + "input": "assets", "output": "/" } ], diff --git a/public/email_qr_black.svg b/assets/images/email_qr_black.svg similarity index 100% rename from public/email_qr_black.svg rename to assets/images/email_qr_black.svg diff --git a/public/favicon.ico b/assets/images/favicon.ico similarity index 100% rename from public/favicon.ico rename to assets/images/favicon.ico diff --git a/public/github_logo.svg b/assets/images/github_logo.svg similarity index 100% rename from public/github_logo.svg rename to assets/images/github_logo.svg diff --git a/public/linkedin_logo.svg b/assets/images/linkedin_logo.svg similarity index 100% rename from public/linkedin_logo.svg rename to assets/images/linkedin_logo.svg diff --git a/public/theme_button.svg b/assets/images/theme_button.svg similarity index 100% rename from public/theme_button.svg rename to assets/images/theme_button.svg diff --git a/public/cyber_agent.mp4 b/assets/video/cyber_agent.mp4 similarity index 100% rename from public/cyber_agent.mp4 rename to assets/video/cyber_agent.mp4 diff --git a/public/cyber_hands.mp4 b/assets/video/cyber_hands.mp4 similarity index 100% rename from public/cyber_hands.mp4 rename to assets/video/cyber_hands.mp4 diff --git a/public/cyber_skull.mp4 b/assets/video/cyber_skull.mp4 similarity index 100% rename from public/cyber_skull.mp4 rename to assets/video/cyber_skull.mp4 diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 7ecdf85..4baebcd 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { RouterOutlet } from '@angular/router'; -import { FooterComponent } from './layout/components/footer/footer.component'; -import { HeaderComponent } from './layout/components/header/header.component'; +import { FooterComponent } from './components/footer/footer.component'; +import { HeaderComponent } from './components/header/header.component'; @Component({ selector: 'app-root', diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 78a6e42..433441e 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -1,33 +1,31 @@ import { Routes } from '@angular/router'; -import { HeroComponent } from './layout/components/hero/hero.component'; +import { HeroComponent } from './pages/hero/hero.component'; export const routes: Routes = [ { path: '', component: HeroComponent }, { path: 'about', loadComponent: () => - import('./layout/components/about/about.component').then( - (c) => c.AboutComponent, - ), + import('./pages/about/about.component').then((c) => c.AboutComponent), }, { path: 'contact', loadComponent: () => - import('./layout/components/contact/contact.component').then( + import('./pages/contact/contact.component').then( (c) => c.ContactComponent, ), }, { path: 'projects', loadComponent: () => - import( - './features/project-display/components/projects-list/projects-list.component' - ).then((c) => c.ProjectListComponent), + import('./pages/projects/projects.component').then( + (c) => c.ProjectsComponent, + ), }, { path: 'experience', loadComponent: () => - import('./layout/components/experience/experience.component').then( + import('./pages/experience/experience.component').then( (c) => c.ExperienceComponent, ), }, diff --git a/src/app/shared/ui/button/nav-button.component.ts b/src/app/components/button/nav-button.component.ts similarity index 100% rename from src/app/shared/ui/button/nav-button.component.ts rename to src/app/components/button/nav-button.component.ts diff --git a/src/app/shared/ui/button/nav-button.css b/src/app/components/button/nav-button.css similarity index 100% rename from src/app/shared/ui/button/nav-button.css rename to src/app/components/button/nav-button.css diff --git a/src/app/shared/ui/button/nav-button.html b/src/app/components/button/nav-button.html similarity index 100% rename from src/app/shared/ui/button/nav-button.html rename to src/app/components/button/nav-button.html diff --git a/src/app/shared/ui/container-decorator/container-decorator.component.css b/src/app/components/container-decorator/container-decorator.component.css similarity index 100% rename from src/app/shared/ui/container-decorator/container-decorator.component.css rename to src/app/components/container-decorator/container-decorator.component.css diff --git a/src/app/shared/ui/container-decorator/container-decorator.component.html b/src/app/components/container-decorator/container-decorator.component.html similarity index 100% rename from src/app/shared/ui/container-decorator/container-decorator.component.html rename to src/app/components/container-decorator/container-decorator.component.html diff --git a/src/app/shared/ui/container-decorator/container-decorator.component.ts b/src/app/components/container-decorator/container-decorator.component.ts similarity index 100% rename from src/app/shared/ui/container-decorator/container-decorator.component.ts rename to src/app/components/container-decorator/container-decorator.component.ts diff --git a/src/app/layout/components/footer/footer.component.css b/src/app/components/footer/footer.component.css similarity index 100% rename from src/app/layout/components/footer/footer.component.css rename to src/app/components/footer/footer.component.css diff --git a/src/app/features/footer-display/footer-display.component.html b/src/app/components/footer/footer.component.html similarity index 100% rename from src/app/features/footer-display/footer-display.component.html rename to src/app/components/footer/footer.component.html diff --git a/src/app/layout/components/footer/footer.component.ts b/src/app/components/footer/footer.component.ts similarity index 59% rename from src/app/layout/components/footer/footer.component.ts rename to src/app/components/footer/footer.component.ts index d28de75..a5bf862 100644 --- a/src/app/layout/components/footer/footer.component.ts +++ b/src/app/components/footer/footer.component.ts @@ -1,9 +1,8 @@ import { Component } from '@angular/core'; -import {FooterDisplayComponent} from '../../../features/footer-display/footer-display.component'; @Component({ selector: 'app-footer', - imports: [FooterDisplayComponent], + imports: [], templateUrl: './footer.component.html', styleUrl: './footer.component.css', }) diff --git a/src/app/features/header-display/header-contact-links/header-contact-links.component.css b/src/app/components/header/header-contact-links/header-contact-links.component.css similarity index 100% rename from src/app/features/header-display/header-contact-links/header-contact-links.component.css rename to src/app/components/header/header-contact-links/header-contact-links.component.css diff --git a/src/app/features/header-display/header-contact-links/header-contact-links.component.html b/src/app/components/header/header-contact-links/header-contact-links.component.html similarity index 100% rename from src/app/features/header-display/header-contact-links/header-contact-links.component.html rename to src/app/components/header/header-contact-links/header-contact-links.component.html diff --git a/src/app/features/header-display/header-contact-links/header-contact-links.component.ts b/src/app/components/header/header-contact-links/header-contact-links.component.ts similarity index 100% rename from src/app/features/header-display/header-contact-links/header-contact-links.component.ts rename to src/app/components/header/header-contact-links/header-contact-links.component.ts diff --git a/src/app/features/header-display/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.css b/src/app/components/header/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.css similarity index 100% rename from src/app/features/header-display/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.css rename to src/app/components/header/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.css diff --git a/src/app/features/header-display/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.html b/src/app/components/header/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.html similarity index 100% rename from src/app/features/header-display/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.html rename to src/app/components/header/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.html diff --git a/src/app/features/header-display/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.spec.ts b/src/app/components/header/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.spec.ts similarity index 100% rename from src/app/features/header-display/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.spec.ts rename to src/app/components/header/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.spec.ts diff --git a/src/app/features/header-display/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.ts b/src/app/components/header/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.ts similarity index 100% rename from src/app/features/header-display/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.ts rename to src/app/components/header/header-contact-links/header-switch-theme-button/header-switch-theme-button.component.ts diff --git a/src/app/features/header-display/header-logo/header-logo.component.css b/src/app/components/header/header-logo/header-logo.component.css similarity index 100% rename from src/app/features/header-display/header-logo/header-logo.component.css rename to src/app/components/header/header-logo/header-logo.component.css diff --git a/src/app/features/header-display/header-logo/header-logo.component.html b/src/app/components/header/header-logo/header-logo.component.html similarity index 100% rename from src/app/features/header-display/header-logo/header-logo.component.html rename to src/app/components/header/header-logo/header-logo.component.html diff --git a/src/app/features/header-display/header-logo/header-logo.component.ts b/src/app/components/header/header-logo/header-logo.component.ts similarity index 100% rename from src/app/features/header-display/header-logo/header-logo.component.ts rename to src/app/components/header/header-logo/header-logo.component.ts diff --git a/src/app/features/header-display/header-nav-links/header-nav-links.component.css b/src/app/components/header/header-nav-links/header-nav-links.component.css similarity index 100% rename from src/app/features/header-display/header-nav-links/header-nav-links.component.css rename to src/app/components/header/header-nav-links/header-nav-links.component.css diff --git a/src/app/features/header-display/header-nav-links/header-nav-links.component.html b/src/app/components/header/header-nav-links/header-nav-links.component.html similarity index 100% rename from src/app/features/header-display/header-nav-links/header-nav-links.component.html rename to src/app/components/header/header-nav-links/header-nav-links.component.html diff --git a/src/app/features/header-display/header-nav-links/header-nav-links.component.ts b/src/app/components/header/header-nav-links/header-nav-links.component.ts similarity index 78% rename from src/app/features/header-display/header-nav-links/header-nav-links.component.ts rename to src/app/components/header/header-nav-links/header-nav-links.component.ts index 2656b94..0843e05 100644 --- a/src/app/features/header-display/header-nav-links/header-nav-links.component.ts +++ b/src/app/components/header/header-nav-links/header-nav-links.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NavButtonComponent } from '../../../shared/ui/button/nav-button.component'; +import { NavButtonComponent } from '../../../components/button/nav-button.component'; @Component({ selector: 'app-header-nav-links', diff --git a/src/app/features/header-display/header-text-animate-section/header-text-animate-section.component.css b/src/app/components/header/header-text-animate-section/header-text-animate-section.component.css similarity index 100% rename from src/app/features/header-display/header-text-animate-section/header-text-animate-section.component.css rename to src/app/components/header/header-text-animate-section/header-text-animate-section.component.css diff --git a/src/app/features/header-display/header-text-animate-section/header-text-animate-section.component.html b/src/app/components/header/header-text-animate-section/header-text-animate-section.component.html similarity index 100% rename from src/app/features/header-display/header-text-animate-section/header-text-animate-section.component.html rename to src/app/components/header/header-text-animate-section/header-text-animate-section.component.html diff --git a/src/app/features/header-display/header-text-animate-section/header-text-animate-section.component.ts b/src/app/components/header/header-text-animate-section/header-text-animate-section.component.ts similarity index 100% rename from src/app/features/header-display/header-text-animate-section/header-text-animate-section.component.ts rename to src/app/components/header/header-text-animate-section/header-text-animate-section.component.ts diff --git a/src/app/layout/components/header/header.component.css b/src/app/components/header/header.component.css similarity index 100% rename from src/app/layout/components/header/header.component.css rename to src/app/components/header/header.component.css diff --git a/src/app/layout/components/header/header.component.html b/src/app/components/header/header.component.html similarity index 100% rename from src/app/layout/components/header/header.component.html rename to src/app/components/header/header.component.html diff --git a/src/app/components/header/header.component.ts b/src/app/components/header/header.component.ts new file mode 100644 index 0000000..757f5b6 --- /dev/null +++ b/src/app/components/header/header.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; +import { HeaderNavLinksComponent } from './header-nav-links/header-nav-links.component'; +import { HeaderLogoComponent } from './header-logo/header-logo.component'; +import { HeaderContactLinksComponent } from './header-contact-links/header-contact-links.component'; +import { HeaderTextAnimateSectionComponent } from './header-text-animate-section/header-text-animate-section.component'; + +@Component({ + selector: 'app-header', + imports: [ + HeaderNavLinksComponent, + HeaderLogoComponent, + HeaderContactLinksComponent, + HeaderTextAnimateSectionComponent, + ], + templateUrl: './header.component.html', + styleUrl: './header.component.css', +}) +export class HeaderComponent {} diff --git a/src/app/shared/ui/holo-video-container/holo-video-container.component.css b/src/app/components/holo-video-container/holo-video-container.component.css similarity index 100% rename from src/app/shared/ui/holo-video-container/holo-video-container.component.css rename to src/app/components/holo-video-container/holo-video-container.component.css diff --git a/src/app/shared/ui/holo-video-container/holo-video-container.component.html b/src/app/components/holo-video-container/holo-video-container.component.html similarity index 100% rename from src/app/shared/ui/holo-video-container/holo-video-container.component.html rename to src/app/components/holo-video-container/holo-video-container.component.html diff --git a/src/app/shared/ui/holo-video-container/holo-video-container.component.ts b/src/app/components/holo-video-container/holo-video-container.component.ts similarity index 100% rename from src/app/shared/ui/holo-video-container/holo-video-container.component.ts rename to src/app/components/holo-video-container/holo-video-container.component.ts diff --git a/src/app/shared/ui/infocard/infocard.component.css b/src/app/components/infocard/infocard.component.css similarity index 100% rename from src/app/shared/ui/infocard/infocard.component.css rename to src/app/components/infocard/infocard.component.css diff --git a/src/app/shared/ui/infocard/infocard.component.html b/src/app/components/infocard/infocard.component.html similarity index 100% rename from src/app/shared/ui/infocard/infocard.component.html rename to src/app/components/infocard/infocard.component.html diff --git a/src/app/shared/ui/infocard/infocard.component.ts b/src/app/components/infocard/infocard.component.ts similarity index 100% rename from src/app/shared/ui/infocard/infocard.component.ts rename to src/app/components/infocard/infocard.component.ts diff --git a/src/app/shared/ui/long-button/long-button.component.css b/src/app/components/long-button/long-button.component.css similarity index 100% rename from src/app/shared/ui/long-button/long-button.component.css rename to src/app/components/long-button/long-button.component.css diff --git a/src/app/shared/ui/long-button/long-button.component.html b/src/app/components/long-button/long-button.component.html similarity index 100% rename from src/app/shared/ui/long-button/long-button.component.html rename to src/app/components/long-button/long-button.component.html diff --git a/src/app/shared/ui/long-button/long-button.component.ts b/src/app/components/long-button/long-button.component.ts similarity index 100% rename from src/app/shared/ui/long-button/long-button.component.ts rename to src/app/components/long-button/long-button.component.ts diff --git a/src/app/shared/ui/nav-button/button.component.css b/src/app/components/nav-button/button.component.css similarity index 100% rename from src/app/shared/ui/nav-button/button.component.css rename to src/app/components/nav-button/button.component.css diff --git a/src/app/shared/ui/nav-button/button.component.html b/src/app/components/nav-button/button.component.html similarity index 100% rename from src/app/shared/ui/nav-button/button.component.html rename to src/app/components/nav-button/button.component.html diff --git a/src/app/shared/ui/nav-button/button.component.ts b/src/app/components/nav-button/button.component.ts similarity index 100% rename from src/app/shared/ui/nav-button/button.component.ts rename to src/app/components/nav-button/button.component.ts diff --git a/src/app/shared/ui/section-title/section-title.component.css b/src/app/components/section-title/section-title.component.css similarity index 100% rename from src/app/shared/ui/section-title/section-title.component.css rename to src/app/components/section-title/section-title.component.css diff --git a/src/app/shared/ui/section-title/section-title.component.html b/src/app/components/section-title/section-title.component.html similarity index 100% rename from src/app/shared/ui/section-title/section-title.component.html rename to src/app/components/section-title/section-title.component.html diff --git a/src/app/shared/ui/section-title/section-title.component.ts b/src/app/components/section-title/section-title.component.ts similarity index 100% rename from src/app/shared/ui/section-title/section-title.component.ts rename to src/app/components/section-title/section-title.component.ts diff --git a/src/app/features/about-display/about-display.component.css b/src/app/features/about-display/about-display.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/features/about-display/about-display.component.ts b/src/app/features/about-display/about-display.component.ts deleted file mode 100644 index 2c419aa..0000000 --- a/src/app/features/about-display/about-display.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Component } from '@angular/core'; -import { SectionTitleComponent } from '../../shared/ui/section-title/section-title.component'; -import { HoloVideoContainerComponent } from '../../shared/ui/holo-video-container/holo-video-container.component'; -import { NeuralProfileTreeComponent } from './neural-profile-tree/neural-profile-tree.component'; - -@Component({ - selector: 'app-about-display', - imports: [ - SectionTitleComponent, - HoloVideoContainerComponent, - NeuralProfileTreeComponent, - ], - templateUrl: './about-display.component.html', - styleUrl: './about-display.component.css', -}) -export class AboutDisplayComponent {} diff --git a/src/app/features/contact-display/contact-display.component.css b/src/app/features/contact-display/contact-display.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/features/contact-display/contact-display.component.ts b/src/app/features/contact-display/contact-display.component.ts deleted file mode 100644 index 0919717..0000000 --- a/src/app/features/contact-display/contact-display.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; -import {SectionTitleComponent} from '../../shared/ui/section-title/section-title.component'; - -@Component({ - selector: 'app-contact-display', - imports: [SectionTitleComponent], - templateUrl: './contact-display.component.html', - styleUrl: './contact-display.component.css', -}) -export class ContactDisplayComponent {} diff --git a/src/app/features/experience-display/experience-display.component.css b/src/app/features/experience-display/experience-display.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/features/experience-display/experience-display.component.ts b/src/app/features/experience-display/experience-display.component.ts deleted file mode 100644 index 3bb2c3b..0000000 --- a/src/app/features/experience-display/experience-display.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; -import {SectionTitleComponent} from '../../shared/ui/section-title/section-title.component'; - -@Component({ - selector: 'app-experience-display', - imports: [SectionTitleComponent], - templateUrl: './experience-display.component.html', - styleUrl: './experience-display.component.css', -}) -export class ExperienceDisplayComponent {} diff --git a/src/app/features/footer-display/footer-display.component.css b/src/app/features/footer-display/footer-display.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/features/footer-display/footer-display.component.ts b/src/app/features/footer-display/footer-display.component.ts deleted file mode 100644 index c68bebb..0000000 --- a/src/app/features/footer-display/footer-display.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-footer-display', - imports: [], - templateUrl: './footer-display.component.html', - styleUrl: './footer-display.component.css' -}) -export class FooterDisplayComponent { - -} diff --git a/src/app/layout/components/about/about.component.html b/src/app/layout/components/about/about.component.html deleted file mode 100644 index aade7cf..0000000 --- a/src/app/layout/components/about/about.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/layout/components/about/about.component.ts b/src/app/layout/components/about/about.component.ts deleted file mode 100644 index 955aa6e..0000000 --- a/src/app/layout/components/about/about.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; -import {AboutDisplayComponent} from '../../../features/about-display/about-display.component'; - -@Component({ - selector: 'app-about', - imports: [AboutDisplayComponent], - templateUrl: './about.component.html', - styleUrl: './about.component.css', -}) -export class AboutComponent {} diff --git a/src/app/layout/components/contact/contact.component.html b/src/app/layout/components/contact/contact.component.html deleted file mode 100644 index d34cbbb..0000000 --- a/src/app/layout/components/contact/contact.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/layout/components/experience/experience.component.html b/src/app/layout/components/experience/experience.component.html deleted file mode 100644 index 25cffb2..0000000 --- a/src/app/layout/components/experience/experience.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/layout/components/footer/footer.component.html b/src/app/layout/components/footer/footer.component.html deleted file mode 100644 index 54a2a5e..0000000 --- a/src/app/layout/components/footer/footer.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/layout/components/header/header.component.ts b/src/app/layout/components/header/header.component.ts deleted file mode 100644 index 3993c19..0000000 --- a/src/app/layout/components/header/header.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Component } from '@angular/core'; -import { HeaderNavLinksComponent } from '../../../features/header-display/header-nav-links/header-nav-links.component'; -import { HeaderLogoComponent } from '../../../features/header-display/header-logo/header-logo.component'; -import { HeaderContactLinksComponent } from '../../../features/header-display/header-contact-links/header-contact-links.component'; -import { HeaderTextAnimateSectionComponent } from '../../../features/header-display/header-text-animate-section/header-text-animate-section.component'; - -@Component({ - selector: 'app-header', - imports: [ - HeaderNavLinksComponent, - HeaderLogoComponent, - HeaderContactLinksComponent, - HeaderTextAnimateSectionComponent, - ], - templateUrl: './header.component.html', - styleUrl: './header.component.css', -}) -export class HeaderComponent {} diff --git a/src/app/layout/components/hero/hero.component.css b/src/app/layout/components/hero/hero.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/layout/components/hero/hero.component.html b/src/app/layout/components/hero/hero.component.html deleted file mode 100644 index 12fbd4d..0000000 --- a/src/app/layout/components/hero/hero.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/layout/components/hero/hero.component.ts b/src/app/layout/components/hero/hero.component.ts deleted file mode 100644 index 5b13f13..0000000 --- a/src/app/layout/components/hero/hero.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; -import {HeroDisplayComponent} from '../../../features/hero-display/hero-display.component'; - -@Component({ - selector: 'app-hero', - imports: [HeroDisplayComponent], - templateUrl: './hero.component.html', - styleUrl: './hero.component.css', -}) -export class HeroComponent {} diff --git a/src/app/layout/components/projects/projects.component.css b/src/app/layout/components/projects/projects.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/layout/components/projects/projects.component.html b/src/app/layout/components/projects/projects.component.html deleted file mode 100644 index 16de6bf..0000000 --- a/src/app/layout/components/projects/projects.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/layout/components/projects/projects.component.ts b/src/app/layout/components/projects/projects.component.ts deleted file mode 100644 index 63e5bc6..0000000 --- a/src/app/layout/components/projects/projects.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Component } from '@angular/core'; -import { - ProjectsListComponent -} from '../../../features/project-display/components/projects-list/projects-list.component'; - -@Component({ - selector: 'app-projects', - imports: [ProjectsListComponent], - templateUrl: './projects.component.html', - styleUrl: './projects.component.css', -}) -export class ProjectsComponent {} diff --git a/src/app/layout/components/about/about.component.css b/src/app/pages/about/about.component.css similarity index 100% rename from src/app/layout/components/about/about.component.css rename to src/app/pages/about/about.component.css diff --git a/src/app/features/about-display/about-display.component.html b/src/app/pages/about/about.component.html similarity index 94% rename from src/app/features/about-display/about-display.component.html rename to src/app/pages/about/about.component.html index 8b5b6b7..657678b 100644 --- a/src/app/features/about-display/about-display.component.html +++ b/src/app/pages/about/about.component.html @@ -2,7 +2,7 @@
- +
@@ -15,7 +15,7 @@
- +
@@ -29,7 +29,7 @@
+ videoSrc="video/cyber_skull.mp4"/>
diff --git a/src/app/pages/about/about.component.ts b/src/app/pages/about/about.component.ts new file mode 100644 index 0000000..7acd69b --- /dev/null +++ b/src/app/pages/about/about.component.ts @@ -0,0 +1,16 @@ +import { Component } from '@angular/core'; +import { SectionTitleComponent } from '../../components/section-title/section-title.component'; +import { HoloVideoContainerComponent } from '../../components/holo-video-container/holo-video-container.component'; +import { NeuralProfileTreeComponent } from './neural-profile-tree/neural-profile-tree.component'; + +@Component({ + selector: 'app-about', + imports: [ + SectionTitleComponent, + HoloVideoContainerComponent, + NeuralProfileTreeComponent, + ], + templateUrl: './about.component.html', + styleUrl: './about.component.css', +}) +export class AboutComponent {} diff --git a/src/app/features/about-display/chip-container/chip-container.component.css b/src/app/pages/about/chip-container/chip-container.component.css similarity index 100% rename from src/app/features/about-display/chip-container/chip-container.component.css rename to src/app/pages/about/chip-container/chip-container.component.css diff --git a/src/app/features/about-display/chip-container/chip-container.component.html b/src/app/pages/about/chip-container/chip-container.component.html similarity index 100% rename from src/app/features/about-display/chip-container/chip-container.component.html rename to src/app/pages/about/chip-container/chip-container.component.html diff --git a/src/app/features/about-display/chip-container/chip-container.component.ts b/src/app/pages/about/chip-container/chip-container.component.ts similarity index 64% rename from src/app/features/about-display/chip-container/chip-container.component.ts rename to src/app/pages/about/chip-container/chip-container.component.ts index 0e96fa8..434448e 100644 --- a/src/app/features/about-display/chip-container/chip-container.component.ts +++ b/src/app/pages/about/chip-container/chip-container.component.ts @@ -4,8 +4,6 @@ import { Component } from '@angular/core'; selector: 'app-chip-container', imports: [], templateUrl: './chip-container.component.html', - styleUrl: './chip-container.component.css' + styleUrl: './chip-container.component.css', }) -export class ChipContainerComponent { - -} +export class ChipContainerComponent {} diff --git a/src/app/features/about-display/neural-profile-tree/neural-profile-tree.component.css b/src/app/pages/about/neural-profile-tree/neural-profile-tree.component.css similarity index 100% rename from src/app/features/about-display/neural-profile-tree/neural-profile-tree.component.css rename to src/app/pages/about/neural-profile-tree/neural-profile-tree.component.css diff --git a/src/app/features/about-display/neural-profile-tree/neural-profile-tree.component.html b/src/app/pages/about/neural-profile-tree/neural-profile-tree.component.html similarity index 92% rename from src/app/features/about-display/neural-profile-tree/neural-profile-tree.component.html rename to src/app/pages/about/neural-profile-tree/neural-profile-tree.component.html index 6c6c127..06f8369 100644 --- a/src/app/features/about-display/neural-profile-tree/neural-profile-tree.component.html +++ b/src/app/pages/about/neural-profile-tree/neural-profile-tree.component.html @@ -1,6 +1,7 @@
-
+
@for (node of treeData(); track node.id) {
diff --git a/src/app/features/about-display/neural-profile-tree/neural-profile-tree.component.ts b/src/app/pages/about/neural-profile-tree/neural-profile-tree.component.ts similarity index 99% rename from src/app/features/about-display/neural-profile-tree/neural-profile-tree.component.ts rename to src/app/pages/about/neural-profile-tree/neural-profile-tree.component.ts index 26e6e50..2efbdcb 100644 --- a/src/app/features/about-display/neural-profile-tree/neural-profile-tree.component.ts +++ b/src/app/pages/about/neural-profile-tree/neural-profile-tree.component.ts @@ -264,6 +264,7 @@ export class NeuralProfileTreeComponent { hoverChipChild(childId: string): void { this.hoveredNodeId.set(childId); } + selectToolChild(childId: string): void { // Find the node in the tree and select it this.treeState.update((state) => { diff --git a/src/app/layout/components/contact/contact.component.css b/src/app/pages/contact/contact.component.css similarity index 100% rename from src/app/layout/components/contact/contact.component.css rename to src/app/pages/contact/contact.component.css diff --git a/src/app/features/contact-display/contact-display.component.html b/src/app/pages/contact/contact.component.html similarity index 100% rename from src/app/features/contact-display/contact-display.component.html rename to src/app/pages/contact/contact.component.html diff --git a/src/app/layout/components/contact/contact.component.ts b/src/app/pages/contact/contact.component.ts similarity index 59% rename from src/app/layout/components/contact/contact.component.ts rename to src/app/pages/contact/contact.component.ts index 7cbfc0c..32c4cad 100644 --- a/src/app/layout/components/contact/contact.component.ts +++ b/src/app/pages/contact/contact.component.ts @@ -1,9 +1,9 @@ import { Component } from '@angular/core'; -import {ContactDisplayComponent} from '../../../features/contact-display/contact-display.component'; +import { SectionTitleComponent } from '../../components/section-title/section-title.component'; @Component({ selector: 'app-contact', - imports: [ContactDisplayComponent], + imports: [SectionTitleComponent], templateUrl: './contact.component.html', styleUrl: './contact.component.css', }) diff --git a/src/app/layout/components/experience/experience.component.css b/src/app/pages/experience/experience.component.css similarity index 100% rename from src/app/layout/components/experience/experience.component.css rename to src/app/pages/experience/experience.component.css diff --git a/src/app/features/experience-display/experience-display.component.html b/src/app/pages/experience/experience.component.html similarity index 100% rename from src/app/features/experience-display/experience-display.component.html rename to src/app/pages/experience/experience.component.html diff --git a/src/app/layout/components/experience/experience.component.ts b/src/app/pages/experience/experience.component.ts similarity index 58% rename from src/app/layout/components/experience/experience.component.ts rename to src/app/pages/experience/experience.component.ts index e6b0226..2fa538e 100644 --- a/src/app/layout/components/experience/experience.component.ts +++ b/src/app/pages/experience/experience.component.ts @@ -1,9 +1,9 @@ import { Component } from '@angular/core'; -import { ExperienceDisplayComponent } from '../../../features/experience-display/experience-display.component'; +import { SectionTitleComponent } from '../../components/section-title/section-title.component'; @Component({ selector: 'app-experience', - imports: [ExperienceDisplayComponent], + imports: [SectionTitleComponent], templateUrl: './experience.component.html', styleUrl: './experience.component.css', }) diff --git a/src/app/features/hero-display/hero-display.component.css b/src/app/pages/hero/hero.component.css similarity index 100% rename from src/app/features/hero-display/hero-display.component.css rename to src/app/pages/hero/hero.component.css diff --git a/src/app/features/hero-display/hero-display.component.html b/src/app/pages/hero/hero.component.html similarity index 97% rename from src/app/features/hero-display/hero-display.component.html rename to src/app/pages/hero/hero.component.html index ac2987c..c55e5c7 100644 --- a/src/app/features/hero-display/hero-display.component.html +++ b/src/app/pages/hero/hero.component.html @@ -1,7 +1,7 @@
+ videoSrc="video/cyber_hands.mp4" />
diff --git a/src/app/features/hero-display/hero-display.component.ts b/src/app/pages/hero/hero.component.ts similarity index 96% rename from src/app/features/hero-display/hero-display.component.ts rename to src/app/pages/hero/hero.component.ts index d63d139..3a346ce 100644 --- a/src/app/features/hero-display/hero-display.component.ts +++ b/src/app/pages/hero/hero.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; -import { HoloVideoContainerComponent } from '../../shared/ui/holo-video-container/holo-video-container.component'; +import { HoloVideoContainerComponent } from '../../components/holo-video-container/holo-video-container.component'; @Component({ - selector: 'app-hero-display', + selector: 'app-hero', imports: [HoloVideoContainerComponent], - templateUrl: './hero-display.component.html', - styleUrl: './hero-display.component.css', + templateUrl: './hero.component.html', + styleUrl: './hero.component.css', }) -export class HeroDisplayComponent implements OnInit, OnDestroy { +export class HeroComponent implements OnInit, OnDestroy { displayText: string = ''; nameText: string = ''; diff --git a/src/app/features/project-display/components/project-card/project-card.component.css b/src/app/pages/projects/project-card/project-card.component.css similarity index 100% rename from src/app/features/project-display/components/project-card/project-card.component.css rename to src/app/pages/projects/project-card/project-card.component.css diff --git a/src/app/features/project-display/components/project-card/project-card.component.html b/src/app/pages/projects/project-card/project-card.component.html similarity index 100% rename from src/app/features/project-display/components/project-card/project-card.component.html rename to src/app/pages/projects/project-card/project-card.component.html diff --git a/src/app/features/project-display/components/project-card/project-card.component.ts b/src/app/pages/projects/project-card/project-card.component.ts similarity index 98% rename from src/app/features/project-display/components/project-card/project-card.component.ts rename to src/app/pages/projects/project-card/project-card.component.ts index 9c722f5..57621c9 100644 --- a/src/app/features/project-display/components/project-card/project-card.component.ts +++ b/src/app/pages/projects/project-card/project-card.component.ts @@ -8,7 +8,7 @@ import { ElementRef, } from '@angular/core'; -import { type Project } from '../../../../shared/models/project.model'; +import { type Project } from '../../../shared/models/project.model'; @Component({ selector: 'app-project-card', diff --git a/src/app/features/project-display/components/projects-list/projects-list.component.css b/src/app/pages/projects/projects.component.css similarity index 100% rename from src/app/features/project-display/components/projects-list/projects-list.component.css rename to src/app/pages/projects/projects.component.css diff --git a/src/app/features/project-display/components/projects-list/projects-list.component.html b/src/app/pages/projects/projects.component.html similarity index 100% rename from src/app/features/project-display/components/projects-list/projects-list.component.html rename to src/app/pages/projects/projects.component.html diff --git a/src/app/features/project-display/components/projects-list/projects-list.component.ts b/src/app/pages/projects/projects.component.ts similarity index 93% rename from src/app/features/project-display/components/projects-list/projects-list.component.ts rename to src/app/pages/projects/projects.component.ts index 773e100..b84a5d8 100644 --- a/src/app/features/project-display/components/projects-list/projects-list.component.ts +++ b/src/app/pages/projects/projects.component.ts @@ -1,17 +1,17 @@ // project-list.component.ts import { Component, signal, computed, effect, OnInit } from '@angular/core'; -import { ProjectCardComponent } from '../project-card/project-card.component'; -import { SectionTitleComponent } from '../../../../shared/ui/section-title/section-title.component'; -import { type Project } from '../../../../shared/models/project.model'; +import { ProjectCardComponent } from './project-card/project-card.component'; +import { SectionTitleComponent } from '../../components/section-title/section-title.component'; +import { type Project } from '../../shared/models/project.model'; @Component({ - selector: 'app-project-list', + selector: 'app-projects', standalone: true, imports: [ProjectCardComponent, SectionTitleComponent], - templateUrl: './projects-list.component.html', - styleUrl: './projects-list.component.css', + templateUrl: './projects.component.html', + styleUrl: './projects.component.css', }) -export class ProjectListComponent implements OnInit { +export class ProjectsComponent implements OnInit { // Signals projects = signal([]); selectedProject = signal(null);