Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 354-actualites-partage-article-via-rs-image-d-illus-a-la-place-du-logo-res-in
  • 582-modification-fiche-structure-offre-structure-vs-offre-accompagnant-numerique-ordre-des-blocs
  • 630-bo-admin-fonction-2
  • 673-fiche-structure-mise-en-forme-des-rs
  • 722-envsubst-client-side-conf
  • 723-structures-l-api-ne-prend-pas-en-compte-l-offre-des-mediateurs
  • 728-cartographie-ordre-d-affichage-de-la-liste
  • 734-actualites-menu-en-mobile
  • dev
  • feat/nginx-security
  • master
  • renovate/bluehalo-ngx-leaflet-20.x
  • renovate/chokidar-4.x
  • renovate/chromatic-com-storybook-4.x
  • renovate/devdependencies-(non-major)
  • renovate/leaflet.locatecontrol-0.x
  • renovate/major-ag-grid-monorepo
  • renovate/major-angular-cli-monorepo
  • renovate/major-angular-eslint-monorepo
  • renovate/major-angular-monorepo
  • renovate/major-angularmaterial-monorepo
  • renovate/major-storybook-monorepo
  • renovate/major-typescript-eslint-monorepo
  • renovate/ng-packagr-20.x
  • renovate/ngx-matomo-client-8.x
  • renovate/ngx-toastr-19.x
  • renovate/npm-11.x
  • wip_3.4
  • 1.1.0
  • v0.0.1
  • v0.0.2
  • v0.0.3
  • v1.1.0
  • v1.10.0
  • v1.11.0
  • v1.11.1
  • v1.12.0
  • v1.12.1
  • v1.13.0
  • v1.14.0
  • v1.15.0
  • v1.16.0
  • v1.16.1
  • v1.16.2
  • v1.16.3
  • v1.17.0
  • v1.17.1
  • v1.17.2
  • v1.17.3
  • v1.2.0
  • v1.3.0
  • v1.4.0
  • v1.5.0
  • v1.6.0
  • v1.6.1
  • v1.7.0
  • v1.8.0
  • v1.9.0
  • v1.9.1
  • v2.0.0
  • v2.0.0-beta1
  • v2.0.0-beta1.1
  • v2.0.0-beta2
  • v2.0.0-beta2.1
  • v2.0.0-beta2.2
  • v2.0.0-beta4
  • v2.0.0-beta5
  • v2.0.1
  • v2.0.2
  • v2.1.0
  • v2.1.1
  • v2.1.2
  • v2.2.0
  • v2.3.0
  • v2.3.1
  • v2.3.2
  • v2.3.3
  • v2.4.0
  • v2.4.1
  • v2.4.2
  • v2.5.0
  • v3.0.0
  • v3.0.1
  • v3.0.2
  • v3.1.0
  • v3.1.0-openshift
  • v3.2.0
  • v3.2.1
  • v3.2.2
  • v3.3.0
  • v3.3.1
  • v3.4.0
  • v3.4.1
  • v3.4.2
  • v3.4.3
  • v4.0.0
  • v4.0.1
  • v4.0.2
  • v4.1.0
  • v4.1.1
100 results

Target

Select target project
  • web-et-numerique / Factory / Resin / Client
