diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ba0fb564..545d81c6 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -31,6 +31,7 @@ import { KeyboardShortcutsModule } from 'ng-keyboard-shortcuts'; import { AdministrationModule } from './features/administration/administration.module'; import { EditComponent } from './features/consultation/edit/edit.component'; import { ChoiceButtonDinumComponent } from './features/shared/components/choice-button-dinum/choice-button-dinum.component'; +import { StaticPagesComponent } from './features/shared/static-pages/static-pages.component'; // register languages files for translation // import localeEn from '@angular/common/locales/en'; @@ -52,7 +53,14 @@ export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader { } @NgModule({ - declarations: [AppComponent, CguComponent, LegalComponent, PrivacyComponent, CipheringComponent], + declarations: [ + AppComponent, + CguComponent, + LegalComponent, + PrivacyComponent, + CipheringComponent, + StaticPagesComponent, + ], imports: [ AppRoutingModule, AdministrationModule, diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html index bea8fb77..3a166664 100644 --- a/src/app/core/components/footer/footer.component.html +++ b/src/app/core/components/footer/footer.component.html @@ -1,8 +1,40 @@ diff --git a/src/app/core/components/footer/footer.component.scss b/src/app/core/components/footer/footer.component.scss index 708a67a2..0db39dff 100644 --- a/src/app/core/components/footer/footer.component.scss +++ b/src/app/core/components/footer/footer.component.scss @@ -2,9 +2,12 @@ .main-footer { a { - color: #fff; + color: $white; } img { max-height: $header-nav-inner-height; } + .border-bottom { + border-bottom: solid 1px #ccc; + } } diff --git a/src/app/core/components/home/home.component.html b/src/app/core/components/home/home.component.html index 5a51b7b4..809839d0 100644 --- a/src/app/core/components/home/home.component.html +++ b/src/app/core/components/home/home.component.html @@ -11,22 +11,26 @@

- +
- +
@@ -35,140 +39,138 @@
-
-
-
- - -
-
-
-
-

- {{ 'home.search_title' | translate }} -

-
- {{ 'home.search_subtitle' | translate }} -
- - +
+
+ +
+
+
+ +
+
+
+

+ {{ 'home.search_title' | translate }} +

+
+ {{ 'home.search_subtitle' | translate }} +
+ + + + + + + + + +
- - - - - - -
+ + +
+
- +
-
- -
-
- -
-
-

- Ce que l'on peut faire sur cette démo: -

-
    -
  • - ☑️ Créer un nouveau sondage -
    • -
  • - ☑️ accéder à un sondage existant en tant que visiteur, ajouter une réponse (StackOfVote) et - un commentaire. -
    • -
  • - ☑️ - lire la documentation -
    • -
-

- Ce qu'on ne peut pas encore faire: -

-
    -
  • - 🚴‍️ mettre à jour son vote à un sondage -
    • -
  • - 🚴‍ modifier un de ses sondages existants par un lien d'administration -
    • -
  • - 🚴‍ recevoir immédiatement les emails. Ceux ci nécessitent un vidage du spool d'emails du - backend sur demande (mesure anti spam). -
    • -
-
-
+
+
+

+ Ce que l'on peut faire sur cette démo: +

+
    +
  • + ☑️ Créer un nouveau sondage +
    • +
  • + ☑️ accéder à un sondage existant en tant que visiteur, ajouter une réponse (StackOfVote) + et un commentaire. +
    • +
  • + ☑️ + lire la documentation +
    • +
+

+ Ce qu'on ne peut pas encore faire: +

+
    +
  • + 🚴‍️ mettre à jour son vote à un sondage +
    • +
  • + 🚴‍ modifier un de ses sondages existants par un lien d'administration +
    • +
  • + 🚴‍ recevoir immédiatement les emails. Ceux ci nécessitent un vidage du spool d'emails + du backend sur demande (mesure anti spam). +
    • +
+
+
+
- -
-

Nos Mentions légales

