diff --git a/package-lock.json b/package-lock.json index f9a0b7dd..64de0fed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -126,9 +126,9 @@ } }, "@angular/animations": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.13.tgz", - "integrity": "sha512-ZE4UZsQ6HDW1ZIj9tL45PVosCcG4Ke7ihV7eWCE1VgLZKDDxTOPbLf1UeEiszUYptMLGH3eGMNBKo85mOlkH8w==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.14.tgz", + "integrity": "sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==", "requires": { "tslib": "^1.9.0" } @@ -183,17 +183,17 @@ } }, "@angular/common": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.13.tgz", - "integrity": "sha512-I9cTcjUi88L+Mb/a/ZzUrdDcn3YgFFK9LubxaPjAfr6+G7IZ//MY5HuvG8Y41yKprXVVvQCbQ1yQD+GGRSCkaA==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.14.tgz", + "integrity": "sha512-Qmt+aX2quUW54kaNT7QH7WGXnFxr/cC2C6sf5SW5SdkZfDQSiz8IaItvieZfXVQUbBOQKFRJ7TlSkt0jI/yjvw==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.13.tgz", - "integrity": "sha512-u2NWCvEn4SjbMvn2PG6sYcf+rR5u3aYMv3/mNQ9k+2UmCIu3yJrcuCzebjo5SdlDVqKD2vzbyMZnr8VB9OcceQ==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.14.tgz", + "integrity": "sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==", "requires": { "tslib": "^1.9.0" } @@ -974,17 +974,17 @@ } }, "@angular/core": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.13.tgz", - "integrity": "sha512-W8HN0lUQV4Sq85l17nhRIXeIfcw1ZdpgGm6to98pl0y9l/1srfzWfTnofuwCJC7gedt5AMrYJGUaNiDbByosFw==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.14.tgz", + "integrity": "sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==", "requires": { "tslib": "^1.9.0" } }, "@angular/forms": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.13.tgz", - "integrity": "sha512-l7lHD4kbWK70KY0Xp4IpSa106ZzSgPMwRYMFKd9qhYaJ7v0Y7Shh7Z/ZDCOP730maj9WULnpy5X4eeozWXgvgg==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.14.tgz", + "integrity": "sha512-zhyKL3CFIqcyHJ/TQF/h1OZztK611a6rxuPHCrt/5Sn1SuBTJJQ1pPTkOYIDy6IrCrtyANc8qB6P17Mao71DNQ==", "requires": { "tslib": "^1.9.0" } @@ -996,25 +996,25 @@ "dev": true }, "@angular/platform-browser": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.13.tgz", - "integrity": "sha512-1lPbeLQIbbafjq9ul3IA8s2fMJ/EXeMJ74ouTolVXoPPur9ZPRLX9FqBAO1K4QzkAWhRlyf6qIC+mDZfJILwZw==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.14.tgz", + "integrity": "sha512-MtJptptyKzsE37JZ2VB/tI4cvMrdAH+cT9pMBYZd66YSZfKjIj5s+AZo7z8ncoskQSB1o3HMfDjSK7QXGx1mLQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.13.tgz", - "integrity": "sha512-KP5psUKujAO8jZKHi6LRC+N7hE/epiGOhYZxdher1sCi81sYoZmqrEWkVZ4VKhov/4aC409CocDXcF7nmHV8tg==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.14.tgz", + "integrity": "sha512-mO2JPR5kLU/A3AQngy9+R/Q5gaF9csMStBQjwsCRI0wNtlItOIGL6+wTYpiTuh/ux+WVN1F2sLcEYU4Zf1ud9A==", "requires": { "tslib": "^1.9.0" } }, "@angular/router": { - "version": "8.2.13", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.13.tgz", - "integrity": "sha512-9CqnachtdASnEmRMtrG/R3c5nDCjjlCU4n0W/xt5+LlveyuUVvAT/CFUC38km4Df3lIvqap8mSpxzGaEzCL+wQ==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.14.tgz", + "integrity": "sha512-DHA2BhODqV7F0g6ZKgFaZgbsqzHHWRcfWchCOrOVKu2rYiKUTwwHVLBgZAhrpNeinq2pWanVYSIhMr7wy+LfEA==", "requires": { "tslib": "^1.9.0" } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fcad575c..66f42676 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -40,6 +40,8 @@ import { import {TranslateHttpLoader} from '@ngx-translate/http-loader'; import { PollGraphicComponent } from './poll-graphic/poll-graphic.component'; +import { AdminComponent } from './pages/admin/admin.component'; + export class MyMissingTranslationHandler implements MissingTranslationHandler { handle(params: MissingTranslationHandlerParams) { return 'some value'; @@ -76,6 +78,7 @@ export function HttpLoaderFactory(http: HttpClient) { HomeComponent, PollGraphicComponent, VoteChoiceComponent, + AdminComponent, ], imports: [ diff --git a/src/app/config/Routes.ts b/src/app/config/Routes.ts index 7cf26526..52360ff5 100644 --- a/src/app/config/Routes.ts +++ b/src/app/config/Routes.ts @@ -1,12 +1,13 @@ -import {KindComponent} from "../pages/kind/kind.component"; -import {DatesComponent} from "../pages/dates/dates.component"; -import {VisibilityComponent} from "../pages/visibility/visibility.component"; -import {ResumeComponent} from "../pages/resume/resume.component"; -import {PicturesComponent} from "../pages/pictures/pictures.component"; -import {EndConfirmationComponent} from "../pages/end-confirmation/end-confirmation.component"; -import {AnswersComponent} from "../pages/answers/answers.component"; -import {CreateOrRetrieveComponent} from "../pages/create-or-retrieve/create-or-retrieve.component"; -import {BaseComponent} from "../pages/base-page/base.component"; +import {KindComponent} from '../pages/kind/kind.component'; +import {DatesComponent} from '../pages/dates/dates.component'; +import {VisibilityComponent} from '../pages/visibility/visibility.component'; +import {ResumeComponent} from '../pages/resume/resume.component'; +import {PicturesComponent} from '../pages/pictures/pictures.component'; +import {EndConfirmationComponent} from '../pages/end-confirmation/end-confirmation.component'; +import {AnswersComponent} from '../pages/answers/answers.component'; +import {AdminComponent} from '../pages/admin/admin.component'; +import {CreateOrRetrieveComponent} from '../pages/create-or-retrieve/create-or-retrieve.component'; +import {BaseComponent} from '../pages/base-page/base.component'; import {HomeComponent} from "../pages/home/home.component"; import {PollGraphicComponent} from '../poll-graphic/poll-graphic.component'; import {VoteChoiceComponent} from "../vote-choice/vote-choice.component"; @@ -24,6 +25,7 @@ export const Routes = {path: 'step/date', component: DatesComponent}, {path: 'step/kind', component: KindComponent}, {path: 'step/answers', component: AnswersComponent}, + {path: 'step/admin', component: AdminComponent}, {path: 'step/pictures', component: PicturesComponent}, {path: 'step/visibility', component: VisibilityComponent}, {path: 'step/resume', component: ResumeComponent}, diff --git a/src/app/pages/admin/admin.component.html b/src/app/pages/admin/admin.component.html new file mode 100644 index 00000000..f2ce8400 --- /dev/null +++ b/src/app/pages/admin/admin.component.html @@ -0,0 +1,75 @@ +
+

Nom du sondage

+ +

Informations du sondage

+ + + + + + + +

Paramètres

+

Visibilité des réponses

+
+ + + +
+

Votes

+
+ + +
+
+ + + + +
+ + + +

Commentaires

+ + +

Archivage

+
+ + +
+

Accés au sondage

+
+ + + +
+

Tout supprimer

+ + +

Liens d'accès au sondage

+

Coté administrateur·ice

+ + + +

Côté sondé·es

+ + + +

Recevoir les liens par mail

+ + + +
diff --git a/src/app/pages/admin/admin.component.scss b/src/app/pages/admin/admin.component.scss new file mode 100644 index 00000000..0909d584 --- /dev/null +++ b/src/app/pages/admin/admin.component.scss @@ -0,0 +1,39 @@ +form{ + display:flex; + flex-direction: column; + width:340px; +margin:auto; +} +.row{ + flex-direction: row; + flex-wrap: wrap; + padding-bottom: 65px; +} +textarea{ + height:115px; + margin-bottom: 50px; +} +label{ + padding-bottom: 10px; + flex-wrap: wrap; +} +h2,h1{ + margin-bottom: 40px; +} +h2{ + margin-top: 40px; + padding-left:16px; +} +.btn--alert{ + font-weight: 600; +} +h3{ + padding-left: 28px; + padding-bottom:15px; +} +select,input[type=date]{ + max-width: 130px; +} +.btn--outline{ + margin-bottom: 70px; +} diff --git a/src/app/pages/admin/admin.component.spec.ts b/src/app/pages/admin/admin.component.spec.ts new file mode 100644 index 00000000..72e742ff --- /dev/null +++ b/src/app/pages/admin/admin.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AdminComponent } from './admin.component'; + +describe('AdminComponent', () => { + let component: AdminComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AdminComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AdminComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/admin/admin.component.ts b/src/app/pages/admin/admin.component.ts new file mode 100644 index 00000000..13ec96e6 --- /dev/null +++ b/src/app/pages/admin/admin.component.ts @@ -0,0 +1,16 @@ +import { Component, OnInit } from '@angular/core'; +import {BaseComponent} from '../base-page/base.component'; +import {ConfigService} from '../../config.service'; +@Component({ + selector: 'framadate-admin', + templateUrl: './admin.component.html', + styleUrls: ['./admin.component.scss'] +}) +export class AdminComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/assets/scss/atoms/_buttons.scss b/src/assets/scss/atoms/_buttons.scss index d03435f0..e84c9276 100644 --- a/src/assets/scss/atoms/_buttons.scss +++ b/src/assets/scss/atoms/_buttons.scss @@ -43,5 +43,9 @@ display: block; min-width: 100%; } + &--mini{ + background-color: $mini-button-color; -} \ No newline at end of file + } + +} diff --git a/src/assets/scss/atoms/_forms.scss b/src/assets/scss/atoms/_forms.scss index 53981723..cc0fde2f 100644 --- a/src/assets/scss/atoms/_forms.scss +++ b/src/assets/scss/atoms/_forms.scss @@ -1,5 +1,9 @@ @charset "UTF-8"; - +input[type="date"]::after{ + content:"au format JJ/MM/AAAA"; + display: inline-block; + position: relative; +} input, select, textarea { @@ -18,6 +22,7 @@ select { textarea { width: 100%; + border-left: 3px solid $primary_color; } select, diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index 9a9eaab7..8bdaa5c3 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -13,7 +13,7 @@ $red: #cd0000; $cool-grey: #aeafb1; $warm-grey:#807e7e; $wisteria:#bf83c2; - +$pale-purple:#d198d4; // interpretations in app $primary_color: $ugly-purple; $secondary_color: $lavender-pink; @@ -23,7 +23,7 @@ $logo_color_2: $camo; $choice_select_border_color: $cool-grey; $hover-color:$warm-grey; $clicked-color:$wisteria; - +$mini-button-color:$pale-purple; // FONT $default_font : "pt_sans"; $title_font: "proza_libre";