1 result
Select Git revision
  • 354-actualites-partage-article-via-rs-image-d-illus-a-la-place-du-logo-res-in
  • 582-modification-fiche-structure-offre-structure-vs-offre-accompagnant-numerique-ordre-des-blocs
  • 630-bo-admin-fonction-2
  • 673-fiche-structure-mise-en-forme-des-rs
  • 722-envsubst-client-side-conf
  • 723-structures-l-api-ne-prend-pas-en-compte-l-offre-des-mediateurs
  • 728-cartographie-ordre-d-affichage-de-la-liste
  • 734-actualites-menu-en-mobile
  • dev
  • feat/nginx-security
  • master
  • renovate/bluehalo-ngx-leaflet-20.x
  • renovate/chokidar-4.x
  • renovate/chromatic-com-storybook-4.x
  • renovate/devdependencies-(non-major)
  • renovate/leaflet.locatecontrol-0.x
  • renovate/major-ag-grid-monorepo
  • renovate/major-angular-cli-monorepo
  • renovate/major-angular-eslint-monorepo
  • renovate/major-angular-monorepo
  • renovate/major-angularmaterial-monorepo
  • renovate/major-storybook-monorepo
  • renovate/major-typescript-eslint-monorepo
  • renovate/ng-packagr-20.x
  • renovate/ngx-matomo-client-8.x
  • renovate/ngx-toastr-19.x
  • renovate/npm-11.x
  • wip_3.4
  • 1.1.0
  • v0.0.1
  • v0.0.2
  • v0.0.3
  • v1.1.0
  • v1.10.0
  • v1.11.0
  • v1.11.1
  • v1.12.0
  • v1.12.1
  • v1.13.0
  • v1.14.0
  • v1.15.0
  • v1.16.0
  • v1.16.1
  • v1.16.2
  • v1.16.3
  • v1.17.0
  • v1.17.1
  • v1.17.2
  • v1.17.3
  • v1.2.0
  • v1.3.0
  • v1.4.0
  • v1.5.0
  • v1.6.0
  • v1.6.1
  • v1.7.0
  • v1.8.0
  • v1.9.0
  • v1.9.1
  • v2.0.0
  • v2.0.0-beta1
  • v2.0.0-beta1.1
  • v2.0.0-beta2
  • v2.0.0-beta2.1
  • v2.0.0-beta2.2
  • v2.0.0-beta4
  • v2.0.0-beta5
  • v2.0.1
  • v2.0.2
  • v2.1.0
  • v2.1.1
  • v2.1.2
  • v2.2.0
  • v2.3.0
  • v2.3.1
  • v2.3.2
  • v2.3.3
  • v2.4.0
  • v2.4.1
  • v2.4.2
  • v2.5.0
  • v3.0.0
  • v3.0.1
  • v3.0.2
  • v3.1.0
  • v3.1.0-openshift
  • v3.2.0
  • v3.2.1
  • v3.2.2
  • v3.3.0
  • v3.3.1
  • v3.4.0
  • v3.4.1
  • v3.4.2
  • v3.4.3
  • v4.0.0
  • v4.0.1
  • v4.0.2
  • v4.1.0
  • v4.1.1
100 results
Show changes

Commits on Source 4

58 files
+ 10161
8202
Compare changes
  • Side-by-side
  • Inline

Files

+210 −198
Original line number Original line Diff line number Diff line
@@ -35,7 +35,10 @@
            "polyfills": "src/polyfills.ts",
            "polyfills": "src/polyfills.ts",
            "tsConfig": "tsconfig.app.json",
            "tsConfig": "tsconfig.app.json",
            "localize": true,
            "localize": true,
            "allowedCommonJsDependencies": ["lodash", "leaflet.locatecontrol"],
            "allowedCommonJsDependencies": [
              "lodash",
              "leaflet.locatecontrol"
            ],
            "assets": [
            "assets": [
              "src/favicon.ico",
              "src/favicon.ico",
              "src/assets",
              "src/assets",
@@ -95,10 +98,14 @@
              "ngswConfigPath": "ngsw-config.json"
              "ngswConfigPath": "ngsw-config.json"
            },
            },
            "fr": {
            "fr": {
              "localize": ["fr"]
              "localize": [
                "fr"
              ]
            },
            },
            "en": {
            "en": {
              "localize": ["en"]
              "localize": [
                "en"
              ]
            }
            }
          },
          },
          "defaultConfiguration": ""
          "defaultConfiguration": ""