- -
- + diff --git a/src/app/core/components/home/home.component.scss b/src/app/core/components/home/home.component.scss index 3b49c90e..5cc042f4 100644 --- a/src/app/core/components/home/home.component.scss +++ b/src/app/core/components/home/home.component.scss @@ -4,6 +4,7 @@ .landing-box { padding: 70px 1em 6em; color: $primary_color; + min-height: 500px; .title { color: $primary_color !important; } @@ -21,25 +22,6 @@ } .search { - margin-top: 2em; - .title { - font-size: 1.5rem; - } - .search-others { - padding: 2rem; - background: $d-grey; - border-radius: 0.5rem; - } - #search_email { - background: $white !important; - margin-bottom: 0; - } - .button-submit { - margin-top: 1rem !important; - background: $d-grey; - color: $secondary_color; - border-color: $secondary_color; - } .search-description { margin: 2rem 0; } diff --git a/src/app/core/components/home/home.component.ts b/src/app/core/components/home/home.component.ts index b878ab39..d3d66529 100644 --- a/src/app/core/components/home/home.component.ts +++ b/src/app/core/components/home/home.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject } from '@angular/core'; +import { ChangeDetectorRef, Component, Inject } from '@angular/core'; import { environment } from '../../../../environments/environment'; import { StorageService } from '../../services/storage.service'; import { ApiService } from '../../services/api.service'; @@ -16,13 +16,15 @@ export class HomeComponent { public AppTitle = environment.appTitle; public nonexistent_email = ''; public email_sent = false; + display_poll_search_dialog: any = false; constructor( @Inject(DOCUMENT) private document: any, public storageService: StorageService, public toastService: ToastService, public titleService: Title, - private api: ApiService + private api: ApiService, + private cd: ChangeDetectorRef ) { this.titleService.setTitle(environment.appTitle + ' - Accueil '); } @@ -51,4 +53,21 @@ export class HomeComponent { } ); } + + openModalFindPoll() { + this.display_poll_search_dialog = true; + this.cd.detectChanges(); + let buttonClose = this.document.querySelector('#close_dialog'); + if (buttonClose) { + buttonClose.focus(); + } + } + + focusOnCancelButton() { + this.display_poll_search_dialog = false; + let buttonClose = this.document.querySelector('#open_popup_button'); + if (buttonClose) { + buttonClose.focus(); + } + } } diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 34d27688..723749b0 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -11,10 +11,11 @@ import { LogoComponent } from './components/logo/logo.component'; import { NavigationComponent } from './components/sibebar/navigation/navigation.component'; import { throwIfAlreadyLoaded } from './guards/module-import.guard'; import { SharedModule } from '../shared/shared.module'; +import { DialogModule } from 'primeng/dialog'; @NgModule({ declarations: [FooterComponent, HeaderComponent, HomeComponent, LogoComponent, NavigationComponent], - imports: [CommonModule, FormsModule, RouterModule, TranslateModule, SharedModule], + imports: [CommonModule, FormsModule, RouterModule, TranslateModule, SharedModule, DialogModule], exports: [HeaderComponent, FooterComponent, NavigationComponent, LogoComponent], }) export class CoreModule { diff --git a/src/app/features/shared/static-pages/static-pages.component.html b/src/app/features/shared/static-pages/static-pages.component.html new file mode 100644 index 00000000..7d07c2ba --- /dev/null +++ b/src/app/features/shared/static-pages/static-pages.component.html @@ -0,0 +1,10 @@ + +
+
+
+ +
+
+ + + diff --git a/src/app/features/shared/static-pages/static-pages.component.scss b/src/app/features/shared/static-pages/static-pages.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/features/shared/static-pages/static-pages.component.spec.ts b/src/app/features/shared/static-pages/static-pages.component.spec.ts new file mode 100644 index 00000000..ac3d9717 --- /dev/null +++ b/src/app/features/shared/static-pages/static-pages.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StaticPagesComponent } from './static-pages.component'; + +describe('StaticPagesComponent', () => { + let component: StaticPagesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [StaticPagesComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(StaticPagesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/features/shared/static-pages/static-pages.component.ts b/src/app/features/shared/static-pages/static-pages.component.ts new file mode 100644 index 00000000..c8ddb7a6 --- /dev/null +++ b/src/app/features/shared/static-pages/static-pages.component.ts @@ -0,0 +1,12 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-static-pages', + templateUrl: './static-pages.component.html', + styleUrls: ['./static-pages.component.scss'], +}) +export class StaticPagesComponent implements OnInit { + constructor() {} + + ngOnInit(): void {} +} diff --git a/src/app/routes-framadate.ts b/src/app/routes-framadate.ts index 779783e4..44ef6eb0 100644 --- a/src/app/routes-framadate.ts +++ b/src/app/routes-framadate.ts @@ -9,6 +9,7 @@ import { LegalComponent } from './features/shared/components/ui/static-pages/leg import { PrivacyComponent } from './features/shared/components/ui/static-pages/privacy/privacy.component'; import { CipheringComponent } from './features/shared/components/ui/static-pages/ciphering/ciphering.component'; import { AboutComponent } from './features/shared/components/ui/static-pages/about/about.component'; +import { StaticPagesComponent } from './features/shared/static-pages/static-pages.component'; export const routes: Routes = [ { path: '', component: HomeComponent, data: { animation: 'HomePage' } }, @@ -35,25 +36,32 @@ export const routes: Routes = [ component: WipTodoComponent, }, { - path: 'cgu', - component: CguComponent, - }, - { - path: 'legal', - component: LegalComponent, - }, - { - path: 'privacy', - component: PrivacyComponent, - }, - { - path: 'ciphering', - component: CipheringComponent, - }, - { - path: 'about', - component: AboutComponent, + path: 'page', + component: StaticPagesComponent, + children: [ + { + path: 'cgu', + component: CguComponent, + }, + { + path: 'legal', + component: LegalComponent, + }, + { + path: 'privacy', + component: PrivacyComponent, + }, + { + path: 'ciphering', + component: CipheringComponent, + }, + { + path: 'about', + component: AboutComponent, + }, + ], }, + { path: 'page-not-found', component: PageNotFoundComponent }, { path: '**', redirectTo: 'page-not-found', pathMatch: 'full' }, ]; diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.html b/src/app/shared/components/selectors/language-selector/language-selector.component.html index 46161a42..9f7639b9 100644 --- a/src/app/shared/components/selectors/language-selector/language-selector.component.html +++ b/src/app/shared/components/selectors/language-selector/language-selector.component.html @@ -5,21 +5,6 @@ - - - - - - - - - - - - - - - +
-
diff --git a/src/app/shared/components/selectors/theme-selector/theme-selector.component.scss b/src/app/shared/components/selectors/theme-selector/theme-selector.component.scss index e69de29b..504923c7 100644 --- a/src/app/shared/components/selectors/theme-selector/theme-selector.component.scss +++ b/src/app/shared/components/selectors/theme-selector/theme-selector.component.scss @@ -0,0 +1,7 @@ +.theme-selector { + button { + border: 0; + padding: 1em; + background: transparent; + } +} diff --git a/src/assets/img/calendar_landing.svg b/src/assets/img/calendar_landing.svg new file mode 100644 index 00000000..6b9e81e5 --- /dev/null +++ b/src/assets/img/calendar_landing.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/landing_calendar.svg b/src/assets/img/landing_calendar.svg new file mode 100644 index 00000000..6b9e81e5 --- /dev/null +++ b/src/assets/img/landing_calendar.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/logo_cipherbliss.png b/src/assets/img/logo_cipherbliss.png new file mode 100644 index 00000000..418033a2 Binary files /dev/null and b/src/assets/img/logo_cipherbliss.png differ diff --git a/src/assets/img/logo_frama_dinum.svg b/src/assets/img/logo_frama_dinum.svg new file mode 100644 index 00000000..00261a97 --- /dev/null +++ b/src/assets/img/logo_frama_dinum.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/assets/img/logo_framasoft.png b/src/assets/img/logo_framasoft.png new file mode 100644 index 00000000..8fca30a7 Binary files /dev/null and b/src/assets/img/logo_framasoft.png differ diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index a985be55..c7e9bc50 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -16,9 +16,11 @@ const apiV1 = { export const environment = { advanced_options_display: true, - appLogo: 'assets/img/logo.png', + appLogo: 'assets/img/logo_frama_dinum.svg', appTitle: 'FramaDate', appVersion: '2.2.1', + appSupportEmail: 'example-support@example.com', + appSupportWebpage: 'https://www.cipherbliss.com/contact', autofill_creation: false, autofill_default_timeslices: false, autofill_participation: false, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 5bf9d0aa..cb9eac27 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -17,9 +17,12 @@ endpoints.baseHref = apiV1.baseHref; export const environment = { advanced_options_display: true, - appLogo: 'assets/img/logo.png', - appTitle: 'FramaDate', + appLogo: 'assets/img/logo_cipherbliss.png', + appLanding: 'assets/img/landing_calendar.svg', + appTitle: 'BlissDate', appVersion: '2.2.1', + appSupportEmail: 'example-support@example.com', + appSupportWebpage: 'https://www.cipherbliss.com/contact', autofill_creation: false, autofill_default_timeslices: false, autofill_participation: false,