](https://www.creative-tim.com/product/argon-dashboard)[
](https://www.creative-tim.com/product/argon-dashboard-react)[
](https://www.creative-tim.com/product/argon-dashboard-angular)[
](https://www.creative-tim.com/product/argon-dashboard-nodejs)[
](https://www.creative-tim.com/product/argon-dashboard-laravel)[
](https://github.com/creativetimofficial/argon-dashboard/tree/sketch)
-
-
-
-| HTML | React | Angular |
-| --- | --- | --- |
-| [](https://www.creative-tim.com/product/argon-dashboard?ref=ada-github-readme) | [](https://www.creative-tim.com/product/argon-dashboard-react?ref=ada-github-readme) | [](https://www.creative-tim.com/product/argon-dashboard-angular?ref=ada-github-readme)
-
-| NodeJS | Laravel |
-| --- | --- |
-| [](https://www.creative-tim.com/product/argon-dashboard-nodejs?ref=ada-github-readme) | [](https://www.creative-tim.com/product/argon-dashboard-laravel?ref=ada-github-readme) |
-
-## Demo
-
-| Dashboard Page | Icons Page | User Profile Page | Tables Page | Login Page | Register Page |
-| --- | --- | --- | --- | --- | --- |
-| [](https://demos.creative-tim.com/argon-dashboard-angular/dashboard?ref=ada-github-readme) | [](https://demos.creative-tim.com/argon-dashboard-angular/icons?ref=ada-github-readme) | [](https://demos.creative-tim.com/argon-dashboard-angular/user?ref=ada-github-readme) | [](https://demos.creative-tim.com/argon-dashboard-angular/tables?ref=ada-github-readme) | [](https://demos.creative-tim.com/argon-dashboard-angular/login?ref=ada-github-readme) | [](https://demos.creative-tim.com/argon-dashboard-angular/register?ref=ada-github-readme)
-
-[View More](https://demos.creative-tim.com/argon-dashboard-angular/dashboard)
-
-
-## Quick start
-
-- [Download from Github](https://github.com/creativetimofficial/argon-dashboard-angular/archive/master.zip).
-- [Download from Creative Tim](https://www.creative-tim.com/product/argon-dashboard-angular?ref=ada-github-readme).
-- Clone the repo: `git clone https://github.com/creativetimofficial/argon-dashboard-angular.git`.
-
-
-## Documentation
-The documentation for the Argon Dashboard Angular is hosted at our [website](https://demos.creative-tim.com/argon-dashboard-angular/documentation/tutorial?ref=ada-github-readme).
-
-
-## File Structure
-Within the download you'll find the following directories and files:
-
-```
-argon-dashboard-angular
-├── CHANGELOG.md
-├── README.md
-├── angular.json
-├── e2e
-├── package.json
-├── src
-│ ├── app
-│ │ ├── app.component.html
-│ │ ├── app.component.scss
-│ │ ├── app.component.spec.ts
-│ │ ├── app.component.ts
-│ │ ├── app.module.ts
-│ │ ├── app.routing.ts
-│ │ ├── components
-│ │ │ ├── components.module.spec.ts
-│ │ │ ├── components.module.ts
-│ │ │ ├── footer
-│ │ │ │ ├── footer.component.html
-│ │ │ │ ├── footer.component.scss
-│ │ │ │ ├── footer.component.spec.ts
-│ │ │ │ └── footer.component.ts
-│ │ │ ├── navbar
-│ │ │ │ ├── navbar.component.html
-│ │ │ │ ├── navbar.component.scss
-│ │ │ │ ├── navbar.component.spec.ts
-│ │ │ │ └── navbar.component.ts
-│ │ │ └── sidebar
-│ │ │ ├── sidebar.component.html
-│ │ │ ├── sidebar.component.scss
-│ │ │ ├── sidebar.component.spec.ts
-│ │ │ └── sidebar.component.ts
-│ │ ├── layouts
-│ │ │ ├── admin-layout
-│ │ │ │ ├── admin-layout.component.html
-│ │ │ │ ├── admin-layout.component.scss
-│ │ │ │ ├── admin-layout.component.spec.ts
-│ │ │ │ ├── admin-layout.component.ts
-│ │ │ │ ├── admin-layout.module.ts
-│ │ │ │ └── admin-layout.routing.ts
-│ │ │ └── auth-layout
-│ │ │ ├── auth-layout.component.html
-│ │ │ ├── auth-layout.component.scss
-│ │ │ ├── auth-layout.component.spec.ts
-│ │ │ ├── auth-layout.component.ts
-│ │ │ ├── auth-layout.module.ts
-│ │ │ └── auth-layout.routing.ts
-│ │ ├── pages
-│ │ │ ├── dashboard
-│ │ │ │ ├── dashboard.component.html
-│ │ │ │ ├── dashboard.component.scss
-│ │ │ │ ├── dashboard.component.spec.ts
-│ │ │ │ └── dashboard.component.ts
-│ │ │ ├── icons
-│ │ │ │ ├── icons.component.html
-│ │ │ │ ├── icons.component.scss
-│ │ │ │ ├── icons.component.spec.ts
-│ │ │ │ └── icons.component.ts
-│ │ │ ├── login
-│ │ │ │ ├── login.component.html
-│ │ │ │ ├── login.component.scss
-│ │ │ │ ├── login.component.spec.ts
-│ │ │ │ └── login.component.ts
-│ │ │ ├── maps
-│ │ │ │ ├── maps.component.html
-│ │ │ │ ├── maps.component.scss
-│ │ │ │ ├── maps.component.spec.ts
-│ │ │ │ └── maps.component.ts
-│ │ │ ├── register
-│ │ │ │ ├── register.component.html
-│ │ │ │ ├── register.component.scss
-│ │ │ │ ├── register.component.spec.ts
-│ │ │ │ └── register.component.ts
-│ │ │ ├── tables
-│ │ │ │ ├── tables.component.html
-│ │ │ │ ├── tables.component.scss
-│ │ │ │ ├── tables.component.spec.ts
-│ │ │ │ └── tables.component.ts
-│ │ │ └── user-profile
-│ │ │ ├── user-profile.component.html
-│ │ │ ├── user-profile.component.scss
-│ │ │ ├── user-profile.component.spec.ts
-│ │ │ └── user-profile.component.ts
-│ │ └── variables
-│ │ └── charts.ts
-│ ├── assets
-│ │ ├── fonts
-│ │ ├── img
-│ │ ├── scss
-│ │ │ ├── angular-differences
-│ │ │ ├── argon.scss
-│ │ │ ├── core
-│ │ │ └── custom
-│ │ └── vendor
-│ ├── browserslist
-│ ├── environments
-│ ├── favicon.ico
-│ ├── index.html
-│ ├── main.ts
-│ ├── polyfills.ts
-│ ├── styles.scss
-│ ├── test.ts
-│ ├── tsconfig.app.json
-│ ├── tsconfig.spec.json
-│ └── tslint.json
-├── tsconfig.json
-└── tslint.json
-```
-
-
-## Browser Support
-
-At present, we officially aim to support the last two versions of the following browsers:
-
-
-
-
-
-## Resources
-- Demo:
- © {{ test | date: "yyyy" }} Creative Tim
+ © {{ test | date: "yyyy" }} Truck Routing Planner
-
-
+
{{getTitle()}}
-
-
+
@@ -31,24 +20,11 @@
-
@@ -23,7 +12,7 @@
- Jessica Jones +
Welcome!
+
+ 
- - -
Documentation
- - + + diff --git a/src/app/components/sidebar/sidebar.component.scss b/src/app/components/sidebar/sidebar.component.scss index e69de29b..d027c105 100644 --- a/src/app/components/sidebar/sidebar.component.scss +++ b/src/app/components/sidebar/sidebar.component.scss @@ -0,0 +1,5 @@ +img { + width: 100%; + max-width: 250px; + height: 100%; + } \ No newline at end of file diff --git a/src/app/components/sidebar/sidebar.component.ts b/src/app/components/sidebar/sidebar.component.ts index e8e392eb..437e4f54 100644 --- a/src/app/components/sidebar/sidebar.component.ts +++ b/src/app/components/sidebar/sidebar.component.ts @@ -2,20 +2,22 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; declare interface RouteInfo { - path: string; - title: string; - icon: string; - class: string; + path: string; + title: string; + icon: string; + class: string; } + export const ROUTES: RouteInfo[] = [ - { path: '/dashboard', title: 'Dashboard', icon: 'ni-tv-2 text-primary', class: '' }, - { path: '/icons', title: 'Icons', icon:'ni-planet text-blue', class: '' }, - { path: '/maps', title: 'Maps', icon:'ni-pin-3 text-orange', class: '' }, - { path: '/user-profile', title: 'User profile', icon:'ni-single-02 text-yellow', class: '' }, - { path: '/tables', title: 'Tables', icon:'ni-bullet-list-67 text-red', class: '' }, - { path: '/login', title: 'Login', icon:'ni-key-25 text-info', class: '' }, - { path: '/register', title: 'Register', icon:'ni-circle-08 text-pink', class: '' } -]; + { path: '/mission', title: 'Mission', icon: 'ni ni-single-copy-04 text-blue', class: '' }, + { path: '/chauffeur', title: 'Chauffeurs', icon: 'ni ni-single-02 text-blue', class: '' }, + { path: '/camion', title: 'Camions', icon: 'ni ni-delivery-fast text-blue', class: '' }, + { path: '/client', title: 'Clients', icon: 'ni ni-box-2 text-blue', class: '' }, + { path: '/facture', title: 'Factures', icon: 'ni ni-credit-card text-blue', class: '' }, + { path: '/fiche-de-paie', title: 'Fiches de paie', icon: 'ni ni-money-coins text-blue', class: '' }, + { path: '/interventionPreventif', title: 'Intervention Preventif', icon: 'ni ni-settings text-blue', class: '' }, + { path: '/interventionCuratif', title: 'Intervention Curatif', icon: 'ni ni-settings text-blue', class: '' }, + ]; @Component({ selector: 'app-sidebar', diff --git a/src/app/layouts/admin-layout/admin-layout.module.ts b/src/app/layouts/admin-layout/admin-layout.module.ts index 5c7b0c84..95202d3f 100644 --- a/src/app/layouts/admin-layout/admin-layout.module.ts +++ b/src/app/layouts/admin-layout/admin-layout.module.ts @@ -12,6 +12,14 @@ import { MapsComponent } from '../../pages/maps/maps.component'; import { UserProfileComponent } from '../../pages/user-profile/user-profile.component'; import { TablesComponent } from '../../pages/tables/tables.component'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { CamionComponent } from 'src/app/pages/camion/camion.component'; +import { ChauffeurComponent } from 'src/app/pages/chauffeur/chauffeur.component'; +import { ClientComponent } from 'src/app/pages/client/client.component'; +import { MissionComponent } from 'src/app/pages/mission/mission.component'; +import { FactureComponent } from 'src/app/pages/facture/facture.component'; +import { InterventionCuratifComponent } from 'src/app/pages/interventionCuratif/intervention-curatif.component'; +import { InterventionPreventifComponent } from 'src/app/pages/InterventionPreventif/intervention-preventif.component'; + // import { ToastrModule } from 'ngx-toastr'; @NgModule({ @@ -28,7 +36,15 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; UserProfileComponent, TablesComponent, IconsComponent, - MapsComponent + MapsComponent, + CamionComponent, + ChauffeurComponent, + ClientComponent, + MissionComponent, + FactureComponent, + InterventionCuratifComponent, + InterventionPreventifComponent + ] }) diff --git a/src/app/layouts/admin-layout/admin-layout.routing.ts b/src/app/layouts/admin-layout/admin-layout.routing.ts index 17a62e3a..1dd5d19e 100644 --- a/src/app/layouts/admin-layout/admin-layout.routing.ts +++ b/src/app/layouts/admin-layout/admin-layout.routing.ts @@ -5,8 +5,25 @@ import { IconsComponent } from '../../pages/icons/icons.component'; import { MapsComponent } from '../../pages/maps/maps.component'; import { UserProfileComponent } from '../../pages/user-profile/user-profile.component'; import { TablesComponent } from '../../pages/tables/tables.component'; +import { CamionComponent } from 'src/app/pages/camion/camion.component'; +import { ChauffeurComponent } from 'src/app/pages/chauffeur/chauffeur.component'; +import { ClientComponent } from 'src/app/pages/client/client.component'; +import { MissionComponent } from 'src/app/pages/mission/mission.component'; +import { FactureComponent } from 'src/app/pages/facture/facture.component'; +import { InterventionPreventifComponent } from 'src/app/pages/InterventionPreventif/intervention-preventif.component'; +import { InterventionCuratifComponent } from 'src/app/pages/interventionCuratif/intervention-curatif.component'; export const AdminLayoutRoutes: Routes = [ + { path: 'camion', component: CamionComponent}, + { path: 'chauffeur', component: ChauffeurComponent}, + { path: 'mission', component: MissionComponent}, + { path: 'fiche-de-paie', component: MissionComponent}, + { path: 'facture', component: FactureComponent}, + { path: 'interventionPreventif', component: InterventionPreventifComponent}, + { path: 'interventionCuratif', component: InterventionCuratifComponent}, + { path: 'client', component: ClientComponent}, + + { path: 'dashboard', component: DashboardComponent }, { path: 'user-profile', component: UserProfileComponent }, { path: 'tables', component: TablesComponent }, diff --git a/src/app/models/camionModel.ts b/src/app/models/camionModel.ts new file mode 100644 index 00000000..f370bd5c --- /dev/null +++ b/src/app/models/camionModel.ts @@ -0,0 +1,6 @@ +export interface CamionModel{ + id:number; + immatriculation:number; + numCarteGrise:number; + kilometrage:number; +} diff --git a/src/app/models/chauffeurModel.ts b/src/app/models/chauffeurModel.ts new file mode 100644 index 00000000..4f66193c --- /dev/null +++ b/src/app/models/chauffeurModel.ts @@ -0,0 +1,10 @@ +export interface ChauffeurModel{ + id:number; + nom:string; + prenom:string; + numCompte:number; + codeCNSS:number; + numTel:number; + adresse:string; + +} diff --git a/src/app/models/clientModel.ts b/src/app/models/clientModel.ts new file mode 100644 index 00000000..7b009324 --- /dev/null +++ b/src/app/models/clientModel.ts @@ -0,0 +1,9 @@ +export interface ClientModel{ + id:number; + nom:string; + email:string; + numTel:String; + address:string; + + +} \ No newline at end of file diff --git a/src/app/models/factureModel.ts b/src/app/models/factureModel.ts new file mode 100644 index 00000000..bfe2700d --- /dev/null +++ b/src/app/models/factureModel.ts @@ -0,0 +1,10 @@ +export interface FactureModel{ + id:number; + dateIntervention:string; + kilometrage:string; + Prochainkilometrage:String; + PieceDeRechange:string; + camion:any; + + +} \ No newline at end of file diff --git a/src/app/models/interventionCuratifModel.ts b/src/app/models/interventionCuratifModel.ts new file mode 100644 index 00000000..d2c5d1ac --- /dev/null +++ b/src/app/models/interventionCuratifModel.ts @@ -0,0 +1,10 @@ +export interface InterventionCuratifModel{ + id:number; + dateIntervention:string; + kilometrage:string; + Prochainkilometrage:String; + PieceDeRechange:string; + camion:any; + + +} \ No newline at end of file diff --git a/src/app/models/interventionPreventifModel.ts b/src/app/models/interventionPreventifModel.ts new file mode 100644 index 00000000..49c8ed3e --- /dev/null +++ b/src/app/models/interventionPreventifModel.ts @@ -0,0 +1,8 @@ +export interface InterventionPreventifModel{ + id:number; + dateInt:string; + kilometrage:string; + prochaineKm:String; + description:string; + camion:any; +} diff --git a/src/app/models/missionModel.ts b/src/app/models/missionModel.ts new file mode 100644 index 00000000..7c9741bb --- /dev/null +++ b/src/app/models/missionModel.ts @@ -0,0 +1,18 @@ +export interface MissionModel{ + id:number; + dateMission:string; + destination:string; + description:string; + qte:number; + prixHT:number; + pourcentageTVA:number ; + prixTotale:number; + etat:boolean; + client:any; + camion:any; + chauffeur:any; + + + + +} \ No newline at end of file diff --git a/src/app/pages/InterventionPreventif/dialog-interventionPreventif.html b/src/app/pages/InterventionPreventif/dialog-interventionPreventif.html new file mode 100644 index 00000000..d1274d0d --- /dev/null +++ b/src/app/pages/InterventionPreventif/dialog-interventionPreventif.html @@ -0,0 +1,40 @@ +Ajouter une intervention
+ +Modifier l´intervention
+ +
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/InterventionPreventif/intervention-preventif.component.spec.ts b/src/app/pages/InterventionPreventif/intervention-preventif.component.spec.ts
new file mode 100644
index 00000000..ad940b15
--- /dev/null
+++ b/src/app/pages/InterventionPreventif/intervention-preventif.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { InterventionPreventifComponent } from './intervention-preventif.component';
+
+describe('InterventionPreventifComponent', () => {
+ let component: InterventionPreventifComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+
+ InterventionPreventif
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/camion/camion.component.spec.ts b/src/app/pages/camion/camion.component.spec.ts
new file mode 100644
index 00000000..55c13574
--- /dev/null
+++ b/src/app/pages/camion/camion.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CamionComponent } from './camion.component';
+
+describe('CamionComponent', () => {
+ let component: CamionComponent;
+ let fixture: ComponentFixtureAjouter une camion
+ +Modifier le camion
+ +
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/chauffeur/chauffeur.component.spec.ts b/src/app/pages/chauffeur/chauffeur.component.spec.ts
new file mode 100644
index 00000000..613f83c3
--- /dev/null
+++ b/src/app/pages/chauffeur/chauffeur.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ChauffeurComponent } from './chauffeur.component';
+
+describe('ChauffeurComponent', () => {
+ let component: ChauffeurComponent;
+ let fixture: ComponentFixtureAjouter un chauffeur
+ +Modifier le chauffeur
+ +
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/client/client.component.spec.ts b/src/app/pages/client/client.component.spec.ts
new file mode 100644
index 00000000..b93d364d
--- /dev/null
+++ b/src/app/pages/client/client.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ClientComponent } from './client.component';
+
+describe('ClientComponent', () => {
+ let component: ClientComponent;
+ let fixture: ComponentFixtureAjouter un client
+ +Modifier le client
+ +Ajouter une mission
+ +Modifier la mission
+ +facture works!
diff --git a/src/app/pages/facture/facture.component.spec.ts b/src/app/pages/facture/facture.component.spec.ts new file mode 100644 index 00000000..63223030 --- /dev/null +++ b/src/app/pages/facture/facture.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FactureComponent } from './facture.component'; + +describe('FactureComponent', () => { + let component: FactureComponent; + let fixture: ComponentFixtureAjouter une intervention
+ +Modifier la mission
+ +intervention-curatif works!
diff --git a/src/app/pages/interventionCuratif/intervention-curatif.component.spec.ts b/src/app/pages/interventionCuratif/intervention-curatif.component.spec.ts new file mode 100644 index 00000000..9fe9cf28 --- /dev/null +++ b/src/app/pages/interventionCuratif/intervention-curatif.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InterventionCuratifComponent } from './intervention-curatif.component'; + +describe('InterventionCuratifComponent', () => { + let component: InterventionCuratifComponent; + let fixture: ComponentFixture
+
@@ -20,22 +19,11 @@
-
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index b1504f1b..71cc872d 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -1,14 +1,58 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
-
+import { Router } from '@angular/router';
+import { AuthService } from 'src/app/services/auth.service';
+import { TokenStorageService } from 'src/app/services/token-storage.service';
@Component({
selector: 'app-login',
templateUrl: './login.component.html',
styleUrls: ['./login.component.scss']
})
export class LoginComponent implements OnInit, OnDestroy {
- constructor() {}
+ form: any = {
+ email: null,
+ password: null
+ };
+ isLoggedIn = false;
+ isLoginFailed = false;
+ errorMessage = '';
+ roles: string[] = [];
+ constructor(private authService: AuthService, private tokenStorage: TokenStorageService, private router:Router) {}
+ showAlert=false
+ alertMsg=""
ngOnInit() {
+ if (this.tokenStorage.getToken()) {
+ this.isLoggedIn = true;
+ this.roles = this.tokenStorage.getUser().roles;
+ }
+ }
+ onSubmit(): void {
+ const {email, password } = this.form;
+
+ this.authService.login(email, password).subscribe(
+
+ data => {
+
+ console.log(data);
+
+ this.tokenStorage.saveToken(data.accessToken);
+ this.tokenStorage.saveUser(data);
+
+ this.isLoginFailed = false;
+ this.isLoggedIn = true;
+ this.roles = this.tokenStorage.getUser().roles;
+ console.log('ok');
+ this.router.navigate(['/mission'] );
+ },
+ err => {
+ this.alertMsg=err.error.detail
+ this.showAlert=true
+ this.isLoginFailed = true;
+ }
+ );
+ }
+ reloadPage(): void {
+ window.location.reload();
}
ngOnDestroy() {
}
diff --git a/src/app/pages/mission/dialog-mission.html b/src/app/pages/mission/dialog-mission.html
new file mode 100644
index 00000000..05a49daf
--- /dev/null
+++ b/src/app/pages/mission/dialog-mission.html
@@ -0,0 +1,52 @@
+
-
Welcome!
-Use these awesome forms to login or create new account in your project for free.
+Bienvenue!
Welcome!
-
-
+
+
Sign in with
-
-
- 
- Github
-
-
- 
- Google
-
-
-
- Github
-
-
-
- Google
-
-
- Or sign in with credentials
+ Se connecter
@@ -51,29 +39,27 @@
-
+
Welcome!
-
+
+
-
+
+
+
+ {{alertMsg}}
+
-
+
- Forgot password?
-
-
- Ajouter une mission
+ +Modifier la mission
+ +
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/mission/mission.component.spec.ts b/src/app/pages/mission/mission.component.spec.ts
new file mode 100644
index 00000000..040e0b4a
--- /dev/null
+++ b/src/app/pages/mission/mission.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MissionComponent } from './mission.component';
+
+describe('MissionComponent', () => {
+ let component: MissionComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+ Missions
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Welcome!
@@ -52,7 +52,7 @@
-
+
Welcome!
@@ -60,7 +60,7 @@
-
+
Welcome!
password strength: strong
@@ -75,7 +75,7 @@ Welcome!
-
+
diff --git a/src/app/pages/register/register.component.ts b/src/app/pages/register/register.component.ts
index 21cfa54e..565a9d69 100644
--- a/src/app/pages/register/register.component.ts
+++ b/src/app/pages/register/register.component.ts
@@ -1,4 +1,6 @@
import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { AuthService } from 'src/app/services/auth.service';
@Component({
selector: 'app-register',
@@ -7,9 +9,38 @@ import { Component, OnInit } from '@angular/core';
})
export class RegisterComponent implements OnInit {
- constructor() { }
+ form: any = {
+ username: null,
+ email: null,
+ password: null
+ };
+ isSuccessful = false;
+ isSignUpFailed = false;
+ errorMessage = '';
- ngOnInit() {
+ constructor(private authService: AuthService,private router:Router) { }
+
+ ngOnInit(): void {
}
+ onSubmit(): void {
+ const { username, email, password } = this.form;
+ this.authService.register(username, email, password).subscribe(
+ data => {
+ console.log(data);
+ this.isSuccessful = true;
+ this.isSignUpFailed = false;
+ console.log('ok');
+ this.router.navigate(['/login'] );
+ },
+ err => {
+ this.errorMessage = err.error.message;
+ this.isSignUpFailed = true;
+ }
+ );
+ }
}
+
+
+
+
diff --git a/src/app/pages/tables/tables.component.html b/src/app/pages/tables/tables.component.html
index e2efaf4c..21f05370 100644
--- a/src/app/pages/tables/tables.component.html
+++ b/src/app/pages/tables/tables.component.html
@@ -1,95 +1,5 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Traffic
- 350,897 -
-
-
-
-
- - 3.48% - Since last month -
-
-
-
-
-
-
-
-
-
-
- New users
- 2,356 -
-
-
-
-
- - 3.48% - Since last week -
-
-
-
-
-
-
-
-
-
-
- Sales
- 924 -
-
-
-
-
- - 1.10% - Since yesterday -
-
-
-
-
-
-
-
-
-
-
- Performance
- 49,65% -
-
-
-
-
- - 12% - Since last month -
-
@@ -435,319 +345,5 @@
- Card tables
-
+
diff --git a/src/app/services/auth.service.spec.ts b/src/app/services/auth.service.spec.ts
new file mode 100644
index 00000000..9fbcaa65
--- /dev/null
+++ b/src/app/services/auth.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AuthService } from './auth.service';
+
+describe('AuthService', () => {
+ let service: AuthService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(AuthService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
\ No newline at end of file
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
new file mode 100644
index 00000000..bb0740c7
--- /dev/null
+++ b/src/app/services/auth.service.ts
@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Observable } from 'rxjs';
+
+const AUTH_API = 'http://localhost:8080/api/auth/';
+
+const httpOptions = {
+ headers: new HttpHeaders({ 'Content-Type': 'application/json' })
+};
+
+@Injectable({
+ providedIn: 'root'
+})
+export class AuthService {
+ constructor(private http: HttpClient) { }
+ user:String;
+ login(email: string, password: string): Observable
-
-
-
-
-
- Card tables
-
-
-
-
-
- | Project | -Budget | -Status | -Users | -Completion | -- |
|---|---|---|---|---|---|
|
-
-
-
- 
-
-
- Argon Design System
-
- |
- - $2,500 USD - | -- - pending - - | -- - | -
-
- 60%
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
- |
-
|
-
-
-
- 
-
-
- Angular Now UI Kit PRO
-
- |
- - $1,800 USD - | -- - completed - - | -- - | -
-
- 100%
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
- |
-
|
-
-
-
- 
-
-
- Black Dashboard
-
- |
- - $3,150 USD - | -- - delayed - - | -- - | -
-
- 72%
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
- |
-
|
-
-
-
- 
-
-
- React Material Dashboard
-
- |
- - $4,400 USD - | -- - on schedule - - | -- - | -
-
- 90%
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
- |
-
|
-
-
-
- 
-
-
- Vue Paper UI Kit PRO
-
- |
- - $2,200 USD - | -- - completed - - | -- - | -
-
- 100%
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
- |
-
- 
- 
- 
-