From 355fed53f3dc45fc27245e5b13dcefadac774b87 Mon Sep 17 00:00:00 2001 From: seraph Date: Tue, 5 May 2020 18:17:12 +0200 Subject: [PATCH 1/2] add user settings button & modal --- angular.json | 1 + package.json | 5 +- src/app/app-routing.module.ts | 2 - src/app/app.component.ts | 7 +- .../components/header/header.component.html | 30 +- .../components/header/header.component.ts | 15 +- .../components/login/login.component.html | 1 - .../core/components/login/login.component.ts | 12 - .../language-selector.component.html | 10 - .../language-selector.component.ts | 38 - .../theme-selector.component.html | 24 - src/app/core/core.module.ts | 16 +- src/app/core/enums/answer-granularity.enum.ts | 4 - .../{answer-type.enum.ts => response.enum.ts} | 2 +- src/app/core/enums/user-role.enum.ts | 2 +- src/app/core/enums/workflow-step.enum.ts | 2 +- .../core/interfaces/date-options.interface.ts | 5 - src/app/core/models/answer.model.ts | 6 +- src/app/core/models/choice.model.ts | 5 + src/app/core/models/comment.model.ts | 3 + src/app/core/models/configuration.model.ts | 26 + src/app/core/models/poll-config.model.ts | 13 - src/app/core/models/poll-options.model.ts | 9 - src/app/core/models/poll.model.ts | 26 +- src/app/core/models/question.model.ts | 3 + src/app/core/models/user.model.ts | 6 +- src/app/core/services/api.service.ts | 31 +- .../core/services/language.service.spec.ts | 16 + src/app/core/services/language.service.ts | 66 + src/app/core/services/loader.service.spec.ts | 16 + src/app/core/services/loader.service.ts | 14 + src/app/core/services/mocking.service.ts | 31 +- src/app/core/services/modal.service.spec.ts | 16 + src/app/core/services/modal.service.ts | 15 + src/app/core/services/poll.service.ts | 5 +- src/app/core/services/storage.service.ts | 3 + src/app/core/services/url.service.spec.ts | 16 + src/app/core/services/url.service.ts | 23 + src/app/core/services/user.service.ts | 11 +- src/app/core/services/workflow.service.ts | 2 +- src/app/core/utils/date-utils.service.ts | 31 - .../edit-description.component.ts | 8 +- .../poll-edit/poll-edit.component.ts | 8 +- .../profile/profile.component.html | 8 +- .../profile/profile.component.ts | 7 +- .../stepper/stepper.component.ts | 2 +- .../old-stuff/old-stuff-routing.module.ts | 4 +- .../create-or-retrieve.component.html | 4 +- .../voting-navigation.component.html | 2 +- .../voting-summary.component.html | 4 +- .../participation-routing.module.ts | 10 +- .../participation.component.html | 33 +- .../participation/participation.component.ts | 26 +- .../participation/participation.module.ts | 3 +- .../poll-comment/poll-comment.component.html | 1 + .../poll-comment/poll-comment.component.scss} | 0 .../poll-comment.component.spec.ts | 24 + .../poll-comment/poll-comment.component.ts | 12 + .../participation/poll/poll.component.html | 16 +- .../participation/poll/poll.component.ts | 22 +- .../language-selector.component.html | 14 + .../language-selector.component.scss | 0 .../language-selector.component.spec.ts | 0 .../language-selector.component.ts | 27 + .../theme-selector.component.html | 30 + .../theme-selector.component.scss | 0 .../theme-selector.component.spec.ts | 0 .../theme-selector.component.ts | 10 +- .../settings/settings.component.html | 33 + .../settings/settings.component.scss | 0 .../settings/settings.component.spec.ts} | 12 +- .../components/settings/settings.component.ts | 41 + src/app/shared/shared.module.ts | 76 +- src/environments/environment.prod.ts | 34 +- src/environments/environment.ts | 19 +- yarn.lock | 1255 ++++++++--------- 76 files changed, 1308 insertions(+), 1006 deletions(-) delete mode 100644 src/app/core/components/login/login.component.html delete mode 100644 src/app/core/components/login/login.component.ts delete mode 100644 src/app/core/components/selectors/language-selector/language-selector.component.html delete mode 100644 src/app/core/components/selectors/language-selector/language-selector.component.ts delete mode 100644 src/app/core/components/selectors/theme-selector/theme-selector.component.html delete mode 100644 src/app/core/enums/answer-granularity.enum.ts rename src/app/core/enums/{answer-type.enum.ts => response.enum.ts} (64%) delete mode 100644 src/app/core/interfaces/date-options.interface.ts create mode 100644 src/app/core/models/choice.model.ts create mode 100644 src/app/core/models/comment.model.ts create mode 100644 src/app/core/models/configuration.model.ts delete mode 100644 src/app/core/models/poll-config.model.ts delete mode 100644 src/app/core/models/poll-options.model.ts create mode 100644 src/app/core/models/question.model.ts create mode 100644 src/app/core/services/language.service.spec.ts create mode 100644 src/app/core/services/language.service.ts create mode 100644 src/app/core/services/loader.service.spec.ts create mode 100644 src/app/core/services/loader.service.ts create mode 100644 src/app/core/services/modal.service.spec.ts create mode 100644 src/app/core/services/modal.service.ts create mode 100644 src/app/core/services/url.service.spec.ts create mode 100644 src/app/core/services/url.service.ts create mode 100644 src/app/features/participation/poll-comment/poll-comment.component.html rename src/app/{core/components/login/login.component.scss => features/participation/poll-comment/poll-comment.component.scss} (100%) create mode 100644 src/app/features/participation/poll-comment/poll-comment.component.spec.ts create mode 100644 src/app/features/participation/poll-comment/poll-comment.component.ts create mode 100644 src/app/shared/components/selectors/language-selector/language-selector.component.html rename src/app/{core => shared}/components/selectors/language-selector/language-selector.component.scss (100%) rename src/app/{core => shared}/components/selectors/language-selector/language-selector.component.spec.ts (100%) create mode 100644 src/app/shared/components/selectors/language-selector/language-selector.component.ts create mode 100644 src/app/shared/components/selectors/theme-selector/theme-selector.component.html rename src/app/{core => shared}/components/selectors/theme-selector/theme-selector.component.scss (100%) rename src/app/{core => shared}/components/selectors/theme-selector/theme-selector.component.spec.ts (100%) rename src/app/{core => shared}/components/selectors/theme-selector/theme-selector.component.ts (67%) create mode 100644 src/app/shared/components/settings/settings.component.html create mode 100644 src/app/shared/components/settings/settings.component.scss rename src/app/{core/components/login/login.component.spec.ts => shared/components/settings/settings.component.spec.ts} (54%) create mode 100644 src/app/shared/components/settings/settings.component.ts diff --git a/angular.json b/angular.json index 3440256d..8864f04b 100644 --- a/angular.json +++ b/angular.json @@ -28,6 +28,7 @@ "node_modules/primeicons/primeicons.css", "node_modules/primeng/resources/themes/nova-light/theme.css", "node_modules/primeng/resources/primeng.min.css", + "node_modules/primeflex/primeflex.css", "src/styles.scss" ], "scripts": [ diff --git a/package.json b/package.json index eea091af..3bcda40e 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "ngx-clipboard": "^13.0.0", "ngx-markdown": "^9.0.0", "ngx-webstorage": "^5.0.0", + "primeflex": "^1.0.0", "primeicons": "^2.0.0", "primeng": "^9.0.6", "quill": "^1.3.7", @@ -67,12 +68,12 @@ "@types/uuid": "^7.0.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", - "babel-jest": "^25.4.0", + "babel-jest": "^26.0.0", "eslint": "^6.8.0", "eslint-config-prettier": "^6.11.0", "eslint-plugin-prettier": "^3.1.3", "husky": "^4.2.5", - "jest": "^25.5.1", + "jest": "^26.0.0", "jest-environment-jsdom-sixteen": "^1.0.3", "jest-preset-angular": "^8.1.3", "lint-staged": "^10.1.7", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 93f2c91c..ca478a7f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -2,12 +2,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { HomeComponent } from './core/components/home/home.component'; -import { LoginComponent } from './core/components/login/login.component'; import { PageNotFoundComponent } from './shared/components/page-not-found/page-not-found.component'; const routes: Routes = [ { path: '', component: HomeComponent }, - { path: 'login', component: LoginComponent }, { path: 'administration', loadChildren: () => diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8cd65e6f..0059d36d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,6 +5,8 @@ import { Subscription } from 'rxjs'; import { environment } from '../environments/environment'; import { Theme } from './core/enums/theme.enum'; import { UserRole } from './core/enums/user-role.enum'; +import { User } from './core/models/user.model'; +import { LanguageService } from './core/services/language.service'; import { MockingService } from './core/services/mocking.service'; import { ThemeService } from './core/services/theme.service'; @@ -22,15 +24,18 @@ export class AppComponent implements OnInit, OnDestroy { constructor( private titleService: Title, private themeService: ThemeService, + private languageService: LanguageService, private mockingService: MockingService ) {} ngOnInit(): void { if (!environment.production) { this.appTitle += ' [DEV]'; - this.mockingService.loadUser(UserRole.REGISTERED); + // TODO: to be removed + this.mockingService.loadUser(new User('TOTO', 'toto@gafam.com', UserRole.REGISTERED, false)); } this.titleService.setTitle(this.appTitle); + this.languageService.configureAndInitTranslations(); this.themeSubscription = this.themeService.theme.subscribe((theme: Theme) => { switch (theme) { case Theme.DARK: diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index c5a76c78..ffc65486 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -40,8 +40,12 @@ Administration - - Participation + + Participation à citron_ou_orange Old stuff @@ -50,22 +54,14 @@ -
- -
-
- -
-
-
-
- - Sign up - - - Log in - +
+
+ + +
diff --git a/src/app/core/components/header/header.component.ts b/src/app/core/components/header/header.component.ts index 245b95a0..c6f9f4c7 100644 --- a/src/app/core/components/header/header.component.ts +++ b/src/app/core/components/header/header.component.ts @@ -1,4 +1,9 @@ -import { Component, EventEmitter, Output, Input } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Observable } from 'rxjs'; + +import { User } from '../../models/user.model'; +import { ModalService } from '../../services/modal.service'; +import { UserService } from '../../services/user.service'; @Component({ selector: 'app-header', @@ -9,6 +14,14 @@ export class HeaderComponent { @Input() isSidebarOpened: boolean; @Output() toggleSidebarEE = new EventEmitter(); + public _user: Observable = this.userService.user; + + constructor(private userService: UserService, private modalService: ModalService) {} + + public openDialog(): void { + this.modalService.openSettingsComponent(); + } + public toggleSidebarOpening(): void { this.isSidebarOpened = !this.isSidebarOpened; this.toggleSidebarEE.emit(this.isSidebarOpened); diff --git a/src/app/core/components/login/login.component.html b/src/app/core/components/login/login.component.html deleted file mode 100644 index 147cfc4f..00000000 --- a/src/app/core/components/login/login.component.html +++ /dev/null @@ -1 +0,0 @@ -

login works!

diff --git a/src/app/core/components/login/login.component.ts b/src/app/core/components/login/login.component.ts deleted file mode 100644 index a062274e..00000000 --- a/src/app/core/components/login/login.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-login', - templateUrl: './login.component.html', - styleUrls: ['./login.component.scss'], -}) -export class LoginComponent implements OnInit { - constructor() {} - - ngOnInit(): void {} -} diff --git a/src/app/core/components/selectors/language-selector/language-selector.component.html b/src/app/core/components/selectors/language-selector/language-selector.component.html deleted file mode 100644 index 2d865b0a..00000000 --- a/src/app/core/components/selectors/language-selector/language-selector.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
- -
- -
-
diff --git a/src/app/core/components/selectors/language-selector/language-selector.component.ts b/src/app/core/components/selectors/language-selector/language-selector.component.ts deleted file mode 100644 index 5adfb671..00000000 --- a/src/app/core/components/selectors/language-selector/language-selector.component.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { Component, DoCheck, OnInit } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; - -import { Language } from '../../../enums/language.enum'; -import { StorageService } from '../../../services/storage.service'; - -@Component({ - selector: 'app-language-selector', - templateUrl: './language-selector.component.html', - styleUrls: ['./language-selector.component.scss'], -}) -export class LanguageSelectorComponent implements OnInit, DoCheck { - public currentLang: Language; - public languagesAvailable: string[] = Object.values(Language); - - constructor(private translate: TranslateService, private storageService: StorageService) {} - - ngOnInit(): void { - const currentBrowserLanguage: Language = this.translate.getBrowserLang().toUpperCase() as Language; - if (this.storageService.language && Object.keys(Language).includes(this.storageService.language)) { - this.currentLang = this.storageService.language; - } else if (Object.keys(Language).includes(currentBrowserLanguage)) { - this.currentLang = currentBrowserLanguage; - } else { - this.currentLang = Language.EN; - } - this.updateLanguage(); - } - - ngDoCheck(): void { - this.updateLanguage(); - } - - public updateLanguage(): void { - this.translate.use(this.currentLang.toString().toUpperCase()); - this.storageService.language = this.currentLang; - } -} diff --git a/src/app/core/components/selectors/theme-selector/theme-selector.component.html b/src/app/core/components/selectors/theme-selector/theme-selector.component.html deleted file mode 100644 index 9f87a43d..00000000 --- a/src/app/core/components/selectors/theme-selector/theme-selector.component.html +++ /dev/null @@ -1,24 +0,0 @@ -
- - - - -
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 6fdb511b..36dc5e32 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -7,26 +7,14 @@ import { TranslateModule } from '@ngx-translate/core'; import { FooterComponent } from './components/footer/footer.component'; import { HeaderComponent } from './components/header/header.component'; import { HomeComponent } from './components/home/home.component'; -import { LoginComponent } from './components/login/login.component'; import { LogoComponent } from './components/logo/logo.component'; -import { LanguageSelectorComponent } from './components/selectors/language-selector/language-selector.component'; -import { ThemeSelectorComponent } from './components/selectors/theme-selector/theme-selector.component'; import { NavigationComponent } from './components/sibebar/navigation/navigation.component'; import { throwIfAlreadyLoaded } from './guards/module-import.guard'; @NgModule({ - declarations: [ - FooterComponent, - HeaderComponent, - HomeComponent, - LanguageSelectorComponent, - LoginComponent, - LogoComponent, - NavigationComponent, - ThemeSelectorComponent, - ], + declarations: [FooterComponent, HeaderComponent, HomeComponent, LogoComponent, NavigationComponent], imports: [CommonModule, FormsModule, RouterModule, TranslateModule], - exports: [HeaderComponent, FooterComponent, NavigationComponent, LoginComponent, LogoComponent], + exports: [HeaderComponent, FooterComponent, NavigationComponent, LogoComponent], }) export class CoreModule { constructor(@Optional() @SkipSelf() parentModule: CoreModule) { diff --git a/src/app/core/enums/answer-granularity.enum.ts b/src/app/core/enums/answer-granularity.enum.ts deleted file mode 100644 index 9f8e5dab..00000000 --- a/src/app/core/enums/answer-granularity.enum.ts +++ /dev/null @@ -1,4 +0,0 @@ -export enum AnswerGranularity { - BASIC = 'BASIC', - COMPLEX = 'COMPLEX', -} diff --git a/src/app/core/enums/answer-type.enum.ts b/src/app/core/enums/response.enum.ts similarity index 64% rename from src/app/core/enums/answer-type.enum.ts rename to src/app/core/enums/response.enum.ts index 1b0a086f..2fc56844 100644 --- a/src/app/core/enums/answer-type.enum.ts +++ b/src/app/core/enums/response.enum.ts @@ -1,4 +1,4 @@ -export enum AnswerType { +export enum Response { YES = 'YES', NO = 'NO', MAYBE = 'MAYBE', diff --git a/src/app/core/enums/user-role.enum.ts b/src/app/core/enums/user-role.enum.ts index 70258b1d..27067ea1 100644 --- a/src/app/core/enums/user-role.enum.ts +++ b/src/app/core/enums/user-role.enum.ts @@ -1,5 +1,5 @@ export enum UserRole { ANONYMOUS = 'ANONYMOUS', - REGISTERED = 'ADMIN', + REGISTERED = 'REGISTERED', ADMIN = 'ADMIN', } diff --git a/src/app/core/enums/workflow-step.enum.ts b/src/app/core/enums/workflow-step.enum.ts index 8d511fcd..afa99827 100644 --- a/src/app/core/enums/workflow-step.enum.ts +++ b/src/app/core/enums/workflow-step.enum.ts @@ -1,5 +1,5 @@ export enum WorkflowStep { DESCRIPTION = 'DESCRIPTION', - OPTIONS = 'OPTIONS', + CHOICES = 'CHOICES', CONFIGURATION = 'CONFIGURATION', } diff --git a/src/app/core/interfaces/date-options.interface.ts b/src/app/core/interfaces/date-options.interface.ts deleted file mode 100644 index 928645ea..00000000 --- a/src/app/core/interfaces/date-options.interface.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface DateOption { - timeList: any; - literal: string; - date_object?: object; -} diff --git a/src/app/core/models/answer.model.ts b/src/app/core/models/answer.model.ts index 29af3b03..9a098456 100644 --- a/src/app/core/models/answer.model.ts +++ b/src/app/core/models/answer.model.ts @@ -1,6 +1,6 @@ -import { AnswerType } from '../enums/answer-type.enum'; -import { PollOption } from './poll-options.model'; +import { Response } from '../enums/response.enum'; +import { Choice } from './choice.model'; export class Answer { - constructor(public pollOption: PollOption, public type: AnswerType, public userPseudo: string) {} + constructor(public author: string, public choice: Choice, public response: Response) {} } diff --git a/src/app/core/models/choice.model.ts b/src/app/core/models/choice.model.ts new file mode 100644 index 00000000..fd528881 --- /dev/null +++ b/src/app/core/models/choice.model.ts @@ -0,0 +1,5 @@ +import { Response } from '../enums/response.enum'; + +export class Choice { + constructor(public label: string, public responses: Response[] = [Response.YES, Response.NO]) {} +} diff --git a/src/app/core/models/comment.model.ts b/src/app/core/models/comment.model.ts new file mode 100644 index 00000000..d60d6129 --- /dev/null +++ b/src/app/core/models/comment.model.ts @@ -0,0 +1,3 @@ +export class Comment { + constructor(public author: string, public content: string) {} +} diff --git a/src/app/core/models/configuration.model.ts b/src/app/core/models/configuration.model.ts new file mode 100644 index 00000000..5a278b39 --- /dev/null +++ b/src/app/core/models/configuration.model.ts @@ -0,0 +1,26 @@ +import { v4 as uuidv4 } from 'uuid'; + +import { environment } from '../../../environments/environment'; +import { DateUtilsService } from '../utils/date-utils.service'; + +export class Configuration { + constructor( + public isAboutDate: boolean = false, + public slug: string = uuidv4(), + public isProtectedByPassword: boolean = false, + public isMaybeAnswerAvailable: boolean = false, + public creationDate: Date = new Date(Date.now()), + public expirationDate: Date = DateUtilsService.addDaysToDate( + environment.poll.defaultConfig.expiracyInDays, + new Date(Date.now()) + ) + ) {} + + public getAdministrationUrl(): string { + return `${environment.api.baseHref}/administration/${environment.api.endpoints.polls}/${this.slug}`; + } + + public getParticipationUrl(): string { + return `${environment.api.baseHref}/participation/${environment.api.endpoints.polls}/${this.slug}`; + } +} diff --git a/src/app/core/models/poll-config.model.ts b/src/app/core/models/poll-config.model.ts deleted file mode 100644 index a2ef3111..00000000 --- a/src/app/core/models/poll-config.model.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { AnswerGranularity } from '../enums/answer-granularity.enum'; - -export class PollConfig { - constructor( - public allowSeveralHours = true, - public isVisibleToAnyoneWithTheLink: boolean = true, - public answerType: AnswerGranularity = AnswerGranularity.BASIC, - public creationDate: Date = new Date(), - public expirationDate?: Date, - public canVotersModifyTheirAnswers = true, - public isProtectedByPassword: boolean = false - ) {} -} diff --git a/src/app/core/models/poll-options.model.ts b/src/app/core/models/poll-options.model.ts deleted file mode 100644 index 7bcc5870..00000000 --- a/src/app/core/models/poll-options.model.ts +++ /dev/null @@ -1,9 +0,0 @@ -import * as moment from 'moment'; - -export class PollOption { - constructor(public label: string, public url?: string, public subOptions?: PollOption[]) {} - - public isDatePoll(): boolean { - return moment(this.label).isValid(); - } -} diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts index d4883137..d6480511 100644 --- a/src/app/core/models/poll.model.ts +++ b/src/app/core/models/poll.model.ts @@ -1,23 +1,17 @@ import { Answer } from './answer.model'; -import { PollConfig } from './poll-config.model'; -import { PollOption } from './poll-options.model'; +import { Choice } from './choice.model'; +import { Comment } from './comment.model'; +import { Configuration } from './configuration.model'; +import { Question } from './question.model'; import { User } from './user.model'; -import { environment } from 'src/environments/environment'; export class Poll { constructor( - public isDateType: boolean, - public title: string, - public description: string, - public slug: string, - public id: string, - public owner?: User, - public config?: PollConfig, - public options: PollOption[] = [], - public answers: Answer[] = [] + public owner: User, + public question: Question, + public choices: Choice[], + public configuration: Configuration = new Configuration(), + public answers: Answer[] = [], + public comments: Comment[] = [] ) {} - - public getUrl(): string { - return `${environment.api.baseHref}/${this.slug}`; - } } diff --git a/src/app/core/models/question.model.ts b/src/app/core/models/question.model.ts new file mode 100644 index 00000000..6ed1805a --- /dev/null +++ b/src/app/core/models/question.model.ts @@ -0,0 +1,3 @@ +export class Question { + constructor(public label: string, public description: string) {} +} diff --git a/src/app/core/models/user.model.ts b/src/app/core/models/user.model.ts index fe9b9605..d661f22e 100644 --- a/src/app/core/models/user.model.ts +++ b/src/app/core/models/user.model.ts @@ -1,12 +1,12 @@ -import { Poll } from './poll.model'; import { UserRole } from '../enums/user-role.enum'; +import { Poll } from './poll.model'; export class User { constructor( + public pseudo: string, + public email: string, public role: UserRole = UserRole.ANONYMOUS, public isOwner: boolean = false, - public pseudo?: string, - public email?: string, public polls?: Poll[] ) {} } diff --git a/src/app/core/services/api.service.ts b/src/app/core/services/api.service.ts index fa4a1c1c..e0d13c12 100644 --- a/src/app/core/services/api.service.ts +++ b/src/app/core/services/api.service.ts @@ -14,7 +14,7 @@ export class ApiService { private readonly commentsEndpoint = environment.api.endpoints.polls.comments.name; private readonly votesEndpoint = environment.api.endpoints.polls.votes.name; private readonly slugsEndpoint = environment.api.endpoints.polls.slugs.name; - private readonly votesStacksEndpoint = environment.api.endpoints.voteStack.name; + private readonly votesStacksEndpoint = environment.api.endpoints.polls.votesStacks.name; private readonly usersEndpoint = environment.api.endpoints.users.name; private readonly usersPollsEndpoint = environment.api.endpoints.users.polls.name; private readonly usersPollsSendEmailEndpoint = environment.api.endpoints.users.polls.sendEmail.name; @@ -28,7 +28,7 @@ export class ApiService { //////////// public async savePoll(poll: Poll): Promise { try { - await this.axiosInstance.post(`${this.pollsEndpoint}`, { params: { config: poll.config } }); + await this.axiosInstance.post(`${this.pollsEndpoint}`, poll); } catch (error) { this.handleError(error); } @@ -37,7 +37,7 @@ export class ApiService { public async saveVote(poll: Poll): Promise { try { // TODO: add the votestack in the params - await this.axiosInstance.post(`${this.pollsEndpoint}/${poll.id}${this.votesEndpoint}`, { + await this.axiosInstance.post(`${this.pollsEndpoint}/${poll.configuration.slug}${this.votesEndpoint}`, { params: { voteStack: {} }, }); } catch (error) { @@ -48,9 +48,10 @@ export class ApiService { public async saveComment(poll: Poll, comment: string): Promise { try { // TODO: add the comment in the params - await this.axiosInstance.post(`${this.pollsEndpoint}/${poll.id}${this.commentsEndpoint}`, { - params: { comment }, - }); + await this.axiosInstance.post( + `${this.pollsEndpoint}/${poll.configuration.slug}${this.commentsEndpoint}`, + comment + ); } catch (error) { this.handleError(error); } @@ -104,9 +105,17 @@ export class ApiService { public async getPollByIdentifier(identifier: string): Promise { // TODO: identifier should be decided according to backend : Id || Slug ? try { + // TODO: this interceptor should not be existing, backend should return the good object poll + const adapterInterceptor: number = this.axiosInstance.interceptors.response.use( + (response): AxiosResponse => { + response.data = response.data['poll']; + return response; + } + ); const response: AxiosResponse = await this.axiosInstance.get( `${this.pollsEndpoint}/${identifier}` ); + axios.interceptors.request.eject(adapterInterceptor); return response?.data; } catch (error) { if (error.response?.status === 404) { @@ -123,7 +132,7 @@ export class ApiService { public async updatePoll(poll: Poll): Promise { try { // TODO: implement the params when entities are finalized. - await this.axiosInstance.put(`${this.pollsEndpoint}/${poll.id}`, { + await this.axiosInstance.put(`${this.pollsEndpoint}/${poll.configuration.slug}`, { params: { voteStack: {}, token: '' }, }); } catch (error) { @@ -145,10 +154,9 @@ export class ApiService { //////////// // DELETE // //////////// - public async deletePoll(poll: Poll): Promise { try { - await this.axiosInstance.delete(`${this.pollsEndpoint}${poll.id}`, {}); + await this.axiosInstance.delete(`${this.pollsEndpoint}${poll.configuration.slug}`, {}); } catch (error) { this.handleError(error); } @@ -157,7 +165,7 @@ export class ApiService { public async deletePollVotes(poll: Poll): Promise { try { // TODO: update endpoint in Backend - await this.axiosInstance.delete(`${this.pollsEndpoint}${poll.id}${this.votesEndpoint}`); + await this.axiosInstance.delete(`${this.pollsEndpoint}${poll.configuration.slug}${this.votesEndpoint}`); } catch (error) { this.handleError(error); } @@ -166,7 +174,7 @@ export class ApiService { public async deletePollComments(poll: Poll): Promise { try { // TODO: modify endpoint in Backend - await this.axiosInstance.delete(`${this.pollsEndpoint}${poll.id}${this.commentsEndpoint}`); + await this.axiosInstance.delete(`${this.pollsEndpoint}${poll.configuration.slug}${this.commentsEndpoint}`); } catch (error) { this.handleError(error); } @@ -192,5 +200,6 @@ export class ApiService { console.log('Error', error.message); } console.log(error.config); + throw error; } } diff --git a/src/app/core/services/language.service.spec.ts b/src/app/core/services/language.service.spec.ts new file mode 100644 index 00000000..4b0106be --- /dev/null +++ b/src/app/core/services/language.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { LanguageService } from './language.service'; + +describe('LanguageService', () => { + let service: LanguageService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(LanguageService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/core/services/language.service.ts b/src/app/core/services/language.service.ts new file mode 100644 index 00000000..9440e9ca --- /dev/null +++ b/src/app/core/services/language.service.ts @@ -0,0 +1,66 @@ +import { Injectable } from '@angular/core'; +import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; + +import { Language } from '../enums/language.enum'; +import { StorageService } from './storage.service'; + +@Injectable({ + providedIn: 'root', +}) +export class LanguageService { + constructor(private translate: TranslateService, private storageService: StorageService) {} + + public getLangage(): Language { + return this.translate.currentLang as Language; + } + + public setLanguage(language: Language): void { + this.translate.use(language.toString().toUpperCase()); + } + + public getAvailableLanguages(): string[] { + return this.translate.getLangs(); + } + + public configureAndInitTranslations(): void { + // always save in storage the currentLang used + this.translate.onLangChange.subscribe((event: LangChangeEvent) => { + this.storageService.language = event.lang as Language; + }); + + // set all languages available + this.translate.addLangs(Object.keys(Language)); + + // set language + this.setLanguageOnInit(); + } + + private setLanguageOnInit(): void { + // set language from storage + if (!this.translate.currentLang) { + this.setLanguageFromStorage(); + } + + // or set language from browser + if (!this.translate.currentLang) { + this.setLanguageFromBrowser(); + } + + // set default language + if (!this.translate.currentLang) { + this.setLanguage(Language.EN); + } + } + + private setLanguageFromStorage(): void { + if (this.storageService.language && this.translate.getLangs().includes(this.storageService.language)) { + this.setLanguage(this.storageService.language); + } + } + private setLanguageFromBrowser(): void { + const currentBrowserLanguage: Language = this.translate.getBrowserLang().toUpperCase() as Language; + if (this.translate.getLangs().includes(currentBrowserLanguage)) { + this.setLanguage(currentBrowserLanguage); + } + } +} diff --git a/src/app/core/services/loader.service.spec.ts b/src/app/core/services/loader.service.spec.ts new file mode 100644 index 00000000..3f84c003 --- /dev/null +++ b/src/app/core/services/loader.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { LoaderService } from './loader.service'; + +describe('LoaderService', () => { + let service: LoaderService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(LoaderService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/core/services/loader.service.ts b/src/app/core/services/loader.service.ts new file mode 100644 index 00000000..563a5445 --- /dev/null +++ b/src/app/core/services/loader.service.ts @@ -0,0 +1,14 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject, Observable } from 'rxjs'; + +@Injectable({ + providedIn: 'root', +}) +export class LoaderService { + private _loadingStatus: BehaviorSubject = new BehaviorSubject(true); + public readonly isLoading: Observable = this._loadingStatus.asObservable(); + + public setStatus(status: boolean): void { + this._loadingStatus.next(status); + } +} diff --git a/src/app/core/services/mocking.service.ts b/src/app/core/services/mocking.service.ts index 43528262..f56a94dc 100644 --- a/src/app/core/services/mocking.service.ts +++ b/src/app/core/services/mocking.service.ts @@ -1,7 +1,9 @@ import { Injectable } from '@angular/core'; import { UserRole } from '../enums/user-role.enum'; +import { Choice } from '../models/choice.model'; import { Poll } from '../models/poll.model'; +import { Question } from '../models/question.model'; import { User } from '../models/user.model'; import { PollService } from './poll.service'; import { UserService } from './user.service'; @@ -10,28 +12,33 @@ import { UserService } from './user.service'; providedIn: 'root', }) export class MockingService { - public pollsDatabase: Poll[]; + private user: User; + public pollsDatabase: Poll[] = []; - private user: User = new User(UserRole.ANONYMOUS, false, 'toto', 'toto@gafam.com', []); - private poll1: Poll = new Poll(false, 'mon super sondage', 'super description 1', 'super_slug_1', 'id1'); - private poll2: Poll = new Poll(false, 'mon autre sondage', 'super description 2', 'super_slug_2', 'id2'); + private poll1: Poll = new Poll(this.user, new Question('Quand le picnic ?', 'Pour faire la teuf'), [ + new Choice('mardi prochain'), + new Choice('mercredi'), + ]); + private poll2: Poll = new Poll(this.user, new Question('On fait quoi à la soirée ?', 'Balancez vos idées'), [ + new Choice('jeux'), + new Choice('danser'), + new Choice('discuter en picolant'), + ]); constructor(private userService: UserService, private pollService: PollService) { this.pollsDatabase = [this.poll1, this.poll2]; - this.user.polls = this.pollsDatabase; } - public loadUser(role: UserRole): void { - this.user.role = role; + public loadUser(user: User): void { + this.user = user; + this.user.polls = this.pollsDatabase; console.info('MOCKING user', { user: this.user }); this.userService.updateUser(this.user); } public loadPoll(slug: string): void { - const poll: Poll | undefined = this.pollsDatabase.find((poll: Poll) => poll.slug === slug); - if (poll) { - console.info('MOCKING poll', { poll }); - this.pollService.updateCurrentPoll(poll); - } + this.poll1.configuration.slug = slug; + console.info('MOCKING poll', { poll: this.poll1 }); + this.pollService.updateCurrentPoll(this.poll1); } } diff --git a/src/app/core/services/modal.service.spec.ts b/src/app/core/services/modal.service.spec.ts new file mode 100644 index 00000000..0daa3a88 --- /dev/null +++ b/src/app/core/services/modal.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ModalService } from './modal.service'; + +describe('ModalService', () => { + let service: ModalService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ModalService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/core/services/modal.service.ts b/src/app/core/services/modal.service.ts new file mode 100644 index 00000000..a603ba4f --- /dev/null +++ b/src/app/core/services/modal.service.ts @@ -0,0 +1,15 @@ +import { Injectable } from '@angular/core'; +import { DialogService } from 'primeng'; + +import { SettingsComponent } from '../../shared/components/settings/settings.component'; + +@Injectable({ + providedIn: 'root', +}) +export class ModalService { + constructor(public dialogService: DialogService) {} + + public openSettingsComponent(): void { + this.dialogService.open(SettingsComponent, { header: 'Paramètres', dismissableMask: true }); + } +} diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts index 31daf2d4..1f30e66a 100644 --- a/src/app/core/services/poll.service.ts +++ b/src/app/core/services/poll.service.ts @@ -37,7 +37,10 @@ export class PollService { // GET public async getPollByIdentifier(slug: string): Promise { - this.updateCurrentPoll(await this.apiService.getPollByIdentifier(slug)); + const poll: Poll | undefined = await this.apiService.getPollByIdentifier(slug); + if (poll) { + this.updateCurrentPoll(poll); + } } // DELETE diff --git a/src/app/core/services/storage.service.ts b/src/app/core/services/storage.service.ts index 80e40596..dc6a1744 100644 --- a/src/app/core/services/storage.service.ts +++ b/src/app/core/services/storage.service.ts @@ -16,4 +16,7 @@ export class StorageService { @LocalStorage() public userPollsIds: string[]; + + @LocalStorage() + public pseudo: string; } diff --git a/src/app/core/services/url.service.spec.ts b/src/app/core/services/url.service.spec.ts new file mode 100644 index 00000000..365a12ea --- /dev/null +++ b/src/app/core/services/url.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { UrlService } from './url.service'; + +describe('UrlService', () => { + let service: UrlService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(UrlService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/core/services/url.service.ts b/src/app/core/services/url.service.ts new file mode 100644 index 00000000..e5082722 --- /dev/null +++ b/src/app/core/services/url.service.ts @@ -0,0 +1,23 @@ +import { Injectable } from '@angular/core'; +import { ActivatedRoute, UrlSegment } from '@angular/router'; + +import { LoaderService } from './loader.service'; +import { PollService } from './poll.service'; + +@Injectable({ + providedIn: 'root', +}) +export class UrlService { + constructor( + private route: ActivatedRoute, + private pollService: PollService, + private loaderService: LoaderService + ) {} + + public async loadPollFromUrl(): Promise { + this.loaderService.setStatus(true); + const wantedSlug: string = this.route.snapshot.firstChild.firstChild.url[1].path; + await this.pollService.getPollByIdentifier(wantedSlug); + this.loaderService.setStatus(false); + } +} diff --git a/src/app/core/services/user.service.ts b/src/app/core/services/user.service.ts index 826cfcc9..148f91b8 100644 --- a/src/app/core/services/user.service.ts +++ b/src/app/core/services/user.service.ts @@ -1,6 +1,8 @@ import { Injectable } from '@angular/core'; +import { DialogService } from 'primeng'; import { BehaviorSubject, Observable } from 'rxjs'; +import { UserRole } from '../enums/user-role.enum'; import { User } from '../models/user.model'; import { ApiService } from './api.service'; @@ -8,16 +10,21 @@ import { ApiService } from './api.service'; providedIn: 'root', }) export class UserService { - public anonymous: User = new User(); + public anonymous: User = new User('', '', UserRole.ANONYMOUS, false); + private _user: BehaviorSubject = new BehaviorSubject(this.anonymous); public readonly user: Observable = this._user.asObservable(); - constructor(private apiService: ApiService) {} + constructor(private apiService: ApiService, public dialogService: DialogService) {} public updateUser(user: User): void { this._user.next(user); } + public isCurrentUserIdentifiable(): boolean { + return this._user.getValue().pseudo ? true : false; + } + // GET public async getUserPolls(): Promise { const currentUser: User = this._user.getValue(); diff --git a/src/app/core/services/workflow.service.ts b/src/app/core/services/workflow.service.ts index 8340f5e7..7334d357 100644 --- a/src/app/core/services/workflow.service.ts +++ b/src/app/core/services/workflow.service.ts @@ -7,7 +7,7 @@ import { WorkflowStep } from '../enums/workflow-step.enum'; providedIn: 'root', }) export class WorkflowService { - private steps = [WorkflowStep.DESCRIPTION, WorkflowStep.OPTIONS, WorkflowStep.CONFIGURATION]; + private steps = [WorkflowStep.DESCRIPTION, WorkflowStep.CHOICES, WorkflowStep.CONFIGURATION]; private _currentStep: BehaviorSubject = new BehaviorSubject(WorkflowStep[0]); public readonly currentStep: Observable = this._currentStep.asObservable(); diff --git a/src/app/core/utils/date-utils.service.ts b/src/app/core/utils/date-utils.service.ts index da108521..9590f40b 100644 --- a/src/app/core/utils/date-utils.service.ts +++ b/src/app/core/utils/date-utils.service.ts @@ -16,35 +16,4 @@ export class DateUtilsService { public static formatDate(date): string { return moment(date).format('yyyy-MM-dd'); } - - public static orderDates(): Date[] { - // TODO: to implement - const datesOrdered: Date[] = []; - return datesOrdered; - } - - public static getDatesInRange(d1: Date, d2: Date, interval: number): Date[] { - // TODO: refacto this - d1 = new Date(d1); - d2 = new Date(d2); - const dates = []; - while (+d1 < +d2) { - dates.push({ - literal: this.formateDate(d1), - date_object: d1, - }); - d1.setDate(d1.getDate() + interval); - } - return [...dates]; - } - - public static getDoubleDigits(str: string): string { - // TODO: ça sert à quoi ça ? - // Parce que ajouter 2 caractère à une string et ensuite slicer à partir du 2ème caractère, euh… - return ('00' + str).slice(-2); - } - - private isInChronologicalOrder(date1: Date, date2: Date): boolean { - return date1 < date2; - } } diff --git a/src/app/features/administration/edit-description/edit-description.component.ts b/src/app/features/administration/edit-description/edit-description.component.ts index 556bb421..51d032f1 100644 --- a/src/app/features/administration/edit-description/edit-description.component.ts +++ b/src/app/features/administration/edit-description/edit-description.component.ts @@ -18,10 +18,10 @@ export class EditDescriptionComponent implements OnInit { ngOnInit(): void { this.pollForm = this.fb.group({ - type: [this.poll ? this.poll.isDateType : false, [Validators.required]], - title: [this.poll ? this.poll.title : '', [Validators.required]], - description: [this.poll ? this.poll.description : ''], - slug: [this.poll ? this.poll.slug : this.generateRandomSlug(), [Validators.required]], + type: [this.poll ? this.poll.configuration.isAboutDate : false, [Validators.required]], + title: [this.poll ? this.poll.question.label : '', [Validators.required]], + description: [this.poll ? this.poll.question.description : ''], + slug: [this.poll ? this.poll.configuration.slug : this.generateRandomSlug(), [Validators.required]], address: this.fb.group({ street: [''], city: [''], diff --git a/src/app/features/administration/poll-edit/poll-edit.component.ts b/src/app/features/administration/poll-edit/poll-edit.component.ts index 2201eea7..2da8f124 100644 --- a/src/app/features/administration/poll-edit/poll-edit.component.ts +++ b/src/app/features/administration/poll-edit/poll-edit.component.ts @@ -18,10 +18,10 @@ export class PollEditComponent implements OnInit { ngOnInit(): void { this.pollForm = this.fb.group({ - type: [this.poll ? this.poll.isDateType : false, [Validators.required]], - title: [this.poll ? this.poll.title : '', [Validators.required]], - description: [this.poll ? this.poll.description : ''], - slug: [this.poll ? this.poll.slug : this.generateRandomSlug(), [Validators.required]], + type: [this.poll ? this.poll.configuration.isAboutDate : false, [Validators.required]], + title: [this.poll ? this.poll.question.label : '', [Validators.required]], + description: [this.poll ? this.poll.question.description : ''], + slug: [this.poll ? this.poll.configuration.slug : this.generateRandomSlug(), [Validators.required]], address: this.fb.group({ street: [''], city: [''], diff --git a/src/app/features/administration/profile/profile.component.html b/src/app/features/administration/profile/profile.component.html index 9eea3a93..edb3ee28 100644 --- a/src/app/features/administration/profile/profile.component.html +++ b/src/app/features/administration/profile/profile.component.html @@ -11,10 +11,10 @@ - {{ poll.title }} + {{ poll.question.label }} - - {{ poll.getUrl() }} + + {{ poll.configuration.getAdministrationUrl() }} @@ -26,7 +26,7 @@
- + J’ai un compte, je me connecte
diff --git a/src/app/features/administration/profile/profile.component.ts b/src/app/features/administration/profile/profile.component.ts index 79ddd1c4..1995f6f6 100644 --- a/src/app/features/administration/profile/profile.component.ts +++ b/src/app/features/administration/profile/profile.component.ts @@ -10,14 +10,13 @@ import { UserService } from '../../../core/services/user.service'; styleUrls: ['./profile.component.scss'], }) export class ProfileComponent implements OnInit { - public _user: Observable; + public _user: Observable = this.userService.user; public isModalOpened = false; constructor(private userService: UserService) {} - ngOnInit(): void { - this._user = this.userService.user; - } + ngOnInit(): void {} + public toggleModal(): void { this.isModalOpened = !this.isModalOpened; } diff --git a/src/app/features/administration/stepper/stepper.component.ts b/src/app/features/administration/stepper/stepper.component.ts index fd7b10b2..8896b451 100644 --- a/src/app/features/administration/stepper/stepper.component.ts +++ b/src/app/features/administration/stepper/stepper.component.ts @@ -22,7 +22,7 @@ export class StepperComponent implements OnInit { }; public itemOptions: MenuItem = { id: '2', - label: WorkflowStep.OPTIONS, + label: WorkflowStep.CHOICES, title: 'Je renseigne les différentes options sur lesquelles les gens vont donner leur avis', routerLink: './options', command: () => {}, diff --git a/src/app/features/old-stuff/old-stuff-routing.module.ts b/src/app/features/old-stuff/old-stuff-routing.module.ts index eec3232e..8a84fe53 100644 --- a/src/app/features/old-stuff/old-stuff-routing.module.ts +++ b/src/app/features/old-stuff/old-stuff-routing.module.ts @@ -32,8 +32,8 @@ const routes: Routes = [ { path: 'step/resume', component: ResumeComponent }, { path: 'step/end', component: EndConfirmationComponent }, { path: 'graphic/:poll', component: PollGraphicComponent }, - { path: 'vote/poll/id/:poll', component: PollDisplayComponent }, - { path: 'vote/poll/slug/:pollSlug', component: PollDisplayComponent }, + { path: 'vote/poll/id/:id', component: PollDisplayComponent }, + { path: 'vote/poll/slug/:slug', component: PollDisplayComponent }, { path: 'votingchoice', component: VotingChoiceComponent }, { path: 'voting', component: VotingComponent }, ]; diff --git a/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html b/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html index aa57eb70..6246c09a 100644 --- a/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html +++ b/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html @@ -51,9 +51,9 @@
  • - {{ poll.title }} + {{ poll.question.label }} - {{ poll.description }} + {{ poll.question.description }}
    • diff --git a/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html b/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html index a0ad3065..28a2c434 100644 --- a/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html +++ b/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html @@ -3,7 +3,7 @@
    • - {{ config.currentPoll.poll.title }} + {{ config.currentPoll.poll.question.label }}
    • diff --git a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.html b/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.html index 09fc7c6b..6590e988 100644 --- a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.html +++ b/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.html @@ -1,8 +1,8 @@

      Résumé

      -

      {{ config.currentPoll.poll.title }}

      -

      {{ config.currentPoll.poll.description }}

      +

      {{ config.currentPoll.poll.question.label }}

      +

      {{ config.currentPoll.poll.question.description }}

      Créé le {{ config.currentPoll.poll.creationDate.date }} Expire le {{ config.currentPoll.poll.expiracyDate.date }}
      diff --git a/src/app/features/participation/participation-routing.module.ts b/src/app/features/participation/participation-routing.module.ts index 775f4883..051173d2 100644 --- a/src/app/features/participation/participation-routing.module.ts +++ b/src/app/features/participation/participation-routing.module.ts @@ -2,14 +2,12 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ParticipationComponent } from './participation.component'; -import { PollComponent } from './poll/poll.component'; const routes: Routes = [ - { - path: '', - component: ParticipationComponent, - children: [{ path: 'poll/:slug', component: PollComponent }], - }, + { path: '', redirectTo: 'poll', pathMatch: 'full' }, + { path: 'poll', component: ParticipationComponent }, + { path: ':slug', redirectTo: 'poll/:slug', pathMatch: 'full' }, + { path: 'poll/:slug', component: ParticipationComponent }, ]; @NgModule({ diff --git a/src/app/features/participation/participation.component.html b/src/app/features/participation/participation.component.html index d3953eaa..798f12d7 100644 --- a/src/app/features/participation/participation.component.html +++ b/src/app/features/participation/participation.component.html @@ -1,7 +1,30 @@ -

      Participation

      +
      +
      +

      Participation

      +
      +
      - - Participer au sondage « Gros slug » - +
      +
      + +
      +
      - + + + + + + +
      +
      + +
      +
      +
      +
      + +
      +
      +       +       diff --git a/src/app/features/participation/participation.component.ts b/src/app/features/participation/participation.component.ts index 5deed108..9d43341f 100644 --- a/src/app/features/participation/participation.component.ts +++ b/src/app/features/participation/participation.component.ts @@ -1,4 +1,12 @@ import { Component, OnInit } from '@angular/core'; +import { Observable } from 'rxjs'; + +import { Poll } from '../../core/models/poll.model'; +import { LoaderService } from '../../core/services/loader.service'; +import { ModalService } from '../../core/services/modal.service'; +import { PollService } from '../../core/services/poll.service'; +import { UrlService } from '../../core/services/url.service'; +import { UserService } from '../../core/services/user.service'; @Component({ selector: 'app-participation', @@ -6,7 +14,21 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./participation.component.scss'], }) export class ParticipationComponent implements OnInit { - constructor() {} + public _isLoading: Observable = this.loaderService.isLoading; + public _poll: Observable = this.pollService.poll; - ngOnInit(): void {} + constructor( + private urlService: UrlService, + private loaderService: LoaderService, + private pollService: PollService, + private userService: UserService, + private modalService: ModalService + ) {} + + ngOnInit(): void { + if (!this.userService.isCurrentUserIdentifiable()) { + this.modalService.openSettingsComponent(); + } + this.urlService.loadPollFromUrl(); + } } diff --git a/src/app/features/participation/participation.module.ts b/src/app/features/participation/participation.module.ts index 457931c2..fc74538b 100644 --- a/src/app/features/participation/participation.module.ts +++ b/src/app/features/participation/participation.module.ts @@ -6,9 +6,10 @@ import { SharedModule } from '../../shared/shared.module'; import { ParticipationRoutingModule } from './participation-routing.module'; import { ParticipationComponent } from './participation.component'; import { PollComponent } from './poll/poll.component'; +import { PollCommentComponent } from './poll-comment/poll-comment.component'; @NgModule({ - declarations: [ParticipationComponent, PollComponent], + declarations: [ParticipationComponent, PollComponent, PollCommentComponent], imports: [CommonModule, ParticipationRoutingModule, SharedModule, TranslateModule.forChild({ extend: true })], exports: [], }) diff --git a/src/app/features/participation/poll-comment/poll-comment.component.html b/src/app/features/participation/poll-comment/poll-comment.component.html new file mode 100644 index 00000000..31b1d5a2 --- /dev/null +++ b/src/app/features/participation/poll-comment/poll-comment.component.html @@ -0,0 +1 @@ +

      poll-comment works!

      diff --git a/src/app/core/components/login/login.component.scss b/src/app/features/participation/poll-comment/poll-comment.component.scss similarity index 100% rename from src/app/core/components/login/login.component.scss rename to src/app/features/participation/poll-comment/poll-comment.component.scss diff --git a/src/app/features/participation/poll-comment/poll-comment.component.spec.ts b/src/app/features/participation/poll-comment/poll-comment.component.spec.ts new file mode 100644 index 00000000..debbe716 --- /dev/null +++ b/src/app/features/participation/poll-comment/poll-comment.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PollCommentComponent } from './poll-comment.component'; + +describe('PollCommentComponent', () => { + let component: PollCommentComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [PollCommentComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PollCommentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/features/participation/poll-comment/poll-comment.component.ts b/src/app/features/participation/poll-comment/poll-comment.component.ts new file mode 100644 index 00000000..f2282abd --- /dev/null +++ b/src/app/features/participation/poll-comment/poll-comment.component.ts @@ -0,0 +1,12 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-poll-comment', + templateUrl: './poll-comment.component.html', + styleUrls: ['./poll-comment.component.scss'], +}) +export class PollCommentComponent implements OnInit { + constructor() {} + + ngOnInit(): void {} +} diff --git a/src/app/features/participation/poll/poll.component.html b/src/app/features/participation/poll/poll.component.html index fef3e73d..42da2955 100644 --- a/src/app/features/participation/poll/poll.component.html +++ b/src/app/features/participation/poll/poll.component.html @@ -1,12 +1,6 @@ - - - - - -

      Sondage : {{ poll.title | async }}

      -       - - - - + +

      Titre:{{ poll.question.label }}

      +

      description: {{ poll.question.description }}

      +

      isDateType:{{ poll.configuration.isAboutDate }}

      +

      slug:{{ poll.configuration.slug }}

       diff --git a/src/app/features/participation/poll/poll.component.ts b/src/app/features/participation/poll/poll.component.ts index 4b578a57..a4d44282 100644 --- a/src/app/features/participation/poll/poll.component.ts +++ b/src/app/features/participation/poll/poll.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; import { Observable } from 'rxjs'; import { Poll } from '../../../core/models/poll.model'; @@ -11,24 +10,9 @@ import { PollService } from '../../../core/services/poll.service'; styleUrls: ['./poll.component.scss'], }) export class PollComponent implements OnInit { - public isLoading = false; - public wantedSlug: string; - public poll: Observable; - public slugFromUrl: string; - private readonly urlMatcher: RegExp = new RegExp(/participation\/poll\/(\w+)/); + public _poll: Observable = this.pollService.poll; - constructor(private router: Router, private pollService: PollService) {} + constructor(private pollService: PollService) {} - ngOnInit(): void { - this.wantedSlug = this.urlMatcher.exec(this.router.url)[1]; - this.poll = this.pollService.poll; - - this.loadPollFromUrl(); - } - - private async loadPollFromUrl(): Promise { - this.isLoading = true; - await this.pollService.getPollByIdentifier(this.wantedSlug); - this.isLoading = false; - } + ngOnInit(): void {} } 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 new file mode 100644 index 00000000..9a93c56b --- /dev/null +++ b/src/app/shared/components/selectors/language-selector/language-selector.component.html @@ -0,0 +1,14 @@ +
      +
      +

      Langue

      +
      +
      +
      + +
      +
      +
      diff --git a/src/app/core/components/selectors/language-selector/language-selector.component.scss b/src/app/shared/components/selectors/language-selector/language-selector.component.scss similarity index 100% rename from src/app/core/components/selectors/language-selector/language-selector.component.scss rename to src/app/shared/components/selectors/language-selector/language-selector.component.scss diff --git a/src/app/core/components/selectors/language-selector/language-selector.component.spec.ts b/src/app/shared/components/selectors/language-selector/language-selector.component.spec.ts similarity index 100% rename from src/app/core/components/selectors/language-selector/language-selector.component.spec.ts rename to src/app/shared/components/selectors/language-selector/language-selector.component.spec.ts diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.ts b/src/app/shared/components/selectors/language-selector/language-selector.component.ts new file mode 100644 index 00000000..438e2c3d --- /dev/null +++ b/src/app/shared/components/selectors/language-selector/language-selector.component.ts @@ -0,0 +1,27 @@ +import { Component, DoCheck, OnInit } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; + +import { Language } from '../../../../core/enums/language.enum'; +import { StorageService } from '../../../../core/services/storage.service'; +import { LanguageService } from '../../../../core/services/language.service'; + +@Component({ + selector: 'app-language-selector', + templateUrl: './language-selector.component.html', + styleUrls: ['./language-selector.component.scss'], +}) +export class LanguageSelectorComponent implements OnInit, DoCheck { + public currentLang: Language; + public availableLanguages: string[] = []; + + constructor(private languageService: LanguageService) {} + + ngOnInit(): void { + this.availableLanguages = this.languageService.getAvailableLanguages(); + this.currentLang = this.languageService.getLangage(); + } + + ngDoCheck(): void { + this.languageService.setLanguage(this.currentLang); + } +} diff --git a/src/app/shared/components/selectors/theme-selector/theme-selector.component.html b/src/app/shared/components/selectors/theme-selector/theme-selector.component.html new file mode 100644 index 00000000..8b31e1db --- /dev/null +++ b/src/app/shared/components/selectors/theme-selector/theme-selector.component.html @@ -0,0 +1,30 @@ +
      +
      +

      Theme

      +
      +
      +
      + + + +
      +
      +
      diff --git a/src/app/core/components/selectors/theme-selector/theme-selector.component.scss b/src/app/shared/components/selectors/theme-selector/theme-selector.component.scss similarity index 100% rename from src/app/core/components/selectors/theme-selector/theme-selector.component.scss rename to src/app/shared/components/selectors/theme-selector/theme-selector.component.scss diff --git a/src/app/core/components/selectors/theme-selector/theme-selector.component.spec.ts b/src/app/shared/components/selectors/theme-selector/theme-selector.component.spec.ts similarity index 100% rename from src/app/core/components/selectors/theme-selector/theme-selector.component.spec.ts rename to src/app/shared/components/selectors/theme-selector/theme-selector.component.spec.ts diff --git a/src/app/core/components/selectors/theme-selector/theme-selector.component.ts b/src/app/shared/components/selectors/theme-selector/theme-selector.component.ts similarity index 67% rename from src/app/core/components/selectors/theme-selector/theme-selector.component.ts rename to src/app/shared/components/selectors/theme-selector/theme-selector.component.ts index 96cc6f0a..0b364254 100644 --- a/src/app/core/components/selectors/theme-selector/theme-selector.component.ts +++ b/src/app/shared/components/selectors/theme-selector/theme-selector.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; -import { Theme } from '../../../enums/theme.enum'; -import { ThemeService } from '../../../services/theme.service'; +import { Theme } from '../../../../core/enums/theme.enum'; +import { ThemeService } from '../../../../core/services/theme.service'; @Component({ selector: 'app-theme-selector', @@ -11,13 +11,11 @@ import { ThemeService } from '../../../services/theme.service'; }) export class ThemeSelectorComponent implements OnInit { public themeEnum = Theme; - public currentTheme: Observable; + public currentTheme: Observable = this.themeService.theme; constructor(private themeService: ThemeService) {} - ngOnInit(): void { - this.currentTheme = this.themeService.theme; - } + ngOnInit(): void {} public selectTheme(theme: string): void { this.themeService.selectTheme(theme as Theme); diff --git a/src/app/shared/components/settings/settings.component.html b/src/app/shared/components/settings/settings.component.html new file mode 100644 index 00000000..7d80afab --- /dev/null +++ b/src/app/shared/components/settings/settings.component.html @@ -0,0 +1,33 @@ + + + +
      +
      +

      Pseudo, nom ou prénom :

      +
      +
      + +
      +
      +
      +
      +

      Email :

      +
      +
      + +
      +
      + +
      + +
      + +
      +       diff --git a/src/app/shared/components/settings/settings.component.scss b/src/app/shared/components/settings/settings.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/core/components/login/login.component.spec.ts b/src/app/shared/components/settings/settings.component.spec.ts similarity index 54% rename from src/app/core/components/login/login.component.spec.ts rename to src/app/shared/components/settings/settings.component.spec.ts index 486bf2bc..8ca573c4 100644 --- a/src/app/core/components/login/login.component.spec.ts +++ b/src/app/shared/components/settings/settings.component.spec.ts @@ -1,19 +1,19 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LoginComponent } from './login.component'; +import { SettingsComponent } from './settings.component'; -describe('LoginComponent', () => { - let component: LoginComponent; - let fixture: ComponentFixture; +describe('SettingsComponent', () => { + let component: SettingsComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [LoginComponent], + declarations: [SettingsComponent], }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(LoginComponent); + fixture = TestBed.createComponent(SettingsComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/shared/components/settings/settings.component.ts b/src/app/shared/components/settings/settings.component.ts new file mode 100644 index 00000000..b2d05c88 --- /dev/null +++ b/src/app/shared/components/settings/settings.component.ts @@ -0,0 +1,41 @@ +import { Component, OnInit } from '@angular/core'; +import { DynamicDialogConfig, DynamicDialogRef } from 'primeng'; +import { Subscription } from 'rxjs'; + +import { User } from '../../../core/models/user.model'; +import { UserService } from '../../../core/services/user.service'; + +@Component({ + selector: 'app-settings', + templateUrl: './settings.component.html', + styleUrls: ['./settings.component.scss'], +}) +export class SettingsComponent implements OnInit { + public user: User; + private userSubscription: Subscription; + + constructor(public ref: DynamicDialogRef, public config: DynamicDialogConfig, private userService: UserService) {} + + ngOnInit(): void { + this.userSubscription = this.userService.user.subscribe((user: User) => { + this.user = user; + }); + } + + ngOnDestroy(): void { + if (this.userSubscription) { + this.userSubscription.unsubscribe(); + } + } + + public saveChanges(): void { + if (this.user?.pseudo?.length > 0) { + this.userService.updateUser(this.user); + } + this.closeDialog(); + } + + public closeDialog(): void { + this.ref.close(); + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 266abaf1..c1ca496e 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,55 +1,67 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; import { ChartsModule } from 'ng2-charts'; import { + ButtonModule, ConfirmDialogModule, DialogModule, + DialogService, + DynamicDialogModule, + FieldsetModule, + FocusTrapModule, InputSwitchModule, InputTextareaModule, MessageModule, + PanelModule, ProgressSpinnerModule, SidebarModule, StepsModule, ToastModule, + TooltipModule, } from 'primeng'; import { ConfirmationService, MessageService } from 'primeng/api'; +import { FeedbackComponent } from './components/feedback/feedback.component'; import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component'; import { PollPageComponent } from './components/poll-page/poll-page.component'; -import { FeedbackComponent } from './components/feedback/feedback.component'; +import { LanguageSelectorComponent } from './components/selectors/language-selector/language-selector.component'; +import { ThemeSelectorComponent } from './components/selectors/theme-selector/theme-selector.component'; +import { SettingsComponent } from './components/settings/settings.component'; + +const MODULE_LIST = [CommonModule, ChartsModule, FormsModule, TranslateModule]; +const PRIMENG_MODULE_LIST = [ + ButtonModule, + ConfirmDialogModule, + DialogModule, + DynamicDialogModule, + FieldsetModule, + FocusTrapModule, + InputSwitchModule, + InputTextareaModule, + MessageModule, + PanelModule, + ProgressSpinnerModule, + SidebarModule, + StepsModule, + ToastModule, + TooltipModule, +]; +const COMPONENT_LIST = [ + ThemeSelectorComponent, + LanguageSelectorComponent, + PageNotFoundComponent, + PollPageComponent, + SettingsComponent, + FeedbackComponent, +]; @NgModule({ - declarations: [PageNotFoundComponent, PollPageComponent, FeedbackComponent], - imports: [ - CommonModule, - ChartsModule, - ConfirmDialogModule, - DialogModule, - InputSwitchModule, - InputTextareaModule, - MessageModule, - ProgressSpinnerModule, - SidebarModule, - StepsModule, - ToastModule, - ], - exports: [ - TranslateModule, - ChartsModule, - ConfirmDialogModule, - DialogModule, - FeedbackComponent, - InputSwitchModule, - InputTextareaModule, - MessageModule, - ProgressSpinnerModule, - SidebarModule, - StepsModule, - ToastModule, - PageNotFoundComponent, - PollPageComponent, - ], - providers: [ConfirmationService, MessageService], + declarations: COMPONENT_LIST, + imports: [...MODULE_LIST, ...PRIMENG_MODULE_LIST], + exports: [...MODULE_LIST, ...PRIMENG_MODULE_LIST, ...COMPONENT_LIST], + providers: [ConfirmationService, MessageService, DialogService], + entryComponents: [SettingsComponent], }) export class SharedModule {} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 3be3174a..6515a3c7 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,5 +1,5 @@ const backendApiUrlsInDev = { - local: 'http://localhost:8000/api', + local: 'http://localhost:8000', remote: 'https://framadate-api.cipherbliss.com/api/v1', }; @@ -9,31 +9,37 @@ export const environment = { api: { baseHref: backendApiUrlsInDev.remote, endpoints: { - poll: { - name: '/poll', - vote: { - name: '/vote', + polls: { + name: '/polls', + votes: { + name: '/votes', }, - comment: { - name: '/comment', + comments: { + name: '/comments', }, - slug: { - name: '/slug', + slugs: { + name: '/slugs', }, }, - user: { - name: '/user', + voteStack: { + name: '/votes-stacks', + }, + users: { + name: '/users', polls: { name: '/polls', sendEmail: { - name: '/polls/send-email', + name: '/send-email', }, }, }, admin: { name: '/admin', - cleanPolls: { - name: '/admin/clean-polls', + polls: { + name: '/polls', + clean: { + name: '/clean', + }, }, }, }, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 94f59643..03c8b4b6 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -3,7 +3,7 @@ // The list of file replacements can be found in `angular.json`. const backendApiUrlsInDev = { - local: 'http://localhost:8000', + local: 'http://localhost:8000/api/v1', remote: 'https://framadate-api.cipherbliss.com/api/v1', }; @@ -11,13 +11,16 @@ export const environment = { production: false, appTitle: 'FramaSondage', api: { - baseHref: backendApiUrlsInDev.remote, + baseHref: backendApiUrlsInDev.local, endpoints: { polls: { name: '/polls', votes: { name: '/votes', }, + votesStacks: { + name: '/votes-stacks', + }, comments: { name: '/comments', }, @@ -25,9 +28,6 @@ export const environment = { name: '/slugs', }, }, - voteStack: { - name: '/votes-stacks', - }, users: { name: '/users', polls: { @@ -37,15 +37,6 @@ export const environment = { }, }, }, - admin: { - name: '/admin', - polls: { - name: '/polls', - clean: { - name: '/clean', - }, - }, - }, }, }, poll: { diff --git a/yarn.lock b/yarn.lock index f19265ac..14d08471 100644 --- a/yarn.lock +++ b/yarn.lock @@ -128,14 +128,14 @@ rxjs "6.5.4" "@angular/animations@^9.1.1": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-9.1.4.tgz#22f64a062103d4903f2c7d862889a88fc6553bc7" - integrity sha512-gMo/DbCm5BDArladMAeC7/75T2DvhLr4CSUGJt/P/aimTEG2ywoAALs3pzwSSe4qxrHiR0OIksVW3l4km3iXEw== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-9.1.6.tgz#aaa1c7c396ecb5fdfa2e095a12fee49412308258" + integrity sha512-7Pp7aqNNcH4fu1BnOVpvqJJHjE7RZ5K1oD396OWCh35pgpLowLSpFjhbVhzGrcAuxHyKnnHSX3etLn2hDaHxmQ== "@angular/cdk@^9.2.2": - version "9.2.2" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-9.2.2.tgz#776be85aa55146f00dcd4909b81c67da47286c75" - integrity sha512-VNd+KuMN6cBcy4/8OyMxqYaxdjPP6IyCqIVijB2JREkc5Sg4VWmPgx2L3rHt/DzjsVBVRgx35uqOMymDezG3jQ== + version "9.2.3" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-9.2.3.tgz#e0f7d4eaeca429346e15bd258966fbb5a5f4ed0b" + integrity sha512-tQr/yt8GNGsZ/DTT+PMq7XdRmL56hwVCyf8F12JQAawutSLfTfMb+S1lpN7L/0Pb/L5JBuCfG2HmXK7vHo02gw== optionalDependencies: parse5 "^5.0.0" @@ -166,14 +166,14 @@ uuid "7.0.2" "@angular/common@^9.0.7": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-9.1.4.tgz#23d7b42cd87aba634b78b8d73e12c6ebffe86043" - integrity sha512-JvCoCWVbx0tF7l/0WTi24ui/mc2SElyVSNchR4VK/FViARnkvnSBdI/Ef5QWXrsPyKU4PYBtnWWgyxRspH+FBA== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-9.1.6.tgz#6428051e8fb18fddf1f800fc6a5e1d7d8f92067b" + integrity sha512-L9vw//wE+8QcSArOA411uJ68znnszCiPrbzSBV0BRZeadc7X68MwANA9qjtiTWZx5Xh9pNfHHwsCUyv2lUeinQ== "@angular/compiler-cli@^9.1.1": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-9.1.4.tgz#24c7c7060bb13f65337fb2998322d56021e185c1" - integrity sha512-n3PzqNnPD7s/AF9mv5CnarK0sgfoq4txFncHjJWBSltuTQoz6BDZyjuEdqsSLUvgAZPeLsmohemOzEE38HYHZA== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-9.1.6.tgz#d80f21bd8b6e4db1e1c0a029db223e5e1fcede65" + integrity sha512-1b7m9tvSQJE4y95wNCdi34MORcsmXPC1vaylYlzChVM2et9Y2eKHYcRs+4g329j66irLBGpS/7cgTT2pgJ+IbA== dependencies: canonical-path "1.0.0" chokidar "^3.0.0" @@ -189,48 +189,48 @@ yargs "15.3.0" "@angular/compiler@^9.0.7": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.1.4.tgz#fe833fc3b74768bdd56b1bdd0010870f38ffaedc" - integrity sha512-B+f3lviFNEJtL9V9exSKYPSz2Ddb6dxgPzQR7GSjGikDo+fKMtC1PjNwgJooS9gavhQx30uwkEEMIPYQbM6nNA== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.1.6.tgz#be4bc14e000c4b9e4c1ebf85f15f8de0b2603dc5" + integrity sha512-tHOQEjWuWqSkrk6/vI6BK7uJnpAyFajCXPW37rH5xspF/aMbetrpoOiGBNUQg/HLaFh04nOAnnFntjLkW0ooaA== "@angular/core@^9.0.7": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.1.4.tgz#85f5322f42cf8add597fc6b02913e8fc3308c361" - integrity sha512-ND240vncmVD2KVe/KSQU3d/DxxoRipFg1+jFOFZGt0n0orCBHk/V1fu9iaG1sRyldL0+rCQ+fTI+1N4DTmMnxA== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.1.6.tgz#810b4bb960cc2a933b89969c4d0f5ac53535c241" + integrity sha512-iXgPh5DebLwkMzLtQ6WKiv/mo4hpwMOwYex3O4F2CKToR2tKPnXbV5WC/ADGm0XYXiocSKQPiyL4ZrUjVeKEqA== "@angular/forms@^9.0.7": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-9.1.4.tgz#7cb75b5731bd6cbcf4a45b7b2cc68b3581de8cc1" - integrity sha512-Njt+pMLfPBchL0/ayIjJqXL6ZfM4Ccvf7KO1wS1HMzh3QlmfNa0JSgc4pfrbRJAMN9g7V/FYLyKejs1bJZkenA== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-9.1.6.tgz#2589b74288318ddebb8c12b0fd45eb48dbd9e665" + integrity sha512-3KiFjLDipZVgS5rfnZ8EoKlkUokOR8dmuw2xdjKHgzflWFFeuaY9ZtQgjZGw9/jkwWlc9P38BOSEHbK8NakdDw== "@angular/language-service@^9.0.7": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-9.1.4.tgz#2fa2c444e5a5a6036d5ca43d2887826df17d0553" - integrity sha512-eyVxxiegdb4ESdFGfkuDN+YfUbOVHRQLjIl6ACFJQDNHzVXzbmuqpyr5hIJANIVady103/7+dqRxxJo1DdIdTQ== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-9.1.6.tgz#ff5e4bda847192820d7921f4551aaa1af8192ed3" + integrity sha512-pB18hVoAbIuk1Wus8ur7yUxSukfPR4pCXiOfbxDQ94qlCzLAzIwXbaNV4erpBfL/fUKxMY3h8RrVt0dfm6M5RQ== "@angular/localize@^9.1.1": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-9.1.4.tgz#3073886a92a6d58918114750ec657cc40726f50d" - integrity sha512-//iE4h45ThsvtAWzk4TS2w9/AIGm5Gk+xspScdQDN3a6RlZh2f0E9fEC1PGjc/1oxxQvUiWVFdHkCgLSnRmEEQ== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-9.1.6.tgz#6b1a3639441da91b8ed7563f82ab3a3112f632a0" + integrity sha512-SGDtXR+HdyfjjMl/JpqHcDPn+OcWKk9eKrJmUB3HcUwsBl1wuYx5dES2iErPTB4BLf2W6rm3o0Bzh7kT+eJFuw== dependencies: "@babel/core" "7.8.3" glob "7.1.2" yargs "15.3.0" "@angular/platform-browser-dynamic@^9.0.7": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.4.tgz#bf1cde9156bd29eeeef932b683b0c993614f75d5" - integrity sha512-YtVbnxyS6FU7xNpA6A95tmSfrB8+WC7OH3mbP8M9NaGk0OYz8B/JOe1HByP4JRpEGCvBtXdJ2NSW/MpLIT8SiQ== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.6.tgz#3522fd43825f12f8e9982acab85c0a9cdc0c5c86" + integrity sha512-7AL3hWu4oY0LRiMS9ZEFXPW2uqybWcVNFDHjPp3UwsDIT4+sW3DIm8P+UvAOFkkRwaHpPDqm4chTTiAHygC/1Q== "@angular/platform-browser@^9.0.7": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-9.1.4.tgz#c4fe868f12a6593702967a957a6bc8aa50c34f3b" - integrity sha512-mBCHfTl+5tQfaUiGlDujP7mFBzovFc54Zi2kcCE8DSdSSVQ2TPBo6hXa6y2cL3hJPFZzQ7mC4ORFrsGADhHn/w== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-9.1.6.tgz#3f107b96f8fdfc87370dae5bc6698c8be9b246e9" + integrity sha512-ebQhbT0Z55vwlQwAY4+s3Bcf1Q4wEN5Yk43iCuVt4g2kFkg09UP0z8aYtbuh7VQDyv/W4TTIGX8smGBWstoedQ== "@angular/router@^9.0.7": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-9.1.4.tgz#1bd09c84d1ec75bdc7cc75e80014eda5041ffeb7" - integrity sha512-yUyjCgG2P2Jh8MvoyC6yirmAtx1Qe7MKLuLvsa9WOB571QNEcNLTYMfAMHUKsQTcE/+o984QyLlneoibgI9wFA== + version "9.1.6" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-9.1.6.tgz#1186e63d3f69faffbf7f92773f342314130b1fcf" + integrity sha512-Oz4nVQUR6t68DSzZuSrVaqrzmA7/0PIEi0sc85CE+UuOEoAqGMwN0NdQYizFT62WZ16DRI/1tZ+TTWvdmpEv8w== "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": version "7.8.3" @@ -1246,61 +1246,60 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.5.0.tgz#770800799d510f37329c508a9edd0b7b447d9abb" - integrity sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw== +"@jest/console@^26.0.1": + version "26.0.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.0.1.tgz#62b3b2fa8990f3cbffbef695c42ae9ddbc8f4b39" + integrity sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw== dependencies: - "@jest/types" "^25.5.0" - chalk "^3.0.0" - jest-message-util "^25.5.0" - jest-util "^25.5.0" + "@jest/types" "^26.0.1" + chalk "^4.0.0" + jest-message-util "^26.0.1" + jest-util "^26.0.1" slash "^3.0.0" -"@jest/core@^25.5.4": - version "25.5.4" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.5.4.tgz#3ef7412f7339210f003cdf36646bbca786efe7b4" - integrity sha512-3uSo7laYxF00Dg/DMgbn4xMJKmDdWvZnf89n8Xj/5/AeQ2dOQmn6b6Hkj/MleyzZWXpwv+WSdYWl4cLsy2JsoA== +"@jest/core@^26.0.1": + version "26.0.1" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.0.1.tgz#aa538d52497dfab56735efb00e506be83d841fae" + integrity sha512-Xq3eqYnxsG9SjDC+WLeIgf7/8KU6rddBxH+SCt18gEpOhAGYC/Mq+YbtlNcIdwjnnT+wDseXSbU0e5X84Y4jTQ== dependencies: - "@jest/console" "^25.5.0" - "@jest/reporters" "^25.5.1" - "@jest/test-result" "^25.5.0" - "@jest/transform" "^25.5.1" - "@jest/types" "^25.5.0" + "@jest/console" "^26.0.1" + "@jest/reporters" "^26.0.1" + "@jest/test-result" "^26.0.1" + "@jest/transform" "^26.0.1" + "@jest/types" "^26.0.1" ansi-escapes "^4.2.1" - chalk "^3.0.0" + chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^25.5.0" - jest-config "^25.5.4" - jest-haste-map "^25.5.1" - jest-message-util "^25.5.0" - jest-regex-util "^25.2.6" - jest-resolve "^25.5.1" - jest-resolve-dependencies "^25.5.4" - jest-runner "^25.5.4" - jest-runtime "^25.5.4" - jest-snapshot "^25.5.1" - jest-util "^25.5.0" - jest-validate "^25.5.0" - jest-watcher "^25.5.0" + jest-changed-files "^26.0.1" + jest-config "^26.0.1" + jest-haste-map "^26.0.1" + jest-message-util "^26.0.1" + jest-regex-util "^26.0.0" + jest-resolve "^26.0.1" + jest-resolve-dependencies "^26.0.1" + jest-runner "^26.0.1" + jest-runtime "^26.0.1" + jest-snapshot "^26.0.1" + jest-util "^26.0.1" + jest-validate "^26.0.1" + jest-watcher "^26.0.1" micromatch "^4.0.2" p-each-series "^2.1.0" - realpath-native "^2.0.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.5.0.tgz#aa33b0c21a716c65686638e7ef816c0e3a0c7b37" - integrity sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA== +"@jest/environment@^26.0.1": + version "26.0.1" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.0.1.tgz#82f519bba71959be9b483675ee89de8c8f72a5c8" + integrity sha512-xBDxPe8/nx251u0VJ2dFAFz2H23Y98qdIaNwnMK6dFQr05jc+Ne/2np73lOAx+5mSBO/yuQldRrQOf6hP1h92g== dependencies: - "@jest/fake-timers" "^25.5.0" - "@jest/types" "^25.5.0" - jest-mock "^25.5.0" + "@jest/fake-timers" "^26.0.1" + "@jest/types" "^26.0.1" + jest-mock "^26.0.1" -"@jest/fake-timers@^25.1.0", "@jest/fake-timers@^25.5.0": +"@jest/fake-timers@^25.1.0": version "25.5.0" resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.5.0.tgz#46352e00533c024c90c2bc2ad9f2959f7f114185" integrity sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ== @@ -1311,26 +1310,37 @@ jest-util "^25.5.0" lolex "^5.0.0" -"@jest/globals@^25.5.2": - version "25.5.2" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-25.5.2.tgz#5e45e9de8d228716af3257eeb3991cc2e162ca88" - integrity sha512-AgAS/Ny7Q2RCIj5kZ+0MuKM1wbF0WMLxbCVl/GOMoCNbODRdJ541IxJ98xnZdVSZXivKpJlNPIWa3QmY0l4CXA== +"@jest/fake-timers@^26.0.1": + version "26.0.1" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.0.1.tgz#f7aeff13b9f387e9d0cac9a8de3bba538d19d796" + integrity sha512-Oj/kCBnTKhm7CR+OJSjZty6N1bRDr9pgiYQr4wY221azLz5PHi08x/U+9+QpceAYOWheauLP8MhtSVFrqXQfhg== dependencies: - "@jest/environment" "^25.5.0" - "@jest/types" "^25.5.0" - expect "^25.5.0" + "@jest/types" "^26.0.1" + "@sinonjs/fake-timers" "^6.0.1" + jest-message-util "^26.0.1" + jest-mock "^26.0.1" + jest-util "^26.0.1" -"@jest/reporters@^25.5.1": - version "25.5.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.5.1.tgz#cb686bcc680f664c2dbaf7ed873e93aa6811538b" - integrity sha512-3jbd8pPDTuhYJ7vqiHXbSwTJQNavczPs+f1kRprRDxETeE3u6srJ+f0NPuwvOmk+lmunZzPkYWIFZDLHQPkviw== +"@jest/globals@^26.0.1": + version "26.0.1" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.0.1.tgz#3f67b508a7ce62b6e6efc536f3d18ec9deb19a9c" + integrity sha512-iuucxOYB7BRCvT+TYBzUqUNuxFX1hqaR6G6IcGgEqkJ5x4htNKo1r7jk1ji9Zj8ZMiMw0oB5NaA7k5Tx6MVssA== + dependencies: + "@jest/environment" "^26.0.1" + "@jest/types" "^26.0.1" + expect "^26.0.1" + +"@jest/reporters@^26.0.1": + version "26.0.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.0.1.tgz#14ae00e7a93e498cec35b0c00ab21c375d9b078f" + integrity sha512-NWWy9KwRtE1iyG/m7huiFVF9YsYv/e+mbflKRV84WDoJfBqUrNRyDbL/vFxQcYLl8IRqI4P3MgPn386x76Gf2g== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^25.5.0" - "@jest/test-result" "^25.5.0" - "@jest/transform" "^25.5.1" - "@jest/types" "^25.5.0" - chalk "^3.0.0" + "@jest/console" "^26.0.1" + "@jest/test-result" "^26.0.1" + "@jest/transform" "^26.0.1" + "@jest/types" "^26.0.1" + chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.2" @@ -1340,66 +1350,65 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^25.5.1" - jest-resolve "^25.5.1" - jest-util "^25.5.0" - jest-worker "^25.5.0" + jest-haste-map "^26.0.1" + jest-resolve "^26.0.1" + jest-util "^26.0.1" + jest-worker "^26.0.0" slash "^3.0.0" source-map "^0.6.0" - string-length "^3.1.0" + string-length "^4.0.1" terminal-link "^2.0.0" v8-to-istanbul "^4.1.3" optionalDependencies: - node-notifier "^6.0.0" + node-notifier "^7.0.0" -"@jest/source-map@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.5.0.tgz#df5c20d6050aa292c2c6d3f0d2c7606af315bd1b" - integrity sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ== +"@jest/source-map@^26.0.0": + version "26.0.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.0.0.tgz#fd7706484a7d3faf7792ae29783933bbf48a4749" + integrity sha512-S2Z+Aj/7KOSU2TfW0dyzBze7xr95bkm5YXNUqqCek+HE0VbNNSNzrRwfIi5lf7wvzDTSS0/ib8XQ1krFNyYgbQ== dependencies: callsites "^3.0.0" graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.5.0.tgz#139a043230cdeffe9ba2d8341b27f2efc77ce87c" - integrity sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A== +"@jest/test-result@^26.0.1": + version "26.0.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.0.1.tgz#1ffdc1ba4bc289919e54b9414b74c9c2f7b2b718" + integrity sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg== dependencies: - "@jest/console" "^25.5.0" - "@jest/types" "^25.5.0" + "@jest/console" "^26.0.1" + "@jest/types" "^26.0.1" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^25.5.4": - version "25.5.4" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz#9b4e685b36954c38d0f052e596d28161bdc8b737" - integrity sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA== +"@jest/test-sequencer@^26.0.1": + version "26.0.1" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.0.1.tgz#b0563424728f3fe9e75d1442b9ae4c11da73f090" + integrity sha512-ssga8XlwfP8YjbDcmVhwNlrmblddMfgUeAkWIXts1V22equp2GMIHxm7cyeD5Q/B0ZgKPK/tngt45sH99yLLGg== dependencies: - "@jest/test-result" "^25.5.0" + "@jest/test-result" "^26.0.1" graceful-fs "^4.2.4" - jest-haste-map "^25.5.1" - jest-runner "^25.5.4" - jest-runtime "^25.5.4" + jest-haste-map "^26.0.1" + jest-runner "^26.0.1" + jest-runtime "^26.0.1" -"@jest/transform@^25.5.1": - version "25.5.1" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.5.1.tgz#0469ddc17699dd2bf985db55fa0fb9309f5c2db3" - integrity sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg== +"@jest/transform@^26.0.1": + version "26.0.1" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.0.1.tgz#0e3ecbb34a11cd4b2080ed0a9c4856cf0ceb0639" + integrity sha512-pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^25.5.0" + "@jest/types" "^26.0.1" babel-plugin-istanbul "^6.0.0" - chalk "^3.0.0" + chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^25.5.1" - jest-regex-util "^25.2.6" - jest-util "^25.5.0" + jest-haste-map "^26.0.1" + jest-regex-util "^26.0.0" + jest-util "^26.0.1" micromatch "^4.0.2" pirates "^4.0.1" - realpath-native "^2.0.0" slash "^3.0.0" source-map "^0.6.1" write-file-atomic "^3.0.0" @@ -1414,6 +1423,16 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" +"@jest/types@^26.0.1": + version "26.0.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.0.1.tgz#b78333fbd113fa7aec8d39de24f88de8686dac67" + integrity sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + "@jsdevtools/coverage-istanbul-loader@3.0.3": version "3.0.3" resolved "https://registry.yarnpkg.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz#102e414b02ae2f0b3c7fd45a705601e1fd4867c5" @@ -1497,6 +1516,13 @@ dependencies: type-detect "4.0.8" +"@sinonjs/fake-timers@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" + integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== + dependencies: + "@sinonjs/commons" "^1.7.0" + "@types/babel__core@^7.1.7": version "7.1.7" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89" @@ -1612,9 +1638,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*", "@types/node@^13.13.2": - version "13.13.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c" - integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA== + version "13.13.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.5.tgz#96ec3b0afafd64a4ccea9107b75bf8489f0e5765" + integrity sha512-3ySmiBYJPqgjiHA7oEaIo2Rzz0HrOZ7yrNO5HWyaE5q0lQ3BppDZ3N53Miz8bw2I7gh1/zir2MGVZBvpb1zq9g== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -1626,10 +1652,10 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/prettier@^1.19.0": - version "1.19.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" - integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ== +"@types/prettier@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.0.tgz#dc85454b953178cc6043df5208b9e949b54a3bc4" + integrity sha512-/rM+sWiuOZ5dvuVzV37sUuklsbg+JPOP8d+nNFlo2ZtfpzPiPvh1/gc8liWOLBqe+sR+ZM7guPaIcTt6UZTo7Q== "@types/q@^0.0.32": version "0.0.32" @@ -1683,39 +1709,39 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^2.27.0": - version "2.30.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.30.0.tgz#312a37e80542a764d96e8ad88a105316cdcd7b05" - integrity sha512-PGejii0qIZ9Q40RB2jIHyUpRWs1GJuHP1pkoCiaeicfwO9z7Fx03NQzupuyzAmv+q9/gFNHu7lo1ByMXe8PNyg== + version "2.31.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz#942c921fec5e200b79593c71fafb1e3f57aa2e36" + integrity sha512-iIC0Pb8qDaoit+m80Ln/aaeu9zKQdOLF4SHcGLarSeY1gurW6aU4JsOPMjKQwXlw70MvWKZQc6S2NamA8SJ/gg== dependencies: - "@typescript-eslint/experimental-utils" "2.30.0" + "@typescript-eslint/experimental-utils" "2.31.0" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.30.0": - version "2.30.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.30.0.tgz#9845e868c01f3aed66472c561d4b6bac44809dd0" - integrity sha512-L3/tS9t+hAHksy8xuorhOzhdefN0ERPDWmR9CclsIGOUqGKy6tqc/P+SoXeJRye5gazkuPO0cK9MQRnolykzkA== +"@typescript-eslint/experimental-utils@2.31.0": + version "2.31.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz#a9ec514bf7fd5e5e82bc10dcb6a86d58baae9508" + integrity sha512-MI6IWkutLYQYTQgZ48IVnRXmLR/0Q6oAyJgiOror74arUMh7EWjJkADfirZhRsUMHeLJ85U2iySDwHTSnNi9vA== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.30.0" + "@typescript-eslint/typescript-estree" "2.31.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" "@typescript-eslint/parser@^2.27.0": - version "2.30.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.30.0.tgz#7681c305a6f4341ae2579f5e3a75846c29eee9ce" - integrity sha512-9kDOxzp0K85UnpmPJqUzdWaCNorYYgk1yZmf4IKzpeTlSAclnFsrLjfwD9mQExctLoLoGAUXq1co+fbr+3HeFw== + version "2.31.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.31.0.tgz#beddd4e8efe64995108b229b2862cd5752d40d6f" + integrity sha512-uph+w6xUOlyV2DLSC6o+fBDzZ5i7+3/TxAsH4h3eC64tlga57oMb96vVlXoMwjR/nN+xyWlsnxtbDkB46M2EPQ== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.30.0" - "@typescript-eslint/typescript-estree" "2.30.0" + "@typescript-eslint/experimental-utils" "2.31.0" + "@typescript-eslint/typescript-estree" "2.31.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.30.0": - version "2.30.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.30.0.tgz#1b8e848b55144270255ffbfe4c63291f8f766615" - integrity sha512-nI5WOechrA0qAhnr+DzqwmqHsx7Ulr/+0H7bWCcClDhhWkSyZR5BmTvnBEyONwJCTWHfc5PAQExX24VD26IAVw== +"@typescript-eslint/typescript-estree@2.31.0": + version "2.31.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz#ac536c2d46672aa1f27ba0ec2140d53670635cfd" + integrity sha512-vxW149bXFXXuBrAak0eKHOzbcu9cvi6iNcJDzEtOkRwGHxJG15chiAQAwhLOsk+86p9GTr/TziYvw+H9kMaIgA== dependencies: debug "^4.1.1" eslint-visitor-keys "^1.1.0" @@ -1894,7 +1920,7 @@ JSONStream@^1.3.4: jsonparse "^1.2.0" through ">=2.2.7 <3" -abab@^2.0.0, abab@^2.0.3: +abab@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a" integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg== @@ -1907,14 +1933,6 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-globals@^4.3.2: - version "4.3.4" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" - integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A== - dependencies: - acorn "^6.0.1" - acorn-walk "^6.0.1" - acorn-globals@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" @@ -1937,22 +1955,17 @@ acorn-node@^1.3.0: acorn-walk "^7.0.0" xtend "^4.0.2" -acorn-walk@^6.0.1: - version "6.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" - integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== - acorn-walk@^7.0.0, acorn-walk@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e" integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== -acorn@^6.0.1, acorn@^6.2.1: +acorn@^6.2.1: version "6.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== -acorn@^7.0.0, acorn@^7.1.0, acorn@^7.1.1: +acorn@^7.0.0, acorn@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== @@ -2187,11 +2200,6 @@ array-differ@^1.0.0: resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE= -array-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" - integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -2349,17 +2357,17 @@ axios@^0.19.2: dependencies: follow-redirects "1.5.10" -babel-jest@^25.4.0, babel-jest@^25.5.1: - version "25.5.1" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.5.1.tgz#bc2e6101f849d6f6aec09720ffc7bc5332e62853" - integrity sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ== +babel-jest@^26.0.0, babel-jest@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.0.1.tgz#450139ce4b6c17174b136425bda91885c397bc46" + integrity sha512-Z4GGmSNQ8pX3WS1O+6v3fo41YItJJZsVxG5gIQ+HuB/iuAQBJxMTHTwz292vuYws1LnHfwSRgoqI+nxdy/pcvw== dependencies: - "@jest/transform" "^25.5.1" - "@jest/types" "^25.5.0" + "@jest/transform" "^26.0.1" + "@jest/types" "^26.0.1" "@types/babel__core" "^7.1.7" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^25.5.0" - chalk "^3.0.0" + babel-preset-jest "^26.0.0" + chalk "^4.0.0" graceful-fs "^4.2.4" slash "^3.0.0" @@ -2391,10 +2399,10 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz#129c80ba5c7fc75baf3a45b93e2e372d57ca2677" - integrity sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g== +babel-plugin-jest-hoist@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.0.0.tgz#fd1d35f95cf8849fc65cb01b5e58aedd710b34a8" + integrity sha512-+AuoehOrjt9irZL7DOt2+4ZaTM6dlu1s5TTS46JBa0/qem4dy7VNW3tMb96qeEqcIh20LD73TVNtmVEeymTG7w== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -2416,12 +2424,12 @@ babel-preset-current-node-syntax@^0.1.2: "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -babel-preset-jest@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz#c1d7f191829487a907764c65307faa0e66590b49" - integrity sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw== +babel-preset-jest@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.0.0.tgz#1eac82f513ad36c4db2e9263d7c485c825b1faa6" + integrity sha512-9ce+DatAa31DpR4Uir8g4Ahxs5K4W4L8refzt+qHWQANb6LhGcAEfIFgLUwk67oya2cCUd6t4eUMtO/z64ocNw== dependencies: - babel-plugin-jest-hoist "^25.5.0" + babel-plugin-jest-hoist "^26.0.0" babel-preset-current-node-syntax "^0.1.2" babel-runtime@^6.26.0: @@ -2518,11 +2526,16 @@ bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA== +bn.js@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.1.tgz#48efc4031a9c4041b9c99c6941d903463ab62eb5" + integrity sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA== + body-parser@1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" @@ -2614,7 +2627,7 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browser-resolve@^1.11.3, browser-resolve@^1.8.1: +browser-resolve@^1.8.1: version "1.11.3" resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6" integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ== @@ -2661,7 +2674,7 @@ browserify-optional@^1.0.0, browserify-optional@^1.0.1: ast-types "^0.7.0" browser-resolve "^1.8.1" -browserify-rsa@^4.0.0: +browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ= @@ -2670,17 +2683,18 @@ browserify-rsa@^4.0.0: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" - integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg= + version "4.1.0" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.1.0.tgz#4fe971b379a5aeb4925e06779f9fa1f41d249d70" + integrity sha512-VYxo7cDCeYUoBZ0ZCy4UyEUCP3smyBd4DRQM5nrFS1jJjPJjX7rP3oLRpPoWfkhQfyJ0I9ZbHbKafrFD/SGlrg== dependencies: - bn.js "^4.1.1" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.2" - elliptic "^6.0.0" - inherits "^2.0.1" - parse-asn1 "^5.0.0" + bn.js "^5.1.1" + browserify-rsa "^4.0.1" + create-hash "^1.2.0" + create-hmac "^1.1.7" + elliptic "^6.5.2" + inherits "^2.0.4" + parse-asn1 "^5.1.5" + readable-stream "^3.6.0" browserify-zlib@^0.2.0: version "0.2.0" @@ -2896,6 +2910,11 @@ camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== +camelcase@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e" + integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w== + caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" @@ -2907,9 +2926,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001043: - version "1.0.30001048" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz#4bb4f1bc2eb304e5e1154da80b93dee3f1cf447e" - integrity sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg== + version "1.0.30001054" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001054.tgz#7e82fc42d927980b0ce1426c4813df12381e1a75" + integrity sha512-jiKlTI6Ur8Kjfj8z0muGrV6FscpRvefcQVPSuMuXnvRCfExU7zlVLNjmOz1TnurWgUrAY7MMmjyy+uTgIl1XHw== canonical-path@1.0.0: version "1.0.0" @@ -2964,6 +2983,11 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +char-regex@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -3467,7 +3491,7 @@ create-ecdh@^4.0.0: bn.js "^4.1.0" elliptic "^6.0.0" -create-hash@^1.1.0, create-hash@^1.1.2: +create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== @@ -3478,7 +3502,7 @@ create-hash@^1.1.0, create-hash@^1.1.2: ripemd160 "^2.0.1" sha.js "^2.4.0" -create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: +create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== @@ -3712,7 +3736,7 @@ csso@^4.0.2: dependencies: css-tree "1.0.0-alpha.39" -cssom@^0.4.1, cssom@^0.4.4: +cssom@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== @@ -3722,7 +3746,7 @@ cssom@~0.3.6: resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -cssstyle@^2.0.0, cssstyle@^2.2.0: +cssstyle@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== @@ -3754,15 +3778,6 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -data-urls@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" - integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ== - dependencies: - abab "^2.0.0" - whatwg-mimetype "^2.2.0" - whatwg-url "^7.0.0" - data-urls@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" @@ -3990,6 +4005,11 @@ diff-sequences@^25.2.6: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== +diff-sequences@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6" + integrity sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg== + diff@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -4077,13 +4097,6 @@ domelementtype@^2.0.1: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d" integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ== -domexception@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90" - integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug== - dependencies: - webidl-conversions "^4.0.2" - domexception@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" @@ -4162,16 +4175,16 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.413: - version "1.3.427" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz#ea43d02908a8c71f47ebb46e09de5a3cf8236f04" - integrity sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A== + version "1.3.431" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.431.tgz#705dd8ef46200415ba837b31d927cdc1e43db303" + integrity sha512-2okqkXCIda7qDwjYhUFxPcQdZDIZZ/zBLDzVOif7WW/TSNfEhdT6SO07O1x/sFteEHX189Z//UwjbZKKCOn2Fg== elegant-spinner@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-2.0.0.tgz#f236378985ecd16da75488d166be4b688fd5af94" integrity sha512-5YRYHhvhYzV/FC4AiMdeSIg3jAYGq9xFvbhZMpPlJoBsfYgrw2DSCYeXfat6tYBu45PWiyRr3+flaCPPmviPaA== -elliptic@^6.0.0: +elliptic@^6.0.0, elliptic@^6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762" integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== @@ -4368,6 +4381,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + escodegen@^1.11.1, escodegen@^1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" @@ -4620,26 +4638,10 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^3.2.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" - integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g== - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - p-finally "^2.0.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - execa@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.0.tgz#7f37d6ec17f09e6b8fc53288611695b6d12b9daf" - integrity sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA== + version "4.0.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.1.tgz#988488781f1f0238cd156f7aaede11c3e853b4c1" + integrity sha512-SCjM/zlBdOK8Q5TIjOn6iEHZaPHFsMoTxXQ2nvUvtPnuohz3H2dIozSg+etNR98dGoYUp2ENSKLL/XaMmbxVgw== dependencies: cross-spawn "^7.0.0" get-stream "^5.0.0" @@ -4669,17 +4671,17 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-25.5.0.tgz#f07f848712a2813bb59167da3fb828ca21f58bba" - integrity sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA== +expect@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.0.1.tgz#18697b9611a7e2725e20ba3ceadda49bc9865421" + integrity sha512-QcCy4nygHeqmbw564YxNbHTJlXh47dVID2BUP52cZFpLU9zHViMFK6h07cC1wf7GYCTIigTdAXhVua8Yl1FkKg== dependencies: - "@jest/types" "^25.5.0" + "@jest/types" "^26.0.1" ansi-styles "^4.0.0" - jest-get-type "^25.2.6" - jest-matcher-utils "^25.5.0" - jest-message-util "^25.5.0" - jest-regex-util "^25.2.6" + jest-get-type "^26.0.0" + jest-matcher-utils "^26.0.1" + jest-message-util "^26.0.1" + jest-regex-util "^26.0.0" express@^4.17.1: version "4.17.1" @@ -5132,9 +5134,9 @@ fs.realpath@^1.0.0: integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^1.2.7: - version "1.2.12" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c" - integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q== + version "1.2.13" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" + integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== dependencies: bindings "^1.5.0" nan "^2.12.1" @@ -5494,13 +5496,6 @@ html-comment-regex@^1.1.0: resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== -html-encoding-sniffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" - integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw== - dependencies: - whatwg-encoding "^1.0.1" - html-encoding-sniffer@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" @@ -6230,9 +6225,11 @@ is-wsl@^1.1.0: integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= is-wsl@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d" - integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog== + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" @@ -6324,61 +6321,59 @@ jasminewd2@^2.1.0: resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e" integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4= -jest-changed-files@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.5.0.tgz#141cc23567ceb3f534526f8614ba39421383634c" - integrity sha512-EOw9QEqapsDT7mKF162m8HFzRPbmP8qJQny6ldVOdOVBz3ACgPm/1nAn5fPQ/NDaYhX/AHkrGwwkCncpAVSXcw== +jest-changed-files@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.0.1.tgz#1334630c6a1ad75784120f39c3aa9278e59f349f" + integrity sha512-q8LP9Sint17HaE2LjxQXL+oYWW/WeeXMPE2+Op9X3mY8IEGFVc14xRxFjUuXUbcPAlDLhtWdIEt59GdQbn76Hw== dependencies: - "@jest/types" "^25.5.0" - execa "^3.2.0" + "@jest/types" "^26.0.1" + execa "^4.0.0" throat "^5.0.0" -jest-cli@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.5.4.tgz#b9f1a84d1301a92c5c217684cb79840831db9f0d" - integrity sha512-rG8uJkIiOUpnREh1768/N3n27Cm+xPFkSNFO91tgg+8o2rXeVLStz+vkXkGr4UtzH6t1SNbjwoiswd7p4AhHTw== +jest-cli@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.0.1.tgz#3a42399a4cbc96a519b99ad069a117d955570cac" + integrity sha512-pFLfSOBcbG9iOZWaMK4Een+tTxi/Wcm34geqZEqrst9cZDkTQ1LZ2CnBrTlHWuYAiTMFr0EQeK52ScyFU8wK+w== dependencies: - "@jest/core" "^25.5.4" - "@jest/test-result" "^25.5.0" - "@jest/types" "^25.5.0" - chalk "^3.0.0" + "@jest/core" "^26.0.1" + "@jest/test-result" "^26.0.1" + "@jest/types" "^26.0.1" + chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^25.5.4" - jest-util "^25.5.0" - jest-validate "^25.5.0" + jest-config "^26.0.1" + jest-util "^26.0.1" + jest-validate "^26.0.1" prompts "^2.0.1" - realpath-native "^2.0.0" yargs "^15.3.1" -jest-config@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.5.4.tgz#38e2057b3f976ef7309b2b2c8dcd2a708a67f02c" - integrity sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg== +jest-config@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.0.1.tgz#096a3d4150afadf719d1fab00e9a6fb2d6d67507" + integrity sha512-9mWKx2L1LFgOXlDsC4YSeavnblN6A4CPfXFiobq+YYLaBMymA/SczN7xYTSmLaEYHZOcB98UdoN4m5uNt6tztg== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^25.5.4" - "@jest/types" "^25.5.0" - babel-jest "^25.5.1" - chalk "^3.0.0" + "@jest/test-sequencer" "^26.0.1" + "@jest/types" "^26.0.1" + babel-jest "^26.0.1" + chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" - jest-environment-jsdom "^25.5.0" - jest-environment-node "^25.5.0" - jest-get-type "^25.2.6" - jest-jasmine2 "^25.5.4" - jest-regex-util "^25.2.6" - jest-resolve "^25.5.1" - jest-util "^25.5.0" - jest-validate "^25.5.0" + jest-environment-jsdom "^26.0.1" + jest-environment-node "^26.0.1" + jest-get-type "^26.0.0" + jest-jasmine2 "^26.0.1" + jest-regex-util "^26.0.0" + jest-resolve "^26.0.1" + jest-util "^26.0.1" + jest-validate "^26.0.1" micromatch "^4.0.2" - pretty-format "^25.5.0" - realpath-native "^2.0.0" + pretty-format "^26.0.1" -jest-diff@^25.2.1, jest-diff@^25.5.0: +jest-diff@^25.2.1: version "25.5.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A== @@ -6388,23 +6383,33 @@ jest-diff@^25.2.1, jest-diff@^25.5.0: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-docblock@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.3.0.tgz#8b777a27e3477cd77a168c05290c471a575623ef" - integrity sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg== +jest-diff@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.0.1.tgz#c44ab3cdd5977d466de69c46929e0e57f89aa1de" + integrity sha512-odTcHyl5X+U+QsczJmOjWw5tPvww+y9Yim5xzqxVl/R1j4z71+fHW4g8qu1ugMmKdFdxw+AtQgs5mupPnzcIBQ== + dependencies: + chalk "^4.0.0" + diff-sequences "^26.0.0" + jest-get-type "^26.0.0" + pretty-format "^26.0.1" + +jest-docblock@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" + integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w== dependencies: detect-newline "^3.0.0" -jest-each@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.5.0.tgz#0c3c2797e8225cb7bec7e4d249dcd96b934be516" - integrity sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA== +jest-each@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.0.1.tgz#633083061619302fc90dd8f58350f9d77d67be04" + integrity sha512-OTgJlwXCAR8NIWaXFL5DBbeS4QIYPuNASkzSwMCJO+ywo9BEa6TqkaSWsfR7VdbMLdgYJqSfQcIyjJCNwl5n4Q== dependencies: - "@jest/types" "^25.5.0" - chalk "^3.0.0" - jest-get-type "^25.2.6" - jest-util "^25.5.0" - pretty-format "^25.5.0" + "@jest/types" "^26.0.1" + chalk "^4.0.0" + jest-get-type "^26.0.0" + jest-util "^26.0.1" + pretty-format "^26.0.1" jest-environment-jsdom-sixteen@^1.0.3: version "1.0.3" @@ -6416,48 +6421,52 @@ jest-environment-jsdom-sixteen@^1.0.3: jest-util "^25.1.0" jsdom "^16.2.1" -jest-environment-jsdom@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz#dcbe4da2ea997707997040ecf6e2560aec4e9834" - integrity sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A== +jest-environment-jsdom@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.0.1.tgz#217690852e5bdd7c846a4e3b50c8ffd441dfd249" + integrity sha512-u88NJa3aptz2Xix2pFhihRBAatwZHWwSiRLBDBQE1cdJvDjPvv7ZGA0NQBxWwDDn7D0g1uHqxM8aGgfA9Bx49g== dependencies: - "@jest/environment" "^25.5.0" - "@jest/fake-timers" "^25.5.0" - "@jest/types" "^25.5.0" - jest-mock "^25.5.0" - jest-util "^25.5.0" - jsdom "^15.2.1" + "@jest/environment" "^26.0.1" + "@jest/fake-timers" "^26.0.1" + "@jest/types" "^26.0.1" + jest-mock "^26.0.1" + jest-util "^26.0.1" + jsdom "^16.2.2" -jest-environment-node@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.5.0.tgz#0f55270d94804902988e64adca37c6ce0f7d07a1" - integrity sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA== +jest-environment-node@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.0.1.tgz#584a9ff623124ff6eeb49e0131b5f7612b310b13" + integrity sha512-4FRBWcSn5yVo0KtNav7+5NH5Z/tEgDLp7VRQVS5tCouWORxj+nI+1tOLutM07Zb2Qi7ja+HEDoOUkjBSWZg/IQ== dependencies: - "@jest/environment" "^25.5.0" - "@jest/fake-timers" "^25.5.0" - "@jest/types" "^25.5.0" - jest-mock "^25.5.0" - jest-util "^25.5.0" - semver "^6.3.0" + "@jest/environment" "^26.0.1" + "@jest/fake-timers" "^26.0.1" + "@jest/types" "^26.0.1" + jest-mock "^26.0.1" + jest-util "^26.0.1" jest-get-type@^25.2.6: version "25.2.6" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== -jest-haste-map@^25.5.1: - version "25.5.1" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.5.1.tgz#1df10f716c1d94e60a1ebf7798c9fb3da2620943" - integrity sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ== +jest-get-type@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.0.0.tgz#381e986a718998dbfafcd5ec05934be538db4039" + integrity sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg== + +jest-haste-map@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.0.1.tgz#40dcc03c43ac94d25b8618075804d09cd5d49de7" + integrity sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA== dependencies: - "@jest/types" "^25.5.0" + "@jest/types" "^26.0.1" "@types/graceful-fs" "^4.1.2" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.4" - jest-serializer "^25.5.0" - jest-util "^25.5.0" - jest-worker "^25.5.0" + jest-serializer "^26.0.0" + jest-util "^26.0.1" + jest-worker "^26.0.0" micromatch "^4.0.2" sane "^4.0.3" walker "^1.0.7" @@ -6465,46 +6474,46 @@ jest-haste-map@^25.5.1: optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz#66ca8b328fb1a3c5364816f8958f6970a8526968" - integrity sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ== +jest-jasmine2@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.0.1.tgz#947c40ee816636ba23112af3206d6fa7b23c1c1c" + integrity sha512-ILaRyiWxiXOJ+RWTKupzQWwnPaeXPIoLS5uW41h18varJzd9/7I0QJGqg69fhTT1ev9JpSSo9QtalriUN0oqOg== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^25.5.0" - "@jest/source-map" "^25.5.0" - "@jest/test-result" "^25.5.0" - "@jest/types" "^25.5.0" - chalk "^3.0.0" + "@jest/environment" "^26.0.1" + "@jest/source-map" "^26.0.0" + "@jest/test-result" "^26.0.1" + "@jest/types" "^26.0.1" + chalk "^4.0.0" co "^4.6.0" - expect "^25.5.0" + expect "^26.0.1" is-generator-fn "^2.0.0" - jest-each "^25.5.0" - jest-matcher-utils "^25.5.0" - jest-message-util "^25.5.0" - jest-runtime "^25.5.4" - jest-snapshot "^25.5.1" - jest-util "^25.5.0" - pretty-format "^25.5.0" + jest-each "^26.0.1" + jest-matcher-utils "^26.0.1" + jest-message-util "^26.0.1" + jest-runtime "^26.0.1" + jest-snapshot "^26.0.1" + jest-util "^26.0.1" + pretty-format "^26.0.1" throat "^5.0.0" -jest-leak-detector@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz#2291c6294b0ce404241bb56fe60e2d0c3e34f0bb" - integrity sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA== +jest-leak-detector@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.0.1.tgz#79b19ab3f41170e0a78eb8fa754a116d3447fb8c" + integrity sha512-93FR8tJhaYIWrWsbmVN1pQ9ZNlbgRpfvrnw5LmgLRX0ckOJ8ut/I35CL7awi2ecq6Ca4lL59bEK9hr7nqoHWPA== dependencies: - jest-get-type "^25.2.6" - pretty-format "^25.5.0" + jest-get-type "^26.0.0" + pretty-format "^26.0.1" -jest-matcher-utils@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz#fbc98a12d730e5d2453d7f1ed4a4d948e34b7867" - integrity sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw== +jest-matcher-utils@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.0.1.tgz#12e1fc386fe4f14678f4cc8dbd5ba75a58092911" + integrity sha512-PUMlsLth0Azen8Q2WFTwnSkGh2JZ8FYuwijC8NR47vXKpsrKmA1wWvgcj1CquuVfcYiDEdj985u5Wmg7COEARw== dependencies: - chalk "^3.0.0" - jest-diff "^25.5.0" - jest-get-type "^25.2.6" - pretty-format "^25.5.0" + chalk "^4.0.0" + jest-diff "^26.0.1" + jest-get-type "^26.0.0" + pretty-format "^26.0.1" jest-message-util@^25.5.0: version "25.5.0" @@ -6520,6 +6529,20 @@ jest-message-util@^25.5.0: slash "^3.0.0" stack-utils "^1.0.1" +jest-message-util@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.0.1.tgz#07af1b42fc450b4cc8e90e4c9cef11b33ce9b0ac" + integrity sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q== + dependencies: + "@babel/code-frame" "^7.0.0" + "@jest/types" "^26.0.1" + "@types/stack-utils" "^1.0.1" + chalk "^4.0.0" + graceful-fs "^4.2.4" + micromatch "^4.0.2" + slash "^3.0.0" + stack-utils "^2.0.2" + jest-mock@^25.1.0, jest-mock@^25.5.0: version "25.5.0" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.5.0.tgz#a91a54dabd14e37ecd61665d6b6e06360a55387a" @@ -6527,132 +6550,138 @@ jest-mock@^25.1.0, jest-mock@^25.5.0: dependencies: "@jest/types" "^25.5.0" +jest-mock@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.0.1.tgz#7fd1517ed4955397cf1620a771dc2d61fad8fd40" + integrity sha512-MpYTBqycuPYSY6xKJognV7Ja46/TeRbAZept987Zp+tuJvMN0YBWyyhG9mXyYQaU3SBI0TUlSaO5L3p49agw7Q== + dependencies: + "@jest/types" "^26.0.1" + jest-pnp-resolver@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ== jest-preset-angular@^8.1.2, jest-preset-angular@^8.1.3: - version "8.1.3" - resolved "https://registry.yarnpkg.com/jest-preset-angular/-/jest-preset-angular-8.1.3.tgz#99951afe34ffa5a3d2fd879936515d3235e3567a" - integrity sha512-T53bmWG4mNynumYcWqvhKGslQCJCTFpcL3SMrggrI65hI2G0ErYZ6WtdJqPDsFFk+KRN+iNLwNBG1idHO9k2uQ== + version "8.2.0" + resolved "https://registry.yarnpkg.com/jest-preset-angular/-/jest-preset-angular-8.2.0.tgz#270c220b4fec2a85d3b4d339d68bcf9a014c9487" + integrity sha512-UNmYGju5AVNSQdICBkGD3JhKH0jjUipY8yUQMGM1eUg8XYgFBir0uUuZd7t7Tfg0ibl95jQmvCaDIh3PUL4ySw== dependencies: pretty-format "^25.0.0" ts-jest "^25.0.0" -jest-regex-util@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.6.tgz#d847d38ba15d2118d3b06390056028d0f2fd3964" - integrity sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw== +jest-regex-util@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" + integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== -jest-resolve-dependencies@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.5.4.tgz#85501f53957c8e3be446e863a74777b5a17397a7" - integrity sha512-yFmbPd+DAQjJQg88HveObcGBA32nqNZ02fjYmtL16t1xw9bAttSn5UGRRhzMHIQbsep7znWvAvnD4kDqOFM0Uw== +jest-resolve-dependencies@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.0.1.tgz#607ba7ccc32151d185a477cff45bf33bce417f0b" + integrity sha512-9d5/RS/ft0vB/qy7jct/qAhzJsr6fRQJyGAFigK3XD4hf9kIbEH5gks4t4Z7kyMRhowU6HWm/o8ILqhaHdSqLw== dependencies: - "@jest/types" "^25.5.0" - jest-regex-util "^25.2.6" - jest-snapshot "^25.5.1" + "@jest/types" "^26.0.1" + jest-regex-util "^26.0.0" + jest-snapshot "^26.0.1" -jest-resolve@^25.5.1: - version "25.5.1" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.5.1.tgz#0e6fbcfa7c26d2a5fe8f456088dc332a79266829" - integrity sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ== +jest-resolve@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.0.1.tgz#21d1ee06f9ea270a343a8893051aeed940cde736" + integrity sha512-6jWxk0IKZkPIVTvq6s72RH735P8f9eCJW3IM5CX/SJFeKq1p2cZx0U49wf/SdMlhaB/anann5J2nCJj6HrbezQ== dependencies: - "@jest/types" "^25.5.0" - browser-resolve "^1.11.3" - chalk "^3.0.0" + "@jest/types" "^26.0.1" + chalk "^4.0.0" graceful-fs "^4.2.4" jest-pnp-resolver "^1.2.1" + jest-util "^26.0.1" read-pkg-up "^7.0.1" - realpath-native "^2.0.0" resolve "^1.17.0" slash "^3.0.0" -jest-runner@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.5.4.tgz#ffec5df3875da5f5c878ae6d0a17b8e4ecd7c71d" - integrity sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg== +jest-runner@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.0.1.tgz#ea03584b7ae4bacfb7e533d680a575a49ae35d50" + integrity sha512-CApm0g81b49Znm4cZekYQK67zY7kkB4umOlI2Dx5CwKAzdgw75EN+ozBHRvxBzwo1ZLYZ07TFxkaPm+1t4d8jA== dependencies: - "@jest/console" "^25.5.0" - "@jest/environment" "^25.5.0" - "@jest/test-result" "^25.5.0" - "@jest/types" "^25.5.0" - chalk "^3.0.0" + "@jest/console" "^26.0.1" + "@jest/environment" "^26.0.1" + "@jest/test-result" "^26.0.1" + "@jest/types" "^26.0.1" + chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^25.5.4" - jest-docblock "^25.3.0" - jest-haste-map "^25.5.1" - jest-jasmine2 "^25.5.4" - jest-leak-detector "^25.5.0" - jest-message-util "^25.5.0" - jest-resolve "^25.5.1" - jest-runtime "^25.5.4" - jest-util "^25.5.0" - jest-worker "^25.5.0" + jest-config "^26.0.1" + jest-docblock "^26.0.0" + jest-haste-map "^26.0.1" + jest-jasmine2 "^26.0.1" + jest-leak-detector "^26.0.1" + jest-message-util "^26.0.1" + jest-resolve "^26.0.1" + jest-runtime "^26.0.1" + jest-util "^26.0.1" + jest-worker "^26.0.0" source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.5.4.tgz#dc981fe2cb2137abcd319e74ccae7f7eeffbfaab" - integrity sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ== +jest-runtime@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.0.1.tgz#a121a6321235987d294168e282d52b364d7d3f89" + integrity sha512-Ci2QhYFmANg5qaXWf78T2Pfo6GtmIBn2rRaLnklRyEucmPccmCKvS9JPljcmtVamsdMmkyNkVFb9pBTD6si9Lw== dependencies: - "@jest/console" "^25.5.0" - "@jest/environment" "^25.5.0" - "@jest/globals" "^25.5.2" - "@jest/source-map" "^25.5.0" - "@jest/test-result" "^25.5.0" - "@jest/transform" "^25.5.1" - "@jest/types" "^25.5.0" + "@jest/console" "^26.0.1" + "@jest/environment" "^26.0.1" + "@jest/fake-timers" "^26.0.1" + "@jest/globals" "^26.0.1" + "@jest/source-map" "^26.0.0" + "@jest/test-result" "^26.0.1" + "@jest/transform" "^26.0.1" + "@jest/types" "^26.0.1" "@types/yargs" "^15.0.0" - chalk "^3.0.0" + chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-config "^25.5.4" - jest-haste-map "^25.5.1" - jest-message-util "^25.5.0" - jest-mock "^25.5.0" - jest-regex-util "^25.2.6" - jest-resolve "^25.5.1" - jest-snapshot "^25.5.1" - jest-util "^25.5.0" - jest-validate "^25.5.0" - realpath-native "^2.0.0" + jest-config "^26.0.1" + jest-haste-map "^26.0.1" + jest-message-util "^26.0.1" + jest-mock "^26.0.1" + jest-regex-util "^26.0.0" + jest-resolve "^26.0.1" + jest-snapshot "^26.0.1" + jest-util "^26.0.1" + jest-validate "^26.0.1" slash "^3.0.0" strip-bom "^4.0.0" yargs "^15.3.1" -jest-serializer@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.5.0.tgz#a993f484e769b4ed54e70e0efdb74007f503072b" - integrity sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA== +jest-serializer@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.0.0.tgz#f6c521ddb976943b93e662c0d4d79245abec72a3" + integrity sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ== dependencies: graceful-fs "^4.2.4" -jest-snapshot@^25.5.1: - version "25.5.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.5.1.tgz#1a2a576491f9961eb8d00c2e5fd479bc28e5ff7f" - integrity sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ== +jest-snapshot@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.0.1.tgz#1baa942bd83d47b837a84af7fcf5fd4a236da399" + integrity sha512-jxd+cF7+LL+a80qh6TAnTLUZHyQoWwEHSUFJjkw35u3Gx+BZUNuXhYvDqHXr62UQPnWo2P6fvQlLjsU93UKyxA== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^25.5.0" - "@types/prettier" "^1.19.0" - chalk "^3.0.0" - expect "^25.5.0" + "@jest/types" "^26.0.1" + "@types/prettier" "^2.0.0" + chalk "^4.0.0" + expect "^26.0.1" graceful-fs "^4.2.4" - jest-diff "^25.5.0" - jest-get-type "^25.2.6" - jest-matcher-utils "^25.5.0" - jest-message-util "^25.5.0" - jest-resolve "^25.5.1" + jest-diff "^26.0.1" + jest-get-type "^26.0.0" + jest-matcher-utils "^26.0.1" + jest-message-util "^26.0.1" + jest-resolve "^26.0.1" make-dir "^3.0.0" natural-compare "^1.4.0" - pretty-format "^25.5.0" - semver "^6.3.0" + pretty-format "^26.0.1" + semver "^7.3.2" jest-util@^25.1.0, jest-util@^25.5.0: version "25.5.0" @@ -6665,29 +6694,40 @@ jest-util@^25.1.0, jest-util@^25.5.0: is-ci "^2.0.0" make-dir "^3.0.0" -jest-validate@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.5.0.tgz#fb4c93f332c2e4cf70151a628e58a35e459a413a" - integrity sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ== +jest-util@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.0.1.tgz#72c4c51177b695fdd795ca072a6f94e3d7cef00a" + integrity sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g== dependencies: - "@jest/types" "^25.5.0" - camelcase "^5.3.1" - chalk "^3.0.0" - jest-get-type "^25.2.6" - leven "^3.1.0" - pretty-format "^25.5.0" + "@jest/types" "^26.0.1" + chalk "^4.0.0" + graceful-fs "^4.2.4" + is-ci "^2.0.0" + make-dir "^3.0.0" -jest-watcher@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.5.0.tgz#d6110d101df98badebe435003956fd4a465e8456" - integrity sha512-XrSfJnVASEl+5+bb51V0Q7WQx65dTSk7NL4yDdVjPnRNpM0hG+ncFmDYJo9O8jaSRcAitVbuVawyXCRoxGrT5Q== +jest-validate@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.0.1.tgz#a62987e1da5b7f724130f904725e22f4e5b2e23c" + integrity sha512-u0xRc+rbmov/VqXnX3DlkxD74rHI/CfS5xaV2VpeaVySjbb1JioNVOyly5b56q2l9ZKe7bVG5qWmjfctkQb0bA== dependencies: - "@jest/test-result" "^25.5.0" - "@jest/types" "^25.5.0" + "@jest/types" "^26.0.1" + camelcase "^6.0.0" + chalk "^4.0.0" + jest-get-type "^26.0.0" + leven "^3.1.0" + pretty-format "^26.0.1" + +jest-watcher@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.0.1.tgz#5b5e3ebbdf10c240e22a98af66d645631afda770" + integrity sha512-pdZPydsS8475f89kGswaNsN3rhP6lnC3/QDCppP7bg1L9JQz7oU9Mb/5xPETk1RHDCWeqmVC47M4K5RR7ejxFw== + dependencies: + "@jest/test-result" "^26.0.1" + "@jest/types" "^26.0.1" ansi-escapes "^4.2.1" - chalk "^3.0.0" - jest-util "^25.5.0" - string-length "^3.1.0" + chalk "^4.0.0" + jest-util "^26.0.1" + string-length "^4.0.1" jest-worker@25.1.0: version "25.1.0" @@ -6697,7 +6737,7 @@ jest-worker@25.1.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^25.1.0, jest-worker@^25.5.0: +jest-worker@^25.1.0: version "25.5.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1" integrity sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw== @@ -6705,14 +6745,22 @@ jest-worker@^25.1.0, jest-worker@^25.5.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jest@^25.5.1: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest/-/jest-25.5.4.tgz#f21107b6489cfe32b076ce2adcadee3587acb9db" - integrity sha512-hHFJROBTqZahnO+X+PMtT6G2/ztqAZJveGqz//FnWWHurizkD05PQGzRZOhF3XP6z7SJmL+5tCfW8qV06JypwQ== +jest-worker@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.0.0.tgz#4920c7714f0a96c6412464718d0c58a3df3fb066" + integrity sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw== dependencies: - "@jest/core" "^25.5.4" + merge-stream "^2.0.0" + supports-color "^7.0.0" + +jest@^26.0.0: + version "26.0.1" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.0.1.tgz#5c51a2e58dff7525b65f169721767173bf832694" + integrity sha512-29Q54kn5Bm7ZGKIuH2JRmnKl85YRigp0o0asTc6Sb6l2ch1DCXIeZTLLFy9ultJvhkTqbswF5DEx4+RlkmCxWg== + dependencies: + "@jest/core" "^26.0.1" import-local "^3.0.2" - jest-cli "^25.5.4" + jest-cli "^26.0.1" "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -6732,39 +6780,7 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdom@^15.2.1: - version "15.2.1" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" - integrity sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g== - dependencies: - abab "^2.0.0" - acorn "^7.1.0" - acorn-globals "^4.3.2" - array-equal "^1.0.0" - cssom "^0.4.1" - cssstyle "^2.0.0" - data-urls "^1.1.0" - domexception "^1.0.1" - escodegen "^1.11.1" - html-encoding-sniffer "^1.0.2" - nwsapi "^2.2.0" - parse5 "5.1.0" - pn "^1.1.0" - request "^2.88.0" - request-promise-native "^1.0.7" - saxes "^3.1.9" - symbol-tree "^3.2.2" - tough-cookie "^3.0.1" - w3c-hr-time "^1.0.1" - w3c-xmlserializer "^1.1.2" - webidl-conversions "^4.0.2" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^7.0.0" - ws "^7.0.0" - xml-name-validator "^3.0.0" - -jsdom@^16.2.1: +jsdom@^16.2.1, jsdom@^16.2.2: version "16.2.2" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b" integrity sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg== @@ -7548,22 +7564,22 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@1.x, mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1, mkdirp@~0.5.x: +mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1, mkdirp@~0.5.x: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: minimist "^1.2.5" +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + moment@^2.10.2: - version "2.25.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.25.1.tgz#1cb546dca1eccdd607c9324747842200b683465d" - integrity sha512-nRKMf9wDS4Fkyd0C9LXh2FFXinD+iwbJ5p/lh3CHitW9kZbRbJ8hCruiadiIXZVbeAqKZzqcTvHnK3mRhFjb6w== + version "2.25.3" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.25.3.tgz#252ff41319cf41e47761a1a88cab30edfe9808c0" + integrity sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg== morgan@^1.9.1: version "1.10.0" @@ -7683,11 +7699,11 @@ ng2-charts@^2.3.0: tslib "^1.9.0" ngx-clipboard@^13.0.0: - version "13.0.0" - resolved "https://registry.yarnpkg.com/ngx-clipboard/-/ngx-clipboard-13.0.0.tgz#cbfc25b0fa5fbaaa76ee1229ebc7a6ed2ef0318b" - integrity sha512-dBSDTbmQ9saJLnFbTmQht2/s/GIvMTdEdFEBtIfKS6Xi9vOPurW7yxaTYYky2ON1FJq6LzYNjxEk/GEOZPz75w== + version "13.0.1" + resolved "https://registry.yarnpkg.com/ngx-clipboard/-/ngx-clipboard-13.0.1.tgz#393239d1a8f0ada8b99ef2d3ac80bc245c9ba3fe" + integrity sha512-e7QBsw7bX5ajhVR2++NAaYZYw90hKeEBlb006TW85WDUA3kmlrXpMDwOvVJuRewU6Nh+U1QiQMJq5a0ivk0zWg== dependencies: - ngx-window-token ">= 3.0.0-beta01 || >= 3.0.0" + ngx-window-token ">=3.0.0" ngx-markdown@^9.0.0: version "9.0.0" @@ -7704,7 +7720,7 @@ ngx-webstorage@^5.0.0: resolved "https://registry.yarnpkg.com/ngx-webstorage/-/ngx-webstorage-5.0.0.tgz#e27d9673c2452ca000ff509cd5a8397924c5b433" integrity sha512-m96dBjUgLCpaknLRKfsJMEik393xrSX0EwO3paNSkS5d+xj2/cAendE3NwJeKY/W1D9EkKAhCvSUDX9/bAwCUg== -"ngx-window-token@>= 3.0.0-beta01 || >= 3.0.0": +ngx-window-token@>=3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ngx-window-token/-/ngx-window-token-3.0.0.tgz#a5419befb133c6226e3e570737a247e66c825ab7" integrity sha512-MDVIQB2SqFCbpoTqEXhO2529hsvpCYyw/iogjU6uskKqUKh79XVKWSMpRH9S1yTr0Ucgh8nFeNcpv2DnFdikJA== @@ -7767,21 +7783,22 @@ node-modules-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-notifier@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-6.0.0.tgz#cea319e06baa16deec8ce5cd7f133c4a46b68e12" - integrity sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw== +node-notifier@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-7.0.0.tgz#513bc42f2aa3a49fce1980a7ff375957c71f718a" + integrity sha512-y8ThJESxsHcak81PGpzWwQKxzk+5YtP3IxR8AYdpXQ1IB6FmcVzFdZXrkPin49F/DKUCfeeiziB8ptY9npzGuA== dependencies: growly "^1.3.0" is-wsl "^2.1.1" - semver "^6.3.0" + semver "^7.2.1" shellwords "^0.1.1" - which "^1.3.1" + uuid "^7.0.3" + which "^2.0.2" node-releases@^1.1.53: - version "1.1.53" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4" - integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ== + version "1.1.55" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz#8af23b7c561d8e2e6e36a46637bab84633b07cee" + integrity sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w== normalize-package-data@^2.0.0, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0: version "2.5.0" @@ -8164,11 +8181,6 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= -p-finally@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" - integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== - p-is-promise@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" @@ -8319,7 +8331,7 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-asn1@^5.0.0: +parse-asn1@^5.0.0, parse-asn1@^5.1.5: version "5.1.5" resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e" integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ== @@ -8359,11 +8371,6 @@ parse5@4.0.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA== -parse5@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" - integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== - parse5@5.1.1, parse5@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" @@ -8558,11 +8565,6 @@ please-upgrade-node@^3.2.0: dependencies: semver-compare "^1.0.0" -pn@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" - integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== - png-js@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/png-js/-/png-js-1.0.0.tgz#e5484f1e8156996e383aceebb3789fd75df1874d" @@ -8918,7 +8920,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== -postcss@7.0.27, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6: +postcss@7.0.27: version "7.0.27" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ== @@ -8927,6 +8929,15 @@ postcss@7.0.27, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16 source-map "^0.6.1" supports-color "^6.1.0" +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.29" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz#d3a903872bd52280b83bce38cdc83ce55c06129e" + integrity sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -8959,6 +8970,21 @@ pretty-format@^25.0.0, pretty-format@^25.2.1, pretty-format@^25.5.0: ansi-styles "^4.0.0" react-is "^16.12.0" +pretty-format@^26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.0.1.tgz#a4fe54fe428ad2fd3413ca6bbd1ec8c2e277e197" + integrity sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw== + dependencies: + "@jest/types" "^26.0.1" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^16.12.0" + +primeflex@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/primeflex/-/primeflex-1.1.0.tgz#cd0ba3c6a18e1e5a410b9933ba255086c630f9a6" + integrity sha512-3obkpZ578PZbwj+2BUdRwc+g7oyHk74e2NbGY77kEWqmo8keji8qtarC58P1/58JhO9Js+twWP3vpVDo/i24TQ== + primeicons@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/primeicons/-/primeicons-2.0.0.tgz#ec3e5a8d4d04a09309225a5a57deb911e08dc0d3" @@ -9338,11 +9364,6 @@ readdirp@~3.4.0: dependencies: picomatch "^2.2.1" -realpath-native@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866" - integrity sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q== - reflect-metadata@^0.1.2: version "0.1.13" resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" @@ -9450,7 +9471,7 @@ request-promise-core@1.1.3: dependencies: lodash "^4.17.15" -request-promise-native@^1.0.7, request-promise-native@^1.0.8: +request-promise-native@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ== @@ -9544,7 +9565,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@1.x, resolve@^1.1.5, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.3.2: +resolve@^1.1.5, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.3.2: version "1.17.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== @@ -9730,13 +9751,6 @@ sax@>=0.6.0, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^3.1.9: - version "3.1.11" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" - integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g== - dependencies: - xmlchars "^2.1.1" - saxes@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -9838,7 +9852,7 @@ semver@7.1.3: resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6" integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA== -semver@^7.0.0, semver@^7.1.1: +semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2: version "7.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== @@ -10299,6 +10313,13 @@ stack-utils@^1.0.1: resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== +stack-utils@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593" + integrity sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg== + dependencies: + escape-string-regexp "^2.0.0" + static-eval@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.5.tgz#f0782e66999c4b3651cda99d9ce59c507d188f71" @@ -10393,13 +10414,13 @@ string-argv@0.3.1: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== -string-length@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-3.1.0.tgz#107ef8c23456e187a8abd4a61162ff4ac6e25837" - integrity sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA== +string-length@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" + integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== dependencies: - astral-regex "^1.0.0" - strip-ansi "^5.2.0" + char-regex "^1.0.2" + strip-ansi "^6.0.0" string-width@^1.0.1: version "1.0.2" @@ -10646,7 +10667,7 @@ symbol-observable@1.2.0: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== -symbol-tree@^3.2.2, symbol-tree@^3.2.4: +symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== @@ -10894,13 +10915,6 @@ tough-cookie@^3.0.1: psl "^1.1.28" punycode "^2.1.1" -tr46@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" - integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= - dependencies: - punycode "^2.1.0" - tr46@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" @@ -10919,9 +10933,9 @@ tree-kill@1.2.2: integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== ts-jest@^25.0.0, ts-jest@^25.4.0: - version "25.4.0" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-25.4.0.tgz#5ad504299f8541d463a52e93e5e9d76876be0ba4" - integrity sha512-+0ZrksdaquxGUBwSdTIcdX7VXdwLIlSRsyjivVA9gcO+Cvr6ByqDhu/mi5+HCcb6cMkiQp5xZ8qRO7/eCqLeyw== + version "25.5.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-25.5.0.tgz#f56f039b6caa15d9e32d064b0a8902886ab2fe72" + integrity sha512-govrjbOk1UEzcJ5cX5k8X8IUtFuP3lp3mrF3ZuKtCdAOQzdeCM7qualhb/U8s8SWFwEDutOqfF5PLkJ+oaYD4w== dependencies: bs-logger "0.x" buffer-from "1.x" @@ -10930,8 +10944,7 @@ ts-jest@^25.0.0, ts-jest@^25.4.0: lodash.memoize "4.x" make-error "1.x" micromatch "4.x" - mkdirp "1.x" - resolve "1.x" + mkdirp "0.x" semver "6.x" yargs-parser "18.x" @@ -10969,11 +10982,16 @@ ts-simple-ast@12.4.0: tslib "^1.9.0" typescript "2.9.1" -tslib@1.11.1, tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0: +tslib@1.11.1: version "1.11.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== +tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0: + version "1.11.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz#9c79d83272c9a7aaf166f73915c9667ecdde3cc9" + integrity sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg== + tsutils@^3.17.1: version "3.17.1" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" @@ -11076,9 +11094,9 @@ typescript@~3.8.3: integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== uglify-js@^3.1.4: - version "3.9.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.1.tgz#a56a71c8caa2d36b5556cc1fd57df01ae3491539" - integrity sha512-JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA== + version "3.9.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.2.tgz#012b74fb6a2e440d9ba1f79110a479d3b1f2d48d" + integrity sha512-zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q== dependencies: commander "~2.20.3" @@ -11302,7 +11320,7 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2, uuid@^3.3.3: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^7.0.2: +uuid@^7.0.2, uuid@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== @@ -11318,9 +11336,9 @@ v8-compile-cache@^2.0.3: integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== v8-to-istanbul@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz#22fe35709a64955f49a08a7c7c959f6520ad6f20" - integrity sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng== + version "4.1.4" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6" + integrity sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -11370,22 +11388,13 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2: +w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== dependencies: browser-process-hrtime "^1.0.0" -w3c-xmlserializer@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794" - integrity sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg== - dependencies: - domexception "^1.0.1" - webidl-conversions "^4.0.2" - xml-name-validator "^3.0.0" - w3c-xmlserializer@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" @@ -11448,11 +11457,6 @@ webdriver-manager@^12.0.6: semver "^5.3.0" xml2js "^0.4.17" -webidl-conversions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" - integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== - webidl-conversions@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" @@ -11586,27 +11590,18 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg== -whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5: +whatwg-encoding@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== dependencies: iconv-lite "0.4.24" -whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: +whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== -whatwg-url@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" - integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - whatwg-url@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.0.0.tgz#37f256cb746398e19b107bd6ef820b4ae2d15871" @@ -11722,7 +11717,7 @@ ws@^6.2.1: dependencies: async-limiter "~1.0.0" -ws@^7.0.0, ws@^7.2.3: +ws@^7.2.3: version "7.2.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d" integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA== @@ -11745,7 +11740,7 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmlchars@^2.1.1, xmlchars@^2.2.0: +xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== From ae2974967048a6bbbba65df79591a1dcff970064 Mon Sep 17 00:00:00 2001 From: seraph Date: Tue, 12 May 2020 19:16:23 +0200 Subject: [PATCH 2/2] add json-server + refacto --- .eslintrc.js | 35 +- .gitlab-ci.yml | 2 +- README.md | 46 +- angular.json | 3 +- mocks/db.json | 234 ++ mocks/routes.json | 8 + package.json | 36 +- proxy.conf.json | 11 + src/app/app-routing.module.ts | 4 + src/app/app.component.ts | 2 +- src/app/app.module.ts | 13 +- .../components/header/header.component.html | 30 +- .../components/header/header.component.ts | 17 +- .../navigation/navigation.component.html | 8 +- .../navigation/navigation.component.ts | 10 +- ...response.enum.ts => response-type.enum.ts} | 2 +- src/app/core/models/answer.model.ts | 6 - src/app/core/models/choice.model.ts | 37 +- src/app/core/models/comment.model.ts | 12 +- src/app/core/models/configuration.model.ts | 20 +- .../core/models/poll-user-answers.model.ts | 6 + src/app/core/models/poll.model.ts | 84 +- src/app/core/models/user.model.ts | 8 +- src/app/core/services/api.service.ts | 163 +- src/app/core/services/comment.service.spec.ts | 16 - src/app/core/services/comment.service.ts | 15 - src/app/core/services/mocking.service.ts | 17 +- src/app/core/services/modal.service.ts | 11 + src/app/core/services/poll.service.ts | 69 +- src/app/core/services/url.service.ts | 7 +- src/app/core/services/user.service.ts | 8 +- src/app/core/services/vote.service.spec.ts | 16 - src/app/core/services/vote.service.ts | 17 - src/app/core/utils/date-utils.service.ts | 10 +- .../edit-description.component.ts | 6 +- .../poll-edit/poll-edit.component.ts | 6 +- .../profile/profile.component.html | 6 +- .../consultation-routing.module.ts | 17 + .../consultation/consultation.component.html | 62 + .../consultation.component.scss} | 0 .../consultation.component.spec.ts | 24 + .../consultation/consultation.component.ts | 40 + .../consultation/consultation.module.ts | 15 + .../poll-results-compact.component.html | 19 + .../poll-results-compact.component.scss} | 0 .../poll-results-compact.component.spec.ts | 24 + .../poll-results-compact.component.ts | 28 + .../poll-results-detailed.component.html | 35 + .../poll-results-detailed.component.scss} | 0 .../poll-results-detailed.component.spec.ts | 24 + .../poll-results-detailed.component.ts | 16 + .../{ => features/old-stuff}/mocks/choice.ts | 0 .../mocks/comment-same-text-error.json | 0 .../mocks/comment-too-fast-error.json | 0 .../mocks/config-poll-dessins-animes.json | 0 .../old-stuff}/mocks/created-comment.json | 0 .../old-stuff}/mocks/mock-comments.ts | 0 .../old-stuff}/mocks/mock-graph.ts | 0 .../old-stuff}/mocks/mock-poll3.ts | 0 .../old-stuff}/mocks/mock-success-vote.ts | 0 .../old-stuff}/mocks/mockmypolls.ts | 0 .../old-stuff}/mocks/votestack-success.json | 0 .../pages/answers/answers.component.html | 6 +- .../create-or-retrieve.component.html | 8 +- .../pages/dates/dates.component.html | 24 +- .../end-confirmation.component.html | 2 +- .../old-stuff/pages/home/home.component.html | 4 +- .../poll-display/poll-display.component.html | 6 +- .../poll-display/poll-display.component.ts | 4 +- .../poll-graphic/poll-graphic.component.ts | 4 +- .../pages/resume/resume.component.html | 8 +- .../visibility/visibility.component.html | 6 +- .../choices-list/choices-list.component.html | 4 +- .../comments-list.component.html | 6 +- .../voting-choice.component.html | 17 +- .../voting-choice.component.spec.ts | 4 +- .../voting-comment.component.ts | 2 +- .../voting-navigation.component.html | 4 +- .../voting-summary.component.html | 28 +- .../voting-summary.component.ts | 2 +- .../old-stuff/services/config.service.ts | 6 +- .../ui/copy-text/copy-text.component.html | 2 +- .../erasable-input.component.html | 2 +- .../add-answer/add-answer.component.html | 41 + .../add-answer/add-answer.component.scss | 0 .../add-answer/add-answer.component.spec.ts} | 12 +- .../add-answer/add-answer.component.ts | 30 + .../add-comment/add-comment.component.html | 26 + .../add-comment/add-comment.component.scss | 0 .../add-comment.component.spec.ts} | 12 +- .../add-comment/add-comment.component.ts | 21 + .../answers/answers.component.html | 1 + .../answers/answers.component.scss | 0 .../answers.component.spec.ts} | 12 +- .../answers/answers.component.ts | 18 + .../participation-routing.module.ts | 2 - .../participation.component.html | 25 +- .../participation/participation.component.ts | 2 + .../participation/participation.module.ts | 7 +- .../poll-comment/poll-comment.component.html | 1 - .../poll-comment/poll-comment.component.ts | 12 - .../participation/poll/poll.component.html | 6 - .../choice-details.component.html | 36 + .../choice-details.component.scss | 0 .../choice-details.component.spec.ts | 24 + .../choice-details.component.ts | 25 + .../comments/comments.component.html | 9 + .../comments/comments.component.scss | 0 .../comments/comments.component.spec.ts | 24 + .../comments/comments.component.ts} | 12 +- .../components/feedback/feedback.component.ts | 3 +- .../poll-page/poll-page.component.html | 1 - .../poll-page/poll-page.component.ts | 12 - .../language-selector.component.html | 6 +- .../theme-selector.component.html | 12 +- .../theme-selector.component.ts | 2 +- .../settings/settings.component.html | 16 +- .../components/settings/settings.component.ts | 2 +- src/app/shared/shared.module.ts | 8 +- ...otant-pas-sur.svg => icon_voter_MAYBE.svg} | 0 .../{votant-sur.svg => icon_voter_YES.svg} | 0 src/environments/environment.prod.ts | 25 +- src/environments/environment.ts | 16 +- tsconfig.json | 41 +- yarn.lock | 2809 ++++++++++------- 125 files changed, 3065 insertions(+), 1700 deletions(-) create mode 100644 mocks/db.json create mode 100644 mocks/routes.json create mode 100644 proxy.conf.json rename src/app/core/enums/{response.enum.ts => response-type.enum.ts} (63%) delete mode 100644 src/app/core/models/answer.model.ts create mode 100644 src/app/core/models/poll-user-answers.model.ts delete mode 100644 src/app/core/services/comment.service.spec.ts delete mode 100644 src/app/core/services/comment.service.ts delete mode 100644 src/app/core/services/vote.service.spec.ts delete mode 100644 src/app/core/services/vote.service.ts create mode 100644 src/app/features/consultation/consultation-routing.module.ts create mode 100644 src/app/features/consultation/consultation.component.html rename src/app/features/{participation/poll-comment/poll-comment.component.scss => consultation/consultation.component.scss} (100%) create mode 100644 src/app/features/consultation/consultation.component.spec.ts create mode 100644 src/app/features/consultation/consultation.component.ts create mode 100644 src/app/features/consultation/consultation.module.ts create mode 100644 src/app/features/consultation/poll-results-compact/poll-results-compact.component.html rename src/app/features/{participation/poll/poll.component.scss => consultation/poll-results-compact/poll-results-compact.component.scss} (100%) create mode 100644 src/app/features/consultation/poll-results-compact/poll-results-compact.component.spec.ts create mode 100644 src/app/features/consultation/poll-results-compact/poll-results-compact.component.ts create mode 100644 src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html rename src/app/{shared/components/poll-page/poll-page.component.scss => features/consultation/poll-results-detailed/poll-results-detailed.component.scss} (100%) create mode 100644 src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.spec.ts create mode 100644 src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.ts rename src/app/{ => features/old-stuff}/mocks/choice.ts (100%) rename src/app/{ => features/old-stuff}/mocks/comment-same-text-error.json (100%) rename src/app/{ => features/old-stuff}/mocks/comment-too-fast-error.json (100%) rename src/app/{ => features/old-stuff}/mocks/config-poll-dessins-animes.json (100%) rename src/app/{ => features/old-stuff}/mocks/created-comment.json (100%) rename src/app/{ => features/old-stuff}/mocks/mock-comments.ts (100%) rename src/app/{ => features/old-stuff}/mocks/mock-graph.ts (100%) rename src/app/{ => features/old-stuff}/mocks/mock-poll3.ts (100%) rename src/app/{ => features/old-stuff}/mocks/mock-success-vote.ts (100%) rename src/app/{ => features/old-stuff}/mocks/mockmypolls.ts (100%) rename src/app/{ => features/old-stuff}/mocks/votestack-success.json (100%) create mode 100644 src/app/features/participation/add-answer/add-answer.component.html create mode 100644 src/app/features/participation/add-answer/add-answer.component.scss rename src/app/{shared/components/poll-page/poll-page.component.spec.ts => features/participation/add-answer/add-answer.component.spec.ts} (54%) create mode 100644 src/app/features/participation/add-answer/add-answer.component.ts create mode 100644 src/app/features/participation/add-comment/add-comment.component.html create mode 100644 src/app/features/participation/add-comment/add-comment.component.scss rename src/app/features/participation/{poll-comment/poll-comment.component.spec.ts => add-comment/add-comment.component.spec.ts} (53%) create mode 100644 src/app/features/participation/add-comment/add-comment.component.ts create mode 100644 src/app/features/participation/answers/answers.component.html create mode 100644 src/app/features/participation/answers/answers.component.scss rename src/app/features/participation/{poll/poll.component.spec.ts => answers/answers.component.spec.ts} (55%) create mode 100644 src/app/features/participation/answers/answers.component.ts delete mode 100644 src/app/features/participation/poll-comment/poll-comment.component.html delete mode 100644 src/app/features/participation/poll-comment/poll-comment.component.ts delete mode 100644 src/app/features/participation/poll/poll.component.html create mode 100644 src/app/shared/components/choice-details/choice-details.component.html create mode 100644 src/app/shared/components/choice-details/choice-details.component.scss create mode 100644 src/app/shared/components/choice-details/choice-details.component.spec.ts create mode 100644 src/app/shared/components/choice-details/choice-details.component.ts create mode 100644 src/app/shared/components/comments/comments.component.html create mode 100644 src/app/shared/components/comments/comments.component.scss create mode 100644 src/app/shared/components/comments/comments.component.spec.ts rename src/app/{features/participation/poll/poll.component.ts => shared/components/comments/comments.component.ts} (56%) delete mode 100644 src/app/shared/components/poll-page/poll-page.component.html delete mode 100644 src/app/shared/components/poll-page/poll-page.component.ts rename src/assets/img/{votant-pas-sur.svg => icon_voter_MAYBE.svg} (100%) rename src/assets/img/{votant-sur.svg => icon_voter_YES.svg} (100%) diff --git a/.eslintrc.js b/.eslintrc.js index 5e525719..904bcc17 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,19 +1,20 @@ module.exports = { - parser: '@typescript-eslint/parser', - parserOptions: { - ecmaVersion: 2018, - sourceType: 'module', - project: './tsconfig.json', - tsconfigRootDir: __dirname, - }, - plugins: ['@typescript-eslint'], - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/eslint-recommended', - 'plugin:@typescript-eslint/recommended', - 'plugin:@typescript-eslint/recommended-requiring-type-checking', - 'prettier/@typescript-eslint', - 'plugin:prettier/recommended', - ], - rules: {}, + parser: '@typescript-eslint/parser', + plugins: ['@typescript-eslint'], + extends: [ + 'eslint:recommended', + 'plugin:@typescript-eslint/eslint-recommended', + 'plugin:@typescript-eslint/recommended', + 'plugin:prettier/recommended', + 'prettier/@typescript-eslint', + ], + parserOptions: { + ecmaVersion: 2018, + sourceType: 'module', + project: './tsconfig.json', + tsconfigRootDir: __dirname, + }, + rules: { + '@typescript-eslint/unbound-method': ['error', { ignoreStatic: true }], + }, }; diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96b90df3..974e9088 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ pages: stage: pages script: - yarn install --pure-lockfile - - npx ng build --base-href=/framadate/funky-framadate-front/ + - yarn build - mv dist/framadate/ public/ artifacts: paths: diff --git a/README.md b/README.md index b4d32f1a..8430f0b9 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,29 @@ ## LIBRARIES USED -| status | lib name | usage | -| --------------- | -------------------------------------------------------------- | ---------------------------------------- | -| | [axios](https://github.com/axios/axios) | http client | -| | [bulma](https://bulma.io/) | CSS framework | -| | [chart.js](https://www.chartjs.org/) | Display graphs. (Comes with MomentJS) | -| | [compodoc](https://compodoc.app/) | Generate technic documentation | -| | ESlint, Prettier, Lint-staged | Format & lint code | -| | [fork-awesome](https://forkaweso.me) | Icons collection | -| | [fullcalendar](https://fullcalendar.io/docs/initialize-es6) | Manage & display calendars | -| | [husky](https://www.npmjs.com/package/husky) | Hook actions on commit | -| | [jest](https://jestjs.io/) | test engine | -| removed | [locale-enum](https://www.npmjs.com/package/locale-enum) | enum of all locales | -| | [momentJS](https://momentjs.com/) | manipulate dates. (chartJS’s dependency) | -| to be installed | [ng2-charts](https://valor-software.com/ng2-charts/) | Manipulate graphs along with chart.js | -| | [ngx-clipboard](https://www.npmjs.com/package/ngx-clipboard) | Handle clipboard | -| | [ngx-markdown](https://www.npmjs.com/package/ngx-markdown) | markdown parser | -| | [ngx-webstorage](https://www.npmjs.com/package/ngx-webstorage) | handle localStorage & webStorage | -| | [primeNG](https://www.primefaces.org/primeng/) | UI components collection | -| | [quill](https://www.npmjs.com/package/quill) | powerful rich text editor. WYSIWYG. | -| removed | [storybook](https://storybook.js.org/) | StyleGuide UI | -| | [ts-mockito](https://www.npmjs.com/package/ts-mockito) | Mocks for testing. | -| | [uuid](https://www.npmjs.com/package/uuid) | handle client-side generation of uuids | +| status | lib name | usage | +| :-------------: | -------------------------------------------------------------- | --------------------------------------------------------- | +| | [axios](https://github.com/axios/axios) | http client | +| | [bulma](https://bulma.io/) | CSS framework | +| | [chart.js](https://www.chartjs.org/) | PrimeNG solution for graphs. (Chart.js installs MomentJS) | +| | [compodoc](https://compodoc.app/) | Generate technic documentation | +| | ESlint, Prettier, Lint-staged | Format & lint code | +| | [fork-awesome](https://forkaweso.me) | Icons collection | +| | [fullcalendar](https://fullcalendar.io/docs/initialize-es6) | PrimeNG solution to manage & display calendars | +| | [husky](https://www.npmjs.com/package/husky) | Hook actions on commit | +| | [jest](https://jestjs.io/) | test engine | +| | [json-server](https://www.npmjs.com/package/json-server) | local server for mocking data backend | +| removed | [locale-enum](https://www.npmjs.com/package/locale-enum) | enum of all locales | +| | [momentJS](https://momentjs.com/) | manipulate dates. (chartJS’s dependency) | +| to be installed | [ng2-charts](https://valor-software.com/ng2-charts/) | Manipulate graphs along with chart.js | +| | [ngx-clipboard](https://www.npmjs.com/package/ngx-clipboard) | Handle clipboard | +| | [ngx-markdown](https://www.npmjs.com/package/ngx-markdown) | markdown parser | +| | [ngx-webstorage](https://www.npmjs.com/package/ngx-webstorage) | handle localStorage & webStorage | +| | [primeNG](https://www.primefaces.org/primeng/) | UI components collection | +| | [quill](https://www.npmjs.com/package/quill) | powerful rich text editor. WYSIWYG. | +| to be installed | [short-uuid](https://www.npmjs.com/package/short-uuid) | generate uuid | +| removed | [storybook](https://storybook.js.org/) | StyleGuide UI | +| | [ts-mockito](https://www.npmjs.com/package/ts-mockito) | Mocks for testing. | +| to be removed | [uuid](https://www.npmjs.com/package/uuid) | generate uuid | --- This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.2.1. diff --git a/angular.json b/angular.json index 8864f04b..a9606a6f 100644 --- a/angular.json +++ b/angular.json @@ -25,10 +25,9 @@ "assets": ["src/favicon.ico", "src/assets"], "styles": [ "node_modules/fork-awesome/css/fork-awesome.min.css", - "node_modules/primeicons/primeicons.css", "node_modules/primeng/resources/themes/nova-light/theme.css", "node_modules/primeng/resources/primeng.min.css", - "node_modules/primeflex/primeflex.css", + "node_modules/bulma-switch/dist/css/bulma-switch.min.css", "src/styles.scss" ], "scripts": [ diff --git a/mocks/db.json b/mocks/db.json new file mode 100644 index 00000000..eef2dd98 --- /dev/null +++ b/mocks/db.json @@ -0,0 +1,234 @@ +{ + "owners": [ + { "id": 1, "email": "toto@gafam.com", "pseudo": "TOTO" }, + { "id": 2, "email": "titi@gafam.com", "pseudo": "TITI" } + ], + "voters": [{ "pseudo": "TOTO", "polls": [] }], + "polls": [ + { + "id": 1, + "slug": "picnic", + "configuration": { + "isAboutDate": true, + "isProtectedByPassword": false, + "isOwnerNotifiedByEmailOnNewVote": false, + "isOwnerNotifiedByEmailOnNewComment": false, + "isMaybeAnswerAvailable": true, + "areResultsPublic": true, + "dateCreated": "2020-05-17", + "expires": "2020-06-17" + }, + "ownerId": 1, + "question": "Quelle date pour le picnic ?", + "description": "Gros badass picnic en plein air ! Come on !", + "answersByChoiceByParticipant": { + "TOTO": { "samedi": "YES", "dimanche": "NO" }, + "TATA": { "samedi": "NO", "dimanche": null }, + "TITI": { "samedi": "MAYBE", "dimanche": "NO" } + }, + "answers": [ + { + "pseudo": "TOTO", + "token": "TOTO-TOKEN", + "responsesByChoices": [ + { "choice": { "label": "samedi", "imagePath": null }, "responseType": "YES" }, + { "choice": { "label": "dimanche", "imagePath": null }, "responseType": "NO" } + ] + }, + { + "pseudo": "TATA", + "token": "TATA-TOKEN", + "responsesByChoices": [ + { "choice": { "label": "samedi", "imagePath": null }, "responseType": "NO" }, + { "choice": { "label": "dimanche", "imagePath": null }, "responseType": "NO" } + ] + }, + { + "pseudo": "TITI", + "token": "TITI-TOKEN", + "responsesByChoices": [ + { "choice": { "label": "samedi", "imagePath": null }, "responseType": "NO" }, + { "choice": { "label": "dimanche", "imagePath": null }, "responseType": "YES" } + ] + }, + { + "pseudo": "TETE", + "token": "TETE-TOKEN", + "responsesByChoices": [ + { "choice": { "label": "samedi", "imagePath": null }, "responseType": "YES" }, + { "choice": { "label": "dimanche", "imagePath": null }, "responseType": "NO" } + ] + } + ] + }, + { + "id": 2, + "slug": "vacances", + "configuration": { + "isAboutDate": true, + "isProtectedByPassword": false, + "isOwnerNotifiedByEmailOnNewVote": false, + "isOwnerNotifiedByEmailOnNewComment": false, + "isMaybeAnswerAvailable": true, + "areResultsPublic": true, + "dateCreated": "2020-05-17", + "expires": "2020-06-17" + }, + "ownerId": 2, + "question": "On fait quoi pendant les vacances ?", + "description": "Vacances en famille", + "answersByChoiceByParticipant": { + "TOTO": { "bateau": "YES", "montagne": "NO", "quad": "MAYBE" }, + "TATA": { "bateau": "NO", "montagne": null, "quad": "YES" }, + "TITI": { "bateau": "MAYBE", "montagne": "NO", "quad": null } + }, + "answers": [ + { + "pseudo": "TOTO", + "token": "TOTO-TOKEN", + "responsesByChoices": [ + { "choice": { "label": "bateau", "imagePath": null }, "responseType": "YES" }, + { "choice": { "label": "montagne", "imagePath": null }, "responseType": "NO" }, + { "choice": { "label": "quad", "imagePath": null }, "responseType": "NO" } + ] + }, + { + "pseudo": "TATA", + "token": "TATA-TOKEN", + "responsesByChoices": [ + { "choice": { "label": "bateau", "imagePath": null }, "responseType": "NO" }, + { "choice": { "label": "montagne", "imagePath": null }, "responseType": "NO" }, + { "choice": { "label": "quad", "imagePath": null }, "responseType": "NO" } + ] + }, + { + "pseudo": "TITI", + "token": "TITI-TOKEN", + "responsesByChoices": [ + { "choice": { "label": "bateau", "imagePath": null }, "responseType": "NO" }, + { "choice": { "label": "montagne", "imagePath": null }, "responseType": "YES" }, + { "choice": { "label": "quad", "imagePath": null }, "responseType": "NO" } + ] + }, + { + "pseudo": "TETE", + "token": "TETE-TOKEN", + "responsesByChoices": [ + { "choice": { "label": "bateau", "imagePath": null }, "responseType": "YES" }, + { "choice": { "label": "montagne", "imagePath": null }, "responseType": "NO" }, + { "choice": { "label": "quad", "imagePath": null }, "responseType": "NO" } + ] + } + ] + } + ], + "choices": [ + { + "id": 1, + "pollId": 1, + "pollSlug": "picnic", + "label": "samedi", + "participants": [ + ["YES", ["TOTO", "TITI"]], + ["NO", ["TETE"]], + ["MAYBE", ["TATA"]] + ] + }, + { + "id": 2, + "pollId": 1, + "pollSlug": "picnic", + "label": "dimanche", + "participants": [ + ["YES", ["TOTO", "TITI"]], + ["NO", ["TETE"]], + ["MAYBE", ["TATA"]] + ] + }, + { + "id": 3, + "pollId": 2, + "pollSlug": "vacances", + "label": "bateau", + "participants": [ + ["YES", ["TOTO", "TITI"]], + ["NO", ["TETE"]], + ["MAYBE", ["TATA"]] + ] + }, + { + "id": 4, + "pollId": 2, + "pollSlug": "vacances", + "label": "montagne", + "participants": [ + ["YES", ["TOTO", "TITI"]], + ["NO", ["TETE"]], + ["MAYBE", ["TATA"]] + ] + }, + { + "id": 5, + "pollId": 2, + "pollSlug": "vacances", + "label": "quad", + "participants": [ + ["YES", ["TOTO", "TITI"]], + ["NO", ["TETE"]], + ["MAYBE", ["TATA"]] + ] + } + ], + "answers": [ + { "choiceId": 1, "pseudo": "TOTO", "response": "YES", "token": "TOTO-TOKEN" }, + { "choiceId": 1, "pseudo": "TATA", "response": "NO", "token": "TATA-TOKEN" }, + { "choiceId": 1, "pseudo": "TITI", "response": "MAYBE", "token": "TITI-TOKEN" }, + { "choiceId": 2, "pseudo": "TOTO", "response": "YES", "token": "TOTO-TOKEN" }, + { "choiceId": 2, "pseudo": "TATA", "response": "NO", "token": "TATA-TOKEN" }, + { "choiceId": 2, "pseudo": "TITI", "response": "MAYBE", "token": "TITI-TOKEN" }, + { "choiceId": 2, "pseudo": "EVA", "response": null, "token": "EVA-TOKEN" }, + { "choiceId": 3, "pseudo": "TOTO", "response": "YES", "token": "TOTO-TOKEN" }, + { "choiceId": 3, "pseudo": "TATA", "response": "NO", "token": "TATA-TOKEN" }, + { "choiceId": 3, "pseudo": "TITI", "response": "MAYBE", "token": "TITI-TOKEN" }, + { "choiceId": 4, "pseudo": "TOTO", "response": "YES", "token": "TOTO-TOKEN" }, + { "choiceId": 4, "pseudo": "TATA", "response": "NO", "token": "TATA-TOKEN" }, + { "choiceId": 4, "pseudo": "TITI", "response": "MAYBE", "token": "TITI-TOKEN" }, + { "choiceId": 5, "pseudo": "TOTO", "response": "YES", "token": "TOTO-TOKEN" }, + { "choiceId": 5, "pseudo": "TATA", "response": "NO", "token": "TATA-TOKEN" }, + { "choiceId": 5, "pseudo": "TITI", "response": "MAYBE", "token": "TITI-TOKEN" } + ], + "comments": [ + { + "id": 1, + "pollId": 1, + "pollSlug": "picnic", + "content": "Les picnics, c’est trop bien, j’adore!", + "author": "TATA", + "dateCreated": 1589111111111 + }, + { + "id": 2, + "pollId": 1, + "pollSlug": "picnic", + "content": "Oué, grave!", + "author": "TETE", + "dateCreated": 1589222222222 + }, + { + "id": 3, + "pollId": 2, + "pollSlug": "vacances", + "content": "Désolé je pourrai pas être là, mais je penserai bien à vous. Mamie", + "author": "MAMIE", + "dateCreated": 1589333333333 + }, + { + "id": 4, + "pollId": 2, + "pollSlug": "vacances", + "content": "Arf, trop dommage.", + "author": "Tom", + "dateCreated": 1589444444444 + } + ] +} diff --git a/mocks/routes.json b/mocks/routes.json new file mode 100644 index 00000000..45524edf --- /dev/null +++ b/mocks/routes.json @@ -0,0 +1,8 @@ +{ + "/api/v1/*": "/$1", + "/owners/:email/": "/owners?email=:email", + "/choices": "/choices?_embed=answers", + "/polls/:slug": "/polls?slug=:slug&_expand=owner&_embed=choices&_embed=comments", + "/polls/:slug/choices": "/choices?pollSlug=:slug&_embed=answers", + "/polls/:slug/comments": "/comments?pollSlug=:slug" +} diff --git a/package.json b/package.json index 3bcda40e..ec19d7f0 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,15 @@ "test": "jest", "test:watch": "jest --watch", "test:ci": "jest --runInBand", - "lint": "ng lint", + "lint": "prettier --write \"src/**/*.{js,jsx,ts,tsx,md,html,css,scss}\"", "e2e": "ng e2e", "format:check": "prettier --list-different \"src/{app,environments,assets}/**/*{.ts,.js,.json,.css,.scss}\"", "format:all": "prettier --write \"src/**/*.{js,jsx,ts,tsx,md,html,css,scss}\"", "trans": "ng xi18n --output-path=src/locale --i18n-locale=fr", - "compodoc": "compodoc -p tsconfig.app.json" + "compodoc": "compodoc -p tsconfig.app.json", + "mock:server": "json-server --port 8000 --watch ./mocks/db.json --routes ./mocks/routes.json", + "start:proxy": "ng serve --proxy-config proxy.conf.json", + "start:proxymock": "concurrently --kill-others \"yarn mock:server\" \"yarn start:proxy\"" }, "private": false, "dependencies": { @@ -36,20 +39,19 @@ "@ngx-translate/http-loader": "^4.0.0", "angular-date-value-accessor": "^1.0.2", "axios": "^0.19.2", - "bulma": "^0.8.2", + "bulma": "^0.9.0", + "bulma-switch": "^2.0.0", "chart.js": "^2.9.3", "fork-awesome": "^1.1.7", "ng2-charts": "^2.3.0", "ngx-clipboard": "^13.0.0", "ngx-markdown": "^9.0.0", "ngx-webstorage": "^5.0.0", - "primeflex": "^1.0.0", - "primeicons": "^2.0.0", "primeng": "^9.0.6", "quill": "^1.3.7", "rxjs": "^6.5.5", "rxjs-compat": "^6.5.5", - "tslib": "^1.11.1", + "tslib": "<2.0.0", "uuid": "^8.0.0", "zone.js": "^0.10.3" }, @@ -64,22 +66,24 @@ "@babel/preset-typescript": "^7.9.0", "@compodoc/compodoc": "^1.1.11", "@types/jest": "^25.2.1", - "@types/node": "^13.13.2", - "@types/uuid": "^7.0.2", - "@typescript-eslint/eslint-plugin": "^2.27.0", - "@typescript-eslint/parser": "^2.27.0", + "@types/node": "^14.0.1", + "@types/uuid": "^8.0.0", + "@typescript-eslint/eslint-plugin": "^3.0.0", + "@typescript-eslint/parser": "^3.0.0", "babel-jest": "^26.0.0", - "eslint": "^6.8.0", + "concurrently": "^5.2.0", + "eslint": "^7.0.0", "eslint-config-prettier": "^6.11.0", "eslint-plugin-prettier": "^3.1.3", "husky": "^4.2.5", "jest": "^26.0.0", "jest-environment-jsdom-sixteen": "^1.0.3", "jest-preset-angular": "^8.1.3", + "json-server": "^0.16.1", "lint-staged": "^10.1.7", "prettier": "^2.0.5", - "protractor": "~5.4.3", - "ts-jest": "^25.4.0", + "protractor": "~7.0.0", + "ts-jest": "^26.0.0", "ts-mockito": "^2.5.0", "ts-node": "^8.10.1", "typescript": "~3.8.3" @@ -90,11 +94,13 @@ } }, "lint-staged": { - "src/{app,environments,assets}/**/*.{js,jsx,ts,tsx,md,html,css,scss}": [ + "src/**/*.{js,jsx,ts,tsx,md,html,css,scss}": [ "prettier --write", "git add" ], - "*.js": "eslint --cache --fix" + "*.js": [ + "prettier --write" + ] }, "jest": { "preset": "jest-preset-angular", diff --git a/proxy.conf.json b/proxy.conf.json new file mode 100644 index 00000000..220da25b --- /dev/null +++ b/proxy.conf.json @@ -0,0 +1,11 @@ +{ + "/api/v1/*": { + "target": "http://localhost:8000", + "secure": false, + "pathRewrite": { + "^/api/v1": "" + }, + "changeOrigin": false, + "logLevel": "debug" + } +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index ca478a7f..1694a968 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -11,6 +11,10 @@ const routes: Routes = [ loadChildren: () => import('./features/administration/administration.module').then((m) => m.AdministrationModule), }, + { + path: 'consultation', + loadChildren: () => import('./features/consultation/consultation.module').then((m) => m.ConsultationModule), + }, { path: 'participation', loadChildren: () => import('./features/participation/participation.module').then((m) => m.ParticipationModule), diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0059d36d..c9586d99 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -32,7 +32,7 @@ export class AppComponent implements OnInit, OnDestroy { if (!environment.production) { this.appTitle += ' [DEV]'; // TODO: to be removed - this.mockingService.loadUser(new User('TOTO', 'toto@gafam.com', UserRole.REGISTERED, false)); + this.mockingService.loadUser(new User('TOTO', 'toto@gafam.com', UserRole.REGISTERED)); } this.titleService.setTitle(this.appTitle); this.languageService.configureAndInitTranslations(); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 71defe54..9667d072 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,7 @@ -import { CommonModule } from '@angular/common'; +import { APP_BASE_HREF, CommonModule, registerLocaleData } from '@angular/common'; import { HttpClient, HttpClientModule } from '@angular/common/http'; +import localeEn from '@angular/common/locales/en'; +import localeFr from '@angular/common/locales/fr'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { BrowserModule, Title } from '@angular/platform-browser'; @@ -21,8 +23,9 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; import { SharedModule } from './shared/shared.module'; -import { ParticipationModule } from './features/participation/participation.module'; -import { AdministrationModule } from './features/administration/administration.module'; + +registerLocaleData(localeEn, 'en-EN'); +registerLocaleData(localeFr, 'fr-FR'); export class MyMissingTranslationHandler implements MissingTranslationHandler { public handle(params: MissingTranslationHandlerParams): string { @@ -38,7 +41,6 @@ export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader { declarations: [AppComponent], imports: [ AppRoutingModule, - AdministrationModule, BrowserAnimationsModule, BrowserModule, ClipboardModule, @@ -61,9 +63,8 @@ export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader { }, useDefaultLang: false, }), - ParticipationModule, ], - providers: [Title, TranslateService], + providers: [{ provide: APP_BASE_HREF, useValue: environment.baseHref }, Title, TranslateService], bootstrap: [AppComponent], }) export class AppModule {} diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index ffc65486..432ec7e3 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -37,18 +37,30 @@
      Modules
      + + Old stuff + Administration + + Consultation + + + Participation + +
      +
      +
      + Tous les sondages +
      - Participation à citron_ou_orange - - - Old stuff + « {{ slug }} »
      @@ -57,11 +69,11 @@
      - - + - +
      diff --git a/src/app/core/components/header/header.component.ts b/src/app/core/components/header/header.component.ts index c6f9f4c7..ad2de52a 100644 --- a/src/app/core/components/header/header.component.ts +++ b/src/app/core/components/header/header.component.ts @@ -1,7 +1,8 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Observable } from 'rxjs'; import { User } from '../../models/user.model'; +import { ApiService } from '../../services/api.service'; import { ModalService } from '../../services/modal.service'; import { UserService } from '../../services/user.service'; @@ -10,13 +11,23 @@ import { UserService } from '../../services/user.service'; templateUrl: './header.component.html', styleUrls: ['./header.component.scss'], }) -export class HeaderComponent { +export class HeaderComponent implements OnInit { @Input() isSidebarOpened: boolean; @Output() toggleSidebarEE = new EventEmitter(); public _user: Observable = this.userService.user; - constructor(private userService: UserService, private modalService: ModalService) {} + public slugsAvailables: string[] = []; + + constructor(private userService: UserService, private modalService: ModalService, private apiService: ApiService) {} + + public ngOnInit(): void { + this.getSlugs(); + } + + public async getSlugs(): Promise { + this.slugsAvailables = await this.apiService.getAllPollsSlugs(); + } public openDialog(): void { this.modalService.openSettingsComponent(); diff --git a/src/app/core/components/sibebar/navigation/navigation.component.html b/src/app/core/components/sibebar/navigation/navigation.component.html index 54c8767d..ccfc3f6a 100644 --- a/src/app/core/components/sibebar/navigation/navigation.component.html +++ b/src/app/core/components/sibebar/navigation/navigation.component.html @@ -1,11 +1,7 @@
      - +
      diff --git a/src/app/features/old-stuff/pages/dates/dates.component.html b/src/app/features/old-stuff/pages/dates/dates.component.html index 4c1253e2..3b7e5b79 100644 --- a/src/app/features/old-stuff/pages/dates/dates.component.html +++ b/src/app/features/old-stuff/pages/dates/dates.component.html @@ -1,4 +1,4 @@ -

      {{ 'dates.title' | translate }}

      +

      {{ 'dates.title' | translate }}

      @@ -45,7 +45,7 @@

@@ -97,7 +97,7 @@
@@ -130,7 +130,7 @@ type="date" />
diff --git a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.html b/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.html index 3c7d44a7..e7458fe0 100644 --- a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.html +++ b/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.html @@ -47,7 +47,7 @@

diff --git a/src/app/features/old-stuff/pages/home/home.component.html b/src/app/features/old-stuff/pages/home/home.component.html index 1eec32ce..fa5b21ce 100644 --- a/src/app/features/old-stuff/pages/home/home.component.html +++ b/src/app/features/old-stuff/pages/home/home.component.html @@ -79,11 +79,11 @@