diff --git a/mocks/db.json b/mocks/db.json index c1bf054c..ef57cf5a 100644 --- a/mocks/db.json +++ b/mocks/db.json @@ -6,7 +6,7 @@ "polls": [ { "id": 1, - "slug": "picnic", + "custom_url": "picnic", "configuration": { "id": 1, "isAboutDate": true, @@ -24,7 +24,7 @@ }, { "id": 2, - "slug": "vacances", + "custom_url": "vacances", "configuration": { "id": 2, "isAboutDate": true, diff --git a/src/app/features/old-stuff/config/PollConfig.ts b/mocks/old-stuff/config/PollConfig.ts similarity index 89% rename from src/app/features/old-stuff/config/PollConfig.ts rename to mocks/old-stuff/config/PollConfig.ts index 483b5539..fd45ce06 100644 --- a/src/app/features/old-stuff/config/PollConfig.ts +++ b/mocks/old-stuff/config/PollConfig.ts @@ -1,7 +1,7 @@ /** * une option de date dans les sondages spéciaux */ -import { environment } from '../../../../environments/environment'; +import { environment } from '../../../src/environments/environment'; import { DateChoice, defaultAnswers, otherDefaultDates, PollAnswer } from './defaultConfigs'; export interface DateOption { @@ -40,7 +40,7 @@ export class PollConfig { myEmail: string = environment.production ? '' : 'tktest@tktest.com'; myPolls: any = []; // list of retrieved polls from the backend api /* - date specific poll, we have the choice to setup different hours (timeList) for all possible dates (dateList), or use the same hours for all dates + date specific poll, we have the choice to setup different hours (timeSlices) for all possible dates (dateList), or use the same hours for all dates */ allowSeveralHours = 'true'; // access @@ -50,11 +50,11 @@ export class PollConfig { expirationDate = ''; // expiracy date voteStackId = null; // id of the vote stack to update pollId = null; // id of the current poll when created. data given by the backend api - pollSlug = null; // id of the current poll when created. data given by the backend api + custom_url = null; // id of the current poll when created. data given by the backend api currentPoll; // current poll selected with createPoll or getPoll of ConfigService passwordAccess = 0; password = ''; - customUrl = ''; // custom slug in the url, must be unique + customUrl = ''; // custom custom_url in the url, must be unique customUrlIsUnique = null; // given by the backend urlSlugPublic = null; urlPublic = environment.production ? '' : document.location.href + '/poll/id/4'; diff --git a/src/app/features/old-stuff/config/defaultConfigs.ts b/mocks/old-stuff/config/defaultConfigs.ts similarity index 100% rename from src/app/features/old-stuff/config/defaultConfigs.ts rename to mocks/old-stuff/config/defaultConfigs.ts diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/date-value-accessor.metadata.json b/mocks/old-stuff/custom-lib/date-value-accessor/date-value-accessor.metadata.json similarity index 100% rename from src/app/features/old-stuff/custom-lib/date-value-accessor/date-value-accessor.metadata.json rename to mocks/old-stuff/custom-lib/date-value-accessor/date-value-accessor.metadata.json diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/date-value-accessor.ts b/mocks/old-stuff/custom-lib/date-value-accessor/date-value-accessor.ts similarity index 100% rename from src/app/features/old-stuff/custom-lib/date-value-accessor/date-value-accessor.ts rename to mocks/old-stuff/custom-lib/date-value-accessor/date-value-accessor.ts diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/index.metadata.json b/mocks/old-stuff/custom-lib/date-value-accessor/index.metadata.json similarity index 100% rename from src/app/features/old-stuff/custom-lib/date-value-accessor/index.metadata.json rename to mocks/old-stuff/custom-lib/date-value-accessor/index.metadata.json diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/index.ts b/mocks/old-stuff/custom-lib/date-value-accessor/index.ts similarity index 100% rename from src/app/features/old-stuff/custom-lib/date-value-accessor/index.ts rename to mocks/old-stuff/custom-lib/date-value-accessor/index.ts diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/module.metadata.json b/mocks/old-stuff/custom-lib/date-value-accessor/module.metadata.json similarity index 100% rename from src/app/features/old-stuff/custom-lib/date-value-accessor/module.metadata.json rename to mocks/old-stuff/custom-lib/date-value-accessor/module.metadata.json diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/module.ts b/mocks/old-stuff/custom-lib/date-value-accessor/module.ts similarity index 100% rename from src/app/features/old-stuff/custom-lib/date-value-accessor/module.ts rename to mocks/old-stuff/custom-lib/date-value-accessor/module.ts diff --git a/src/app/features/old-stuff/mocks/choice.ts b/mocks/old-stuff/mocks/choice.ts similarity index 100% rename from src/app/features/old-stuff/mocks/choice.ts rename to mocks/old-stuff/mocks/choice.ts diff --git a/src/app/features/old-stuff/mocks/comment-same-text-error.json b/mocks/old-stuff/mocks/comment-same-text-error.json similarity index 100% rename from src/app/features/old-stuff/mocks/comment-same-text-error.json rename to mocks/old-stuff/mocks/comment-same-text-error.json diff --git a/src/app/features/old-stuff/mocks/comment-too-fast-error.json b/mocks/old-stuff/mocks/comment-too-fast-error.json similarity index 100% rename from src/app/features/old-stuff/mocks/comment-too-fast-error.json rename to mocks/old-stuff/mocks/comment-too-fast-error.json diff --git a/src/app/features/old-stuff/mocks/config-poll-dessins-animes.json b/mocks/old-stuff/mocks/config-poll-dessins-animes.json similarity index 100% rename from src/app/features/old-stuff/mocks/config-poll-dessins-animes.json rename to mocks/old-stuff/mocks/config-poll-dessins-animes.json diff --git a/src/app/features/old-stuff/mocks/created-comment.json b/mocks/old-stuff/mocks/created-comment.json similarity index 100% rename from src/app/features/old-stuff/mocks/created-comment.json rename to mocks/old-stuff/mocks/created-comment.json diff --git a/src/app/features/old-stuff/mocks/mock-comments.ts b/mocks/old-stuff/mocks/mock-comments.ts similarity index 100% rename from src/app/features/old-stuff/mocks/mock-comments.ts rename to mocks/old-stuff/mocks/mock-comments.ts diff --git a/src/app/features/old-stuff/mocks/mock-graph.ts b/mocks/old-stuff/mocks/mock-graph.ts similarity index 100% rename from src/app/features/old-stuff/mocks/mock-graph.ts rename to mocks/old-stuff/mocks/mock-graph.ts diff --git a/src/app/features/old-stuff/mocks/mock-poll3.ts b/mocks/old-stuff/mocks/mock-poll3.ts similarity index 100% rename from src/app/features/old-stuff/mocks/mock-poll3.ts rename to mocks/old-stuff/mocks/mock-poll3.ts diff --git a/src/app/features/old-stuff/mocks/mock-success-vote.ts b/mocks/old-stuff/mocks/mock-success-vote.ts similarity index 100% rename from src/app/features/old-stuff/mocks/mock-success-vote.ts rename to mocks/old-stuff/mocks/mock-success-vote.ts diff --git a/src/app/features/old-stuff/mocks/mockmypolls.ts b/mocks/old-stuff/mocks/mockmypolls.ts similarity index 100% rename from src/app/features/old-stuff/mocks/mockmypolls.ts rename to mocks/old-stuff/mocks/mockmypolls.ts diff --git a/src/app/features/old-stuff/mocks/votestack-success.json b/mocks/old-stuff/mocks/votestack-success.json similarity index 100% rename from src/app/features/old-stuff/mocks/votestack-success.json rename to mocks/old-stuff/mocks/votestack-success.json diff --git a/src/app/features/old-stuff/old-stuff-routing.module.ts b/mocks/old-stuff/old-stuff-routing.module.ts similarity index 96% rename from src/app/features/old-stuff/old-stuff-routing.module.ts rename to mocks/old-stuff/old-stuff-routing.module.ts index 8a84fe53..a51f91e5 100644 --- a/src/app/features/old-stuff/old-stuff-routing.module.ts +++ b/mocks/old-stuff/old-stuff-routing.module.ts @@ -33,7 +33,7 @@ const routes: Routes = [ { path: 'step/end', component: EndConfirmationComponent }, { path: 'graphic/:poll', component: PollGraphicComponent }, { path: 'vote/poll/id/:id', component: PollDisplayComponent }, - { path: 'vote/poll/slug/:slug', component: PollDisplayComponent }, + { path: 'vote/poll/custom_url/:custom_url', component: PollDisplayComponent }, { path: 'votingchoice', component: VotingChoiceComponent }, { path: 'voting', component: VotingComponent }, ]; diff --git a/src/app/features/old-stuff/old-stuff.module.ts b/mocks/old-stuff/old-stuff.module.ts similarity index 98% rename from src/app/features/old-stuff/old-stuff.module.ts rename to mocks/old-stuff/old-stuff.module.ts index 3dea8e28..c4502415 100644 --- a/src/app/features/old-stuff/old-stuff.module.ts +++ b/mocks/old-stuff/old-stuff.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { ConfirmationService, DialogModule, MessageService } from 'primeng'; -import { SharedModule } from '../../shared/shared.module'; +import { SharedModule } from '../../src/app/shared/shared.module'; import { DateValueAccessorModule } from './custom-lib/date-value-accessor'; import { OldStuffRoutingModule } from './old-stuff-routing.module'; import { AdminComponent } from './pages/admin/admin.component'; diff --git a/src/app/features/old-stuff/pages/admin/admin.component.html b/mocks/old-stuff/pages/admin/admin.component.html similarity index 100% rename from src/app/features/old-stuff/pages/admin/admin.component.html rename to mocks/old-stuff/pages/admin/admin.component.html diff --git a/src/app/features/old-stuff/pages/admin/admin.component.scss b/mocks/old-stuff/pages/admin/admin.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/admin/admin.component.scss rename to mocks/old-stuff/pages/admin/admin.component.scss diff --git a/src/app/features/old-stuff/pages/admin/admin.component.spec.ts b/mocks/old-stuff/pages/admin/admin.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/admin/admin.component.spec.ts rename to mocks/old-stuff/pages/admin/admin.component.spec.ts diff --git a/src/app/features/old-stuff/pages/admin/admin.component.ts b/mocks/old-stuff/pages/admin/admin.component.ts similarity index 86% rename from src/app/features/old-stuff/pages/admin/admin.component.ts rename to mocks/old-stuff/pages/admin/admin.component.ts index 370973d2..5e0c1fd3 100644 --- a/src/app/features/old-stuff/pages/admin/admin.component.ts +++ b/mocks/old-stuff/pages/admin/admin.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { ConfigService } from '../../services/config.service'; import { ActivatedRoute, Router } from '@angular/router'; import { HttpClient } from '@angular/common/http'; -import { PollUtilities } from '../../config/PollUtilities'; -import { environment } from '../../../../../environments/environment'; +import { PollUtilitiesService } from '../../../../src/app/core/services/poll.utilities.service'; +import { environment } from '../../../../src/environments/environment'; @Component({ selector: 'app-admin', @@ -16,7 +16,7 @@ export class AdminComponent implements OnInit { constructor( public config: ConfigService, public router: Router, - private utils: PollUtilities, + private utils: PollUtilitiesService, public http: HttpClient, public activeRoute: ActivatedRoute ) {} @@ -39,7 +39,7 @@ export class AdminComponent implements OnInit { }); } - // fetch poll with its ID or slug. + // fetch poll with its ID or custom_url. fetchPoll() { const token = this.tokenForAdministration; const headers = this.utils.makeHeaders({ token: token }); diff --git a/src/app/features/old-stuff/pages/answers/answers.component.html b/mocks/old-stuff/pages/answers/answers.component.html similarity index 100% rename from src/app/features/old-stuff/pages/answers/answers.component.html rename to mocks/old-stuff/pages/answers/answers.component.html diff --git a/src/app/features/old-stuff/pages/answers/answers.component.scss b/mocks/old-stuff/pages/answers/answers.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/answers/answers.component.scss rename to mocks/old-stuff/pages/answers/answers.component.scss diff --git a/src/app/features/old-stuff/pages/answers/answers.component.spec.ts b/mocks/old-stuff/pages/answers/answers.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/answers/answers.component.spec.ts rename to mocks/old-stuff/pages/answers/answers.component.spec.ts diff --git a/src/app/features/old-stuff/pages/answers/answers.component.ts b/mocks/old-stuff/pages/answers/answers.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/answers/answers.component.ts rename to mocks/old-stuff/pages/answers/answers.component.ts diff --git a/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html b/mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html similarity index 100% rename from src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html rename to mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html diff --git a/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.scss b/mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.scss rename to mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.scss diff --git a/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.spec.ts b/mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.spec.ts rename to mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.spec.ts diff --git a/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.ts b/mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.ts rename to mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.ts diff --git a/src/app/features/old-stuff/pages/dates/dates.component.html b/mocks/old-stuff/pages/dates/dates.component.html similarity index 100% rename from src/app/features/old-stuff/pages/dates/dates.component.html rename to mocks/old-stuff/pages/dates/dates.component.html diff --git a/src/app/features/old-stuff/pages/dates/dates.component.scss b/mocks/old-stuff/pages/dates/dates.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/dates/dates.component.scss rename to mocks/old-stuff/pages/dates/dates.component.scss diff --git a/src/app/features/old-stuff/pages/dates/dates.component.spec.ts b/mocks/old-stuff/pages/dates/dates.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/dates/dates.component.spec.ts rename to mocks/old-stuff/pages/dates/dates.component.spec.ts diff --git a/src/app/features/old-stuff/pages/dates/dates.component.ts b/mocks/old-stuff/pages/dates/dates.component.ts similarity index 93% rename from src/app/features/old-stuff/pages/dates/dates.component.ts rename to mocks/old-stuff/pages/dates/dates.component.ts index 1caed356..ce9d8046 100644 --- a/src/app/features/old-stuff/pages/dates/dates.component.ts +++ b/mocks/old-stuff/pages/dates/dates.component.ts @@ -1,8 +1,8 @@ import { DOCUMENT } from '@angular/common'; import { ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core'; -import { ToastService } from '../../../../core/services/toast.service'; -import { DateUtilities } from '../../config/DateUtilities'; +import { ToastService } from '../../../../src/app/core/services/toast.service'; +import { DateUtilitiesService } from '../../../../src/app/core/services/date.utilities.service'; import { otherDefaultDates } from '../../config/defaultConfigs'; import { ConfigService } from '../../services/config.service'; import { BaseComponent } from '../example/base-page/base.component'; @@ -23,7 +23,7 @@ export class DatesComponent extends BaseComponent implements OnInit { public config: ConfigService, private cd: ChangeDetectorRef, private toastService: ToastService, - private dateUtilities: DateUtilities, + private dateUtilities: DateUtilitiesService, @Inject(DOCUMENT) private document: any ) { super(config); diff --git a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.html b/mocks/old-stuff/pages/end-confirmation/end-confirmation.component.html similarity index 100% rename from src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.html rename to mocks/old-stuff/pages/end-confirmation/end-confirmation.component.html diff --git a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.scss b/mocks/old-stuff/pages/end-confirmation/end-confirmation.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.scss rename to mocks/old-stuff/pages/end-confirmation/end-confirmation.component.scss diff --git a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.spec.ts b/mocks/old-stuff/pages/end-confirmation/end-confirmation.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.spec.ts rename to mocks/old-stuff/pages/end-confirmation/end-confirmation.component.spec.ts diff --git a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.ts b/mocks/old-stuff/pages/end-confirmation/end-confirmation.component.ts similarity index 90% rename from src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.ts rename to mocks/old-stuff/pages/end-confirmation/end-confirmation.component.ts index ac4eab66..cba66989 100644 --- a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.ts +++ b/mocks/old-stuff/pages/end-confirmation/end-confirmation.component.ts @@ -1,7 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; -import { ToastService } from '../../../../core/services/toast.service'; +import { ToastService } from '../../../../src/app/core/services/toast.service'; import { ConfigService } from '../../services/config.service'; import { BaseComponent } from '../example/base-page/base.component'; diff --git a/src/app/features/old-stuff/pages/example/base-page/base.component.html b/mocks/old-stuff/pages/example/base-page/base.component.html similarity index 100% rename from src/app/features/old-stuff/pages/example/base-page/base.component.html rename to mocks/old-stuff/pages/example/base-page/base.component.html diff --git a/src/app/features/old-stuff/pages/example/base-page/base.component.scss b/mocks/old-stuff/pages/example/base-page/base.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/example/base-page/base.component.scss rename to mocks/old-stuff/pages/example/base-page/base.component.scss diff --git a/src/app/features/old-stuff/pages/example/base-page/base.component.spec.ts b/mocks/old-stuff/pages/example/base-page/base.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/example/base-page/base.component.spec.ts rename to mocks/old-stuff/pages/example/base-page/base.component.spec.ts diff --git a/src/app/features/old-stuff/pages/example/base-page/base.component.ts b/mocks/old-stuff/pages/example/base-page/base.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/example/base-page/base.component.ts rename to mocks/old-stuff/pages/example/base-page/base.component.ts diff --git a/src/app/features/old-stuff/pages/example/kind/kind.component.html b/mocks/old-stuff/pages/example/kind/kind.component.html similarity index 98% rename from src/app/features/old-stuff/pages/example/kind/kind.component.html rename to mocks/old-stuff/pages/example/kind/kind.component.html index 10c0467e..0cf28006 100644 --- a/src/app/features/old-stuff/pages/example/kind/kind.component.html +++ b/mocks/old-stuff/pages/example/kind/kind.component.html @@ -47,7 +47,7 @@
- + primary - outline - default diff --git a/src/app/features/old-stuff/pages/example/kind/kind.component.scss b/mocks/old-stuff/pages/example/kind/kind.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/example/kind/kind.component.scss rename to mocks/old-stuff/pages/example/kind/kind.component.scss diff --git a/src/app/features/old-stuff/pages/example/kind/kind.component.spec.ts b/mocks/old-stuff/pages/example/kind/kind.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/example/kind/kind.component.spec.ts rename to mocks/old-stuff/pages/example/kind/kind.component.spec.ts diff --git a/src/app/features/old-stuff/pages/example/kind/kind.component.ts b/mocks/old-stuff/pages/example/kind/kind.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/example/kind/kind.component.ts rename to mocks/old-stuff/pages/example/kind/kind.component.ts diff --git a/src/app/features/old-stuff/pages/example/pictures/pictures.component.html b/mocks/old-stuff/pages/example/pictures/pictures.component.html similarity index 100% rename from src/app/features/old-stuff/pages/example/pictures/pictures.component.html rename to mocks/old-stuff/pages/example/pictures/pictures.component.html diff --git a/src/app/features/old-stuff/pages/example/pictures/pictures.component.scss b/mocks/old-stuff/pages/example/pictures/pictures.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/example/pictures/pictures.component.scss rename to mocks/old-stuff/pages/example/pictures/pictures.component.scss diff --git a/src/app/features/old-stuff/pages/example/pictures/pictures.component.spec.ts b/mocks/old-stuff/pages/example/pictures/pictures.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/example/pictures/pictures.component.spec.ts rename to mocks/old-stuff/pages/example/pictures/pictures.component.spec.ts diff --git a/src/app/features/old-stuff/pages/example/pictures/pictures.component.ts b/mocks/old-stuff/pages/example/pictures/pictures.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/example/pictures/pictures.component.ts rename to mocks/old-stuff/pages/example/pictures/pictures.component.ts diff --git a/src/app/features/old-stuff/pages/home/home.component.html b/mocks/old-stuff/pages/home/home.component.html similarity index 100% rename from src/app/features/old-stuff/pages/home/home.component.html rename to mocks/old-stuff/pages/home/home.component.html diff --git a/src/app/features/old-stuff/pages/home/home.component.scss b/mocks/old-stuff/pages/home/home.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/home/home.component.scss rename to mocks/old-stuff/pages/home/home.component.scss diff --git a/src/app/features/old-stuff/pages/home/home.component.spec.ts b/mocks/old-stuff/pages/home/home.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/home/home.component.spec.ts rename to mocks/old-stuff/pages/home/home.component.spec.ts diff --git a/src/app/features/old-stuff/pages/home/home.component.ts b/mocks/old-stuff/pages/home/home.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/home/home.component.ts rename to mocks/old-stuff/pages/home/home.component.ts diff --git a/src/app/features/old-stuff/pages/password/password.component.html b/mocks/old-stuff/pages/password/password.component.html similarity index 100% rename from src/app/features/old-stuff/pages/password/password.component.html rename to mocks/old-stuff/pages/password/password.component.html diff --git a/src/app/features/old-stuff/pages/password/password.component.scss b/mocks/old-stuff/pages/password/password.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/password/password.component.scss rename to mocks/old-stuff/pages/password/password.component.scss diff --git a/src/app/features/old-stuff/pages/password/password.component.spec.ts b/mocks/old-stuff/pages/password/password.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/password/password.component.spec.ts rename to mocks/old-stuff/pages/password/password.component.spec.ts diff --git a/src/app/features/old-stuff/pages/password/password.component.ts b/mocks/old-stuff/pages/password/password.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/password/password.component.ts rename to mocks/old-stuff/pages/password/password.component.ts diff --git a/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.html b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.html similarity index 100% rename from src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.html rename to mocks/old-stuff/pages/poll/poll-display/poll-display.component.html diff --git a/mocks/old-stuff/pages/poll/poll-display/poll-display.component.scss b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.scss new file mode 100644 index 00000000..97075968 --- /dev/null +++ b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.scss @@ -0,0 +1 @@ +@import '../../../../../src/styles/variables'; diff --git a/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.spec.ts b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.spec.ts rename to mocks/old-stuff/pages/poll/poll-display/poll-display.component.spec.ts diff --git a/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.ts b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts similarity index 94% rename from src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.ts rename to mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts index 9489db1a..61a98bbe 100644 --- a/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.ts +++ b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts @@ -3,7 +3,7 @@ import { BaseComponent } from '../../example/base-page/base.component'; import { ConfigService } from '../../../services/config.service'; import { mockComments } from '../../../mocks/mock-comments'; import { ActivatedRoute, Router } from '@angular/router'; -import { environment } from '../../../../../../environments/environment'; +import { environment } from '../../../../../src/environments/environment'; import { mockPoll3 } from '../../../mocks/mock-poll3'; @Component({ @@ -28,7 +28,7 @@ export class PollDisplayComponent extends BaseComponent implements OnInit { ngOnInit(): void {} - // fetch poll with its ID or slug. + // fetch poll with its ID or custom_url. fetchPoll() { const id = this.activeRoute.snapshot.params.poll; const pollSlug = this.activeRoute.snapshot.params.pollSlug; diff --git a/src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.html b/mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.html similarity index 100% rename from src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.html rename to mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.html diff --git a/src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.scss b/mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.scss rename to mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.scss diff --git a/src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.spec.ts b/mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.spec.ts rename to mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.spec.ts diff --git a/src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.ts b/mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.ts rename to mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.ts diff --git a/src/app/features/old-stuff/pages/resume/resume.component.html b/mocks/old-stuff/pages/resume/resume.component.html similarity index 100% rename from src/app/features/old-stuff/pages/resume/resume.component.html rename to mocks/old-stuff/pages/resume/resume.component.html diff --git a/src/app/features/old-stuff/pages/resume/resume.component.scss b/mocks/old-stuff/pages/resume/resume.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/resume/resume.component.scss rename to mocks/old-stuff/pages/resume/resume.component.scss diff --git a/src/app/features/old-stuff/pages/resume/resume.component.spec.ts b/mocks/old-stuff/pages/resume/resume.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/resume/resume.component.spec.ts rename to mocks/old-stuff/pages/resume/resume.component.spec.ts diff --git a/src/app/features/old-stuff/pages/resume/resume.component.ts b/mocks/old-stuff/pages/resume/resume.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/resume/resume.component.ts rename to mocks/old-stuff/pages/resume/resume.component.ts diff --git a/src/app/features/old-stuff/pages/visibility/visibility.component.html b/mocks/old-stuff/pages/visibility/visibility.component.html similarity index 97% rename from src/app/features/old-stuff/pages/visibility/visibility.component.html rename to mocks/old-stuff/pages/visibility/visibility.component.html index 1244f37e..d57e4f74 100644 --- a/src/app/features/old-stuff/pages/visibility/visibility.component.html +++ b/mocks/old-stuff/pages/visibility/visibility.component.html @@ -102,8 +102,8 @@ {{ 'visibility.access_instructions' | translate }}
- - {{ '/vote/poll/slug/' + config.customUrl }} + + {{ '/vote/poll/custom_url/' + config.customUrl }}

diff --git a/src/app/features/old-stuff/pages/visibility/visibility.component.scss b/mocks/old-stuff/pages/visibility/visibility.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/visibility/visibility.component.scss rename to mocks/old-stuff/pages/visibility/visibility.component.scss diff --git a/src/app/features/old-stuff/pages/visibility/visibility.component.spec.ts b/mocks/old-stuff/pages/visibility/visibility.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/visibility/visibility.component.spec.ts rename to mocks/old-stuff/pages/visibility/visibility.component.spec.ts diff --git a/src/app/features/old-stuff/pages/visibility/visibility.component.ts b/mocks/old-stuff/pages/visibility/visibility.component.ts similarity index 79% rename from src/app/features/old-stuff/pages/visibility/visibility.component.ts rename to mocks/old-stuff/pages/visibility/visibility.component.ts index e29a8fb1..c2996329 100644 --- a/src/app/features/old-stuff/pages/visibility/visibility.component.ts +++ b/mocks/old-stuff/pages/visibility/visibility.component.ts @@ -1,8 +1,8 @@ import { Location } from '@angular/common'; import { Component, OnInit } from '@angular/core'; -import { environment } from '../../../../../environments/environment'; -import { PollUtilities } from '../../config/PollUtilities'; +import { environment } from '../../../../src/environments/environment'; +import { PollUtilitiesService } from '../../../../src/app/core/services/poll.utilities.service'; import { ConfigService } from '../../services/config.service'; import { BaseComponent } from '../example/base-page/base.component'; @@ -16,12 +16,12 @@ export class VisibilityComponent extends BaseComponent implements OnInit { public showCustomPassword = false; public baseUrl = environment.api.baseHref; - constructor(public config: ConfigService, public utils: PollUtilities) { + constructor(public config: ConfigService, public utils: PollUtilitiesService) { super(config); } ngOnInit(): void { - this.config.customUrl = 'un slug'; + this.config.customUrl = 'un custom_url'; this.config.expirationDate = this.config .addDaysToDate(this.config.expiracyDateDefaultInDays, new Date()) .toISOString() diff --git a/src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.html b/mocks/old-stuff/pages/voting/choices-list/choices-list.component.html similarity index 100% rename from src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.html rename to mocks/old-stuff/pages/voting/choices-list/choices-list.component.html diff --git a/src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.scss b/mocks/old-stuff/pages/voting/choices-list/choices-list.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.scss rename to mocks/old-stuff/pages/voting/choices-list/choices-list.component.scss diff --git a/src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.spec.ts b/mocks/old-stuff/pages/voting/choices-list/choices-list.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.spec.ts rename to mocks/old-stuff/pages/voting/choices-list/choices-list.component.spec.ts diff --git a/src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.ts b/mocks/old-stuff/pages/voting/choices-list/choices-list.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.ts rename to mocks/old-stuff/pages/voting/choices-list/choices-list.component.ts diff --git a/src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.html b/mocks/old-stuff/pages/voting/comments-list/comments-list.component.html similarity index 100% rename from src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.html rename to mocks/old-stuff/pages/voting/comments-list/comments-list.component.html diff --git a/src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.scss b/mocks/old-stuff/pages/voting/comments-list/comments-list.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.scss rename to mocks/old-stuff/pages/voting/comments-list/comments-list.component.scss diff --git a/src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.spec.ts b/mocks/old-stuff/pages/voting/comments-list/comments-list.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.spec.ts rename to mocks/old-stuff/pages/voting/comments-list/comments-list.component.spec.ts diff --git a/src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.ts b/mocks/old-stuff/pages/voting/comments-list/comments-list.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.ts rename to mocks/old-stuff/pages/voting/comments-list/comments-list.component.ts diff --git a/src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.html b/mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.html similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.html rename to mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.html diff --git a/src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.scss b/mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.scss similarity index 98% rename from src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.scss rename to mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.scss index 4b2f821e..c619c0b3 100644 --- a/src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.scss +++ b/mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.scss @@ -5,7 +5,7 @@ // -- IMPORTS // ---------------------------- -@import '../../../../../../styles/variables'; +@import '../../../../../src/styles/variables'; // -- VARIABLES // ---------------------------- diff --git a/src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.spec.ts b/mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.spec.ts rename to mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.spec.ts diff --git a/src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.ts b/mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.ts rename to mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.ts diff --git a/src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.html b/mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.html similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.html rename to mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.html diff --git a/src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.scss b/mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.scss rename to mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.scss diff --git a/src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.spec.ts b/mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.spec.ts rename to mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.spec.ts diff --git a/src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.ts b/mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.ts rename to mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.ts diff --git a/src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.html b/mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.html similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.html rename to mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.html diff --git a/src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.scss b/mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.scss rename to mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.scss diff --git a/src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.spec.ts b/mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.spec.ts rename to mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.spec.ts diff --git a/src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.ts b/mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.ts rename to mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.ts diff --git a/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html b/mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html rename to mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html diff --git a/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.scss b/mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.scss rename to mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.scss diff --git a/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.spec.ts b/mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.spec.ts rename to mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.spec.ts diff --git a/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.ts b/mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.ts rename to mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.ts diff --git a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.html b/mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.html similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.html rename to mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.html diff --git a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.scss b/mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.scss similarity index 84% rename from src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.scss rename to mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.scss index df5b9f7c..8fc60aa0 100644 --- a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.scss +++ b/mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../styles/variables'; +@import '../../../../../src/styles/variables'; .person { font-weight: 700; diff --git a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.spec.ts b/mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.spec.ts rename to mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.spec.ts diff --git a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.ts b/mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.ts rename to mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.ts diff --git a/src/app/features/old-stuff/pages/voting/voting.component.html b/mocks/old-stuff/pages/voting/voting.component.html similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting.component.html rename to mocks/old-stuff/pages/voting/voting.component.html diff --git a/src/app/features/old-stuff/pages/voting/voting.component.scss b/mocks/old-stuff/pages/voting/voting.component.scss similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting.component.scss rename to mocks/old-stuff/pages/voting/voting.component.scss diff --git a/src/app/features/old-stuff/pages/voting/voting.component.spec.ts b/mocks/old-stuff/pages/voting/voting.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting.component.spec.ts rename to mocks/old-stuff/pages/voting/voting.component.spec.ts diff --git a/src/app/features/old-stuff/pages/voting/voting.component.ts b/mocks/old-stuff/pages/voting/voting.component.ts similarity index 100% rename from src/app/features/old-stuff/pages/voting/voting.component.ts rename to mocks/old-stuff/pages/voting/voting.component.ts diff --git a/src/app/features/old-stuff/services/config.service.ts b/mocks/old-stuff/services/config.service.ts similarity index 98% rename from src/app/features/old-stuff/services/config.service.ts rename to mocks/old-stuff/services/config.service.ts index 50b10d55..9a1268f2 100644 --- a/src/app/features/old-stuff/services/config.service.ts +++ b/mocks/old-stuff/services/config.service.ts @@ -3,10 +3,10 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { ConfirmationService } from 'primeng/api'; -import { environment } from '../../../../environments/environment'; -import { ToastService } from '../../../core/services/toast.service'; +import { environment } from '../../../src/environments/environment'; +import { ToastService } from '../../../src/app/core/services/toast.service'; import { PollConfig } from '../config/PollConfig'; -import { PollUtilities } from '../config/PollUtilities'; +import { PollUtilitiesService } from '../../../src/app/core/services/poll.utilities.service'; import { mockPoll3 } from '../mocks/mock-poll3'; import { mockSuccessVote } from '../mocks/mock-success-vote'; import { mockMyPolls } from '../mocks/mockmypolls'; @@ -20,12 +20,13 @@ import { mockMyPolls } from '../mocks/mockmypolls'; export class ConfigService extends PollConfig { loading = false; apiBaseHref: any = environment.api.baseHref; + pollSlug: string; constructor( private http: HttpClient, private toastService: ToastService, private router: Router, - private utils: PollUtilities, + private utils: PollUtilitiesService, private confirmationService: ConfirmationService ) { super(); @@ -97,12 +98,12 @@ export class ConfigService extends PollConfig { // TODO: http requests moved to apiService this.customUrlIsUnique = null; if (!slug) { - slug = 'un slug'; + slug = 'un custom_url'; } this.loading = true; // TODO - this.todo('check slug is unique'); + this.todo('check custom_url is unique'); this.http .get(`${this.apiBaseHref}/check-slug-is-uniq/${slug}`, this.utils.makeHeaders({ slug: this.customUrl })) .subscribe( @@ -163,7 +164,7 @@ export class ConfigService extends PollConfig { } /** - * get one poll by its slug choice_label + * get one poll by its custom_url choice_label * @param url */ getPollByURL(url: string) { @@ -219,7 +220,7 @@ export class ConfigService extends PollConfig { this.pollId = res.poll.id; this.owner_modifier_token = res.owner_modifier_token; this.urlPublic = this.apiBaseHref + '/vote/poll/id/' + res.poll.id; - this.urlSlugPublic = this.apiBaseHref + '/vote/poll/slug/' + res.poll.id; + this.urlSlugPublic = this.apiBaseHref + '/vote/poll/custom_url/' + res.poll.id; if (res.poll.customUrl) { this.urlSlugPublic = this.apiBaseHref + '/vote/poll/id/' + res.poll.customUrl; } diff --git a/src/app/features/old-stuff/services/progression.service.spec.ts b/mocks/old-stuff/services/progression.service.spec.ts similarity index 100% rename from src/app/features/old-stuff/services/progression.service.spec.ts rename to mocks/old-stuff/services/progression.service.spec.ts diff --git a/src/app/features/old-stuff/ui/copy-text/copy-text.component.html b/mocks/old-stuff/ui/copy-text/copy-text.component.html similarity index 100% rename from src/app/features/old-stuff/ui/copy-text/copy-text.component.html rename to mocks/old-stuff/ui/copy-text/copy-text.component.html diff --git a/src/app/features/old-stuff/ui/copy-text/copy-text.component.scss b/mocks/old-stuff/ui/copy-text/copy-text.component.scss similarity index 100% rename from src/app/features/old-stuff/ui/copy-text/copy-text.component.scss rename to mocks/old-stuff/ui/copy-text/copy-text.component.scss diff --git a/src/app/features/old-stuff/ui/copy-text/copy-text.component.spec.ts b/mocks/old-stuff/ui/copy-text/copy-text.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/ui/copy-text/copy-text.component.spec.ts rename to mocks/old-stuff/ui/copy-text/copy-text.component.spec.ts diff --git a/src/app/features/old-stuff/ui/copy-text/copy-text.component.ts b/mocks/old-stuff/ui/copy-text/copy-text.component.ts similarity index 88% rename from src/app/features/old-stuff/ui/copy-text/copy-text.component.ts rename to mocks/old-stuff/ui/copy-text/copy-text.component.ts index 31c295b9..c9029eb2 100644 --- a/src/app/features/old-stuff/ui/copy-text/copy-text.component.ts +++ b/mocks/old-stuff/ui/copy-text/copy-text.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { ClipboardService } from 'ngx-clipboard'; -import { ToastService } from '../../../../core/services/toast.service'; +import { ToastService } from '../../../../src/app/core/services/toast.service'; @Component({ selector: 'app-copy-text', diff --git a/src/app/features/old-stuff/ui/directives/resettable-input.directive.spec.ts b/mocks/old-stuff/ui/directives/resettable-input.directive.spec.ts similarity index 100% rename from src/app/features/old-stuff/ui/directives/resettable-input.directive.spec.ts rename to mocks/old-stuff/ui/directives/resettable-input.directive.spec.ts diff --git a/src/app/features/old-stuff/ui/directives/resettable-input.directive.ts b/mocks/old-stuff/ui/directives/resettable-input.directive.ts similarity index 100% rename from src/app/features/old-stuff/ui/directives/resettable-input.directive.ts rename to mocks/old-stuff/ui/directives/resettable-input.directive.ts diff --git a/src/app/features/old-stuff/ui/erasable-input/erasable-input.component.html b/mocks/old-stuff/ui/erasable-input/erasable-input.component.html similarity index 100% rename from src/app/features/old-stuff/ui/erasable-input/erasable-input.component.html rename to mocks/old-stuff/ui/erasable-input/erasable-input.component.html diff --git a/src/app/features/old-stuff/ui/erasable-input/erasable-input.component.scss b/mocks/old-stuff/ui/erasable-input/erasable-input.component.scss similarity index 100% rename from src/app/features/old-stuff/ui/erasable-input/erasable-input.component.scss rename to mocks/old-stuff/ui/erasable-input/erasable-input.component.scss diff --git a/src/app/features/old-stuff/ui/erasable-input/erasable-input.component.spec.ts b/mocks/old-stuff/ui/erasable-input/erasable-input.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/ui/erasable-input/erasable-input.component.spec.ts rename to mocks/old-stuff/ui/erasable-input/erasable-input.component.spec.ts diff --git a/src/app/features/old-stuff/ui/erasable-input/erasable-input.component.ts b/mocks/old-stuff/ui/erasable-input/erasable-input.component.ts similarity index 100% rename from src/app/features/old-stuff/ui/erasable-input/erasable-input.component.ts rename to mocks/old-stuff/ui/erasable-input/erasable-input.component.ts diff --git a/src/app/features/old-stuff/ui/two-links/two-links.component.html b/mocks/old-stuff/ui/two-links/two-links.component.html similarity index 100% rename from src/app/features/old-stuff/ui/two-links/two-links.component.html rename to mocks/old-stuff/ui/two-links/two-links.component.html diff --git a/src/app/features/old-stuff/ui/two-links/two-links.component.scss b/mocks/old-stuff/ui/two-links/two-links.component.scss similarity index 100% rename from src/app/features/old-stuff/ui/two-links/two-links.component.scss rename to mocks/old-stuff/ui/two-links/two-links.component.scss diff --git a/src/app/features/old-stuff/ui/two-links/two-links.component.spec.ts b/mocks/old-stuff/ui/two-links/two-links.component.spec.ts similarity index 100% rename from src/app/features/old-stuff/ui/two-links/two-links.component.spec.ts rename to mocks/old-stuff/ui/two-links/two-links.component.spec.ts diff --git a/src/app/features/old-stuff/ui/two-links/two-links.component.ts b/mocks/old-stuff/ui/two-links/two-links.component.ts similarity index 100% rename from src/app/features/old-stuff/ui/two-links/two-links.component.ts rename to mocks/old-stuff/ui/two-links/two-links.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4a0e9f19..f347c701 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router'; import { routes } from './routes-framadate'; @NgModule({ - imports: [RouterModule.forRoot(routes, { useHash: true })], + imports: [RouterModule.forRoot(routes)], exports: [RouterModule], }) export class AppRoutingModule {} diff --git a/src/app/app.component.html b/src/app/app.component.html index ce833dc8..8f398fd4 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,6 +1,6 @@ - + diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html index 9410a3e2..fbf8ee53 100644 --- a/src/app/core/components/footer/footer.component.html +++ b/src/app/core/components/footer/footer.component.html @@ -26,34 +26,5 @@ canal Matrix

-
- Environnement de développement: voici des liens de démonstration issus des fixtures Doctrine de - date-poll-api. - - - - -
diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index 41034276..bbe7f57f 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -43,7 +43,59 @@
- menu mobile + +
+
+ Environnement de développement: voici des liens de démonstration issus des fixtures Doctrine de date-poll-api. +
+
+ + + le-titre-de-demo-oh-oh + + + dessin-anime + + + + consulter le sondage + + aujourdhui-ou-demain + + + + + citron + + sans pass + + + + + citron + + + pass + +
+
+
diff --git a/src/app/core/components/header/header.component.ts b/src/app/core/components/header/header.component.ts index 57146ba7..f2b56dd6 100644 --- a/src/app/core/components/header/header.component.ts +++ b/src/app/core/components/header/header.component.ts @@ -15,8 +15,8 @@ import { environment } from '../../../../environments/environment'; export class HeaderComponent implements OnInit { public _user: Observable = this.userService.user; public env = environment; - @Input() public appTitle: string = 'FramaDate Funky'; - @Input() public appLogo: string; + @Input() public appTitle = environment.appTitle; + @Input() public appLogo = environment.appLogo; mobileMenuVisible = false; constructor(private userService: UserService) {} diff --git a/src/app/core/components/sibebar/navigation/navigation.component.html b/src/app/core/components/sibebar/navigation/navigation.component.html index fa4f467a..2ee6ea2d 100644 --- a/src/app/core/components/sibebar/navigation/navigation.component.html +++ b/src/app/core/components/sibebar/navigation/navigation.component.html @@ -1,62 +1,60 @@ -