tykayn
/
funky-framadate-front
mirror of https://framagit.org/framasoft/framadate/funky-framadate-front.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Le Libre Au Quotidien 2019-10-03 11:52:31 +02:00
parent 1b9c669ae3 2d060f9905
commit 940b34fc1c
3 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/app/app.module.ts
View File

@ -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,61 +10,59 @@ 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 { DatesComponent } from './pages/dates/dates.component';
import { DebuggerComponent } from './debugger/debugger.component';
import { VisibilityComponent } from './pages/visibility/visibility.component';
import { ResumeComponent } from './pages/resume/resume.component';
import { PicturesComponent } from './pages/pictures/pictures.component';
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 {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';
import {ResumeComponent} from './pages/resume/resume.component';
import {PicturesComponent} from './pages/pictures/pictures.component';
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 localeFr from '@angular/common/locales/fr';
import { VotingSummaryComponent } from './pages/voting-summary/voting-summary.component';
import { VotingGraphComponent } from './pages/voting-graph/voting-graph.component';
import { VotingChoiceComponent } from './pages/voting-choice/voting-choice.component';
import { PasswordComponent } from './pages/password/password.component';
import { HomeComponent } from './pages/home/home.component';
import { VoteChoiceComponent } from './vote-choice/vote-choice.component';
import {VotingSummaryComponent} from './pages/voting-summary/voting-summary.component';
import {VotingGraphComponent} from './pages/voting-graph/voting-graph.component';
import {VotingChoiceComponent} from './pages/voting-choice/voting-choice.component';
import {PasswordComponent} from './pages/password/password.component';
import {HomeComponent} from './pages/home/home.component';
import {VoteChoiceComponent} from './vote-choice/vote-choice.component';
registerLocaleData(localeFr, 'fr');
@NgModule({
declarations: [
AppComponent,
BaseComponent,
KindComponent,
HeaderComponent,
NavigationComponent,
DatesComponent,
DebuggerComponent,
VisibilityComponent,
ResumeComponent,
PicturesComponent,
AnswersComponent,
EndConfirmationComponent,
CreateOrRetrieveComponent,
CalendarComponent,
VotingSummaryComponent,
VotingGraphComponent,
VotingChoiceComponent,
PasswordComponent,
HomeComponent,
VoteChoiceComponent,
declarations: [
AppComponent,
BaseComponent,
KindComponent,
HeaderComponent,
NavigationComponent,
DatesComponent,
DebuggerComponent,
VisibilityComponent,
ResumeComponent,
PicturesComponent,
AnswersComponent,
EndConfirmationComponent,
CreateOrRetrieveComponent,
CalendarComponent,
VotingSummaryComponent,
VotingGraphComponent,
VotingChoiceComponent,
PasswordComponent,
HomeComponent,
VoteChoiceComponent,
],
imports: [
CommonModule,
BrowserModule,
AppRoutingModule,
FormsModule,
RouterModule.forRoot(Routes)
],
providers: [],
bootstrap: [AppComponent]
],
imports: [
CommonModule,
BrowserModule,
AppRoutingModule,
FormsModule,
RouterModule.forRoot(Routes)
],
providers: [{provide: LOCALE_ID, useValue: "fr-FR"}],
bootstrap: [AppComponent]
})
export class AppModule {
}

2
src/app/config/Routes.ts
View File

@ -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},
]
;

11
src/app/vote-choice/vote-choice.component.html
View File

@ -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>