diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0297262..8d72890 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,10 +1,58 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { HomeComponent } from './components/home/home.component'; +import { LoginComponent } from './components/login/login.component'; +import { NotFoundComponent } from './components/not-found/not-found.component'; -const routes: Routes = []; +const routes: Routes = [ + { + path:"login", + component:LoginComponent + }, + { + path:"", + component:HomeComponent + // children: [ + // { + // path:"intro", + // component:IntroductionComponent + // }, + // { + // path:"sign", + // component:SignatureComponent + // }, + // { + // path:"signCMS", + // component:SignatureCmsComponent + // }, + // { + // path:"logs", + // component:LogComponent + // }, + // { + // path:"status", + // component:DeviceComponent + // } + // ], + // canActivate: [ProfileService], + // canActivateChild: [ProfileService] + }, + { + path:"not-found", + component:NotFoundComponent + }, + { + path:"**", + redirectTo:'/not-found' + } +]; @NgModule({ - imports: [RouterModule.forRoot(routes)], - exports: [RouterModule] + imports: [ + RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' }) + ], + exports: [ + RouterModule + ] }) export class AppRoutingModule { } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5c20967..71db51b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,20 +1,80 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; +import { HttpClientModule, HttpClientXsrfModule, HTTP_INTERCEPTORS } from '@angular/common/http'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; + +import { MatToolbarModule } from '@angular/material/toolbar'; +import { MatSidenavModule } from '@angular/material/sidenav'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatCardModule } from '@angular/material/card'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTableModule } from "@angular/material/table"; +import { MatSelectModule } from '@angular/material/select'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { MatStepperModule } from '@angular/material/stepper'; +import { MatListModule } from '@angular/material/list'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { ToastrModule } from 'ngx-toastr'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { LoginComponent } from './components/login/login.component'; +import { NotFoundComponent } from './components/not-found/not-found.component'; +import { HomeComponent } from './components/home/home.component'; +import { NavbarComponent } from './components/home/navbar/navbar.component'; +import { WorkspaceComponent } from './components/home/workspace/workspace.component'; @NgModule({ - declarations: [ - AppComponent - ], - imports: [ - BrowserModule, - AppRoutingModule, - BrowserAnimationsModule - ], - providers: [], - bootstrap: [AppComponent] + declarations: [ + AppComponent, + LoginComponent, + NotFoundComponent, + HomeComponent, + NavbarComponent, + WorkspaceComponent + ], + imports: [ + BrowserModule, + AppRoutingModule, + BrowserAnimationsModule, + HttpClientModule, + FormsModule, + ReactiveFormsModule, + MatToolbarModule, + MatSidenavModule, + MatIconModule, + MatDividerModule, + MatDialogModule, + MatFormFieldModule, + MatInputModule, + MatButtonModule, + MatCardModule, + MatPaginatorModule, + MatSortModule, + MatTableModule, + MatSelectModule, + MatCheckboxModule, + MatListModule, + MatProgressSpinnerModule, + MatProgressBarModule, + MatStepperModule, + FlexLayoutModule, + RouterModule, + FontAwesomeModule, + ToastrModule.forRoot() + ], + providers: [], + bootstrap: [AppComponent] }) export class AppModule { } diff --git a/src/app/components/home/home.component.css b/src/app/components/home/home.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/components/home/home.component.html b/src/app/components/home/home.component.html new file mode 100644 index 0000000..5f2c53f --- /dev/null +++ b/src/app/components/home/home.component.html @@ -0,0 +1 @@ +
home works!
diff --git a/src/app/components/home/home.component.spec.ts b/src/app/components/home/home.component.spec.ts new file mode 100644 index 0000000..2c5a172 --- /dev/null +++ b/src/app/components/home/home.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeComponent } from './home.component'; + +describe('HomeComponent', () => { + let component: HomeComponent; + let fixture: ComponentFixturenavbar works!
diff --git a/src/app/components/home/navbar/navbar.component.spec.ts b/src/app/components/home/navbar/navbar.component.spec.ts new file mode 100644 index 0000000..f8ccd6f --- /dev/null +++ b/src/app/components/home/navbar/navbar.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NavbarComponent } from './navbar.component'; + +describe('NavbarComponent', () => { + let component: NavbarComponent; + let fixture: ComponentFixtureworkspace works!
diff --git a/src/app/components/home/workspace/workspace.component.spec.ts b/src/app/components/home/workspace/workspace.component.spec.ts new file mode 100644 index 0000000..c0c0c01 --- /dev/null +++ b/src/app/components/home/workspace/workspace.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WorkspaceComponent } from './workspace.component'; + +describe('WorkspaceComponent', () => { + let component: WorkspaceComponent; + let fixture: ComponentFixturelogin works!
diff --git a/src/app/components/login/login.component.spec.ts b/src/app/components/login/login.component.spec.ts new file mode 100644 index 0000000..d2c0e6c --- /dev/null +++ b/src/app/components/login/login.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LoginComponent } from './login.component'; + +describe('LoginComponent', () => { + let component: LoginComponent; + let fixture: ComponentFixturenot-found works!
diff --git a/src/app/components/not-found/not-found.component.spec.ts b/src/app/components/not-found/not-found.component.spec.ts new file mode 100644 index 0000000..9d41c99 --- /dev/null +++ b/src/app/components/not-found/not-found.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NotFoundComponent } from './not-found.component'; + +describe('NotFoundComponent', () => { + let component: NotFoundComponent; + let fixture: ComponentFixture