From 03f7c49c519e2db062de3d64a1cfdd8c1f109e05 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Wed, 16 Dec 2020 17:21:01 +0100 Subject: [PATCH] create success page and route --- .../administration/administration.module.ts | 3 ++- .../administration/form/form.component.ts | 10 +++++++- .../success/success.component.html | 16 +++++++++++++ .../success/success.component.scss | 0 .../success/success.component.spec.ts | 24 +++++++++++++++++++ .../success/success.component.ts | 12 ++++++++++ src/app/routes-framadate.ts | 5 ++++ src/proxy.conf.json | 2 +- src/styles/themes/_base.scss | 1 + src/styles/themes/_light.scss | 4 +++- 10 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 src/app/features/administration/success/success.component.html create mode 100644 src/app/features/administration/success/success.component.scss create mode 100644 src/app/features/administration/success/success.component.spec.ts create mode 100644 src/app/features/administration/success/success.component.ts diff --git a/src/app/features/administration/administration.module.ts b/src/app/features/administration/administration.module.ts index 051ead96..20ca163f 100644 --- a/src/app/features/administration/administration.module.ts +++ b/src/app/features/administration/administration.module.ts @@ -10,9 +10,10 @@ import { StepperComponent } from './stepper/stepper.component'; import { NamingComponent } from './naming/naming.component'; import { FormComponent } from './form/form.component'; import { DateValueAccessorModule } from 'angular-date-value-accessor'; +import { SuccessComponent } from './success/success.component'; @NgModule({ - declarations: [AdministrationComponent, StepperComponent, NamingComponent, FormComponent], + declarations: [AdministrationComponent, StepperComponent, NamingComponent, FormComponent, SuccessComponent], imports: [ AdministrationRoutingModule, CommonModule, diff --git a/src/app/features/administration/form/form.component.ts b/src/app/features/administration/form/form.component.ts index 308d390c..5d1c976b 100644 --- a/src/app/features/administration/form/form.component.ts +++ b/src/app/features/administration/form/form.component.ts @@ -9,6 +9,7 @@ import { DateUtilities } from '../../old-stuff/config/DateUtilities'; import { DOCUMENT } from '@angular/common'; import { DateChoice, otherDefaultDates } from '../../old-stuff/config/defaultConfigs'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; +import { Router } from '@angular/router'; @Component({ selector: 'app-admin-form', @@ -39,6 +40,7 @@ export class FormComponent implements OnInit { private pollService: PollService, public dateUtilities: DateUtilities, private apiService: ApiService, + private router: Router, @Inject(DOCUMENT) private document: any ) {} drop(event: CdkDragDrop) { @@ -60,7 +62,13 @@ export class FormComponent implements OnInit { console.log('this.form', this.form); const newpoll = this.pollService.newPollFromForm(this.form); console.log('newpoll', newpoll); - this.apiService.createPoll(newpoll); + let self = this; + + this.apiService.createPoll(newpoll).then((resp) => { + console.log('resp', resp); + self.router.navigate(['success']); + }); + // this.router // if (this.form.valid) { // console.log('Le sondage est correctement rempli, prêt à enregistrer.'); // const newpoll = this.pollService.newPollFromForm(this.form); diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html new file mode 100644 index 00000000..cb3015cf --- /dev/null +++ b/src/app/features/administration/success/success.component.html @@ -0,0 +1,16 @@ +
+
+
+

+ Création de sondage réussie +

+

+ Bravo! partagez le lien de votre sondage. Un récapitulatif a été envoyé à votre adresse email. +

+
+
+
+
+
+ image succès +
diff --git a/src/app/features/administration/success/success.component.scss b/src/app/features/administration/success/success.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/features/administration/success/success.component.spec.ts b/src/app/features/administration/success/success.component.spec.ts new file mode 100644 index 00000000..1e4f6a41 --- /dev/null +++ b/src/app/features/administration/success/success.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SuccessComponent } from './success.component'; + +describe('SuccessComponent', () => { + let component: SuccessComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [SuccessComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SuccessComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/features/administration/success/success.component.ts b/src/app/features/administration/success/success.component.ts new file mode 100644 index 00000000..13e175db --- /dev/null +++ b/src/app/features/administration/success/success.component.ts @@ -0,0 +1,12 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-success', + templateUrl: './success.component.html', + styleUrls: ['./success.component.scss'], +}) +export class SuccessComponent implements OnInit { + constructor() {} + + ngOnInit(): void {} +} diff --git a/src/app/routes-framadate.ts b/src/app/routes-framadate.ts index 671b46c1..0129c932 100644 --- a/src/app/routes-framadate.ts +++ b/src/app/routes-framadate.ts @@ -2,6 +2,7 @@ import { Routes } from '@angular/router'; import { HomeComponent } from './core/components/home/home.component'; import { PollService } from './core/services/poll.service'; import { PageNotFoundComponent } from './shared/components/page-not-found/page-not-found.component'; +import { SuccessComponent } from './features/administration/success/success.component'; export const routes: Routes = [ { path: '', component: HomeComponent }, @@ -35,6 +36,10 @@ export const routes: Routes = [ path: 'oldstuff', loadChildren: () => import('./features/old-stuff/old-stuff.module').then((m) => m.OldStuffModule), }, + { + path: 'success', + component: SuccessComponent, + }, { path: 'page-not-found', component: PageNotFoundComponent }, { path: '**', redirectTo: 'page-not-found', pathMatch: 'full' }, ]; diff --git a/src/proxy.conf.json b/src/proxy.conf.json index 709cdb6c..5b9f3ff5 100644 --- a/src/proxy.conf.json +++ b/src/proxy.conf.json @@ -1,6 +1,6 @@ { "/api/*": { - "target": "http://localhost:8000", + "target": "http://localhost:3001", "secure": false, "logLevel": "debug" } diff --git a/src/styles/themes/_base.scss b/src/styles/themes/_base.scss index 4d7250bc..5e2a778e 100644 --- a/src/styles/themes/_base.scss +++ b/src/styles/themes/_base.scss @@ -2,6 +2,7 @@ background: $primary; main { + padding: 0; margin-bottom: 2em; padding-bottom: 5em; padding-top: 1em; diff --git a/src/styles/themes/_light.scss b/src/styles/themes/_light.scss index eab5078e..7b12ab78 100644 --- a/src/styles/themes/_light.scss +++ b/src/styles/themes/_light.scss @@ -11,7 +11,9 @@ } main { - .container { + padding-top: 0; + + > .container { background: #fff; padding-bottom: 10em; }