@@ -134,8 +141,14 @@
            "polyfills": "src/polyfills.ts",
            "polyfills": "src/polyfills.ts",
            "tsConfig": "tsconfig.spec.json",
            "tsConfig": "tsconfig.spec.json",
            "karmaConfig": "karma.conf.js",
            "karmaConfig": "karma.conf.js",
            "assets": ["src/favicon.ico", "src/assets", "src/manifest.webmanifest"],
            "assets": [
            "styles": ["src/styles.scss"],
              "src/favicon.ico",
              "src/assets",
              "src/manifest.webmanifest"
            ],
            "styles": [
              "src/styles.scss"
            ],
            "scripts": []
            "scripts": []
          }
          }
        },
        },
@@ -193,6 +206,5 @@
        }
        }
      }
      }
    }
    }
  },
  }
  "defaultProject": "pamn"
}
}
+9671 −7723

File changed.

Preview size limit exceeded, changes collapsed.

+26 −26
Original line number Original line Diff line number Diff line
@@ -17,17 +17,17 @@
  },
  },
  "private": true,
  "private": true,
  "dependencies": {
  "dependencies": {
    "@angular/animations": "~13.1.1",
    "@angular/animations": "^14.2.1",
    "@angular/cdk": "^13.1.1",
    "@angular/cdk": "^13.1.1",
    "@angular/common": "~13.1.1",
    "@angular/common": "^14.2.1",
    "@angular/compiler": "~13.1.1",
    "@angular/compiler": "^14.2.1",
    "@angular/core": "~13.1.1",
    "@angular/core": "^14.2.1",
    "@angular/flex-layout": "^13.0.0-beta.38",
    "@angular/flex-layout": "^13.0.0-beta.38",
    "@angular/forms": "~13.1.1",
    "@angular/forms": "^14.2.1",
    "@angular/platform-browser": "~13.1.1",
    "@angular/platform-browser": "^14.2.1",
    "@angular/platform-browser-dynamic": "~13.1.1",
    "@angular/platform-browser-dynamic": "^14.2.1",
    "@angular/router": "~13.1.1",
    "@angular/router": "^14.2.1",
    "@angular/service-worker": "~13.1.1",
    "@angular/service-worker": "^14.2.1",
    "@asymmetrik/ngx-leaflet": "^8.1.0",
    "@asymmetrik/ngx-leaflet": "^8.1.0",
    "@gouvfr-anct/mediation-numerique": "^0.0.17",
    "@gouvfr-anct/mediation-numerique": "^0.0.17",
    "@ngx-translate/core": "^13.0.0",
    "@ngx-translate/core": "^13.0.0",
@@ -40,20 +40,20 @@
    "luxon": "^1.25.0",
    "luxon": "^1.25.0",
    "ngx-toastr": "^13.2.1",
    "ngx-toastr": "^13.2.1",
    "rxjs": "~6.6.0",
    "rxjs": "~6.6.0",
    "tslib": "^2.0.0",
    "tslib": "^2.4.0",
    "zone.js": "~0.11.4"
    "zone.js": "~0.11.4"
  },
  },
  "devDependencies": {
  "devDependencies": {
    "@angular-builders/jest": "^13.0.3",
    "@angular-builders/jest": "^14.0.0",
    "@angular-devkit/build-angular": "^13.2.1",
    "@angular-devkit/build-angular": "^14.2.2",
    "@angular-eslint/builder": "^13.2.1",
    "@angular-eslint/builder": "^14.0.0-alpha.4",
    "@angular-eslint/eslint-plugin": "^13.2.1",
    "@angular-eslint/eslint-plugin": "^14.0.0-alpha.4",
    "@angular-eslint/eslint-plugin-template": "^13.2.1",
    "@angular-eslint/eslint-plugin-template": "^14.0.0-alpha.4",
    "@angular-eslint/schematics": "^13.2.1",
    "@angular-eslint/schematics": "^14.0.0-alpha.4",
    "@angular-eslint/template-parser": "^13.2.1",
    "@angular-eslint/template-parser": "^14.0.0-alpha.4",
    "@angular/cli": "^13.1.2",
    "@angular/cli": "^14.2.2",
    "@angular/compiler-cli": "~13.1.1",
    "@angular/compiler-cli": "^14.2.1",
    "@angular/localize": "^13.1.1",
    "@angular/localize": "^14.2.1",
    "@compodoc/compodoc": "^1.1.16",
    "@compodoc/compodoc": "^1.1.16",
    "@types/jasmine": "~4.0.0",
    "@types/jasmine": "~4.0.0",
    "@types/jasminewd2": "~2.0.3",
    "@types/jasminewd2": "~2.0.3",
@@ -61,29 +61,29 @@
    "@types/leaflet": "^1.5.17",
    "@types/leaflet": "^1.5.17",
    "@types/leaflet.locatecontrol": "^0.60.7",
    "@types/leaflet.locatecontrol": "^0.60.7",
    "@types/node": "^16.0.0",
    "@types/node": "^16.0.0",
    "@typescript-eslint/eslint-plugin": "^5.24.0",
    "@typescript-eslint/eslint-plugin": "^5.36.2",
    "@typescript-eslint/parser": "^5.24.0",
    "@typescript-eslint/parser": "^5.36.2",
    "codelyzer": "^6.0.0",
    "codelyzer": "^6.0.0",
    "eslint": "^8.15.0",
    "eslint": "^8.23.0",
    "eslint-plugin-jest": "^26.2.2",
    "eslint-plugin-jest": "^26.2.2",
    "http-server": "^14.1.0",
    "http-server": "^14.1.0",
    "jasmine-core": "~4.1.0",
    "jasmine-core": "~4.1.0",
    "jasmine-spec-reporter": "~5.0.0",
    "jasmine-spec-reporter": "~5.0.0",
    "jest": "^27.5.1",
    "jest": "^27.5.1",
    "jest-preset-angular": "^11.1.2",
    "jest-preset-angular": "^11.1.2",
    "karma": "^6.3.9",
    "karma": "^6.4.0",
    "karma-browserify": "^7.0.0",
    "karma-browserify": "^7.0.0",
    "karma-chrome-launcher": "~3.1.0",
    "karma-chrome-launcher": "~3.1.0",
    "karma-coverage-istanbul-reporter": "~3.0.2",
    "karma-coverage-istanbul-reporter": "~3.0.2",
    "karma-jasmine": "~4.0.0",
    "karma-jasmine": "~4.0.0",
    "karma-jasmine-html-reporter": "^1.5.0",
    "karma-jasmine-html-reporter": "^1.5.0",
    "ng-packagr": "^13.0.0",
    "ng-packagr": "^14.2.1",
    "prettier": "^2.1.2",
    "prettier": "^2.1.2",
    "protractor": "~7.0.0",
    "protractor": "~7.0.0",
    "standard-version": "^9.3.2",
    "standard-version": "^9.3.2",
    "ts-jest": "^27.1.4",
    "ts-jest": "^27.1.4",
    "ts-node": "~8.3.0",
    "ts-node": "~8.3.0",
    "tslint": "~6.1.0",
    "tslint": "~6.1.0",
    "typescript": "~4.5.4"
    "typescript": "~4.8.3"
  }
  }
}
}
Original line number Original line Diff line number Diff line
import { Component, OnInit } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { Employer } from '../../../models/employer.model';
import { Employer } from '../../../models/employer.model';
import { NotificationService } from '../../../services/notification.service';
import { NotificationService } from '../../../services/notification.service';
import { AdminService } from '../../services/admin.service';
import { AdminService } from '../../services/admin.service';
@@ -14,7 +14,7 @@ import { ValidateEmployerComponent } from './validate-employer/validate-employer
  styleUrls: ['./manage-employers.component.scss'],
  styleUrls: ['./manage-employers.component.scss'],
})
})
export class ManageEmployersComponent implements OnInit {
export class ManageEmployersComponent implements OnInit {
  public newEmployerForm: FormGroup;
  public newEmployerForm: UntypedFormGroup;
  public validatedEmployers: Employer[] = [];
  public validatedEmployers: Employer[] = [];
  public unvalidatedEmployers: Employer[] = [];
  public unvalidatedEmployers: Employer[] = [];
  public deleteModalOpenned = false;
  public deleteModalOpenned = false;
@@ -51,7 +51,7 @@ export class ManageEmployersComponent implements OnInit {
  constructor(
  constructor(
    private adminService: AdminService,
    private adminService: AdminService,
    private notificationService: NotificationService,
    private notificationService: NotificationService,
    private formBuilder: FormBuilder
    private formBuilder: UntypedFormBuilder
  ) {
  ) {
    this.findValidatedEmployers();
    this.findValidatedEmployers();
    this.findUnvalidatedEmployers();
    this.findUnvalidatedEmployers();
Original line number Original line Diff line number Diff line
import { Component, OnInit } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { ValueGetterParams } from 'ag-grid-community';
import { ValueGetterParams } from 'ag-grid-community';
import { Job } from '../../../models/job.model';
import { Job } from '../../../models/job.model';
import { NotificationService } from '../../../services/notification.service';
import { NotificationService } from '../../../services/notification.service';
@@ -16,7 +16,7 @@ import { ValidateJobComponent } from './validate-job/validate-job.component';
  styleUrls: ['./manage-jobs.component.scss'],
  styleUrls: ['./manage-jobs.component.scss'],
})
})
export class ManageJobsComponent implements OnInit {
export class ManageJobsComponent implements OnInit {
  public newJobForm: FormGroup;
  public newJobForm: UntypedFormGroup;
  public validatedJobs: Job[] = [];
  public validatedJobs: Job[] = [];
  public unvalidatedJobs: Job[] = [];
  public unvalidatedJobs: Job[] = [];
  public deleteModalOpenned = false;
  public deleteModalOpenned = false;
@@ -54,7 +54,7 @@ export class ManageJobsComponent implements OnInit {
  constructor(
  constructor(
    private adminService: AdminService,
    private adminService: AdminService,
    private notificationService: NotificationService,
    private notificationService: NotificationService,
    private formBuilder: FormBuilder
    private formBuilder: UntypedFormBuilder
  ) {
  ) {
    this.findValidatedJobs();
    this.findValidatedJobs();
    this.findUnvalidatedJobs();
    this.findUnvalidatedJobs();
Original line number Original line Diff line number Diff line
import { Component, OnInit } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { Router } from '@angular/router';
import { Router } from '@angular/router';
import { Meta } from '@angular/platform-browser';
import { Meta } from '@angular/platform-browser';
import { ContactMessage } from '../models/contact-message.model';
import { ContactMessage } from '../models/contact-message.model';
@@ -15,11 +15,11 @@ import { Utils } from '../utils/utils';
  styleUrls: ['./contact.component.scss'],
  styleUrls: ['./contact.component.scss'],
})
})
export class ContactComponent implements OnInit {
export class ContactComponent implements OnInit {
  public contactForm: FormGroup;
  public contactForm: UntypedFormGroup;
  public loading = false;
  public loading = false;


