Merge branch 'issue-56' into 'dev'

Issue 56

See merge request framasoft/framadate/funky-framadate-front!22

package.json

@@ -1,52 +1,52 @@
 {
-    "name": "framadate-funky-frontend",
+  "name": "framadate-funky-frontend",
-    "version": "0.1.0",
+  "version": "0.1.0",
-    "scripts": {
+  "scripts": {
-        "ng": "ng",
+    "ng": "ng",
-        "start": "ng serve",
+    "start": "ng serve",
-        "build": "ng build",
+    "build": "ng build",
-        "test": "ng test",
+    "test": "ng test",
-        "lint": "ng lint",
+    "lint": "ng lint",
-        "e2e": "ng e2e",
+    "e2e": "ng e2e",
-        "trans": "ng xi18n --output-path=src/locale --i18n-locale=fr"
+    "trans": "ng xi18n --output-path=src/locale --i18n-locale=fr"
-    },
+  },
-    "private": true,
+  "private": true,
-    "dependencies": {
+  "dependencies": {
-        "@angular/animations": "~8.2.0",
+    "@angular/animations": "~8.2.0",
-        "@angular/common": "~8.2.0",
+    "@angular/common": "~8.2.0",
-        "@angular/compiler": "~8.2.0",
+    "@angular/compiler": "~8.2.0",
-        "@angular/core": "~8.2.0",
+    "@angular/core": "~8.2.0",
-        "@angular/forms": "~8.2.0",
+    "@angular/forms": "~8.2.0",
-        "@angular/platform-browser": "~8.2.0",
+    "@angular/platform-browser": "~8.2.0",
-        "@angular/platform-browser-dynamic": "~8.2.0",
+    "@angular/platform-browser-dynamic": "~8.2.0",
-        "@angular/router": "~8.2.0",
+    "@angular/router": "~8.2.0",
-        "@ngx-translate/core": "^11.0.1",
+    "@ngx-translate/core": "^11.0.1",
-        "@ngx-translate/http-loader": "^4.0.0",
+    "@ngx-translate/http-loader": "^4.0.0",
-        "chart.js": "^2.8.0",
+    "chart.js": "^2.8.0",
-        "ngx-markdown": "^8.2.1",
+    "ngx-markdown": "^8.2.1",
-        "rxjs": "~6.4.0",
+    "rxjs": "~6.4.0",
-        "tslib": "^1.10.0",
+    "tslib": "^1.10.0",
-        "zone.js": "~0.9.1"
+    "zone.js": "~0.9.1"
-    },
+  },
-    "devDependencies": {
+  "devDependencies": {
-        "@angular-devkit/build-angular": "^0.803.21",
+    "@angular-devkit/build-angular": "^0.803.21",
-        "@angular/cli": "~8.2.1",
+    "@angular/cli": "~8.3.21",
-        "@angular/compiler-cli": "~8.2.0",
+    "@angular/compiler-cli": "^8.2.14",
-        "@angular/language-service": "~8.2.0",
+    "@angular/language-service": "^8.2.14",
-        "@types/jasmine": "~3.3.8",
+    "@types/jasmine": "~3.3.8",
-        "@types/jasminewd2": "~2.0.3",
+    "@types/jasminewd2": "^2.0.8",
-        "@types/node": "~8.9.4",
+    "@types/node": "~8.9.4",
-        "codelyzer": "^5.0.0",
+    "codelyzer": "^5.2.1",
-        "jasmine-core": "~3.4.0",
+    "jasmine-core": "~3.4.0",
-        "jasmine-spec-reporter": "~4.2.1",
+    "jasmine-spec-reporter": "~4.2.1",
-        "karma": "~4.1.0",
+    "karma": "~4.1.0",
-        "karma-chrome-launcher": "~2.2.0",
+    "karma-chrome-launcher": "~2.2.0",
-        "karma-coverage-istanbul-reporter": "~2.0.1",
+    "karma-coverage-istanbul-reporter": "~2.0.1",
-        "karma-jasmine": "~2.0.1",
+    "karma-jasmine": "~2.0.1",
-        "karma-jasmine-html-reporter": "^1.4.0",
+    "karma-jasmine-html-reporter": "^1.5.1",
-        "protractor": "~5.4.0",
+    "protractor": "~5.4.0",
-        "ts-node": "~7.0.0",
+    "ts-node": "~7.0.0",
-        "tslint": "~5.15.0",
+    "tslint": "~5.15.0",
-        "typescript": "~3.5.3"
+    "typescript": "~3.5.3"
-    }
+  }
 }

src/app/config/Routes.ts

@@ -12,6 +12,7 @@ import {HomeComponent} from "../pages/home/home.component";
 import {PollGraphicComponent} from '../poll-graphic/poll-graphic.component';
 import {VoteChoiceComponent} from "../vote-choice/vote-choice.component";
 import {VotingComponent} from "../pages/voting/voting.component";
+import {PasswordComponent} from "../pages/password/password.component";
 /**
  * each step in the form is a component
  */
@@ -33,5 +34,6 @@ export const Routes =
         {path: 'graphic/:poll', component: PollGraphicComponent},
         {path: 'votechoice', component: VoteChoiceComponent},
         {path: 'voting', component: VotingComponent},
+        {path: 'step/password', component: PasswordComponent},
     ]
 ;

src/app/pages/password/password.component.html

@@ -1 +1,12 @@
-<p>password works!</p>
+<h1 class="margin-btm-x3">Nom du sondage</h1>
+<p class="margin-btm-x6">Ce sondage est protégé par un mot de passe</p>
+
+<form>
+  <label for="password">Mot de passe :</label>
+  <section class="row">
+    <input class="margin-btm-x5" type="password" name="password">
+    <input type="submit" name="view" value="Voir" class="btn btn--small btn--purple">
+  </section>
+
+<input type="submit" name="go" value="Accéder au sondage" class="btn btn--primary btn--full btn--semi-bold">
+</form>

src/app/pages/password/password.component.scss

@@ -0,0 +1,12 @@
+form{
+  display:flex;
+  flex-direction: column;
+}
+label{
+  font-weight: 600;
+  font-size: 18px;
+}
+h1{
+  display:flex;
+  align-self: center;
+}

src/assets/scss/atoms/_buttons.scss

@@ -31,6 +31,9 @@
     &--primary {
         @include btnTheme($primary_color);
     }
+    &--semi-bold {
+        font-weight: 600;
+    }
     &--black-text {
         color:black;
     }

src/assets/scss/useful_classes.scss

@@ -108,6 +108,9 @@
 .margin-top-x8{
   margin-top:80px;
 }
+.margin-right-x2{
+  margin-bottom:20px;
+}
 .text-14{
   font-size: 14px;
 }