From ebe66c87c09d84fd5eced632e67b8b64045de68c Mon Sep 17 00:00:00 2001 From: akastijn Date: Fri, 4 Jul 2025 19:50:21 +0200 Subject: [PATCH] Rework folder structure in frontend Pages are now grouped per group they appear in on in the header (where possible) Utilities used by multiple pages in the project are grouped in folders such as services/pipes/etc --- frontend/src/app/app.component.ts | 8 +-- frontend/src/app/app.routes.ts | 60 +++++++++---------- .../altitude}/about/about.component.html | 0 .../altitude}/about/about.component.scss | 0 .../altitude}/about/about.component.spec.ts | 0 .../altitude}/about/about.component.ts | 4 +- .../birthdays/birthdays.component.html | 0 .../birthdays/birthdays.component.scss | 0 .../birthdays/birthdays.component.spec.ts | 0 .../birthdays/birthdays.component.ts | 4 +- .../altitude}/socials/socials.component.html | 0 .../altitude}/socials/socials.component.scss | 0 .../socials/socials.component.spec.ts | 0 .../altitude}/socials/socials.component.ts | 4 +- .../altitude}/team/team.component.html | 0 .../altitude}/team/team.component.scss | 0 .../altitude}/team/team.component.spec.ts | 0 .../altitude}/team/team.component.ts | 8 +-- .../claiming/claiming.component.html | 0 .../claiming/claiming.component.scss | 0 .../claiming/claiming.component.spec.ts | 0 .../features}/claiming/claiming.component.ts | 2 +- .../customfeatures.component.html | 0 .../customfeatures.component.scss | 0 .../customfeatures.component.spec.ts | 0 .../customfeatures.component.ts | 2 +- .../features}/economy/economy.component.html | 0 .../features}/economy/economy.component.scss | 0 .../economy/economy.component.spec.ts | 0 .../features}/economy/economy.component.ts | 2 +- .../features}/map/map.component.html | 0 .../features}/map/map.component.scss | 0 .../features}/map/map.component.spec.ts | 0 .../{ => pages/features}/map/map.component.ts | 2 +- .../features}/mypet/mypet.component.html | 0 .../features}/mypet/mypet.component.scss | 0 .../features}/mypet/mypet.component.spec.ts | 0 .../features}/mypet/mypet.component.ts | 2 +- .../skyblock/skyblock.component.html | 0 .../skyblock/skyblock.component.scss | 0 .../skyblock/skyblock.component.spec.ts | 0 .../features}/skyblock/skyblock.component.ts | 2 +- .../features}/warps/warps.component.html | 0 .../features}/warps/warps.component.scss | 0 .../features}/warps/warps.component.spec.ts | 0 .../features}/warps/warps.component.ts | 2 +- .../footer}/footer/footer.component.html | 0 .../footer}/footer/footer.component.scss | 0 .../footer}/footer/footer.component.spec.ts | 0 .../footer}/footer/footer.component.ts | 2 +- .../footer}/privacy/privacy.component.html | 0 .../footer}/privacy/privacy.component.scss | 0 .../footer}/privacy/privacy.component.spec.ts | 0 .../footer}/privacy/privacy.component.ts | 4 +- .../footer}/terms/terms.component.html | 0 .../footer}/terms/terms.component.scss | 0 .../footer}/terms/terms.component.spec.ts | 0 .../footer}/terms/terms.component.ts | 4 +- .../forms/appeal/appeal.component.html | 0 .../forms/appeal/appeal.component.scss | 0 .../forms/appeal/appeal.component.spec.ts | 0 .../forms/appeal/appeal.component.ts | 2 +- .../src/app/{ => pages}/forms/form_type.ts | 0 .../{ => pages}/forms/forms.component.html | 0 .../{ => pages}/forms/forms.component.scss | 0 .../{ => pages}/forms/forms.component.spec.ts | 0 .../app/{ => pages}/forms/forms.component.ts | 6 +- .../header}/header/header.component.html | 0 .../header}/header/header.component.scss | 0 .../header}/header/header.component.spec.ts | 0 .../header}/header/header.component.ts | 2 +- .../app/{ => pages}/home/home.component.html | 0 .../app/{ => pages}/home/home.component.scss | 0 .../{ => pages}/home/home.component.spec.ts | 0 .../app/{ => pages}/home/home.component.ts | 8 +-- .../components/frames/frames.component.html | 0 .../components/frames/frames.component.scss | 0 .../frames/frames.component.spec.ts | 0 .../components/frames/frames.component.ts | 0 .../particle/particle.component.html | 0 .../particle/particle.component.scss | 0 .../particle/particle.component.spec.ts | 0 .../components/particle/particle.component.ts | 0 .../properties/properties.component.html | 0 .../properties/properties.component.scss | 0 .../properties/properties.component.spec.ts | 0 .../properties/properties.component.ts | 0 .../render-container.component.html | 0 .../render-container.component.scss | 0 .../render-container.component.spec.ts | 0 .../render-container.component.ts | 0 .../particles/models/particle.model.ts | 0 .../particles/particles.component.html | 0 .../particles/particles.component.scss | 0 .../particles/particles.component.spec.ts | 0 .../particles/particles.component.ts | 4 +- .../services/frame-manager.service.ts | 0 .../services/input-handler.service.ts | 0 .../services/intersection-plane.service.ts | 0 .../services/particle-manager.service.ts | 0 .../services/player-model.service.ts | 0 .../particles/services/renderer.service.ts | 4 +- .../reference}/bans/bans.component.html | 0 .../reference}/bans/bans.component.scss | 0 .../reference}/bans/bans.component.spec.ts | 0 .../reference}/bans/bans.component.ts | 4 +- .../bans/details/details.component.html | 0 .../bans/details/details.component.scss | 0 .../bans/details/details.component.spec.ts | 0 .../bans/details/details.component.ts | 6 +- .../bans/history-format.service.spec.ts | 0 .../reference}/bans/history-format.service.ts | 2 +- .../bans/history/history.component.html | 0 .../bans/history/history.component.scss | 0 .../bans/history/history.component.spec.ts | 0 .../bans/history/history.component.ts | 6 +- .../reference}/bans/search-terms.ts | 0 .../commandlist/commandlist.component.html | 0 .../commandlist/commandlist.component.scss | 0 .../commandlist/commandlist.component.spec.ts | 0 .../commandlist/commandlist.component.ts | 2 +- .../reference}/guide/guide.component.html | 0 .../reference}/guide/guide.component.scss | 0 .../reference}/guide/guide.component.spec.ts | 0 .../reference}/guide/guide.component.ts | 4 +- .../reference}/lag/lag.component.html | 0 .../reference}/lag/lag.component.scss | 0 .../reference}/lag/lag.component.spec.ts | 0 .../reference}/lag/lag.component.ts | 4 +- .../reference}/mapart/mapart.component.html | 0 .../reference}/mapart/mapart.component.scss | 0 .../mapart/mapart.component.spec.ts | 0 .../reference}/mapart/mapart.component.ts | 2 +- .../reference}/ranks/ranks.component.html | 0 .../reference}/ranks/ranks.component.scss | 0 .../reference}/ranks/ranks.component.spec.ts | 0 .../reference}/ranks/ranks.component.ts | 2 +- .../reference}/rules/rules.component.html | 0 .../reference}/rules/rules.component.scss | 0 .../reference}/rules/rules.component.spec.ts | 0 .../reference}/rules/rules.component.ts | 4 +- .../staffpowers/staffpowers.component.html | 0 .../staffpowers/staffpowers.component.scss | 0 .../staffpowers/staffpowers.component.spec.ts | 0 .../staffpowers/staffpowers.component.ts | 2 +- .../app/{ => pages}/vote/vote.component.html | 0 .../app/{ => pages}/vote/vote.component.scss | 0 .../{ => pages}/vote/vote.component.spec.ts | 0 .../app/{ => pages}/vote/vote.component.ts | 4 +- .../RemoveTrailingPeriodPipe.ts | 0 .../src/app/scroll/scroll.service.spec.ts | 16 ----- frontend/src/app/services/auth.service.ts | 2 +- .../{scroll => services}/scroll.service.ts | 0 .../copy-ip/copy-ip.component.html | 0 .../copy-ip/copy-ip.component.scss | 0 .../copy-ip/copy-ip.component.spec.ts | 0 .../copy-ip/copy-ip.component.ts | 0 .../login/login.component.html | 0 .../login/login.component.scss | 0 .../login/login.component.spec.ts | 0 .../login/login.component.ts | 2 +- .../theme/theme.component.html | 0 .../theme/theme.component.scss | 0 .../theme/theme.component.spec.ts | 0 .../theme/theme.component.ts | 2 +- .../theme/theme.service.spec.ts | 0 .../theme/theme.service.ts | 2 +- frontend/src/app/{ => types}/constant.ts | 0 frontend/tsconfig.json | 32 +++++++++- 169 files changed, 123 insertions(+), 113 deletions(-) rename frontend/src/app/{ => pages/altitude}/about/about.component.html (100%) rename frontend/src/app/{ => pages/altitude}/about/about.component.scss (100%) rename frontend/src/app/{ => pages/altitude}/about/about.component.spec.ts (100%) rename frontend/src/app/{ => pages/altitude}/about/about.component.ts (76%) rename frontend/src/app/{ => pages/altitude}/birthdays/birthdays.component.html (100%) rename frontend/src/app/{ => pages/altitude}/birthdays/birthdays.component.scss (100%) rename frontend/src/app/{ => pages/altitude}/birthdays/birthdays.component.spec.ts (100%) rename frontend/src/app/{ => pages/altitude}/birthdays/birthdays.component.ts (76%) rename frontend/src/app/{ => pages/altitude}/socials/socials.component.html (100%) rename frontend/src/app/{ => pages/altitude}/socials/socials.component.scss (100%) rename frontend/src/app/{ => pages/altitude}/socials/socials.component.spec.ts (100%) rename frontend/src/app/{ => pages/altitude}/socials/socials.component.ts (78%) rename frontend/src/app/{ => pages/altitude}/team/team.component.html (100%) rename frontend/src/app/{ => pages/altitude}/team/team.component.scss (100%) rename frontend/src/app/{ => pages/altitude}/team/team.component.spec.ts (100%) rename frontend/src/app/{ => pages/altitude}/team/team.component.ts (85%) rename frontend/src/app/{ => pages/features}/claiming/claiming.component.html (100%) rename frontend/src/app/{ => pages/features}/claiming/claiming.component.scss (100%) rename frontend/src/app/{ => pages/features}/claiming/claiming.component.spec.ts (100%) rename frontend/src/app/{ => pages/features}/claiming/claiming.component.ts (86%) rename frontend/src/app/{ => pages/features}/customfeatures/customfeatures.component.html (100%) rename frontend/src/app/{ => pages/features}/customfeatures/customfeatures.component.scss (100%) rename frontend/src/app/{ => pages/features}/customfeatures/customfeatures.component.spec.ts (100%) rename frontend/src/app/{ => pages/features}/customfeatures/customfeatures.component.ts (84%) rename frontend/src/app/{ => pages/features}/economy/economy.component.html (100%) rename frontend/src/app/{ => pages/features}/economy/economy.component.scss (100%) rename frontend/src/app/{ => pages/features}/economy/economy.component.spec.ts (100%) rename frontend/src/app/{ => pages/features}/economy/economy.component.ts (83%) rename frontend/src/app/{ => pages/features}/map/map.component.html (100%) rename frontend/src/app/{ => pages/features}/map/map.component.scss (100%) rename frontend/src/app/{ => pages/features}/map/map.component.spec.ts (100%) rename frontend/src/app/{ => pages/features}/map/map.component.ts (83%) rename frontend/src/app/{ => pages/features}/mypet/mypet.component.html (100%) rename frontend/src/app/{ => pages/features}/mypet/mypet.component.scss (100%) rename frontend/src/app/{ => pages/features}/mypet/mypet.component.spec.ts (100%) rename frontend/src/app/{ => pages/features}/mypet/mypet.component.ts (83%) rename frontend/src/app/{ => pages/features}/skyblock/skyblock.component.html (100%) rename frontend/src/app/{ => pages/features}/skyblock/skyblock.component.scss (100%) rename frontend/src/app/{ => pages/features}/skyblock/skyblock.component.spec.ts (100%) rename frontend/src/app/{ => pages/features}/skyblock/skyblock.component.ts (80%) rename frontend/src/app/{ => pages/features}/warps/warps.component.html (100%) rename frontend/src/app/{ => pages/features}/warps/warps.component.scss (100%) rename frontend/src/app/{ => pages/features}/warps/warps.component.spec.ts (100%) rename frontend/src/app/{ => pages/features}/warps/warps.component.ts (85%) rename frontend/src/app/{ => pages/footer}/footer/footer.component.html (100%) rename frontend/src/app/{ => pages/footer}/footer/footer.component.scss (100%) rename frontend/src/app/{ => pages/footer}/footer/footer.component.spec.ts (100%) rename frontend/src/app/{ => pages/footer}/footer/footer.component.ts (90%) rename frontend/src/app/{ => pages/footer}/privacy/privacy.component.html (100%) rename frontend/src/app/{ => pages/footer}/privacy/privacy.component.scss (100%) rename frontend/src/app/{ => pages/footer}/privacy/privacy.component.spec.ts (100%) rename frontend/src/app/{ => pages/footer}/privacy/privacy.component.ts (79%) rename frontend/src/app/{ => pages/footer}/terms/terms.component.html (100%) rename frontend/src/app/{ => pages/footer}/terms/terms.component.scss (100%) rename frontend/src/app/{ => pages/footer}/terms/terms.component.spec.ts (100%) rename frontend/src/app/{ => pages/footer}/terms/terms.component.ts (78%) rename frontend/src/app/{ => pages}/forms/appeal/appeal.component.html (100%) rename frontend/src/app/{ => pages}/forms/appeal/appeal.component.scss (100%) rename frontend/src/app/{ => pages}/forms/appeal/appeal.component.spec.ts (100%) rename frontend/src/app/{ => pages}/forms/appeal/appeal.component.ts (97%) rename frontend/src/app/{ => pages}/forms/form_type.ts (100%) rename frontend/src/app/{ => pages}/forms/forms.component.html (100%) rename frontend/src/app/{ => pages}/forms/forms.component.scss (100%) rename frontend/src/app/{ => pages}/forms/forms.component.spec.ts (100%) rename frontend/src/app/{ => pages}/forms/forms.component.ts (90%) rename frontend/src/app/{ => pages/header}/header/header.component.html (100%) rename frontend/src/app/{ => pages/header}/header/header.component.scss (100%) rename frontend/src/app/{ => pages/header}/header/header.component.spec.ts (100%) rename frontend/src/app/{ => pages/header}/header/header.component.ts (95%) rename frontend/src/app/{ => pages}/home/home.component.html (100%) rename frontend/src/app/{ => pages}/home/home.component.scss (100%) rename frontend/src/app/{ => pages}/home/home.component.spec.ts (100%) rename frontend/src/app/{ => pages}/home/home.component.ts (91%) rename frontend/src/app/{ => pages}/particles/components/frames/frames.component.html (100%) rename frontend/src/app/{ => pages}/particles/components/frames/frames.component.scss (100%) rename frontend/src/app/{ => pages}/particles/components/frames/frames.component.spec.ts (100%) rename frontend/src/app/{ => pages}/particles/components/frames/frames.component.ts (100%) rename frontend/src/app/{ => pages}/particles/components/particle/particle.component.html (100%) rename frontend/src/app/{ => pages}/particles/components/particle/particle.component.scss (100%) rename frontend/src/app/{ => pages}/particles/components/particle/particle.component.spec.ts (100%) rename frontend/src/app/{ => pages}/particles/components/particle/particle.component.ts (100%) rename frontend/src/app/{ => pages}/particles/components/properties/properties.component.html (100%) rename frontend/src/app/{ => pages}/particles/components/properties/properties.component.scss (100%) rename frontend/src/app/{ => pages}/particles/components/properties/properties.component.spec.ts (100%) rename frontend/src/app/{ => pages}/particles/components/properties/properties.component.ts (100%) rename frontend/src/app/{ => pages}/particles/components/render-container/render-container.component.html (100%) rename frontend/src/app/{ => pages}/particles/components/render-container/render-container.component.scss (100%) rename frontend/src/app/{ => pages}/particles/components/render-container/render-container.component.spec.ts (100%) rename frontend/src/app/{ => pages}/particles/components/render-container/render-container.component.ts (100%) rename frontend/src/app/{ => pages}/particles/models/particle.model.ts (100%) rename frontend/src/app/{ => pages}/particles/particles.component.html (100%) rename frontend/src/app/{ => pages}/particles/particles.component.scss (100%) rename frontend/src/app/{ => pages}/particles/particles.component.spec.ts (100%) rename frontend/src/app/{ => pages}/particles/particles.component.ts (97%) rename frontend/src/app/{ => pages}/particles/services/frame-manager.service.ts (100%) rename frontend/src/app/{ => pages}/particles/services/input-handler.service.ts (100%) rename frontend/src/app/{ => pages}/particles/services/intersection-plane.service.ts (100%) rename frontend/src/app/{ => pages}/particles/services/particle-manager.service.ts (100%) rename frontend/src/app/{ => pages}/particles/services/player-model.service.ts (100%) rename frontend/src/app/{ => pages}/particles/services/renderer.service.ts (96%) rename frontend/src/app/{ => pages/reference}/bans/bans.component.html (100%) rename frontend/src/app/{ => pages/reference}/bans/bans.component.scss (100%) rename frontend/src/app/{ => pages/reference}/bans/bans.component.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/bans/bans.component.ts (98%) rename frontend/src/app/{ => pages/reference}/bans/details/details.component.html (100%) rename frontend/src/app/{ => pages/reference}/bans/details/details.component.scss (100%) rename frontend/src/app/{ => pages/reference}/bans/details/details.component.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/bans/details/details.component.ts (89%) rename frontend/src/app/{ => pages/reference}/bans/history-format.service.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/bans/history-format.service.ts (97%) rename frontend/src/app/{ => pages/reference}/bans/history/history.component.html (100%) rename frontend/src/app/{ => pages/reference}/bans/history/history.component.scss (100%) rename frontend/src/app/{ => pages/reference}/bans/history/history.component.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/bans/history/history.component.ts (94%) rename frontend/src/app/{ => pages/reference}/bans/search-terms.ts (100%) rename frontend/src/app/{ => pages/reference}/commandlist/commandlist.component.html (100%) rename frontend/src/app/{ => pages/reference}/commandlist/commandlist.component.scss (100%) rename frontend/src/app/{ => pages/reference}/commandlist/commandlist.component.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/commandlist/commandlist.component.ts (81%) rename frontend/src/app/{ => pages/reference}/guide/guide.component.html (100%) rename frontend/src/app/{ => pages/reference}/guide/guide.component.scss (100%) rename frontend/src/app/{ => pages/reference}/guide/guide.component.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/guide/guide.component.ts (75%) rename frontend/src/app/{ => pages/reference}/lag/lag.component.html (100%) rename frontend/src/app/{ => pages/reference}/lag/lag.component.scss (100%) rename frontend/src/app/{ => pages/reference}/lag/lag.component.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/lag/lag.component.ts (80%) rename frontend/src/app/{ => pages/reference}/mapart/mapart.component.html (100%) rename frontend/src/app/{ => pages/reference}/mapart/mapart.component.scss (100%) rename frontend/src/app/{ => pages/reference}/mapart/mapart.component.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/mapart/mapart.component.ts (79%) rename frontend/src/app/{ => pages/reference}/ranks/ranks.component.html (100%) rename frontend/src/app/{ => pages/reference}/ranks/ranks.component.scss (100%) rename frontend/src/app/{ => pages/reference}/ranks/ranks.component.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/ranks/ranks.component.ts (79%) rename frontend/src/app/{ => pages/reference}/rules/rules.component.html (100%) rename frontend/src/app/{ => pages/reference}/rules/rules.component.scss (100%) rename frontend/src/app/{ => pages/reference}/rules/rules.component.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/rules/rules.component.ts (82%) rename frontend/src/app/{ => pages/reference}/staffpowers/staffpowers.component.html (100%) rename frontend/src/app/{ => pages/reference}/staffpowers/staffpowers.component.scss (100%) rename frontend/src/app/{ => pages/reference}/staffpowers/staffpowers.component.spec.ts (100%) rename frontend/src/app/{ => pages/reference}/staffpowers/staffpowers.component.ts (81%) rename frontend/src/app/{ => pages}/vote/vote.component.html (100%) rename frontend/src/app/{ => pages}/vote/vote.component.scss (100%) rename frontend/src/app/{ => pages}/vote/vote.component.spec.ts (100%) rename frontend/src/app/{ => pages}/vote/vote.component.ts (79%) rename frontend/src/app/{util => pipes}/RemoveTrailingPeriodPipe.ts (100%) delete mode 100644 frontend/src/app/scroll/scroll.service.spec.ts rename frontend/src/app/{scroll => services}/scroll.service.ts (100%) rename frontend/src/app/{ => shared-components}/copy-ip/copy-ip.component.html (100%) rename frontend/src/app/{ => shared-components}/copy-ip/copy-ip.component.scss (100%) rename frontend/src/app/{ => shared-components}/copy-ip/copy-ip.component.spec.ts (100%) rename frontend/src/app/{ => shared-components}/copy-ip/copy-ip.component.ts (100%) rename frontend/src/app/{ => shared-components}/login/login.component.html (100%) rename frontend/src/app/{ => shared-components}/login/login.component.scss (100%) rename frontend/src/app/{ => shared-components}/login/login.component.spec.ts (100%) rename frontend/src/app/{ => shared-components}/login/login.component.ts (97%) rename frontend/src/app/{ => shared-components}/theme/theme.component.html (100%) rename frontend/src/app/{ => shared-components}/theme/theme.component.scss (100%) rename frontend/src/app/{ => shared-components}/theme/theme.component.spec.ts (100%) rename frontend/src/app/{ => shared-components}/theme/theme.component.ts (94%) rename frontend/src/app/{ => shared-components}/theme/theme.service.spec.ts (100%) rename frontend/src/app/{ => shared-components}/theme/theme.service.ts (96%) rename frontend/src/app/{ => types}/constant.ts (100%) diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index a01e9b7..c09668c 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -1,8 +1,8 @@ import {Component, OnInit} from '@angular/core'; import {Meta, Title} from '@angular/platform-browser'; -import {ALTITUDE_VERSION} from './constant'; +import {ALTITUDE_VERSION} from '@custom-types/constant'; import {Router, RouterOutlet} from '@angular/router'; -import {FooterComponent} from './footer/footer.component'; +import {FooterComponent} from '@pages/footer/footer/footer.component'; @Component({ standalone: true, @@ -10,8 +10,8 @@ import {FooterComponent} from './footer/footer.component'; templateUrl: './app.component.html', styleUrl: './app.component.scss', imports: [ - FooterComponent, - RouterOutlet + RouterOutlet, + FooterComponent ] }) export class AppComponent implements OnInit { diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts index 03a8d52..0608afd 100644 --- a/frontend/src/app/app.routes.ts +++ b/frontend/src/app/app.routes.ts @@ -3,114 +3,110 @@ import {Routes} from '@angular/router'; export const routes: Routes = [ { path: '', - loadComponent: () => import('./home/home.component').then(m => m.HomeComponent) + loadComponent: () => import('./pages/home/home.component').then(m => m.HomeComponent) }, { path: 'particles', - loadComponent: () => import('./particles/particles.component').then(m => m.ParticlesComponent) + loadComponent: () => import('./pages/particles/particles.component').then(m => m.ParticlesComponent) }, { path: 'map', - loadComponent: () => import('./map/map.component').then(m => m.MapComponent) + loadComponent: () => import('./pages/features/map/map.component').then(m => m.MapComponent) }, { path: 'rules', - loadComponent: () => import('./rules/rules.component').then(m => m.RulesComponent) + loadComponent: () => import('./pages/reference/rules/rules.component').then(m => m.RulesComponent) }, { path: 'vote', - loadComponent: () => import('./vote/vote.component').then(m => m.VoteComponent) + loadComponent: () => import('./pages/vote/vote.component').then(m => m.VoteComponent) }, { path: 'about', - loadComponent: () => import('./about/about.component').then(m => m.AboutComponent) + loadComponent: () => import('./pages/altitude/about/about.component').then(m => m.AboutComponent) }, { path: 'socials', - loadComponent: () => import('./socials/socials.component').then(m => m.SocialsComponent) + loadComponent: () => import('./pages/altitude/socials/socials.component').then(m => m.SocialsComponent) }, { path: 'team', - loadComponent: () => import('./team/team.component').then(m => m.TeamComponent) + loadComponent: () => import('./pages/altitude/team/team.component').then(m => m.TeamComponent) }, { path: 'birthdays', - loadComponent: () => import('./birthdays/birthdays.component').then(m => m.BirthdaysComponent) + loadComponent: () => import('./pages/altitude/birthdays/birthdays.component').then(m => m.BirthdaysComponent) }, { path: 'terms', - loadComponent: () => import('./terms/terms.component').then(m => m.TermsComponent) + loadComponent: () => import('./pages/footer/terms/terms.component').then(m => m.TermsComponent) }, { path: 'privacy', - loadComponent: () => import('./privacy/privacy.component').then(m => m.PrivacyComponent) + loadComponent: () => import('./pages/footer/privacy/privacy.component').then(m => m.PrivacyComponent) }, { path: 'bans', - loadComponent: () => import('./bans/bans.component').then(m => m.BansComponent) + loadComponent: () => import('./pages/reference/bans/bans.component').then(m => m.BansComponent) }, { path: 'bans/:type/:id', - loadComponent: () => import('./bans/details/details.component').then(m => m.DetailsComponent) + loadComponent: () => import('./pages/reference/bans/details/details.component').then(m => m.DetailsComponent) }, { path: 'economy', - loadComponent: () => import('./economy/economy.component').then(m => m.EconomyComponent) + loadComponent: () => import('./pages/features/economy/economy.component').then(m => m.EconomyComponent) }, { path: 'claiming', - loadComponent: () => import('./claiming/claiming.component').then(m => m.ClaimingComponent) + loadComponent: () => import('./pages/features/claiming/claiming.component').then(m => m.ClaimingComponent) }, { path: 'mypet', - loadComponent: () => import('./mypet/mypet.component').then(m => m.MypetComponent) + loadComponent: () => import('./pages/features/mypet/mypet.component').then(m => m.MypetComponent) }, { path: 'warps', - loadComponent: () => import('./warps/warps.component').then(m => m.WarpsComponent) + loadComponent: () => import('./pages/features/warps/warps.component').then(m => m.WarpsComponent) }, { path: 'skyblock', - loadComponent: () => import('./skyblock/skyblock.component').then(m => m.SkyblockComponent) + loadComponent: () => import('./pages/features/skyblock/skyblock.component').then(m => m.SkyblockComponent) }, { path: 'customfeatures', - loadComponent: () => import('./customfeatures/customfeatures.component').then(m => m.CustomfeaturesComponent) + loadComponent: () => import('./pages/features/customfeatures/customfeatures.component').then(m => m.CustomfeaturesComponent) }, { path: 'guide', - loadComponent: () => import('./guide/guide.component').then(m => m.GuideComponent) + loadComponent: () => import('./pages/reference/guide/guide.component').then(m => m.GuideComponent) }, { path: 'ranks', - loadComponent: () => import('./ranks/ranks.component').then(m => m.RanksComponent) + loadComponent: () => import('./pages/reference/ranks/ranks.component').then(m => m.RanksComponent) }, { path: 'commandlist', - loadComponent: () => import('./commandlist/commandlist.component').then(m => m.CommandlistComponent) + loadComponent: () => import('./pages/reference/commandlist/commandlist.component').then(m => m.CommandlistComponent) }, { path: 'mapart', - loadComponent: () => import('./mapart/mapart.component').then(m => m.MapartComponent) + loadComponent: () => import('./pages/reference/mapart/mapart.component').then(m => m.MapartComponent) }, { path: 'lag', - loadComponent: () => import('./lag/lag.component').then(m => m.LagComponent) + loadComponent: () => import('./pages/reference/lag/lag.component').then(m => m.LagComponent) }, { path: 'staffpowers', - loadComponent: () => import('./staffpowers/staffpowers.component').then(m => m.StaffpowersComponent) + loadComponent: () => import('./pages/reference/staffpowers/staffpowers.component').then(m => m.StaffpowersComponent) }, { path: 'forms/:form', - loadComponent: () => import('./forms/forms.component').then(m => m.FormsComponent) + loadComponent: () => import('./pages/forms/forms.component').then(m => m.FormsComponent) }, { path: 'forms', - loadComponent: () => import('./forms/forms.component').then(m => m.FormsComponent) - }, - { - path: 'login', - loadComponent: () => import('./login/login.component').then(m => m.LoginDialogComponent) - }, + loadComponent: () => import('./pages/forms/forms.component').then(m => m.FormsComponent) + } ]; diff --git a/frontend/src/app/about/about.component.html b/frontend/src/app/pages/altitude/about/about.component.html similarity index 100% rename from frontend/src/app/about/about.component.html rename to frontend/src/app/pages/altitude/about/about.component.html diff --git a/frontend/src/app/about/about.component.scss b/frontend/src/app/pages/altitude/about/about.component.scss similarity index 100% rename from frontend/src/app/about/about.component.scss rename to frontend/src/app/pages/altitude/about/about.component.scss diff --git a/frontend/src/app/about/about.component.spec.ts b/frontend/src/app/pages/altitude/about/about.component.spec.ts similarity index 100% rename from frontend/src/app/about/about.component.spec.ts rename to frontend/src/app/pages/altitude/about/about.component.spec.ts diff --git a/frontend/src/app/about/about.component.ts b/frontend/src/app/pages/altitude/about/about.component.ts similarity index 76% rename from frontend/src/app/about/about.component.ts rename to frontend/src/app/pages/altitude/about/about.component.ts index f995dfc..5b1c42e 100644 --- a/frontend/src/app/about/about.component.ts +++ b/frontend/src/app/pages/altitude/about/about.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; -import {ScrollService} from '../scroll/scroll.service'; +import {ScrollService} from '@services/scroll.service'; import {CommonModule} from '@angular/common'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; @Component({ selector: 'app-about', diff --git a/frontend/src/app/birthdays/birthdays.component.html b/frontend/src/app/pages/altitude/birthdays/birthdays.component.html similarity index 100% rename from frontend/src/app/birthdays/birthdays.component.html rename to frontend/src/app/pages/altitude/birthdays/birthdays.component.html diff --git a/frontend/src/app/birthdays/birthdays.component.scss b/frontend/src/app/pages/altitude/birthdays/birthdays.component.scss similarity index 100% rename from frontend/src/app/birthdays/birthdays.component.scss rename to frontend/src/app/pages/altitude/birthdays/birthdays.component.scss diff --git a/frontend/src/app/birthdays/birthdays.component.spec.ts b/frontend/src/app/pages/altitude/birthdays/birthdays.component.spec.ts similarity index 100% rename from frontend/src/app/birthdays/birthdays.component.spec.ts rename to frontend/src/app/pages/altitude/birthdays/birthdays.component.spec.ts diff --git a/frontend/src/app/birthdays/birthdays.component.ts b/frontend/src/app/pages/altitude/birthdays/birthdays.component.ts similarity index 76% rename from frontend/src/app/birthdays/birthdays.component.ts rename to frontend/src/app/pages/altitude/birthdays/birthdays.component.ts index aa09a71..684af9b 100644 --- a/frontend/src/app/birthdays/birthdays.component.ts +++ b/frontend/src/app/pages/altitude/birthdays/birthdays.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; -import {ScrollService} from '../scroll/scroll.service'; +import {ScrollService} from '@services/scroll.service'; import {CommonModule} from '@angular/common'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; @Component({ selector: 'app-birthdays', diff --git a/frontend/src/app/socials/socials.component.html b/frontend/src/app/pages/altitude/socials/socials.component.html similarity index 100% rename from frontend/src/app/socials/socials.component.html rename to frontend/src/app/pages/altitude/socials/socials.component.html diff --git a/frontend/src/app/socials/socials.component.scss b/frontend/src/app/pages/altitude/socials/socials.component.scss similarity index 100% rename from frontend/src/app/socials/socials.component.scss rename to frontend/src/app/pages/altitude/socials/socials.component.scss diff --git a/frontend/src/app/socials/socials.component.spec.ts b/frontend/src/app/pages/altitude/socials/socials.component.spec.ts similarity index 100% rename from frontend/src/app/socials/socials.component.spec.ts rename to frontend/src/app/pages/altitude/socials/socials.component.spec.ts diff --git a/frontend/src/app/socials/socials.component.ts b/frontend/src/app/pages/altitude/socials/socials.component.ts similarity index 78% rename from frontend/src/app/socials/socials.component.ts rename to frontend/src/app/pages/altitude/socials/socials.component.ts index 5e2959f..7efec87 100644 --- a/frontend/src/app/socials/socials.component.ts +++ b/frontend/src/app/pages/altitude/socials/socials.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; -import {ScrollService} from '../scroll/scroll.service'; +import {ScrollService} from '@services/scroll.service'; import {CommonModule, NgOptimizedImage} from '@angular/common'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; @Component({ selector: 'app-socials', diff --git a/frontend/src/app/team/team.component.html b/frontend/src/app/pages/altitude/team/team.component.html similarity index 100% rename from frontend/src/app/team/team.component.html rename to frontend/src/app/pages/altitude/team/team.component.html diff --git a/frontend/src/app/team/team.component.scss b/frontend/src/app/pages/altitude/team/team.component.scss similarity index 100% rename from frontend/src/app/team/team.component.scss rename to frontend/src/app/pages/altitude/team/team.component.scss diff --git a/frontend/src/app/team/team.component.spec.ts b/frontend/src/app/pages/altitude/team/team.component.spec.ts similarity index 100% rename from frontend/src/app/team/team.component.spec.ts rename to frontend/src/app/pages/altitude/team/team.component.spec.ts diff --git a/frontend/src/app/team/team.component.ts b/frontend/src/app/pages/altitude/team/team.component.ts similarity index 85% rename from frontend/src/app/team/team.component.ts rename to frontend/src/app/pages/altitude/team/team.component.ts index 24af99d..dd9cfb2 100644 --- a/frontend/src/app/team/team.component.ts +++ b/frontend/src/app/pages/altitude/team/team.component.ts @@ -1,11 +1,11 @@ import {Component} from '@angular/core'; -import {ScrollService} from '../scroll/scroll.service'; -import {BASE_PATH, Player, TeamService} from '../../api'; +import {ScrollService} from '@services/scroll.service'; +import {BASE_PATH, Player, TeamService} from '@api'; import {CommonModule, NgOptimizedImage} from '@angular/common'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; import {CookieService} from 'ngx-cookie-service'; import {map, Observable, shareReplay} from 'rxjs'; -import {environment} from '../../environments/environment'; +import {environment} from '@environment'; @Component({ selector: 'app-team', diff --git a/frontend/src/app/claiming/claiming.component.html b/frontend/src/app/pages/features/claiming/claiming.component.html similarity index 100% rename from frontend/src/app/claiming/claiming.component.html rename to frontend/src/app/pages/features/claiming/claiming.component.html diff --git a/frontend/src/app/claiming/claiming.component.scss b/frontend/src/app/pages/features/claiming/claiming.component.scss similarity index 100% rename from frontend/src/app/claiming/claiming.component.scss rename to frontend/src/app/pages/features/claiming/claiming.component.scss diff --git a/frontend/src/app/claiming/claiming.component.spec.ts b/frontend/src/app/pages/features/claiming/claiming.component.spec.ts similarity index 100% rename from frontend/src/app/claiming/claiming.component.spec.ts rename to frontend/src/app/pages/features/claiming/claiming.component.spec.ts diff --git a/frontend/src/app/claiming/claiming.component.ts b/frontend/src/app/pages/features/claiming/claiming.component.ts similarity index 86% rename from frontend/src/app/claiming/claiming.component.ts rename to frontend/src/app/pages/features/claiming/claiming.component.ts index 66aaa80..a13d35b 100644 --- a/frontend/src/app/claiming/claiming.component.ts +++ b/frontend/src/app/pages/features/claiming/claiming.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; import {NgOptimizedImage} from '@angular/common'; import {RouterLink} from '@angular/router'; diff --git a/frontend/src/app/customfeatures/customfeatures.component.html b/frontend/src/app/pages/features/customfeatures/customfeatures.component.html similarity index 100% rename from frontend/src/app/customfeatures/customfeatures.component.html rename to frontend/src/app/pages/features/customfeatures/customfeatures.component.html diff --git a/frontend/src/app/customfeatures/customfeatures.component.scss b/frontend/src/app/pages/features/customfeatures/customfeatures.component.scss similarity index 100% rename from frontend/src/app/customfeatures/customfeatures.component.scss rename to frontend/src/app/pages/features/customfeatures/customfeatures.component.scss diff --git a/frontend/src/app/customfeatures/customfeatures.component.spec.ts b/frontend/src/app/pages/features/customfeatures/customfeatures.component.spec.ts similarity index 100% rename from frontend/src/app/customfeatures/customfeatures.component.spec.ts rename to frontend/src/app/pages/features/customfeatures/customfeatures.component.spec.ts diff --git a/frontend/src/app/customfeatures/customfeatures.component.ts b/frontend/src/app/pages/features/customfeatures/customfeatures.component.ts similarity index 84% rename from frontend/src/app/customfeatures/customfeatures.component.ts rename to frontend/src/app/pages/features/customfeatures/customfeatures.component.ts index ad4bb36..d5dd0d7 100644 --- a/frontend/src/app/customfeatures/customfeatures.component.ts +++ b/frontend/src/app/pages/features/customfeatures/customfeatures.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from "../header/header.component"; +import {HeaderComponent} from "@header/header.component"; import {RouterLink} from '@angular/router'; @Component({ diff --git a/frontend/src/app/economy/economy.component.html b/frontend/src/app/pages/features/economy/economy.component.html similarity index 100% rename from frontend/src/app/economy/economy.component.html rename to frontend/src/app/pages/features/economy/economy.component.html diff --git a/frontend/src/app/economy/economy.component.scss b/frontend/src/app/pages/features/economy/economy.component.scss similarity index 100% rename from frontend/src/app/economy/economy.component.scss rename to frontend/src/app/pages/features/economy/economy.component.scss diff --git a/frontend/src/app/economy/economy.component.spec.ts b/frontend/src/app/pages/features/economy/economy.component.spec.ts similarity index 100% rename from frontend/src/app/economy/economy.component.spec.ts rename to frontend/src/app/pages/features/economy/economy.component.spec.ts diff --git a/frontend/src/app/economy/economy.component.ts b/frontend/src/app/pages/features/economy/economy.component.ts similarity index 83% rename from frontend/src/app/economy/economy.component.ts rename to frontend/src/app/pages/features/economy/economy.component.ts index e01508b..2e558b4 100644 --- a/frontend/src/app/economy/economy.component.ts +++ b/frontend/src/app/pages/features/economy/economy.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; import {NgOptimizedImage} from '@angular/common'; @Component({ diff --git a/frontend/src/app/map/map.component.html b/frontend/src/app/pages/features/map/map.component.html similarity index 100% rename from frontend/src/app/map/map.component.html rename to frontend/src/app/pages/features/map/map.component.html diff --git a/frontend/src/app/map/map.component.scss b/frontend/src/app/pages/features/map/map.component.scss similarity index 100% rename from frontend/src/app/map/map.component.scss rename to frontend/src/app/pages/features/map/map.component.scss diff --git a/frontend/src/app/map/map.component.spec.ts b/frontend/src/app/pages/features/map/map.component.spec.ts similarity index 100% rename from frontend/src/app/map/map.component.spec.ts rename to frontend/src/app/pages/features/map/map.component.spec.ts diff --git a/frontend/src/app/map/map.component.ts b/frontend/src/app/pages/features/map/map.component.ts similarity index 83% rename from frontend/src/app/map/map.component.ts rename to frontend/src/app/pages/features/map/map.component.ts index f74cd7b..2eee7e6 100644 --- a/frontend/src/app/map/map.component.ts +++ b/frontend/src/app/pages/features/map/map.component.ts @@ -1,6 +1,6 @@ import {Component} from '@angular/core'; import {CommonModule} from '@angular/common'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; @Component({ standalone: true, diff --git a/frontend/src/app/mypet/mypet.component.html b/frontend/src/app/pages/features/mypet/mypet.component.html similarity index 100% rename from frontend/src/app/mypet/mypet.component.html rename to frontend/src/app/pages/features/mypet/mypet.component.html diff --git a/frontend/src/app/mypet/mypet.component.scss b/frontend/src/app/pages/features/mypet/mypet.component.scss similarity index 100% rename from frontend/src/app/mypet/mypet.component.scss rename to frontend/src/app/pages/features/mypet/mypet.component.scss diff --git a/frontend/src/app/mypet/mypet.component.spec.ts b/frontend/src/app/pages/features/mypet/mypet.component.spec.ts similarity index 100% rename from frontend/src/app/mypet/mypet.component.spec.ts rename to frontend/src/app/pages/features/mypet/mypet.component.spec.ts diff --git a/frontend/src/app/mypet/mypet.component.ts b/frontend/src/app/pages/features/mypet/mypet.component.ts similarity index 83% rename from frontend/src/app/mypet/mypet.component.ts rename to frontend/src/app/pages/features/mypet/mypet.component.ts index f146dc7..f017e53 100644 --- a/frontend/src/app/mypet/mypet.component.ts +++ b/frontend/src/app/pages/features/mypet/mypet.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; import {NgOptimizedImage} from '@angular/common'; @Component({ diff --git a/frontend/src/app/skyblock/skyblock.component.html b/frontend/src/app/pages/features/skyblock/skyblock.component.html similarity index 100% rename from frontend/src/app/skyblock/skyblock.component.html rename to frontend/src/app/pages/features/skyblock/skyblock.component.html diff --git a/frontend/src/app/skyblock/skyblock.component.scss b/frontend/src/app/pages/features/skyblock/skyblock.component.scss similarity index 100% rename from frontend/src/app/skyblock/skyblock.component.scss rename to frontend/src/app/pages/features/skyblock/skyblock.component.scss diff --git a/frontend/src/app/skyblock/skyblock.component.spec.ts b/frontend/src/app/pages/features/skyblock/skyblock.component.spec.ts similarity index 100% rename from frontend/src/app/skyblock/skyblock.component.spec.ts rename to frontend/src/app/pages/features/skyblock/skyblock.component.spec.ts diff --git a/frontend/src/app/skyblock/skyblock.component.ts b/frontend/src/app/pages/features/skyblock/skyblock.component.ts similarity index 80% rename from frontend/src/app/skyblock/skyblock.component.ts rename to frontend/src/app/pages/features/skyblock/skyblock.component.ts index 25d48d9..416fcca 100644 --- a/frontend/src/app/skyblock/skyblock.component.ts +++ b/frontend/src/app/pages/features/skyblock/skyblock.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; @Component({ selector: 'app-skyblock', diff --git a/frontend/src/app/warps/warps.component.html b/frontend/src/app/pages/features/warps/warps.component.html similarity index 100% rename from frontend/src/app/warps/warps.component.html rename to frontend/src/app/pages/features/warps/warps.component.html diff --git a/frontend/src/app/warps/warps.component.scss b/frontend/src/app/pages/features/warps/warps.component.scss similarity index 100% rename from frontend/src/app/warps/warps.component.scss rename to frontend/src/app/pages/features/warps/warps.component.scss diff --git a/frontend/src/app/warps/warps.component.spec.ts b/frontend/src/app/pages/features/warps/warps.component.spec.ts similarity index 100% rename from frontend/src/app/warps/warps.component.spec.ts rename to frontend/src/app/pages/features/warps/warps.component.spec.ts diff --git a/frontend/src/app/warps/warps.component.ts b/frontend/src/app/pages/features/warps/warps.component.ts similarity index 85% rename from frontend/src/app/warps/warps.component.ts rename to frontend/src/app/pages/features/warps/warps.component.ts index 45bcfdd..8dba747 100644 --- a/frontend/src/app/warps/warps.component.ts +++ b/frontend/src/app/pages/features/warps/warps.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; import {NgOptimizedImage} from '@angular/common'; import {RouterLink} from '@angular/router'; diff --git a/frontend/src/app/footer/footer.component.html b/frontend/src/app/pages/footer/footer/footer.component.html similarity index 100% rename from frontend/src/app/footer/footer.component.html rename to frontend/src/app/pages/footer/footer/footer.component.html diff --git a/frontend/src/app/footer/footer.component.scss b/frontend/src/app/pages/footer/footer/footer.component.scss similarity index 100% rename from frontend/src/app/footer/footer.component.scss rename to frontend/src/app/pages/footer/footer/footer.component.scss diff --git a/frontend/src/app/footer/footer.component.spec.ts b/frontend/src/app/pages/footer/footer/footer.component.spec.ts similarity index 100% rename from frontend/src/app/footer/footer.component.spec.ts rename to frontend/src/app/pages/footer/footer/footer.component.spec.ts diff --git a/frontend/src/app/footer/footer.component.ts b/frontend/src/app/pages/footer/footer/footer.component.ts similarity index 90% rename from frontend/src/app/footer/footer.component.ts rename to frontend/src/app/pages/footer/footer/footer.component.ts index b898377..0bd7475 100644 --- a/frontend/src/app/footer/footer.component.ts +++ b/frontend/src/app/pages/footer/footer/footer.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {ALTITUDE_VERSION} from '../constant'; +import {ALTITUDE_VERSION} from '@custom-types/constant'; import {CommonModule, NgOptimizedImage} from '@angular/common'; import {RouterLink} from '@angular/router'; diff --git a/frontend/src/app/privacy/privacy.component.html b/frontend/src/app/pages/footer/privacy/privacy.component.html similarity index 100% rename from frontend/src/app/privacy/privacy.component.html rename to frontend/src/app/pages/footer/privacy/privacy.component.html diff --git a/frontend/src/app/privacy/privacy.component.scss b/frontend/src/app/pages/footer/privacy/privacy.component.scss similarity index 100% rename from frontend/src/app/privacy/privacy.component.scss rename to frontend/src/app/pages/footer/privacy/privacy.component.scss diff --git a/frontend/src/app/privacy/privacy.component.spec.ts b/frontend/src/app/pages/footer/privacy/privacy.component.spec.ts similarity index 100% rename from frontend/src/app/privacy/privacy.component.spec.ts rename to frontend/src/app/pages/footer/privacy/privacy.component.spec.ts diff --git a/frontend/src/app/privacy/privacy.component.ts b/frontend/src/app/pages/footer/privacy/privacy.component.ts similarity index 79% rename from frontend/src/app/privacy/privacy.component.ts rename to frontend/src/app/pages/footer/privacy/privacy.component.ts index d9d9798..b84598a 100644 --- a/frontend/src/app/privacy/privacy.component.ts +++ b/frontend/src/app/pages/footer/privacy/privacy.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; -import {ScrollService} from '../scroll/scroll.service'; +import {ScrollService} from '@services/scroll.service'; import {CommonModule} from '@angular/common'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; import {RouterLink} from '@angular/router'; @Component({ diff --git a/frontend/src/app/terms/terms.component.html b/frontend/src/app/pages/footer/terms/terms.component.html similarity index 100% rename from frontend/src/app/terms/terms.component.html rename to frontend/src/app/pages/footer/terms/terms.component.html diff --git a/frontend/src/app/terms/terms.component.scss b/frontend/src/app/pages/footer/terms/terms.component.scss similarity index 100% rename from frontend/src/app/terms/terms.component.scss rename to frontend/src/app/pages/footer/terms/terms.component.scss diff --git a/frontend/src/app/terms/terms.component.spec.ts b/frontend/src/app/pages/footer/terms/terms.component.spec.ts similarity index 100% rename from frontend/src/app/terms/terms.component.spec.ts rename to frontend/src/app/pages/footer/terms/terms.component.spec.ts diff --git a/frontend/src/app/terms/terms.component.ts b/frontend/src/app/pages/footer/terms/terms.component.ts similarity index 78% rename from frontend/src/app/terms/terms.component.ts rename to frontend/src/app/pages/footer/terms/terms.component.ts index 43fffd7..89d2eb4 100644 --- a/frontend/src/app/terms/terms.component.ts +++ b/frontend/src/app/pages/footer/terms/terms.component.ts @@ -1,6 +1,6 @@ import {Component} from '@angular/core'; -import {ScrollService} from '../scroll/scroll.service'; -import {HeaderComponent} from '../header/header.component'; +import {ScrollService} from '@services/scroll.service'; +import {HeaderComponent} from '@header/header.component'; import {CommonModule} from '@angular/common'; import {RouterLink} from '@angular/router'; diff --git a/frontend/src/app/forms/appeal/appeal.component.html b/frontend/src/app/pages/forms/appeal/appeal.component.html similarity index 100% rename from frontend/src/app/forms/appeal/appeal.component.html rename to frontend/src/app/pages/forms/appeal/appeal.component.html diff --git a/frontend/src/app/forms/appeal/appeal.component.scss b/frontend/src/app/pages/forms/appeal/appeal.component.scss similarity index 100% rename from frontend/src/app/forms/appeal/appeal.component.scss rename to frontend/src/app/pages/forms/appeal/appeal.component.scss diff --git a/frontend/src/app/forms/appeal/appeal.component.spec.ts b/frontend/src/app/pages/forms/appeal/appeal.component.spec.ts similarity index 100% rename from frontend/src/app/forms/appeal/appeal.component.spec.ts rename to frontend/src/app/pages/forms/appeal/appeal.component.spec.ts diff --git a/frontend/src/app/forms/appeal/appeal.component.ts b/frontend/src/app/pages/forms/appeal/appeal.component.ts similarity index 97% rename from frontend/src/app/forms/appeal/appeal.component.ts rename to frontend/src/app/pages/forms/appeal/appeal.component.ts index 82973d7..ac9652c 100644 --- a/frontend/src/app/forms/appeal/appeal.component.ts +++ b/frontend/src/app/pages/forms/appeal/appeal.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit} from '@angular/core'; import {FormsComponent} from '../forms.component'; import {FormControl, FormGroup, Validators} from '@angular/forms'; -import {AppealsService, MinecraftAppeal} from '../../../api'; +import {AppealsService, MinecraftAppeal} from '@api'; @Component({ selector: 'app-appeal', diff --git a/frontend/src/app/forms/form_type.ts b/frontend/src/app/pages/forms/form_type.ts similarity index 100% rename from frontend/src/app/forms/form_type.ts rename to frontend/src/app/pages/forms/form_type.ts diff --git a/frontend/src/app/forms/forms.component.html b/frontend/src/app/pages/forms/forms.component.html similarity index 100% rename from frontend/src/app/forms/forms.component.html rename to frontend/src/app/pages/forms/forms.component.html diff --git a/frontend/src/app/forms/forms.component.scss b/frontend/src/app/pages/forms/forms.component.scss similarity index 100% rename from frontend/src/app/forms/forms.component.scss rename to frontend/src/app/pages/forms/forms.component.scss diff --git a/frontend/src/app/forms/forms.component.spec.ts b/frontend/src/app/pages/forms/forms.component.spec.ts similarity index 100% rename from frontend/src/app/forms/forms.component.spec.ts rename to frontend/src/app/pages/forms/forms.component.spec.ts diff --git a/frontend/src/app/forms/forms.component.ts b/frontend/src/app/pages/forms/forms.component.ts similarity index 90% rename from frontend/src/app/forms/forms.component.ts rename to frontend/src/app/pages/forms/forms.component.ts index 78ece55..7ef1310 100644 --- a/frontend/src/app/forms/forms.component.ts +++ b/frontend/src/app/pages/forms/forms.component.ts @@ -1,12 +1,12 @@ import {Component, Input, OnInit} from '@angular/core'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; import {MatDialog} from '@angular/material/dialog'; import {ActivatedRoute} from '@angular/router'; -import {LoginDialogComponent} from '../login/login.component'; +import {LoginDialogComponent} from '@shared-components/login/login.component'; import {KeyValuePipe, NgForOf, NgIf} from '@angular/common'; import {FormType} from './form_type'; import {MatButton} from '@angular/material/button'; -import {AuthService} from '../services/auth.service'; +import {AuthService} from '@services/auth.service'; @Component({ selector: 'app-forms', diff --git a/frontend/src/app/header/header.component.html b/frontend/src/app/pages/header/header/header.component.html similarity index 100% rename from frontend/src/app/header/header.component.html rename to frontend/src/app/pages/header/header/header.component.html diff --git a/frontend/src/app/header/header.component.scss b/frontend/src/app/pages/header/header/header.component.scss similarity index 100% rename from frontend/src/app/header/header.component.scss rename to frontend/src/app/pages/header/header/header.component.scss diff --git a/frontend/src/app/header/header.component.spec.ts b/frontend/src/app/pages/header/header/header.component.spec.ts similarity index 100% rename from frontend/src/app/header/header.component.spec.ts rename to frontend/src/app/pages/header/header/header.component.spec.ts diff --git a/frontend/src/app/header/header.component.ts b/frontend/src/app/pages/header/header/header.component.ts similarity index 95% rename from frontend/src/app/header/header.component.ts rename to frontend/src/app/pages/header/header/header.component.ts index f066ba4..89f3986 100644 --- a/frontend/src/app/header/header.component.ts +++ b/frontend/src/app/pages/header/header/header.component.ts @@ -1,6 +1,6 @@ import {Component, HostListener, Input} from '@angular/core'; import {CommonModule, NgOptimizedImage} from '@angular/common'; -import {ThemeComponent} from '../theme/theme.component'; +import {ThemeComponent} from '@shared-components/theme/theme.component'; import {RouterLink} from '@angular/router'; @Component({ diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/pages/home/home.component.html similarity index 100% rename from frontend/src/app/home/home.component.html rename to frontend/src/app/pages/home/home.component.html diff --git a/frontend/src/app/home/home.component.scss b/frontend/src/app/pages/home/home.component.scss similarity index 100% rename from frontend/src/app/home/home.component.scss rename to frontend/src/app/pages/home/home.component.scss diff --git a/frontend/src/app/home/home.component.spec.ts b/frontend/src/app/pages/home/home.component.spec.ts similarity index 100% rename from frontend/src/app/home/home.component.spec.ts rename to frontend/src/app/pages/home/home.component.spec.ts diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/pages/home/home.component.ts similarity index 91% rename from frontend/src/app/home/home.component.ts rename to frontend/src/app/pages/home/home.component.ts index 9c18b92..e200d77 100644 --- a/frontend/src/app/home/home.component.ts +++ b/frontend/src/app/pages/home/home.component.ts @@ -1,10 +1,10 @@ import {Component, OnInit} from '@angular/core'; import {Title} from '@angular/platform-browser'; -import {ALTITUDE_VERSION} from '../constant'; -import {ScrollService} from '../scroll/scroll.service'; +import {ALTITUDE_VERSION} from '@custom-types/constant'; +import {ScrollService} from '@services/scroll.service'; import {CommonModule, NgOptimizedImage} from '@angular/common'; -import {HeaderComponent} from '../header/header.component'; -import {CopyIpComponent} from '../copy-ip/copy-ip.component'; +import {HeaderComponent} from '@header/header.component'; +import {CopyIpComponent} from '@shared-components/copy-ip/copy-ip.component'; import {RouterLink} from '@angular/router'; @Component({ diff --git a/frontend/src/app/particles/components/frames/frames.component.html b/frontend/src/app/pages/particles/components/frames/frames.component.html similarity index 100% rename from frontend/src/app/particles/components/frames/frames.component.html rename to frontend/src/app/pages/particles/components/frames/frames.component.html diff --git a/frontend/src/app/particles/components/frames/frames.component.scss b/frontend/src/app/pages/particles/components/frames/frames.component.scss similarity index 100% rename from frontend/src/app/particles/components/frames/frames.component.scss rename to frontend/src/app/pages/particles/components/frames/frames.component.scss diff --git a/frontend/src/app/particles/components/frames/frames.component.spec.ts b/frontend/src/app/pages/particles/components/frames/frames.component.spec.ts similarity index 100% rename from frontend/src/app/particles/components/frames/frames.component.spec.ts rename to frontend/src/app/pages/particles/components/frames/frames.component.spec.ts diff --git a/frontend/src/app/particles/components/frames/frames.component.ts b/frontend/src/app/pages/particles/components/frames/frames.component.ts similarity index 100% rename from frontend/src/app/particles/components/frames/frames.component.ts rename to frontend/src/app/pages/particles/components/frames/frames.component.ts diff --git a/frontend/src/app/particles/components/particle/particle.component.html b/frontend/src/app/pages/particles/components/particle/particle.component.html similarity index 100% rename from frontend/src/app/particles/components/particle/particle.component.html rename to frontend/src/app/pages/particles/components/particle/particle.component.html diff --git a/frontend/src/app/particles/components/particle/particle.component.scss b/frontend/src/app/pages/particles/components/particle/particle.component.scss similarity index 100% rename from frontend/src/app/particles/components/particle/particle.component.scss rename to frontend/src/app/pages/particles/components/particle/particle.component.scss diff --git a/frontend/src/app/particles/components/particle/particle.component.spec.ts b/frontend/src/app/pages/particles/components/particle/particle.component.spec.ts similarity index 100% rename from frontend/src/app/particles/components/particle/particle.component.spec.ts rename to frontend/src/app/pages/particles/components/particle/particle.component.spec.ts diff --git a/frontend/src/app/particles/components/particle/particle.component.ts b/frontend/src/app/pages/particles/components/particle/particle.component.ts similarity index 100% rename from frontend/src/app/particles/components/particle/particle.component.ts rename to frontend/src/app/pages/particles/components/particle/particle.component.ts diff --git a/frontend/src/app/particles/components/properties/properties.component.html b/frontend/src/app/pages/particles/components/properties/properties.component.html similarity index 100% rename from frontend/src/app/particles/components/properties/properties.component.html rename to frontend/src/app/pages/particles/components/properties/properties.component.html diff --git a/frontend/src/app/particles/components/properties/properties.component.scss b/frontend/src/app/pages/particles/components/properties/properties.component.scss similarity index 100% rename from frontend/src/app/particles/components/properties/properties.component.scss rename to frontend/src/app/pages/particles/components/properties/properties.component.scss diff --git a/frontend/src/app/particles/components/properties/properties.component.spec.ts b/frontend/src/app/pages/particles/components/properties/properties.component.spec.ts similarity index 100% rename from frontend/src/app/particles/components/properties/properties.component.spec.ts rename to frontend/src/app/pages/particles/components/properties/properties.component.spec.ts diff --git a/frontend/src/app/particles/components/properties/properties.component.ts b/frontend/src/app/pages/particles/components/properties/properties.component.ts similarity index 100% rename from frontend/src/app/particles/components/properties/properties.component.ts rename to frontend/src/app/pages/particles/components/properties/properties.component.ts diff --git a/frontend/src/app/particles/components/render-container/render-container.component.html b/frontend/src/app/pages/particles/components/render-container/render-container.component.html similarity index 100% rename from frontend/src/app/particles/components/render-container/render-container.component.html rename to frontend/src/app/pages/particles/components/render-container/render-container.component.html diff --git a/frontend/src/app/particles/components/render-container/render-container.component.scss b/frontend/src/app/pages/particles/components/render-container/render-container.component.scss similarity index 100% rename from frontend/src/app/particles/components/render-container/render-container.component.scss rename to frontend/src/app/pages/particles/components/render-container/render-container.component.scss diff --git a/frontend/src/app/particles/components/render-container/render-container.component.spec.ts b/frontend/src/app/pages/particles/components/render-container/render-container.component.spec.ts similarity index 100% rename from frontend/src/app/particles/components/render-container/render-container.component.spec.ts rename to frontend/src/app/pages/particles/components/render-container/render-container.component.spec.ts diff --git a/frontend/src/app/particles/components/render-container/render-container.component.ts b/frontend/src/app/pages/particles/components/render-container/render-container.component.ts similarity index 100% rename from frontend/src/app/particles/components/render-container/render-container.component.ts rename to frontend/src/app/pages/particles/components/render-container/render-container.component.ts diff --git a/frontend/src/app/particles/models/particle.model.ts b/frontend/src/app/pages/particles/models/particle.model.ts similarity index 100% rename from frontend/src/app/particles/models/particle.model.ts rename to frontend/src/app/pages/particles/models/particle.model.ts diff --git a/frontend/src/app/particles/particles.component.html b/frontend/src/app/pages/particles/particles.component.html similarity index 100% rename from frontend/src/app/particles/particles.component.html rename to frontend/src/app/pages/particles/particles.component.html diff --git a/frontend/src/app/particles/particles.component.scss b/frontend/src/app/pages/particles/particles.component.scss similarity index 100% rename from frontend/src/app/particles/particles.component.scss rename to frontend/src/app/pages/particles/particles.component.scss diff --git a/frontend/src/app/particles/particles.component.spec.ts b/frontend/src/app/pages/particles/particles.component.spec.ts similarity index 100% rename from frontend/src/app/particles/particles.component.spec.ts rename to frontend/src/app/pages/particles/particles.component.spec.ts diff --git a/frontend/src/app/particles/particles.component.ts b/frontend/src/app/pages/particles/particles.component.ts similarity index 97% rename from frontend/src/app/particles/particles.component.ts rename to frontend/src/app/pages/particles/particles.component.ts index ad98194..c63b8d7 100644 --- a/frontend/src/app/particles/particles.component.ts +++ b/frontend/src/app/pages/particles/particles.component.ts @@ -10,7 +10,7 @@ import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatTabsModule} from '@angular/material/tabs'; import {MatCardModule} from '@angular/material/card'; import {MatIconModule} from '@angular/material/icon'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; // Services import {IntersectionPlaneService} from './services/intersection-plane.service'; @@ -22,7 +22,7 @@ import {ParticleComponent} from './components/particle/particle.component'; import {FramesComponent} from './components/frames/frames.component'; import {MatSnackBar} from '@angular/material/snack-bar'; import {RenderContainerComponent} from './components/render-container/render-container.component'; -import {ParticlesService} from '../../api'; +import {ParticlesService} from '@api'; @Component({ selector: 'app-particles', diff --git a/frontend/src/app/particles/services/frame-manager.service.ts b/frontend/src/app/pages/particles/services/frame-manager.service.ts similarity index 100% rename from frontend/src/app/particles/services/frame-manager.service.ts rename to frontend/src/app/pages/particles/services/frame-manager.service.ts diff --git a/frontend/src/app/particles/services/input-handler.service.ts b/frontend/src/app/pages/particles/services/input-handler.service.ts similarity index 100% rename from frontend/src/app/particles/services/input-handler.service.ts rename to frontend/src/app/pages/particles/services/input-handler.service.ts diff --git a/frontend/src/app/particles/services/intersection-plane.service.ts b/frontend/src/app/pages/particles/services/intersection-plane.service.ts similarity index 100% rename from frontend/src/app/particles/services/intersection-plane.service.ts rename to frontend/src/app/pages/particles/services/intersection-plane.service.ts diff --git a/frontend/src/app/particles/services/particle-manager.service.ts b/frontend/src/app/pages/particles/services/particle-manager.service.ts similarity index 100% rename from frontend/src/app/particles/services/particle-manager.service.ts rename to frontend/src/app/pages/particles/services/particle-manager.service.ts diff --git a/frontend/src/app/particles/services/player-model.service.ts b/frontend/src/app/pages/particles/services/player-model.service.ts similarity index 100% rename from frontend/src/app/particles/services/player-model.service.ts rename to frontend/src/app/pages/particles/services/player-model.service.ts diff --git a/frontend/src/app/particles/services/renderer.service.ts b/frontend/src/app/pages/particles/services/renderer.service.ts similarity index 96% rename from frontend/src/app/particles/services/renderer.service.ts rename to frontend/src/app/pages/particles/services/renderer.service.ts index a53a71e..99224c3 100644 --- a/frontend/src/app/particles/services/renderer.service.ts +++ b/frontend/src/app/pages/particles/services/renderer.service.ts @@ -1,8 +1,8 @@ import {ElementRef, Injectable} from '@angular/core'; import * as THREE from 'three'; import {OrbitControls} from 'three/examples/jsm/controls/OrbitControls.js'; -import {ThemeService} from '../../theme/theme.service'; -import {THEME_MODE} from '../../constant'; +import {ThemeService} from '@shared-components/theme/theme.service'; +import {THEME_MODE} from '@custom-types/constant'; /** * Service responsible for managing the Three.js rendering environment diff --git a/frontend/src/app/bans/bans.component.html b/frontend/src/app/pages/reference/bans/bans.component.html similarity index 100% rename from frontend/src/app/bans/bans.component.html rename to frontend/src/app/pages/reference/bans/bans.component.html diff --git a/frontend/src/app/bans/bans.component.scss b/frontend/src/app/pages/reference/bans/bans.component.scss similarity index 100% rename from frontend/src/app/bans/bans.component.scss rename to frontend/src/app/pages/reference/bans/bans.component.scss diff --git a/frontend/src/app/bans/bans.component.spec.ts b/frontend/src/app/pages/reference/bans/bans.component.spec.ts similarity index 100% rename from frontend/src/app/bans/bans.component.spec.ts rename to frontend/src/app/pages/reference/bans/bans.component.spec.ts diff --git a/frontend/src/app/bans/bans.component.ts b/frontend/src/app/pages/reference/bans/bans.component.ts similarity index 98% rename from frontend/src/app/bans/bans.component.ts rename to frontend/src/app/pages/reference/bans/bans.component.ts index 58ab210..0aecc90 100644 --- a/frontend/src/app/bans/bans.component.ts +++ b/frontend/src/app/pages/reference/bans/bans.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit} from '@angular/core'; -import {HeaderComponent} from "../header/header.component"; +import {HeaderComponent} from "@header/header.component"; import {HistoryComponent} from './history/history.component'; -import {HistoryCount, HistoryService} from '../../api'; +import {HistoryCount, HistoryService} from '@api'; import {NgClass, NgForOf, NgIf} from '@angular/common'; import {FormsModule} from '@angular/forms'; import {catchError, map, Observable} from 'rxjs'; diff --git a/frontend/src/app/bans/details/details.component.html b/frontend/src/app/pages/reference/bans/details/details.component.html similarity index 100% rename from frontend/src/app/bans/details/details.component.html rename to frontend/src/app/pages/reference/bans/details/details.component.html diff --git a/frontend/src/app/bans/details/details.component.scss b/frontend/src/app/pages/reference/bans/details/details.component.scss similarity index 100% rename from frontend/src/app/bans/details/details.component.scss rename to frontend/src/app/pages/reference/bans/details/details.component.scss diff --git a/frontend/src/app/bans/details/details.component.spec.ts b/frontend/src/app/pages/reference/bans/details/details.component.spec.ts similarity index 100% rename from frontend/src/app/bans/details/details.component.spec.ts rename to frontend/src/app/pages/reference/bans/details/details.component.spec.ts diff --git a/frontend/src/app/bans/details/details.component.ts b/frontend/src/app/pages/reference/bans/details/details.component.ts similarity index 89% rename from frontend/src/app/bans/details/details.component.ts rename to frontend/src/app/pages/reference/bans/details/details.component.ts index 7f26ebf..4389358 100644 --- a/frontend/src/app/bans/details/details.component.ts +++ b/frontend/src/app/pages/reference/bans/details/details.component.ts @@ -1,11 +1,11 @@ import {Component, OnInit} from '@angular/core'; -import {HistoryService, PunishmentHistory} from '../../../api'; +import {HistoryService, PunishmentHistory} from '@api'; import {NgClass, NgIf, NgOptimizedImage} from '@angular/common'; -import {RemoveTrailingPeriodPipe} from '../../util/RemoveTrailingPeriodPipe'; +import {RemoveTrailingPeriodPipe} from '@pipes/RemoveTrailingPeriodPipe'; import {HistoryFormatService} from '../history-format.service'; import {ActivatedRoute, RouterLink} from '@angular/router'; import {catchError, map} from 'rxjs'; -import {HeaderComponent} from '../../header/header.component'; +import {HeaderComponent} from '@header/header.component'; @Component({ selector: 'app-details', diff --git a/frontend/src/app/bans/history-format.service.spec.ts b/frontend/src/app/pages/reference/bans/history-format.service.spec.ts similarity index 100% rename from frontend/src/app/bans/history-format.service.spec.ts rename to frontend/src/app/pages/reference/bans/history-format.service.spec.ts diff --git a/frontend/src/app/bans/history-format.service.ts b/frontend/src/app/pages/reference/bans/history-format.service.ts similarity index 97% rename from frontend/src/app/bans/history-format.service.ts rename to frontend/src/app/pages/reference/bans/history-format.service.ts index f400bd4..7694292 100644 --- a/frontend/src/app/bans/history-format.service.ts +++ b/frontend/src/app/pages/reference/bans/history-format.service.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {PunishmentHistory} from '../../api'; +import {PunishmentHistory} from '@api'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/bans/history/history.component.html b/frontend/src/app/pages/reference/bans/history/history.component.html similarity index 100% rename from frontend/src/app/bans/history/history.component.html rename to frontend/src/app/pages/reference/bans/history/history.component.html diff --git a/frontend/src/app/bans/history/history.component.scss b/frontend/src/app/pages/reference/bans/history/history.component.scss similarity index 100% rename from frontend/src/app/bans/history/history.component.scss rename to frontend/src/app/pages/reference/bans/history/history.component.scss diff --git a/frontend/src/app/bans/history/history.component.spec.ts b/frontend/src/app/pages/reference/bans/history/history.component.spec.ts similarity index 100% rename from frontend/src/app/bans/history/history.component.spec.ts rename to frontend/src/app/pages/reference/bans/history/history.component.spec.ts diff --git a/frontend/src/app/bans/history/history.component.ts b/frontend/src/app/pages/reference/bans/history/history.component.ts similarity index 94% rename from frontend/src/app/bans/history/history.component.ts rename to frontend/src/app/pages/reference/bans/history/history.component.ts index 7bcec0d..a33d1c6 100644 --- a/frontend/src/app/bans/history/history.component.ts +++ b/frontend/src/app/pages/reference/bans/history/history.component.ts @@ -1,11 +1,11 @@ import {Component, EventEmitter, Input, OnChanges, OnInit, Output} from '@angular/core'; -import {BASE_PATH, HistoryService, PunishmentHistory} from '../../../api'; +import {BASE_PATH, HistoryService, PunishmentHistory} from '@api'; import {catchError, map, Observable, shareReplay} from 'rxjs'; import {NgForOf, NgIf, NgOptimizedImage} from '@angular/common'; import {CookieService} from 'ngx-cookie-service'; -import {RemoveTrailingPeriodPipe} from '../../util/RemoveTrailingPeriodPipe'; +import {RemoveTrailingPeriodPipe} from '@pipes/RemoveTrailingPeriodPipe'; import {HttpErrorResponse} from '@angular/common/http'; -import {environment} from '../../../environments/environment'; +import {environment} from '@environment'; import {HistoryFormatService} from '../history-format.service'; import {SearchParams} from '../search-terms'; import {Router} from '@angular/router'; diff --git a/frontend/src/app/bans/search-terms.ts b/frontend/src/app/pages/reference/bans/search-terms.ts similarity index 100% rename from frontend/src/app/bans/search-terms.ts rename to frontend/src/app/pages/reference/bans/search-terms.ts diff --git a/frontend/src/app/commandlist/commandlist.component.html b/frontend/src/app/pages/reference/commandlist/commandlist.component.html similarity index 100% rename from frontend/src/app/commandlist/commandlist.component.html rename to frontend/src/app/pages/reference/commandlist/commandlist.component.html diff --git a/frontend/src/app/commandlist/commandlist.component.scss b/frontend/src/app/pages/reference/commandlist/commandlist.component.scss similarity index 100% rename from frontend/src/app/commandlist/commandlist.component.scss rename to frontend/src/app/pages/reference/commandlist/commandlist.component.scss diff --git a/frontend/src/app/commandlist/commandlist.component.spec.ts b/frontend/src/app/pages/reference/commandlist/commandlist.component.spec.ts similarity index 100% rename from frontend/src/app/commandlist/commandlist.component.spec.ts rename to frontend/src/app/pages/reference/commandlist/commandlist.component.spec.ts diff --git a/frontend/src/app/commandlist/commandlist.component.ts b/frontend/src/app/pages/reference/commandlist/commandlist.component.ts similarity index 81% rename from frontend/src/app/commandlist/commandlist.component.ts rename to frontend/src/app/pages/reference/commandlist/commandlist.component.ts index a199dc6..c678103 100644 --- a/frontend/src/app/commandlist/commandlist.component.ts +++ b/frontend/src/app/pages/reference/commandlist/commandlist.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from "../header/header.component"; +import {HeaderComponent} from "@header/header.component"; @Component({ selector: 'app-commandlist', diff --git a/frontend/src/app/guide/guide.component.html b/frontend/src/app/pages/reference/guide/guide.component.html similarity index 100% rename from frontend/src/app/guide/guide.component.html rename to frontend/src/app/pages/reference/guide/guide.component.html diff --git a/frontend/src/app/guide/guide.component.scss b/frontend/src/app/pages/reference/guide/guide.component.scss similarity index 100% rename from frontend/src/app/guide/guide.component.scss rename to frontend/src/app/pages/reference/guide/guide.component.scss diff --git a/frontend/src/app/guide/guide.component.spec.ts b/frontend/src/app/pages/reference/guide/guide.component.spec.ts similarity index 100% rename from frontend/src/app/guide/guide.component.spec.ts rename to frontend/src/app/pages/reference/guide/guide.component.spec.ts diff --git a/frontend/src/app/guide/guide.component.ts b/frontend/src/app/pages/reference/guide/guide.component.ts similarity index 75% rename from frontend/src/app/guide/guide.component.ts rename to frontend/src/app/pages/reference/guide/guide.component.ts index cb7d319..0dfc7bc 100644 --- a/frontend/src/app/guide/guide.component.ts +++ b/frontend/src/app/pages/reference/guide/guide.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from "../header/header.component"; +import {HeaderComponent} from "@header/header.component"; import {RouterLink} from '@angular/router'; -import {ALTITUDE_VERSION} from '../constant'; +import {ALTITUDE_VERSION} from '@custom-types/constant'; @Component({ selector: 'app-guide', diff --git a/frontend/src/app/lag/lag.component.html b/frontend/src/app/pages/reference/lag/lag.component.html similarity index 100% rename from frontend/src/app/lag/lag.component.html rename to frontend/src/app/pages/reference/lag/lag.component.html diff --git a/frontend/src/app/lag/lag.component.scss b/frontend/src/app/pages/reference/lag/lag.component.scss similarity index 100% rename from frontend/src/app/lag/lag.component.scss rename to frontend/src/app/pages/reference/lag/lag.component.scss diff --git a/frontend/src/app/lag/lag.component.spec.ts b/frontend/src/app/pages/reference/lag/lag.component.spec.ts similarity index 100% rename from frontend/src/app/lag/lag.component.spec.ts rename to frontend/src/app/pages/reference/lag/lag.component.spec.ts diff --git a/frontend/src/app/lag/lag.component.ts b/frontend/src/app/pages/reference/lag/lag.component.ts similarity index 80% rename from frontend/src/app/lag/lag.component.ts rename to frontend/src/app/pages/reference/lag/lag.component.ts index 8b52b71..fe5f09f 100644 --- a/frontend/src/app/lag/lag.component.ts +++ b/frontend/src/app/pages/reference/lag/lag.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from "../header/header.component"; +import {HeaderComponent} from "@header/header.component"; import {NgClass, NgOptimizedImage} from '@angular/common'; -import {ScrollService} from '../scroll/scroll.service'; +import {ScrollService} from '@services/scroll.service'; @Component({ selector: 'app-lag', diff --git a/frontend/src/app/mapart/mapart.component.html b/frontend/src/app/pages/reference/mapart/mapart.component.html similarity index 100% rename from frontend/src/app/mapart/mapart.component.html rename to frontend/src/app/pages/reference/mapart/mapart.component.html diff --git a/frontend/src/app/mapart/mapart.component.scss b/frontend/src/app/pages/reference/mapart/mapart.component.scss similarity index 100% rename from frontend/src/app/mapart/mapart.component.scss rename to frontend/src/app/pages/reference/mapart/mapart.component.scss diff --git a/frontend/src/app/mapart/mapart.component.spec.ts b/frontend/src/app/pages/reference/mapart/mapart.component.spec.ts similarity index 100% rename from frontend/src/app/mapart/mapart.component.spec.ts rename to frontend/src/app/pages/reference/mapart/mapart.component.spec.ts diff --git a/frontend/src/app/mapart/mapart.component.ts b/frontend/src/app/pages/reference/mapart/mapart.component.ts similarity index 79% rename from frontend/src/app/mapart/mapart.component.ts rename to frontend/src/app/pages/reference/mapart/mapart.component.ts index d00e222..2c0c873 100644 --- a/frontend/src/app/mapart/mapart.component.ts +++ b/frontend/src/app/pages/reference/mapart/mapart.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from "../header/header.component"; +import {HeaderComponent} from "@header/header.component"; @Component({ selector: 'app-mapart', diff --git a/frontend/src/app/ranks/ranks.component.html b/frontend/src/app/pages/reference/ranks/ranks.component.html similarity index 100% rename from frontend/src/app/ranks/ranks.component.html rename to frontend/src/app/pages/reference/ranks/ranks.component.html diff --git a/frontend/src/app/ranks/ranks.component.scss b/frontend/src/app/pages/reference/ranks/ranks.component.scss similarity index 100% rename from frontend/src/app/ranks/ranks.component.scss rename to frontend/src/app/pages/reference/ranks/ranks.component.scss diff --git a/frontend/src/app/ranks/ranks.component.spec.ts b/frontend/src/app/pages/reference/ranks/ranks.component.spec.ts similarity index 100% rename from frontend/src/app/ranks/ranks.component.spec.ts rename to frontend/src/app/pages/reference/ranks/ranks.component.spec.ts diff --git a/frontend/src/app/ranks/ranks.component.ts b/frontend/src/app/pages/reference/ranks/ranks.component.ts similarity index 79% rename from frontend/src/app/ranks/ranks.component.ts rename to frontend/src/app/pages/reference/ranks/ranks.component.ts index f3a5e57..6699cab 100644 --- a/frontend/src/app/ranks/ranks.component.ts +++ b/frontend/src/app/pages/reference/ranks/ranks.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from "../header/header.component"; +import {HeaderComponent} from "@header/header.component"; @Component({ selector: 'app-ranks', diff --git a/frontend/src/app/rules/rules.component.html b/frontend/src/app/pages/reference/rules/rules.component.html similarity index 100% rename from frontend/src/app/rules/rules.component.html rename to frontend/src/app/pages/reference/rules/rules.component.html diff --git a/frontend/src/app/rules/rules.component.scss b/frontend/src/app/pages/reference/rules/rules.component.scss similarity index 100% rename from frontend/src/app/rules/rules.component.scss rename to frontend/src/app/pages/reference/rules/rules.component.scss diff --git a/frontend/src/app/rules/rules.component.spec.ts b/frontend/src/app/pages/reference/rules/rules.component.spec.ts similarity index 100% rename from frontend/src/app/rules/rules.component.spec.ts rename to frontend/src/app/pages/reference/rules/rules.component.spec.ts diff --git a/frontend/src/app/rules/rules.component.ts b/frontend/src/app/pages/reference/rules/rules.component.ts similarity index 82% rename from frontend/src/app/rules/rules.component.ts rename to frontend/src/app/pages/reference/rules/rules.component.ts index 46cf086..27866b3 100644 --- a/frontend/src/app/rules/rules.component.ts +++ b/frontend/src/app/pages/reference/rules/rules.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; -import {ScrollService} from '../scroll/scroll.service'; +import {ScrollService} from '@services/scroll.service'; import {CommonModule} from '@angular/common'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; import {RouterLink} from '@angular/router'; @Component({ diff --git a/frontend/src/app/staffpowers/staffpowers.component.html b/frontend/src/app/pages/reference/staffpowers/staffpowers.component.html similarity index 100% rename from frontend/src/app/staffpowers/staffpowers.component.html rename to frontend/src/app/pages/reference/staffpowers/staffpowers.component.html diff --git a/frontend/src/app/staffpowers/staffpowers.component.scss b/frontend/src/app/pages/reference/staffpowers/staffpowers.component.scss similarity index 100% rename from frontend/src/app/staffpowers/staffpowers.component.scss rename to frontend/src/app/pages/reference/staffpowers/staffpowers.component.scss diff --git a/frontend/src/app/staffpowers/staffpowers.component.spec.ts b/frontend/src/app/pages/reference/staffpowers/staffpowers.component.spec.ts similarity index 100% rename from frontend/src/app/staffpowers/staffpowers.component.spec.ts rename to frontend/src/app/pages/reference/staffpowers/staffpowers.component.spec.ts diff --git a/frontend/src/app/staffpowers/staffpowers.component.ts b/frontend/src/app/pages/reference/staffpowers/staffpowers.component.ts similarity index 81% rename from frontend/src/app/staffpowers/staffpowers.component.ts rename to frontend/src/app/pages/reference/staffpowers/staffpowers.component.ts index 95245b8..3788598 100644 --- a/frontend/src/app/staffpowers/staffpowers.component.ts +++ b/frontend/src/app/pages/reference/staffpowers/staffpowers.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HeaderComponent} from "../header/header.component"; +import {HeaderComponent} from "@header/header.component"; @Component({ selector: 'app-staffpowers', diff --git a/frontend/src/app/vote/vote.component.html b/frontend/src/app/pages/vote/vote.component.html similarity index 100% rename from frontend/src/app/vote/vote.component.html rename to frontend/src/app/pages/vote/vote.component.html diff --git a/frontend/src/app/vote/vote.component.scss b/frontend/src/app/pages/vote/vote.component.scss similarity index 100% rename from frontend/src/app/vote/vote.component.scss rename to frontend/src/app/pages/vote/vote.component.scss diff --git a/frontend/src/app/vote/vote.component.spec.ts b/frontend/src/app/pages/vote/vote.component.spec.ts similarity index 100% rename from frontend/src/app/vote/vote.component.spec.ts rename to frontend/src/app/pages/vote/vote.component.spec.ts diff --git a/frontend/src/app/vote/vote.component.ts b/frontend/src/app/pages/vote/vote.component.ts similarity index 79% rename from frontend/src/app/vote/vote.component.ts rename to frontend/src/app/pages/vote/vote.component.ts index 59f6b1e..fcbffd5 100644 --- a/frontend/src/app/vote/vote.component.ts +++ b/frontend/src/app/pages/vote/vote.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; -import {ScrollService} from '../scroll/scroll.service'; +import {ScrollService} from '@services/scroll.service'; import {CommonModule} from '@angular/common'; -import {HeaderComponent} from '../header/header.component'; +import {HeaderComponent} from '@header/header.component'; @Component({ selector: 'app-vote', diff --git a/frontend/src/app/util/RemoveTrailingPeriodPipe.ts b/frontend/src/app/pipes/RemoveTrailingPeriodPipe.ts similarity index 100% rename from frontend/src/app/util/RemoveTrailingPeriodPipe.ts rename to frontend/src/app/pipes/RemoveTrailingPeriodPipe.ts diff --git a/frontend/src/app/scroll/scroll.service.spec.ts b/frontend/src/app/scroll/scroll.service.spec.ts deleted file mode 100644 index 725042d..0000000 --- a/frontend/src/app/scroll/scroll.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ScrollService } from './scroll.service'; - -describe('ScrollService', () => { - let service: ScrollService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ScrollService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts index 17a6aeb..114dbed 100644 --- a/frontend/src/app/services/auth.service.ts +++ b/frontend/src/app/services/auth.service.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {LoginService} from '../../api'; +import {LoginService} from '@api'; import {CookieService} from 'ngx-cookie-service'; import {BehaviorSubject, Observable, throwError} from 'rxjs'; import {catchError, tap} from 'rxjs/operators'; diff --git a/frontend/src/app/scroll/scroll.service.ts b/frontend/src/app/services/scroll.service.ts similarity index 100% rename from frontend/src/app/scroll/scroll.service.ts rename to frontend/src/app/services/scroll.service.ts diff --git a/frontend/src/app/copy-ip/copy-ip.component.html b/frontend/src/app/shared-components/copy-ip/copy-ip.component.html similarity index 100% rename from frontend/src/app/copy-ip/copy-ip.component.html rename to frontend/src/app/shared-components/copy-ip/copy-ip.component.html diff --git a/frontend/src/app/copy-ip/copy-ip.component.scss b/frontend/src/app/shared-components/copy-ip/copy-ip.component.scss similarity index 100% rename from frontend/src/app/copy-ip/copy-ip.component.scss rename to frontend/src/app/shared-components/copy-ip/copy-ip.component.scss diff --git a/frontend/src/app/copy-ip/copy-ip.component.spec.ts b/frontend/src/app/shared-components/copy-ip/copy-ip.component.spec.ts similarity index 100% rename from frontend/src/app/copy-ip/copy-ip.component.spec.ts rename to frontend/src/app/shared-components/copy-ip/copy-ip.component.spec.ts diff --git a/frontend/src/app/copy-ip/copy-ip.component.ts b/frontend/src/app/shared-components/copy-ip/copy-ip.component.ts similarity index 100% rename from frontend/src/app/copy-ip/copy-ip.component.ts rename to frontend/src/app/shared-components/copy-ip/copy-ip.component.ts diff --git a/frontend/src/app/login/login.component.html b/frontend/src/app/shared-components/login/login.component.html similarity index 100% rename from frontend/src/app/login/login.component.html rename to frontend/src/app/shared-components/login/login.component.html diff --git a/frontend/src/app/login/login.component.scss b/frontend/src/app/shared-components/login/login.component.scss similarity index 100% rename from frontend/src/app/login/login.component.scss rename to frontend/src/app/shared-components/login/login.component.scss diff --git a/frontend/src/app/login/login.component.spec.ts b/frontend/src/app/shared-components/login/login.component.spec.ts similarity index 100% rename from frontend/src/app/login/login.component.spec.ts rename to frontend/src/app/shared-components/login/login.component.spec.ts diff --git a/frontend/src/app/login/login.component.ts b/frontend/src/app/shared-components/login/login.component.ts similarity index 97% rename from frontend/src/app/login/login.component.ts rename to frontend/src/app/shared-components/login/login.component.ts index c825356..f729541 100644 --- a/frontend/src/app/login/login.component.ts +++ b/frontend/src/app/shared-components/login/login.component.ts @@ -6,7 +6,7 @@ import {MatInputModule} from '@angular/material/input'; import {MatFormFieldModule} from '@angular/material/form-field'; import {NgIf} from '@angular/common'; import {MatSnackBar} from '@angular/material/snack-bar'; -import {AuthService} from '../services/auth.service'; +import {AuthService} from '@services/auth.service'; @Component({ selector: 'app-login', diff --git a/frontend/src/app/theme/theme.component.html b/frontend/src/app/shared-components/theme/theme.component.html similarity index 100% rename from frontend/src/app/theme/theme.component.html rename to frontend/src/app/shared-components/theme/theme.component.html diff --git a/frontend/src/app/theme/theme.component.scss b/frontend/src/app/shared-components/theme/theme.component.scss similarity index 100% rename from frontend/src/app/theme/theme.component.scss rename to frontend/src/app/shared-components/theme/theme.component.scss diff --git a/frontend/src/app/theme/theme.component.spec.ts b/frontend/src/app/shared-components/theme/theme.component.spec.ts similarity index 100% rename from frontend/src/app/theme/theme.component.spec.ts rename to frontend/src/app/shared-components/theme/theme.component.spec.ts diff --git a/frontend/src/app/theme/theme.component.ts b/frontend/src/app/shared-components/theme/theme.component.ts similarity index 94% rename from frontend/src/app/theme/theme.component.ts rename to frontend/src/app/shared-components/theme/theme.component.ts index 9500f6a..d84a10d 100644 --- a/frontend/src/app/theme/theme.component.ts +++ b/frontend/src/app/shared-components/theme/theme.component.ts @@ -1,7 +1,7 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {Subscription} from 'rxjs'; import {ThemeService} from './theme.service'; -import {THEME_MODE} from '../constant'; +import {THEME_MODE} from '@custom-types/constant'; import {CommonModule} from '@angular/common'; @Component({ diff --git a/frontend/src/app/theme/theme.service.spec.ts b/frontend/src/app/shared-components/theme/theme.service.spec.ts similarity index 100% rename from frontend/src/app/theme/theme.service.spec.ts rename to frontend/src/app/shared-components/theme/theme.service.spec.ts diff --git a/frontend/src/app/theme/theme.service.ts b/frontend/src/app/shared-components/theme/theme.service.ts similarity index 96% rename from frontend/src/app/theme/theme.service.ts rename to frontend/src/app/shared-components/theme/theme.service.ts index 1747676..3bc1c94 100644 --- a/frontend/src/app/theme/theme.service.ts +++ b/frontend/src/app/shared-components/theme/theme.service.ts @@ -1,7 +1,7 @@ import {Injectable} from '@angular/core'; import {CookieService} from 'ngx-cookie-service'; import {BehaviorSubject} from 'rxjs'; -import {THEME_MODE} from '../constant'; +import {THEME_MODE} from '@custom-types/constant'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/constant.ts b/frontend/src/app/types/constant.ts similarity index 100% rename from frontend/src/app/constant.ts rename to frontend/src/app/types/constant.ts diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 5525117..1a3a8b5 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -16,7 +16,37 @@ "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", - "module": "ES2022" + "module": "ES2022", + "baseUrl": "src", + "paths": { + "@shared-components/*": [ + "app/shared-components/*" + ], + "@services/*": [ + "app/services/*" + ], + "@header/*": [ + "app/pages/header/header/*" + ], + "@custom-types/*": [ + "app/types/*" + ], + "@pipes/*": [ + "app/pipes/*" + ], + "@pages/*": [ + "app/pages/*" + ], + "@api": [ + "api" + ], + "@api/*": [ + "api/*" + ], + "@environment": [ + "environments/environment" + ] + } }, "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": false,