diff --git a/src/app/app-router.module.ts b/src/app/app-router.module.ts index c05a30d..1f099fc 100644 --- a/src/app/app-router.module.ts +++ b/src/app/app-router.module.ts @@ -1,9 +1,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; -import { HomeComponent } from './home/home.component'; import { CallbackComponent } from './header/header-popup/callback/callback.component'; -import {ProjectsComponent} from "./projects/projects.component"; + const routes: Routes = [ { @@ -13,11 +12,11 @@ const routes: Routes = [ }, { path: 'home', - component: HomeComponent, + loadChildren: () => import('./home/home.module').then(mod => mod.HomeModule), }, { path: 'projects', - component: ProjectsComponent, + loadChildren: () => import('./projects/projects.module').then(mod => mod.ProjectsModule), }, { path: 'callback', diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 2b4186e..66f2d6e 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { AuthService } from './shared/auth/auth.service'; +import { AuthService } from './shared/service/auth.service'; import { UpdateService } from './shared/service-worker/update.service'; import { NgcCookieConsentService, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 98c88c1..3c70d55 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,16 +10,12 @@ import { AppServiceWorkerModule } from './app-service-worker.module'; import { ServiceWorkerModule } from '@angular/service-worker'; import { environment } from '../environments/environment'; import { FooterComponent } from './footer/footer.component'; -import {HomeModule} from "./home/home.module"; -import {ProjectsModule} from "./projects/projects.module"; @NgModule({ declarations: [AppComponent, FooterComponent], imports: [ BrowserModule, HeaderModule, - HomeModule, - ProjectsModule, AppRouterModule, AppServiceWorkerModule, SharedModule, diff --git a/src/app/header/header-dropdown/header-dropdown.component.ts b/src/app/header/header-dropdown/header-dropdown.component.ts index 2812b9b..55aac63 100644 --- a/src/app/header/header-dropdown/header-dropdown.component.ts +++ b/src/app/header/header-dropdown/header-dropdown.component.ts @@ -22,7 +22,7 @@ import { faUser, } from '@fortawesome/free-solid-svg-icons'; import { Subscription } from 'rxjs'; -import { AuthService } from 'src/app/shared/auth/auth.service'; +import { AuthService } from 'src/app/shared/service/auth.service'; import { User } from '../../shared/model/user/user.model'; import UserChecker from '../../shared/model/user/user.checker'; import { HelpComponent } from '../header-popup/help/help.component'; @@ -96,25 +96,25 @@ export class HeaderDropdownComponent implements OnInit, OnDestroy { private userSubscription!: Subscription; @Input() - state: boolean = false; + state: boolean = false; @Input() - ignoreClickOutside!: HTMLDivElement[]; + ignoreClickOutside!: HTMLDivElement[]; @Output() - clickOutside = new EventEmitter(); + clickOutside = new EventEmitter(); @Output() - loginPopupState: EventEmitter = new EventEmitter(); + loginPopupState: EventEmitter = new EventEmitter(); @Output() - signupPopupState: EventEmitter = new EventEmitter(); + signupPopupState: EventEmitter = new EventEmitter(); @Output() - helpPopupState: EventEmitter = new EventEmitter(); + helpPopupState: EventEmitter = new EventEmitter(); @Output() - myProfilePopupState: EventEmitter = new EventEmitter(); + myProfilePopupState: EventEmitter = new EventEmitter(); constructor( private viewContainerRef: ViewContainerRef, diff --git a/src/app/header/header-popup/callback/callback.component.ts b/src/app/header/header-popup/callback/callback.component.ts index 18bc37f..3a81d79 100644 --- a/src/app/header/header-popup/callback/callback.component.ts +++ b/src/app/header/header-popup/callback/callback.component.ts @@ -1,6 +1,6 @@ import { ActivatedRoute, Router } from '@angular/router'; import { Component, OnInit } from '@angular/core'; -import { AuthService } from 'src/app/shared/auth/auth.service'; +import { AuthService } from 'src/app/shared/service/auth.service'; @Component({ selector: 'app-callback', @@ -19,15 +19,15 @@ export class CallbackComponent implements OnInit { let auth: 'google' | 'github' = p['auth']; switch (auth) { - case 'github': - this.authService.loginGithubUser(p); - break; - case 'google': - this.authService.loginGoogleUser(p); - break; - default: - console.log(`Unimplemented auth: ${auth}`); - break; + case 'github': + this.authService.loginGithubUser(p); + break; + case 'google': + this.authService.loginGoogleUser(p); + break; + default: + console.log(`Unimplemented auth: ${auth}`); + break; } this.router.navigate(['/home']); diff --git a/src/app/header/header-popup/login/login.component.ts b/src/app/header/header-popup/login/login.component.ts index f96873e..a6a1baa 100644 --- a/src/app/header/header-popup/login/login.component.ts +++ b/src/app/header/header-popup/login/login.component.ts @@ -13,7 +13,7 @@ import { MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer } from '@angular/platform-browser'; import { faLock, faUser } from '@fortawesome/free-solid-svg-icons'; import { Subscription } from 'rxjs'; -import { AuthService } from 'src/app/shared/auth/auth.service'; +import { AuthService } from 'src/app/shared/service/auth.service'; import { HttpError } from 'src/app/shared/model/httpError/httpError.model'; import HttpErrorChecker from 'src/app/shared/model/httpError/httpErrorChecker'; import UserChecker from 'src/app/shared/model/user/user.checker'; @@ -99,13 +99,13 @@ const GITHUB_LOGO_SVG = 'assets/img/providers/github.svg'; }) export class LoginComponent implements OnInit, AfterViewInit, OnDestroy { @Input() - state: boolean = false; + state: boolean = false; @Input() - ignoreClickOutside!: HTMLDivElement[]; + ignoreClickOutside!: HTMLDivElement[]; @Output() - stateChange = new EventEmitter(); + stateChange = new EventEmitter(); loginForm!: FormGroup; diff --git a/src/app/header/header-popup/my-profile/my-profile.component.ts b/src/app/header/header-popup/my-profile/my-profile.component.ts index ee46287..fe3bdf0 100644 --- a/src/app/header/header-popup/my-profile/my-profile.component.ts +++ b/src/app/header/header-popup/my-profile/my-profile.component.ts @@ -6,7 +6,7 @@ import { OnInit, Output, } from '@angular/core'; -import { AuthService } from '../../../shared/auth/auth.service'; +import { AuthService } from '../../../shared/service/auth.service'; import { User } from '../../../shared/model/user/user.model'; import { animate, @@ -88,16 +88,16 @@ import { faFileUpload } from '@fortawesome/free-solid-svg-icons'; }) export class MyProfileComponent implements OnInit { @Input() - state: boolean = false; + state: boolean = false; @Input() - user!: User | null; + user!: User | null; @Input() - ignoreClickOutside!: HTMLDivElement[]; + ignoreClickOutside!: HTMLDivElement[]; @Output() - stateChange = new EventEmitter(); + stateChange = new EventEmitter(); alterForm!: FormGroup; diff --git a/src/app/header/header-popup/my-profile/profile-picture-picker/profile-picture-picker.component.ts b/src/app/header/header-popup/my-profile/profile-picture-picker/profile-picture-picker.component.ts index e211ac5..62e89e2 100644 --- a/src/app/header/header-popup/my-profile/profile-picture-picker/profile-picture-picker.component.ts +++ b/src/app/header/header-popup/my-profile/profile-picture-picker/profile-picture-picker.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Output } from '@angular/core'; -import { AuthService } from '../../../../shared/auth/auth.service'; +import { AuthService } from '../../../../shared/service/auth.service'; @Component({ selector: 'app-profile-picture-picker', @@ -8,7 +8,7 @@ import { AuthService } from '../../../../shared/auth/auth.service'; }) export class ProfilePicturePickerComponent { @Output() - imageSent = new EventEmitter(); + imageSent = new EventEmitter(); private profilePicture!: File; diff --git a/src/app/header/header-popup/signup/signup.component.ts b/src/app/header/header-popup/signup/signup.component.ts index 6c041b3..3430aca 100644 --- a/src/app/header/header-popup/signup/signup.component.ts +++ b/src/app/header/header-popup/signup/signup.component.ts @@ -9,7 +9,7 @@ import { faUser, } from '@fortawesome/free-solid-svg-icons'; import { Subscription } from 'rxjs'; -import { AuthService } from 'src/app/shared/auth/auth.service'; +import { AuthService } from 'src/app/shared/service/auth.service'; import { HttpError } from 'src/app/shared/model/httpError/httpError.model'; import HttpErrorChecker from 'src/app/shared/model/httpError/httpErrorChecker'; import UserChecker from 'src/app/shared/model/user/user.checker'; @@ -90,13 +90,13 @@ const GITHUB_LOGO_SVG = 'assets/img/providers/github.svg'; }) export class SignupComponent implements OnInit { @Input() - state: boolean = false; + state: boolean = false; @Input() - ignoreClickOutside!: HTMLDivElement[]; + ignoreClickOutside!: HTMLDivElement[]; @Output() - stateChange = new EventEmitter(); + stateChange = new EventEmitter(); signupForm!: FormGroup; diff --git a/src/app/header/header-slider/nav-slider/nav-slider.component.ts b/src/app/header/header-slider/nav-slider/nav-slider.component.ts index b2b65c9..3154012 100644 --- a/src/app/header/header-slider/nav-slider/nav-slider.component.ts +++ b/src/app/header/header-slider/nav-slider/nav-slider.component.ts @@ -10,7 +10,7 @@ import { faUser } from '@fortawesome/free-solid-svg-icons'; import { SliderItemComponent } from 'src/app/shared/components/slider-item/slider-item.component'; import UserChecker from '../../../shared/model/user/user.checker'; import { User } from '../../../shared/model/user/user.model'; -import { AuthService } from '../../../shared/auth/auth.service'; +import { AuthService } from '../../../shared/service/auth.service'; import { Subscription } from 'rxjs'; @Component({ @@ -25,14 +25,14 @@ export class NavSliderComponent userIcon = faUser; @Input() - pages!: { name: string; route: string }[]; + pages!: { name: string; route: string }[]; loggedUser!: User | null; private userSubscription!: Subscription; @Output() - profileButtonClicked = new EventEmitter(); + profileButtonClicked = new EventEmitter(); constructor(private authService: AuthService) { super(); diff --git a/src/app/header/header-slider/user-slider/user-slider.component.ts b/src/app/header/header-slider/user-slider/user-slider.component.ts index f97c412..9da3b36 100644 --- a/src/app/header/header-slider/user-slider/user-slider.component.ts +++ b/src/app/header/header-slider/user-slider/user-slider.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import { Subscription } from 'rxjs'; -import { AuthService } from 'src/app/shared/auth/auth.service'; +import { AuthService } from 'src/app/shared/service/auth.service'; import { SliderItemComponent } from 'src/app/shared/components/slider-item/slider-item.component'; import UserChecker from 'src/app/shared/model/user/user.checker'; import { User } from 'src/app/shared/model/user/user.model'; @@ -52,16 +52,16 @@ export class UserSliderComponent extends SliderItemComponent implements OnInit { authSubscription!: Subscription; @Output() - loginPopupState: EventEmitter = new EventEmitter(); + loginPopupState: EventEmitter = new EventEmitter(); @Output() - signupPopupState: EventEmitter = new EventEmitter(); + signupPopupState: EventEmitter = new EventEmitter(); @Output() - helpPopupState: EventEmitter = new EventEmitter(); + helpPopupState: EventEmitter = new EventEmitter(); @Output() - myProfilePopupState: EventEmitter = new EventEmitter(); + myProfilePopupState: EventEmitter = new EventEmitter(); constructor(private authService: AuthService) { super(); diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index c13684f..e9f0b64 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -10,7 +10,7 @@ import { import { faUser } from '@fortawesome/free-solid-svg-icons'; import { LoginComponent } from './header-popup/login/login.component'; import { SignupComponent } from './header-popup/signup/signup.component'; -import { AuthService } from '../shared/auth/auth.service'; +import { AuthService } from '../shared/service/auth.service'; import UserChecker from '../shared/model/user/user.checker'; import { User } from '../shared/model/user/user.model'; import { Subscription } from 'rxjs'; diff --git a/src/app/home/home-router.module.ts b/src/app/home/home-router.module.ts new file mode 100644 index 0000000..7cfc348 --- /dev/null +++ b/src/app/home/home-router.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; +import {HomeComponent} from "./home.component"; + +const routes: Routes = [ + { + path: '', + component: HomeComponent, + }, +]; + +@NgModule({ + declarations: [], + imports: [CommonModule, RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class HomeRouterModule {} diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index 2bfa1be..96d951b 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -4,6 +4,7 @@ import {HomeComponent} from "./home.component"; import {StackSliderComponent} from "./stack-slider/stack-slider.component"; import {StackCardComponent} from "./stack-slider/stack-card/stack-card.component"; import {NgxGlideComponent} from "ngx-glide"; +import {HomeRouterModule} from "./home-router.module"; @@ -16,7 +17,8 @@ import {NgxGlideComponent} from "ngx-glide"; imports: [ CommonModule, NgxGlideComponent, - NgOptimizedImage + NgOptimizedImage, + HomeRouterModule ] }) export class HomeModule { } diff --git a/src/app/projects/project-card/project-card.component.spec.ts b/src/app/projects/project-card/project-card.component.spec.ts deleted file mode 100644 index 74de6b1..0000000 --- a/src/app/projects/project-card/project-card.component.spec.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ProjectCardComponent } from './project-card.component'; - -describe('ProjectCardComponent', () => { - let component: ProjectCardComponent; - let fixture: ComponentFixture; - - beforeEach(() => { - TestBed.configureTestingModule({ - declarations: [ProjectCardComponent] - }); - fixture = TestBed.createComponent(ProjectCardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/projects/project-card/project-card.component.ts b/src/app/projects/project-card/project-card.component.ts index b92f5ce..45b5ad3 100644 --- a/src/app/projects/project-card/project-card.component.ts +++ b/src/app/projects/project-card/project-card.component.ts @@ -1,9 +1,7 @@ import {Component, HostListener, Input, OnInit, ViewChild} from '@angular/core'; -import { faCodeFork, faEye, faStar } from '@fortawesome/free-solid-svg-icons'; +import {faCodeFork, faEye, faScaleBalanced, faStar} from '@fortawesome/free-solid-svg-icons'; import {Language, Project} from "../../shared/model/project/project.model"; -import {faScaleBalanced} from "@fortawesome/free-solid-svg-icons/faScaleBalanced"; import { - ApexAnnotations, ApexChart, ApexDataLabels, ApexNonAxisChartSeries, ApexPlotOptions, diff --git a/src/app/projects/projects-router.module.ts b/src/app/projects/projects-router.module.ts new file mode 100644 index 0000000..6f01310 --- /dev/null +++ b/src/app/projects/projects-router.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; +import {ProjectsComponent} from "./projects.component"; + +const routes: Routes = [ + { + path: '', + component: ProjectsComponent + }, +]; + +@NgModule({ + declarations: [], + imports: [CommonModule, RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ProjectsRouterModule {} diff --git a/src/app/projects/projects.component.spec.ts b/src/app/projects/projects.component.spec.ts deleted file mode 100644 index d396b2d..0000000 --- a/src/app/projects/projects.component.spec.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ProjectsComponent } from './projects.component'; - -describe('ProjectsComponent', () => { - let component: ProjectsComponent; - let fixture: ComponentFixture; - - beforeEach(() => { - TestBed.configureTestingModule({ - declarations: [ProjectsComponent] - }); - fixture = TestBed.createComponent(ProjectsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/projects/projects.component.ts b/src/app/projects/projects.component.ts index 23da837..2412c35 100644 --- a/src/app/projects/projects.component.ts +++ b/src/app/projects/projects.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit} from '@angular/core'; -import {GithubService} from "../shared/github-service/github.service"; +import {GithubService} from "../shared/service/github.service"; import {Project} from "../shared/model/project/project.model"; @Component({ diff --git a/src/app/projects/projects.module.ts b/src/app/projects/projects.module.ts index 25c2b8f..15b5a90 100644 --- a/src/app/projects/projects.module.ts +++ b/src/app/projects/projects.module.ts @@ -5,6 +5,7 @@ import { ProjectCardComponent } from './project-card/project-card.component'; import {MatIconModule} from "@angular/material/icon"; import {FontAwesomeModule} from "@fortawesome/angular-fontawesome"; import {NgApexchartsModule} from "ng-apexcharts"; +import {ProjectsRouterModule} from "./projects-router.module"; @NgModule({ declarations: [ @@ -16,7 +17,8 @@ import {NgApexchartsModule} from "ng-apexcharts"; NgOptimizedImage, MatIconModule, FontAwesomeModule, - NgApexchartsModule + NgApexchartsModule, + ProjectsRouterModule ], exports: [] }) diff --git a/src/app/shared/github-service/github.service.spec.ts b/src/app/shared/github-service/github.service.spec.ts deleted file mode 100644 index bcef5d4..0000000 --- a/src/app/shared/github-service/github.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { GithubServiceService } from './github.service'; - -describe('GithubServiceService', () => { - let service: GithubServiceService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(GithubServiceService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/shared/auth/auth.service.ts b/src/app/shared/service/auth.service.ts similarity index 100% rename from src/app/shared/auth/auth.service.ts rename to src/app/shared/service/auth.service.ts diff --git a/src/app/shared/github-service/github.service.ts b/src/app/shared/service/github.service.ts similarity index 100% rename from src/app/shared/github-service/github.service.ts rename to src/app/shared/service/github.service.ts