Merge branch 'styles' of https://framagit.org/framasoft/framadate/funky-framadate-front into styles

src/app/app.module.ts

@@ -1,5 +1,5 @@
 import {BrowserModule} from '@angular/platform-browser';
-import {NgModule} from '@angular/core';
+import {LOCALE_ID, NgModule} from '@angular/core';
 
 import {AppRoutingModule} from './app-routing.module';
 import {AppComponent} from './app.component';
@@ -10,7 +10,7 @@ import {FormsModule} from '@angular/forms';
 import {NavigationComponent} from './ui/navigation/navigation.component';
 import {RouterModule} from '@angular/router';
 import {Routes} from './config/Routes';
-import {CommonModule} from '@angular/common';
+import {CommonModule, registerLocaleData} from '@angular/common';
 import {DatesComponent} from './pages/dates/dates.component';
 import {DebuggerComponent} from './debugger/debugger.component';
 import {VisibilityComponent} from './pages/visibility/visibility.component';
@@ -20,8 +20,6 @@ import { AnswersComponent } from './pages/answers/answers.component';
 import {EndConfirmationComponent} from './pages/end-confirmation/end-confirmation.component';
 import {CreateOrRetrieveComponent} from './pages/create-or-retrieve/create-or-retrieve.component';
 import {CalendarComponent} from './calendar/calendar.component';
-
-import { registerLocaleData } from '@angular/common';
 import localeFr from '@angular/common/locales/fr';
 import {VotingSummaryComponent} from './pages/voting-summary/voting-summary.component';
 import {VotingGraphComponent} from './pages/voting-graph/voting-graph.component';
@@ -63,7 +61,7 @@ registerLocaleData(localeFr, 'fr');
         FormsModule,
         RouterModule.forRoot(Routes)
     ],
-  providers: [],
+    providers: [{provide: LOCALE_ID, useValue: "fr-FR"}],
     bootstrap: [AppComponent]
 })
 export class AppModule {

src/app/config/Routes.ts

@@ -8,6 +8,7 @@ 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 {HomeComponent} from "../pages/home/home.component";
+import {VoteChoiceComponent} from "../vote-choice/vote-choice.component";
 
 /**
  * each step in the form is a component
@@ -25,5 +26,6 @@ export const Routes =
         {path: 'step/visibility', component: VisibilityComponent},
         {path: 'step/resume', component: ResumeComponent},
         {path: 'step/end', component: EndConfirmationComponent},
+        {path: 'votechoice', component: VoteChoiceComponent},
     ]
 ;

src/app/vote-choice/vote-choice.component.html

@@ -2,12 +2,17 @@
     <div class="info">
         <div class="date" *ngIf="choice.date">
             <div class="date-day">
-                {{choice.date | date:'Y-m-d'}}
+                {{choice.date | date:'EEEE'}}
+            </div>
+            <div class="date-month-number">
+                {{choice.date | date:'dd'}}
+            </div>
+            <div class="date-month">
+                {{choice.date | date:'LLLL'}}
             </div>
             <div class="date-hour">
-                {{choice.date | date:'H:i:s'}}
+                {{choice.date | date:'H:m'}}
             </div>
-
             <div class="description">
                 {{choice.text}}
             </div>