From 5bac37a7905ba1ccd16bab3568a366bf8b9d9090 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Thu, 4 Feb 2021 18:34:06 +0100 Subject: [PATCH] home page reorder and statistics, todo component --- src/app/app-routing.module.ts | 13 +-- src/app/app.component.ts | 1 - src/app/app.module.ts | 1 - .../core/components/home/home.component.html | 93 +++++++++++++------ .../user-polls/user-polls.component.html | 26 +++--- .../user-profile/user-profile.module.ts | 9 +- src/app/routes-framadate.ts | 5 + .../ui/wip-todo/wip-todo.component.html | 11 +++ .../ui/wip-todo/wip-todo.component.scss | 0 .../ui/wip-todo/wip-todo.component.spec.ts | 24 +++++ .../ui/wip-todo/wip-todo.component.ts | 12 +++ src/app/shared/shared.module.ts | 2 + src/environments/environment.ts | 4 +- 13 files changed, 148 insertions(+), 53 deletions(-) create mode 100644 src/app/shared/components/ui/wip-todo/wip-todo.component.html create mode 100644 src/app/shared/components/ui/wip-todo/wip-todo.component.scss create mode 100644 src/app/shared/components/ui/wip-todo/wip-todo.component.spec.ts create mode 100644 src/app/shared/components/ui/wip-todo/wip-todo.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 5e91c5eb..f347c701 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,14 +1,9 @@ -import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {routes} from "./routes-framadate"; - +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { routes } from './routes-framadate'; @NgModule({ - imports: [ - RouterModule.forRoot(routes, { - // enableTracing: true, // <-- debugging purposes only - }), - ], + imports: [RouterModule.forRoot(routes)], exports: [RouterModule], }) export class AppRoutingModule {} diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c4e0eb3d..f071ed2e 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -6,7 +6,6 @@ import { environment } from '../environments/environment'; import { Theme } from './core/enums/theme.enum'; import { LanguageService } from './core/services/language.service'; import { ThemeService } from './core/services/theme.service'; -import { MockingService } from './core/services/mocking.service'; @Component({ selector: 'app-root', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7db18013..db24b22b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -23,7 +23,6 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; import { SharedModule } from './shared/shared.module'; - registerLocaleData(localeEn, 'en-EN'); registerLocaleData(localeFr, 'fr-FR'); diff --git a/src/app/core/components/home/home.component.html b/src/app/core/components/home/home.component.html index cb87a8f9..bc0a3116 100644 --- a/src/app/core/components/home/home.component.html +++ b/src/app/core/components/home/home.component.html @@ -1,10 +1,20 @@
-

- {{ 'home.title' | translate }} - {{ env.appTitle }} -

+
+
+

+ {{ 'home.title' | translate }} + {{ env.appTitle }} +

+ + {{ + 'SENTENCES.framadate-is-an-online-service-for-planning-an-appointment-or-making-a-decision-quickly-and-easily' + | translate + }} +
+ image WIP +

@@ -19,34 +29,22 @@

- + {{ 'home.create_button' | translate }} sondage date
- + {{ 'home.search_button' | translate }} sondage date
+
-
-

- {{ 'SENTENCES.what-is-framadate' | translate }} -

- - {{ - 'SENTENCES.framadate-is-an-online-service-for-planning-an-appointment-or-making-a-decision-quickly-and-easily' - | translate - }} -
-
-
- image WIP

@@ -72,15 +70,9 @@ {{ 'SENTENCES.framadate-is-licensed-under-the' | translate }} + GNU Affero v3 Licence - - - Sources -

@@ -103,6 +95,55 @@
+ +

Statistiques

+ +
+
+
+
+ 62 346 +
+

sondages

+
+
+
+ 223 124 +
+

votes

+
+
+
+ 123 +
+

consensus parfaits

+
+
+
+ 41 875 +
+

commentaires

+
+
+
+
+
+ 44 985 +
+

sondages de type date

+
+
+
+ 22 985 +
+

sondages de type classique

+
+
+

Mentions légales

+

Voir ici le détail des mentions légales, CGU, CPU, politique de confidentialité.

+
+
+
diff --git a/src/app/features/user-profile/user-polls/user-polls.component.html b/src/app/features/user-profile/user-polls/user-polls.component.html index eca9d4f9..1b24d918 100644 --- a/src/app/features/user-profile/user-polls/user-polls.component.html +++ b/src/app/features/user-profile/user-polls/user-polls.component.html @@ -4,6 +4,19 @@

Mes sondages

+
+
+
+ + + +
+
+
@@ -23,17 +36,4 @@
-
-
-
- - -
-
-
diff --git a/src/app/features/user-profile/user-profile.module.ts b/src/app/features/user-profile/user-profile.module.ts index 0dc60659..ad45254b 100644 --- a/src/app/features/user-profile/user-profile.module.ts +++ b/src/app/features/user-profile/user-profile.module.ts @@ -5,9 +5,16 @@ import { TranslateModule } from '@ngx-translate/core'; import { SharedModule } from '../../shared/shared.module'; import { UserPollsComponent } from './user-polls/user-polls.component'; import { UserProfileRoutingModule } from './user-profile-routing.module'; +import { AppModule } from '../../app.module'; @NgModule({ declarations: [UserPollsComponent], - imports: [CommonModule, UserProfileRoutingModule, SharedModule, TranslateModule.forChild({ extend: true })], + imports: [ + CommonModule, + UserProfileRoutingModule, + SharedModule, + TranslateModule.forChild({ extend: true }), + AppModule, + ], }) export class UserProfileModule {} diff --git a/src/app/routes-framadate.ts b/src/app/routes-framadate.ts index 0129c932..1e6b2c0e 100644 --- a/src/app/routes-framadate.ts +++ b/src/app/routes-framadate.ts @@ -3,6 +3,7 @@ import { HomeComponent } from './core/components/home/home.component'; import { PollService } from './core/services/poll.service'; import { PageNotFoundComponent } from './shared/components/page-not-found/page-not-found.component'; import { SuccessComponent } from './features/administration/success/success.component'; +import { WipTodoComponent } from './shared/components/ui/wip-todo/wip-todo.component'; export const routes: Routes = [ { path: '', component: HomeComponent }, @@ -40,6 +41,10 @@ export const routes: Routes = [ path: 'success', component: SuccessComponent, }, + { + path: 'todo', + component: WipTodoComponent, + }, { path: 'page-not-found', component: PageNotFoundComponent }, { path: '**', redirectTo: 'page-not-found', pathMatch: 'full' }, ]; diff --git a/src/app/shared/components/ui/wip-todo/wip-todo.component.html b/src/app/shared/components/ui/wip-todo/wip-todo.component.html new file mode 100644 index 00000000..4e86e638 --- /dev/null +++ b/src/app/shared/components/ui/wip-todo/wip-todo.component.html @@ -0,0 +1,11 @@ +
+
+
+ +
+
+ Cette fonctionnalité est en cours de développement, vous pouvez contribuer à son + amélioration avec le bouton de feedback. +
+
+
diff --git a/src/app/shared/components/ui/wip-todo/wip-todo.component.scss b/src/app/shared/components/ui/wip-todo/wip-todo.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/shared/components/ui/wip-todo/wip-todo.component.spec.ts b/src/app/shared/components/ui/wip-todo/wip-todo.component.spec.ts new file mode 100644 index 00000000..ee227b25 --- /dev/null +++ b/src/app/shared/components/ui/wip-todo/wip-todo.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WipTodoComponent } from './wip-todo.component'; + +describe('WipTodoComponent', () => { + let component: WipTodoComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [WipTodoComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WipTodoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/components/ui/wip-todo/wip-todo.component.ts b/src/app/shared/components/ui/wip-todo/wip-todo.component.ts new file mode 100644 index 00000000..9e861c15 --- /dev/null +++ b/src/app/shared/components/ui/wip-todo/wip-todo.component.ts @@ -0,0 +1,12 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-wip-todo', + templateUrl: './wip-todo.component.html', + styleUrls: ['./wip-todo.component.scss'], +}) +export class WipTodoComponent implements OnInit { + constructor() {} + + ngOnInit(): void {} +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index d75e7988..1ecfed1c 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -25,6 +25,7 @@ import { SettingsComponent } from './components/settings/settings.component'; import { SpinnerComponent } from './components/spinner/spinner.component'; import { CopyTextComponent } from './components/ui/copy-text/copy-text.component'; import { ErasableInputComponent } from './components/ui/erasable-input/erasable-input.component'; +import { WipTodoComponent } from './components/ui/wip-todo/wip-todo.component'; const COMPONENTS = [ ChoiceDetailsComponent, @@ -37,6 +38,7 @@ const COMPONENTS = [ ThemeSelectorComponent, CopyTextComponent, ErasableInputComponent, + WipTodoComponent, ]; const ANGULAR_MODULES = [CommonModule, ChartsModule, FormsModule, TranslateModule]; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index d4c9aff8..86d5495a 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,10 +4,10 @@ const backendApiUrlsInDev = { local: '/api/v1', - remote: 'https://framadate-api.cipherbliss.com/api/v1', + remote: 'http://localhost:8000/api/v1', }; const apiV1 = { - baseHref: 'https://framadate-api.cipherbliss.com/api/v1', + baseHref: 'http://localhost:8000/api/v1', api_new_poll: '/poll/', api_get_poll: '/poll/{id}', 'api_test-mail-poll': '/api/v1/poll/mail/test-mail-poll/{emailChoice}',