b33fefcef9d4b941140f0b5a2f0092d28cf64e63 to 37e12415ec12e5fe0a56d7d852e79f3653b57b8a · web-et-numerique / Factory / Resin / Client

.prettierrc

+16
−4

Original line number
Original line
Diff line number
Diff line

{

{

  "printWidth": 120,

  "printWidth": 128,

  "singleQuote": true,

  "useTabs": false,

  "tabWidth": 2,

  "tabWidth": 2,

  "useTabs": false,

  "semi": true,

  "semi": true,

  "bracketSpacing": true

  "singleQuote": true,

  "quoteProps": "as-needed",

  "jsxSingleQuote": true,

  "trailingComma": "none",

  "bracketSpacing": true,

  "bracketSameLine": true,

  "arrowParens": "always",

  "requirePragma": false,

  "insertPragma": false,

  "proseWrap": "preserve",

  "htmlWhitespaceSensitivity": "ignore",

  "vueIndentScriptAndStyle": false,

  "endOfLine": "lf",

  "embeddedLanguageFormatting": "auto"

}

}

src/app/admin/components/claim-structure/claim-structure.component.ts

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -36,7 +36,7 @@ export class ClaimStructureComponent implements OnInit {

      });

      });

  }

  }

  public claimedStructure(event: boolean): void {

  public claimedStructure(_event: boolean): void {

    this.isClaimedStructure = !this.isClaimedStructure;

    this.isClaimedStructure = !this.isClaimedStructure;

  }

  }

}

}

src/app/admin/components/manage-employers/manage-employers.component.ts

+3
−3

Original line number
Original line
Diff line number
Diff line