  constructor(
  constructor(
    private formBuilder: FormBuilder,
    private formBuilder: UntypedFormBuilder,
    private contactService: ContactService,
    private contactService: ContactService,
    private router: Router,
    private router: Router,
    private authService: AuthService,
    private authService: AuthService,
Original line number Original line Diff line number Diff line
import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { Router } from '@angular/router';
import { Router } from '@angular/router';
import { ButtonType } from '@gouvfr-anct/mediation-numerique/shared';
import { ButtonType } from '@gouvfr-anct/mediation-numerique/shared';
import { User } from '../../models/user.model';
import { User } from '../../models/user.model';
@@ -25,7 +25,7 @@ export class FooterFormComponent implements OnChanges {
  @Input() isAccountMode: boolean;
  @Input() isAccountMode: boolean;
  @Input() btnName: string[];
  @Input() btnName: string[];
  @Input() nbPagesForm: number;
  @Input() nbPagesForm: number;
  @Input() form: FormGroup;
  @Input() form: UntypedFormGroup;
  @Input() linkedStructureId: Array<string> = null;
  @Input() linkedStructureId: Array<string> = null;
  @Input() acceptNewsletter: boolean;
  @Input() acceptNewsletter: boolean;
  @Input() currentStep: accountFormStep | profileFormStep | structureFormStep | personalOfferFormStep;
  @Input() currentStep: accountFormStep | profileFormStep | structureFormStep | personalOfferFormStep;
Original line number Original line Diff line number Diff line
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { User } from '../../../../models/user.model';
import { User } from '../../../../models/user.model';
import { CustomRegExp } from '../../../../utils/CustomRegExp';
import { CustomRegExp } from '../../../../utils/CustomRegExp';


@@ -9,7 +9,7 @@ import { CustomRegExp } from '../../../../utils/CustomRegExp';
  styleUrls: ['./account-credentials.component.scss'],
  styleUrls: ['./account-credentials.component.scss'],
})
})
export class AccountCredentialsComponent {
export class AccountCredentialsComponent {
  @Input() accountForm: FormGroup;
  @Input() accountForm: UntypedFormGroup;
  @Input() isAccountMode: boolean;
  @Input() isAccountMode: boolean;
  @Input() profile: User;
  @Input() profile: User;
  @Output() validateForm = new EventEmitter<any>();
  @Output() validateForm = new EventEmitter<any>();
Original line number Original line Diff line number Diff line
import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';


import { User } from '../../../models/user.model';
import { User } from '../../../models/user.model';
import { ProfileService } from '../../../profile/services/profile.service';
import { ProfileService } from '../../../profile/services/profile.service';
@@ -13,7 +13,7 @@ import { accountFormStep } from './accountFormStep.enum';
export class AccountFormComponent implements OnChanges {
export class AccountFormComponent implements OnChanges {
  @Input() nbSteps: number;
  @Input() nbSteps: number;
  @Input() currentStep: accountFormStep;
  @Input() currentStep: accountFormStep;
  @Input() accountForm: FormGroup;
  @Input() accountForm: UntypedFormGroup;
  public isClaimMode = false;
  public isClaimMode = false;
  public isAccountMode = false;
  public isAccountMode = false;
  public pagesValidation = [];
  public pagesValidation = [];
Original line number Original line Diff line number Diff line
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { User } from '../../../../models/user.model';
import { User } from '../../../../models/user.model';
import { Utils } from '../../../../utils/utils';
import { Utils } from '../../../../utils/utils';


@@ -8,7 +8,7 @@ import { Utils } from '../../../../utils/utils';
  templateUrl: './account-info.component.html',
  templateUrl: './account-info.component.html',
})
})
export class AccountInfoComponent {
export class AccountInfoComponent {
  @Input() accountForm: FormGroup;
  @Input() accountForm: UntypedFormGroup;
  @Input() isClaimMode: boolean;
  @Input() isClaimMode: boolean;
  @Input() profile: User;
  @Input() profile: User;


Original line number Original line Diff line number Diff line
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { User } from '../../../../models/user.model';
import { User } from '../../../../models/user.model';


@Component({
@Component({
@@ -7,7 +7,7 @@ import { User } from '../../../../models/user.model';
  templateUrl: './account-newsletter.component.html',
  templateUrl: './account-newsletter.component.html',
})
})
export class AccountNewsletterComponent {
export class AccountNewsletterComponent {
  @Input() accountForm: FormGroup;
  @Input() accountForm: UntypedFormGroup;
  @Input() profile: User;
  @Input() profile: User;
  @Output() acceptNewsletter = new EventEmitter<any>();
  @Output() acceptNewsletter = new EventEmitter<any>();
  public userAcceptNewsletter: boolean = false;
  public userAcceptNewsletter: boolean = false;