diff --git a/src/app/app.component.html b/src/app/app.component.html index 90e7c6cd..6322ea28 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,80 +1,47 @@
+ class={{this.config.themeClass}} +>
-
-
- -

- Frama - date (démo) -

-
proposé par - Frama - soft -
- +
+
+ -
-
-
-
- location icon - menu icon - - Menu -
- -
-
-
- -
-
+
+
+ +
+
+
- +
+
-
+
+
+ - -
- - - + + + *ngIf="isDevelopmentEnv" + > + +
+
+ +
+
+ + + + + + diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 58fa8247..1fe5ba65 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,9 +1,10 @@ import {Component, Inject} from '@angular/core'; import {TranslateService} from '@ngx-translate/core'; import {NavigationStart, Router} from '@angular/router'; -import {DOCUMENT} from "@angular/common"; -import {filter} from "rxjs/operators"; -import {ConfigService} from "./services/config.service"; +import {DOCUMENT} from '@angular/common'; +import {filter} from 'rxjs/operators'; +import {ConfigService} from './services/config.service'; +import {environment} from '../environments/environment'; @Component({ selector: 'app-root', @@ -11,25 +12,17 @@ import {ConfigService} from "./services/config.service"; styleUrls: ['./app.component.scss'] }) export class AppComponent { - currentLang = 'fr'; - langsAvailable = ['fr', 'en']; - title = 'framadate'; - //translation demo: - minutes = 12; - user = { - name: 'Arthur', - age: 42 - }; - menuVisible: boolean = true; + step: string; + isDevelopmentEnv=false; constructor(private translate: TranslateService, public config: ConfigService, @Inject(DOCUMENT) private document, private route: Router) { - this.translate.setDefaultLang(this.currentLang); this.detectCurrentTabOnRouteChange(); + this.isDevelopmentEnv = !environment.production } detectCurrentTabOnRouteChange() { @@ -46,31 +39,6 @@ export class AppComponent { } - switchLanguage(language: string) { - this.translate.use(language); - this.currentLang = language; - } - - /** - * set the next lang or loop to the first - * this is to manage future languages available - */ - changeLanguage() { - let langs = this.langsAvailable; - let indexofCurrent = langs.indexOf(this.currentLang); - if (indexofCurrent > -1) { - let newIndex = indexofCurrent + 1; - if (newIndex > (langs.length - 1)) { - newIndex = 0; - } - this.currentLang = this.langsAvailable[newIndex]; - } - this.translate.use(this.currentLang); - } - - toggleMenu() { - this.menuVisible = !this.menuVisible; - } scrollGoToTop() { this.document.documentElement.scrollTop = 0; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1ecb0f60..5d6f5c5a 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -39,25 +39,27 @@ import {PollGraphicComponent} from './poll-graphic/poll-graphic.component'; import {AdminComponent} from './pages/admin/admin.component'; import {SelectorComponent} from './ui/selector/selector.component'; -import {BrowserAnimationsModule} from "@angular/platform-browser/animations"; -import {ConfigService} from "./services/config.service"; -import {PollService} from "./services/poll.service"; +import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; +import {ConfigService} from './services/config.service'; +import {PollService} from './services/poll.service'; import {ToastModule} from 'primeng/toast'; -import {ConfirmationService, MessageModule, MessageService} from "primeng"; +import {ConfirmationService, MessageModule, MessageService} from 'primeng'; import {PollDisplayComponent} from './pages/poll-display/poll-display.component'; import {VotingComponent} from './pages/voting/voting.component'; import {VotingCommentComponent} from './pages/voting/voting-comment/voting-comment.component'; import {ResettableInputDirective} from './ui/directives/resettable-input.directive'; -import {ClipboardModule} from "ngx-clipboard"; +import {ClipboardModule} from 'ngx-clipboard'; import {ErasableInputComponent} from './ui/erasable-input/erasable-input.component'; import {ConfirmDialogModule} from 'primeng/confirmdialog'; import {DialogModule} from 'primeng/dialog'; -import {DateValueAccessorModule} from "./custom-lib/date-value-accessor"; +import {DateValueAccessorModule} from './custom-lib/date-value-accessor'; import {CopyTextComponent} from './ui/copy-text/copy-text.component'; import {CommentsListComponent} from './pages/voting/comments-list/comments-list.component'; import {ChoicesListComponent} from './pages/voting/choices-list/choices-list.component'; import {VotingNavigationComponent} from './pages/voting/voting-navigation/voting-navigation.component'; import { ThemeSelectorComponent } from './ui/theme-selector/theme-selector.component'; +import { MasterHeadComponent } from './ui/navigation/master-head/master-head.component'; +import { LanguageComponent } from './ui/selector/language/language.component'; export class MyMissingTranslationHandler implements MissingTranslationHandler { handle(params: MissingTranslationHandlerParams) { @@ -105,6 +107,8 @@ export function HttpLoaderFactory(http: HttpClient) { ChoicesListComponent, VotingNavigationComponent, ThemeSelectorComponent, + MasterHeadComponent, + LanguageComponent, ], imports: [ diff --git a/src/app/config/PollConfig.ts b/src/app/config/PollConfig.ts index a7cd1244..2474383d 100644 --- a/src/app/config/PollConfig.ts +++ b/src/app/config/PollConfig.ts @@ -23,6 +23,9 @@ const baseConfigValues = { * configuration of the poll, add new fields at will */ export class PollConfig { + + menuVisible = true; + expiracyDateDefaultInDays = 60; deletionDateAfterLastModification = 180; step: number = 0; // step in the progress of creating a poll diff --git a/src/app/debugger/debugger.component.html b/src/app/debugger/debugger.component.html index b964cd72..406e1b4a 100644 --- a/src/app/debugger/debugger.component.html +++ b/src/app/debugger/debugger.component.html @@ -1,7 +1,7 @@

- infos de debug + infos de debug - environement de Dev

{{"config.demo"|translate}} diff --git a/src/app/pages/dates/dates.component.html b/src/app/pages/dates/dates.component.html index c2ffaaa9..223f029a 100644 --- a/src/app/pages/dates/dates.component.html +++ b/src/app/pages/dates/dates.component.html @@ -1,6 +1,6 @@ -
- {{"dates.title"|translate}} -
+

+ {{"dates.title"|translate}} +