@@ -18,7 +18,7 @@ export class ManageEmployersComponent implements OnInit {

  public validatedEmployers: Employer[] = [];

  public validatedEmployers: Employer[] = [];

  public unvalidatedEmployers: Employer[] = [];

  public unvalidatedEmployers: Employer[] = [];

  public deleteModalOpenned = false;

  public deleteModalOpenned = false;

  public validatedEmployersName: String[] = [];

  public validatedEmployersName: string[] = [];

  public mergeEmployerModalOpenned = false;

  public mergeEmployerModalOpenned = false;

  public employerToDelete: Employer = null;

  public employerToDelete: Employer = null;

  public mergeOpe: any = {

  public mergeOpe: any = {

@@ -209,8 +209,8 @@ export class ManageEmployersComponent implements OnInit {

    }

    }

  }

  }

  public validateEmployer(employerId: string, context?): void {

  public validateEmployer(employerId: string, _context?): void {

    this.adminService.validateEmployer(employerId).subscribe((data) => {

    this.adminService.validateEmployer(employerId).subscribe((_data) => {

      this.findValidatedEmployers();

      this.findValidatedEmployers();

      this.findUnvalidatedEmployers();

      this.findUnvalidatedEmployers();

    });

    });

src/app/admin/components/manage-jobs/manage-jobs.component.ts

+3
−3

Original line number
Original line
Diff line number
Diff line

@@ -20,7 +20,7 @@ export class ManageJobsComponent implements OnInit {

  public validatedJobs: Job[] = [];

  public validatedJobs: Job[] = [];

  public unvalidatedJobs: Job[] = [];

  public unvalidatedJobs: Job[] = [];

  public deleteModalOpenned = false;

  public deleteModalOpenned = false;

  public validatedJobsName: String[] = [];

  public validatedJobsName: string[] = [];

  public mergeJobModalOpenned = false;

  public mergeJobModalOpenned = false;

  public jobToDelete: Job = null;

  public jobToDelete: Job = null;

  public mergeOpe: any = {

  public mergeOpe: any = {

@@ -246,8 +246,8 @@ export class ManageJobsComponent implements OnInit {

    }

    }

  }

  }

  public validateJob(jobId: string, context?): void {

  public validateJob(jobId: string, _context?): void {

    this.adminService.validateJob(jobId).subscribe((data) => {

    this.adminService.validateJob(jobId).subscribe((_data) => {

      this.findValidatedJobs();

      this.findValidatedJobs();

      this.findUnvalidatedJobs();

      this.findUnvalidatedJobs();

    });

    });

src/app/admin/components/manage-users/manage-users.component.ts

+2
−2

Original line number
Original line
Diff line number
Diff line

@@ -18,9 +18,9 @@ export class ManageUsersComponent {

  public attachedUsers: User[] = [];

  public attachedUsers: User[] = [];

  public unAttachedUsers: User[] = [];

  public unAttachedUsers: User[] = [];

  public unVerifiedUsers: User[] = [];

  public unVerifiedUsers: User[] = [];

  public validatedJobsName: String[] = [];

  public validatedJobsName: string[] = [];

  public validatedJobs: Job[] = [];

  public validatedJobs: Job[] = [];

  public validatedEmployersName: String[] = [];

  public validatedEmployersName: string[] = [];

  public validatedEmployers: Employer[] = [];

  public validatedEmployers: Employer[] = [];

  public deleteModalOpenned = false;

  public deleteModalOpenned = false;

  public editJobModalOpenned = false;

  public editJobModalOpenned = false;

src/app/admin/components/newsletter-users/newsletter-users.component.ts

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -34,7 +34,7 @@ export class NewsletterUsersComponent {

  public unsubscribeEmail(email: string, shouldUnsubscribe: boolean): void {

  public unsubscribeEmail(email: string, shouldUnsubscribe: boolean): void {

    this.toggleUnsubscribeModal(email);

    this.toggleUnsubscribeModal(email);

    if (shouldUnsubscribe) {

    if (shouldUnsubscribe) {

      this.adminService.unsubscribeEmail(email).subscribe((data) => {

      this.adminService.unsubscribeEmail(email).subscribe((_data) => {

        this.subscriptions = this.subscriptions.filter((obj) => obj.email !== email);

        this.subscriptions = this.subscriptions.filter((obj) => obj.email !== email);

        this.subscriptionsCount = this.subscriptions.length;

        this.subscriptionsCount = this.subscriptions.length;

      });

      });

src/app/carto/carto.component.spec.ts

+1
−2

Original line number
Original line
Diff line number
Diff line

@@ -33,7 +33,7 @@ describe('HomeComponent', () => {

  it('getAddress(): should getAddress', () => {

  it('getAddress(): should getAddress', () => {

    spyOn(navigator.geolocation, 'getCurrentPosition').and.callFake(() => {

    spyOn(navigator.geolocation, 'getCurrentPosition').and.callFake(() => {

      const position = {

      return {

        coords: {

        coords: {

          accuracy: 1490,

          accuracy: 1490,

          altitude: null,

          altitude: null,

@@ -44,7 +44,6 @@ describe('HomeComponent', () => {

          speed: null,

          speed: null,

        },

        },

      };

      };

      return position;

    });

    });

    component.getLocation();

    component.getLocation();

    expect(navigator.geolocation.getCurrentPosition).toHaveBeenCalled();

    expect(navigator.geolocation.getCurrentPosition).toHaveBeenCalled();

src/app/carto/carto.component.ts

+3
−1

Original line number
Original line
Diff line number
Diff line

@@ -116,8 +116,10 @@ export class CartoComponent implements OnInit {

      structures.map(async (structure) => {

      structures.map(async (structure) => {

        if (this.geolocation) {

        if (this.geolocation) {

          structure = this.getStructurePosition(structure, lon, lat);

          structure = this.getStructurePosition(structure, lon, lat);

          if (this.isAdmin) {

            structure.isClaimed = await this.isClaimed(structure).toPromise();

            structure.isClaimed = await this.isClaimed(structure).toPromise();

          }

          }

        }

        return structure;

        return structure;

      })

      })

    ).then(async (structureList: Structure[]) => {

    ).then(async (structureList: Structure[]) => {

src/app/config/http-interceptor.ts

+1
−5

Original line number
Original line
Diff line number
Diff line

import { Observable } from 'rxjs';

import { Observable } from 'rxjs';

import { Injectable } from '@angular/core';

import { Injectable } from '@angular/core';

import { HttpInterceptor } from '@angular/common/http';

import { HttpInterceptor, HttpHandler, HttpEvent, HttpRequest, HttpHeaders } from '@angular/common/http';

import { HttpRequest } from '@angular/common/http';

import { HttpHandler } from '@angular/common/http';

import { HttpEvent } from '@angular/common/http';

import { HttpHeaders } from '@angular/common/http';

import { AuthService } from '../services/auth.service';

import { AuthService } from '../services/auth.service';

@Injectable()

@Injectable()

src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.ts

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -10,7 +10,7 @@ export class AccountNewsletterComponent {

  @Input() accountForm: FormGroup;

  @Input() accountForm: FormGroup;

  @Input() profile: User;

  @Input() profile: User;

  @Output() acceptNewsletter = new EventEmitter<any>();

  @Output() acceptNewsletter = new EventEmitter<any>();

  public userAcceptNewsletter: Boolean = false;

  public userAcceptNewsletter: boolean = false;

  public acceptReceiveNewsletter(accepts: boolean) {

  public acceptReceiveNewsletter(accepts: boolean) {

    this.acceptNewsletter.emit(accepts);

    this.acceptNewsletter.emit(accepts);

src/app/form/form-view/form-view-routing.module.ts

+0
−1

Original line number
Original line
Diff line number
Diff line

import { NgModule } from '@angular/core';

import { NgModule } from '@angular/core';

import { Routes, RouterModule } from '@angular/router';

import { Routes, RouterModule } from '@angular/router';

import { AdminGuard } from '../../guards/admin.guard';

import { AuthGuard } from '../../guards/auth.guard';

import { AuthGuard } from '../../guards/auth.guard';

import { RoleGuard } from '../../guards/role.guard';

import { RoleGuard } from '../../guards/role.guard';

import { StructureResolver } from '../../resolvers/structure.resolver';

import { StructureResolver } from '../../resolvers/structure.resolver';

Compare revisions

Source

Target

Commits on Source 10

Files

.prettierrc

src/app/admin/components/claim-structure/claim-structure.component.ts

src/app/admin/components/manage-employers/manage-employers.component.ts

src/app/admin/components/manage-jobs/manage-jobs.component.ts

src/app/admin/components/manage-users/manage-users.component.ts

src/app/admin/components/newsletter-users/newsletter-users.component.ts

src/app/carto/carto.component.spec.ts

src/app/carto/carto.component.ts

src/app/config/http-interceptor.ts

src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.ts

src/app/form/form-view/form-view-routing.module.ts