diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html index 7190e9c8..fbf8ee53 100644 --- a/src/app/core/components/footer/footer.component.html +++ b/src/app/core/components/footer/footer.component.html @@ -5,6 +5,8 @@ {{ env.appTitle }} - {{ env.appVersion }} - libérez vos sondages. Logiciel libre sous licence AGPL v3. + + Sources diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index 47591274..44c22495 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -6,7 +6,7 @@ {{ appTitle }} - + (dev) @@ -31,16 +31,15 @@
diff --git a/src/app/core/components/header/header.component.scss b/src/app/core/components/header/header.component.scss index 61220d68..d204fe06 100644 --- a/src/app/core/components/header/header.component.scss +++ b/src/app/core/components/header/header.component.scss @@ -2,6 +2,9 @@ header { nav { padding-right: 1em; + .fa { + margin-right: 1ch; + } } .container { padding: 0; diff --git a/src/app/core/components/home/home.component.html b/src/app/core/components/home/home.component.html index 84c973ee..90baee32 100644 --- a/src/app/core/components/home/home.component.html +++ b/src/app/core/components/home/home.component.html @@ -2,24 +2,35 @@

- Bienvenue sur Framasondage + {{ 'home.title' | translate }} + {{ env.appTitle }}

- Se consulter simplement pour s’organiser collectivement. + {{ 'home.subtitle' | translate }}

- - Créer un nouveau sondage -

- Où sont mes sondages? + {{ 'home.search_title' | translate }}

- - Mes sondages +
+
+
+
+ + + {{ 'home.create_button' | translate }} + sondage date +
+
+ + + {{ 'home.search_button' | translate }} + + sondage date
diff --git a/src/app/core/components/home/home.component.scss b/src/app/core/components/home/home.component.scss index e69de29b..f50dfe0f 100644 --- a/src/app/core/components/home/home.component.scss +++ b/src/app/core/components/home/home.component.scss @@ -0,0 +1,6 @@ +:host { + text-align: center; + a .fa { + margin-right: 1ch; + } +} diff --git a/src/app/core/components/home/home.component.ts b/src/app/core/components/home/home.component.ts index 4aeb12a4..997226b9 100644 --- a/src/app/core/components/home/home.component.ts +++ b/src/app/core/components/home/home.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; +import { environment } from '../../../../environments/environment'; @Component({ selector: 'app-home', templateUrl: './home.component.html', styleUrls: ['./home.component.scss'], }) -export class HomeComponent implements OnInit { - constructor() {} - - ngOnInit(): void {} +export class HomeComponent { + public env = environment; } diff --git a/src/app/features/administration/form/form.component.html b/src/app/features/administration/form/form.component.html index 87fec962..759d1492 100644 --- a/src/app/features/administration/form/form.component.html +++ b/src/app/features/administration/form/form.component.html @@ -29,7 +29,7 @@ [ngClass]="{ 'is-primary': !form.controls.isAboutDate.value }" (click)="form.controls.isAboutDate.setValue(false)" > - + {{ 'creation.kind.classic' | translate }}
diff --git a/src/assets/i18n/EN.json b/src/assets/i18n/EN.json index 08deb5f2..ffe61dfd 100644 --- a/src/assets/i18n/EN.json +++ b/src/assets/i18n/EN.json @@ -3,7 +3,11 @@ "Title": "Translation example", "Intro": "Hello I am {{name}}, I am {{age}} years old.", "home": { - "title": "home's title" + "title": "Welcome at", + "subtitle": "Simply get together to collectivly organize", + "search_title": "Where are my polls ? ", + "create_button": "Create a new poll", + "search_button": "Search" }, "PAGE_NOT_FOUND": { "DEFAULT": "This page doesn’t exist.", diff --git a/src/assets/i18n/FR.json b/src/assets/i18n/FR.json index ab4f1dd3..3091b6d6 100644 --- a/src/assets/i18n/FR.json +++ b/src/assets/i18n/FR.json @@ -3,7 +3,11 @@ "Title": "Exemple de traduction", "Intro": "Bonjour je m'appelle {{name}}, j'ai {{age}} ans.", "home": { - "title": "le titre de la home" + "title": "Bienvenue sur", + "subtitle": "Se consulter simplement pour s’organiser collectivement.", + "search_title": "Où sont mes sondages? ", + "create_button": "Créer un nouveau sondage ", + "search_button": "Rechercher" }, "PAGE_NOT_FOUND": { "DEFAULT": "Cette page n’existe pas.", diff --git a/src/assets/img/kind/classic.jpeg b/src/assets/img/kind/classic.jpeg new file mode 100644 index 00000000..b9f7bbb9 Binary files /dev/null and b/src/assets/img/kind/classic.jpeg differ diff --git a/src/assets/img/kind/date.jpeg b/src/assets/img/kind/date.jpeg new file mode 100644 index 00000000..089e0534 Binary files /dev/null and b/src/assets/img/kind/date.jpeg differ diff --git a/src/styles/partials/_links.scss b/src/styles/partials/_links.scss index 31e431ea..f215174a 100644 --- a/src/styles/partials/_links.scss +++ b/src/styles/partials/_links.scss @@ -18,8 +18,16 @@ a { background: $pale-purple; } } + .fa { + margin-right: 1ch; + } +} +.button, +.btn { + .fa { + margin-right: 1ch; + } } - .list-my-polls { a { @extend .is-block;