From 019593c6f16d16d18363267f3f0e425a87663f9c Mon Sep 17 00:00:00 2001 From: Patrick Sun Date: Tue, 3 Nov 2020 05:01:26 +1100 Subject: [PATCH] switching between components --- src/app/app-routing.module.ts | 6 ++++-- src/app/app.module.ts | 4 +++- src/app/auth/auth.component.html | 1 + src/app/auth/auth.component.scss | 0 src/app/auth/auth.component.spec.ts | 25 +++++++++++++++++++++++++ src/app/auth/auth.component.ts | 15 +++++++++++++++ src/app/dist/app-routing.module.js | 6 ++++-- src/app/dist/main-menu-items.js | 4 ++-- src/app/main-menu-items.ts | 4 ++-- 9 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 src/app/auth/auth.component.html create mode 100644 src/app/auth/auth.component.scss create mode 100644 src/app/auth/auth.component.spec.ts create mode 100644 src/app/auth/auth.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 81fb884..bf0b612 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,15 +1,17 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; +import { AuthComponent } from './auth/auth.component'; import { DashboardComponent } from './dashboard/dashboard.component'; const routes: Routes = [ {path : '', component: DashboardComponent}, - {path : 'dashboard', component: DashboardComponent} + {path : 'dashboard', component: DashboardComponent}, + {path : 'login', component: AuthComponent} ]; @NgModule({ - imports: [RouterModule.forRoot(routes)], + imports: [RouterModule.forRoot(routes, {useHash: true} )], exports: [RouterModule] }) export class AppRoutingModule { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f3085eb..b227cdc 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,11 +10,13 @@ import { IconsModule } from '@progress/kendo-angular-icons'; import { AppComponent } from './app.component'; import { AppRoutingModule } from './app-routing.module'; import { DashboardComponent } from './dashboard/dashboard.component'; +import { AuthComponent } from './auth/auth.component'; @NgModule({ declarations: [ AppComponent, - DashboardComponent + DashboardComponent, + AuthComponent ], imports: [ BrowserModule, diff --git a/src/app/auth/auth.component.html b/src/app/auth/auth.component.html new file mode 100644 index 0000000..f66eb69 --- /dev/null +++ b/src/app/auth/auth.component.html @@ -0,0 +1 @@ +

auth works!

diff --git a/src/app/auth/auth.component.scss b/src/app/auth/auth.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/auth/auth.component.spec.ts b/src/app/auth/auth.component.spec.ts new file mode 100644 index 0000000..2e9ddd9 --- /dev/null +++ b/src/app/auth/auth.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AuthComponent } from './auth.component'; + +describe('AuthComponent', () => { + let component: AuthComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ AuthComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(AuthComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/auth/auth.component.ts b/src/app/auth/auth.component.ts new file mode 100644 index 0000000..e586c96 --- /dev/null +++ b/src/app/auth/auth.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-auth', + templateUrl: './auth.component.html', + styleUrls: ['./auth.component.scss'] +}) +export class AuthComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/dist/app-routing.module.js b/src/app/dist/app-routing.module.js index 620b5a3..472bdcc 100644 --- a/src/app/dist/app-routing.module.js +++ b/src/app/dist/app-routing.module.js @@ -9,17 +9,19 @@ exports.__esModule = true; exports.AppRoutingModule = void 0; var core_1 = require("@angular/core"); var router_1 = require("@angular/router"); +var auth_component_1 = require("./auth/auth.component"); var dashboard_component_1 = require("./dashboard/dashboard.component"); var routes = [ { path: '', component: dashboard_component_1.DashboardComponent }, - { path: 'dashboard', component: dashboard_component_1.DashboardComponent } + { path: 'dashboard', component: dashboard_component_1.DashboardComponent }, + { path: 'login', component: auth_component_1.AuthComponent } ]; var AppRoutingModule = /** @class */ (function () { function AppRoutingModule() { } AppRoutingModule = __decorate([ core_1.NgModule({ - imports: [router_1.RouterModule.forRoot(routes)], + imports: [router_1.RouterModule.forRoot(routes, { useHash: true })], exports: [router_1.RouterModule] }) ], AppRoutingModule); diff --git a/src/app/dist/main-menu-items.js b/src/app/dist/main-menu-items.js index c19cdca..c13e534 100644 --- a/src/app/dist/main-menu-items.js +++ b/src/app/dist/main-menu-items.js @@ -10,9 +10,9 @@ exports.mainMenuItems = [ text: 'SFM', icon: 'more-vertical', items: [ - { text: 'Summary', icon: 'calculator', url: '/dashboard' }, + { text: 'Summary', icon: 'calculator', url: '/#/dashboard' }, { text: '--', separator: "true" }, - { text: 'Logout', icon: 'logout', url: '/login' } + { text: 'Logout', icon: 'logout', url: '/#/login' } ] }, { diff --git a/src/app/main-menu-items.ts b/src/app/main-menu-items.ts index 7b11f59..73f48b3 100644 --- a/src/app/main-menu-items.ts +++ b/src/app/main-menu-items.ts @@ -7,9 +7,9 @@ export const mainMenuItems: any[] = [ text: 'SFM', icon: 'more-vertical', items: [ - { text: 'Summary', icon: 'calculator', url: '/dashboard'}, + { text: 'Summary', icon: 'calculator', url: '/#/dashboard'}, { text: '--', separator: "true" }, - { text: 'Logout', icon: 'logout', url: '/login'}] + { text: 'Logout', icon: 'logout', url: '/#/login'}] }, { text: 'Loans',