Compare commits
No commits in common. 'e6541acd078681cde0f7f90b16f1979a4eb42cd3' and '747e345494eb6d94ecbda49a1b88cfe00d0742dc' have entirely different histories.
e6541acd07
...
747e345494
@ -1,25 +1,20 @@ |
||||
## STEP 1 BUILD ## |
||||
FROM node:16.13-alpine AS build |
||||
FROM node:17.0.1-alpine AS build |
||||
|
||||
RUN mkdir -p /app |
||||
|
||||
WORKDIR /app |
||||
WORKDIR /dist/src/app |
||||
|
||||
RUN npm cache clean --force |
||||
|
||||
COPY package*.json /app |
||||
|
||||
RUN npm install --only=prod |
||||
RUN npm install @angular/cli@12.2.12 |
||||
COPY . . |
||||
|
||||
COPY . /app |
||||
RUN npm install |
||||
|
||||
RUN npm run build-prod |
||||
RUN npm run build --prod |
||||
|
||||
## STEP 2 DEPLOY ## |
||||
FROM nginx:1.21.3 AS ngi |
||||
|
||||
COPY --from=build /app/dist/EPAClient /usr/share/nginx/html |
||||
COPY --from=build /dist/src/app/dist/EPAClient /usr/share/nginx/html |
||||
COPY /nginx.conf /etc/nginx/conf.d/default.conf |
||||
|
||||
EXPOSE 4200 49153 |
||||
EXPOSE 80 |
||||
File diff suppressed because it is too large
Load Diff
@ -1,34 +0,0 @@ |
||||
import { NgModule } from '@angular/core'; |
||||
import { CommonModule } from '@angular/common'; |
||||
import { DemandesFormationService } from './services/demandesformation.service'; |
||||
import { CollaborateursService } from './services/collaborateurs.service'; |
||||
import { DemandesDelegationService } from './services/demandesDelegation.service'; |
||||
import { DemandesEPIService } from './services/demandesEPI.service'; |
||||
import { EngagementsService } from './services/engagements.service'; |
||||
import { EpService } from './services/ep.service'; |
||||
import { FormationsService } from './services/formations.service'; |
||||
import { NotesService } from './services/notes.service'; |
||||
import { ParticipationsFormationsService } from './services/participationsFormations.service'; |
||||
import { ReferentsEPService } from './services/referentsEP.service'; |
||||
|
||||
|
||||
|
||||
@NgModule({ |
||||
declarations: [], |
||||
imports: [ |
||||
CommonModule |
||||
], |
||||
providers: [ |
||||
CollaborateursService, |
||||
DemandesDelegationService, |
||||
DemandesEPIService, |
||||
DemandesFormationService, |
||||
EngagementsService, |
||||
EpService, |
||||
FormationsService, |
||||
NotesService, |
||||
ParticipationsFormationsService, |
||||
ReferentsEPService |
||||
] |
||||
}) |
||||
export class CommunModule {} |
||||
@ -1,166 +0,0 @@ |
||||
import { NgModule } from '@angular/core'; |
||||
import { CommonModule } from '@angular/common'; |
||||
import { MatCardModule } from '@angular/material/card'; |
||||
import { MatButtonModule } from '@angular/material/button'; |
||||
import { MatMenuModule } from '@angular/material/menu'; |
||||
import { MatPaginatorModule } from '@angular/material/paginator'; |
||||
import { MatIconModule } from '@angular/material/icon'; |
||||
import { MatSortModule } from '@angular/material/sort'; |
||||
import { MatInputModule } from '@angular/material/input'; |
||||
import { MatTableModule } from '@angular/material/table'; |
||||
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; |
||||
import { MatFormFieldModule } from '@angular/material/form-field'; |
||||
import { MatTabsModule } from '@angular/material/tabs'; |
||||
import { NgxMatDatetimePickerModule, NgxMatNativeDateModule } from '@angular-material-components/datetime-picker'; |
||||
import { MatDatepickerModule } from '@angular/material/datepicker'; |
||||
import { MatListModule } from '@angular/material/list'; |
||||
import { MatNativeDateModule, MatOption, MatOptionModule } from '@angular/material/core'; |
||||
import { MatCheckboxModule } from '@angular/material/checkbox'; |
||||
import { MatSelectModule } from '@angular/material/select'; |
||||
import { MatStepperModule } from '@angular/material/stepper'; |
||||
import { MatChipsModule } from '@angular/material/chips'; |
||||
import { MatSnackBarModule } from '@angular/material/snack-bar'; |
||||
import { MatSlideToggleModule } from '@angular/material/slide-toggle'; |
||||
import { MatRadioModule } from '@angular/material/radio'; |
||||
import { CollaborateursTableComponent } from './mat-tables/collaborateurs-table/collaborateurs.table'; |
||||
import { DemandesFormationTableComponent } from './mat-tables/demandes-formation-table/demandes-formation.table'; |
||||
import { EngagementTableComponent } from './mat-tables/engagements-table/engagements-table'; |
||||
import { EpTableComponent } from './mat-tables/ep-table/ep-table'; |
||||
import { FormationsTableComponent } from './mat-tables/formations-table/formations.table'; |
||||
import { ParticipationsFormationTableComponent } from './mat-tables/participations-formation-table/participations-formation.table'; |
||||
import { FilterModule } from './filter/filter.module'; |
||||
import { AuthModule } from './auth/auth.module'; |
||||
import { NavMenuComponent } from './nav-menu/nav-menu.component'; |
||||
import { NavMenuAssistanteComponent } from './nav-menu/nav-menu-assistante/nav-menu-assistante.component'; |
||||
import { NavMenuCollaborateurComponent } from './nav-menu/nav-menu-collaborateur/nav-menu-collaborateur.component'; |
||||
import { NavMenuCommercialComponent } from './nav-menu/nav-menu-commercial/nav-menu-commercial.component'; |
||||
import { NavMenuRHComponent } from './nav-menu/nav-menu-rh/nav-menu-rh.component'; |
||||
import { RouterModule } from '@angular/router'; |
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; |
||||
import { CheckboxFilterComponent } from './filter/checkbox-filter/checkbox-filter'; |
||||
import { SelectFilterComponent } from './filter/select-filter/select-filter'; |
||||
import { AffichageDetailsCollaborateurComponent } from './affichage-details-collaboarteur/affichage-details-collaborateur'; |
||||
import { DialogAssignationRapideReferentComponent, DialogAssignationRapideCollaborateursComponent } from './affichage-details-collaboarteur/dialog-assignation-rapide/dialog-assignation-rapide.component'; |
||||
import { ProchainEpComponent } from './affichage-details-collaboarteur/prochain-ep/prochain-ep.component'; |
||||
|
||||
|
||||
|
||||
@NgModule({ |
||||
imports: [ |
||||
// Materials
|
||||
MatCardModule, |
||||
MatButtonModule, |
||||
MatMenuModule, |
||||
MatIconModule, |
||||
MatPaginatorModule, |
||||
MatSortModule, |
||||
MatTableModule, |
||||
MatInputModule, |
||||
MatProgressSpinnerModule, |
||||
MatTabsModule, |
||||
MatFormFieldModule, |
||||
NgxMatDatetimePickerModule, |
||||
MatDatepickerModule, |
||||
NgxMatNativeDateModule, |
||||
MatNativeDateModule, |
||||
MatListModule, |
||||
MatCheckboxModule, |
||||
MatSelectModule, |
||||
MatStepperModule, |
||||
MatChipsModule, |
||||
MatSnackBarModule, |
||||
MatSlideToggleModule, |
||||
MatRadioModule, |
||||
MatOptionModule, |
||||
|
||||
// Forms Angular
|
||||
FormsModule, |
||||
ReactiveFormsModule, |
||||
|
||||
// Common angular
|
||||
CommonModule, |
||||
|
||||
// Module commun
|
||||
FilterModule, |
||||
RouterModule, |
||||
AuthModule.forRoot() |
||||
], |
||||
exports: [ |
||||
// Materials
|
||||
MatCardModule, |
||||
MatButtonModule, |
||||
MatMenuModule, |
||||
MatIconModule, |
||||
MatPaginatorModule, |
||||
MatSortModule, |
||||
MatTableModule, |
||||
MatInputModule, |
||||
MatProgressSpinnerModule, |
||||
MatTabsModule, |
||||
MatFormFieldModule, |
||||
NgxMatDatetimePickerModule, |
||||
MatDatepickerModule, |
||||
NgxMatNativeDateModule, |
||||
MatNativeDateModule, |
||||
MatListModule, |
||||
MatCheckboxModule, |
||||
MatSelectModule, |
||||
MatStepperModule, |
||||
MatChipsModule, |
||||
MatSnackBarModule, |
||||
MatSlideToggleModule, |
||||
MatRadioModule, |
||||
MatOptionModule, |
||||
|
||||
// Module commun
|
||||
FilterModule, |
||||
|
||||
// Component commun
|
||||
NavMenuComponent, |
||||
ProchainEpComponent, |
||||
DialogAssignationRapideReferentComponent, |
||||
AffichageDetailsCollaborateurComponent, |
||||
|
||||
// Table commun
|
||||
CollaborateursTableComponent, |
||||
EngagementTableComponent, |
||||
FormationsTableComponent, |
||||
EpTableComponent, |
||||
ParticipationsFormationTableComponent, |
||||
DemandesFormationTableComponent |
||||
|
||||
], |
||||
declarations: [ |
||||
|
||||
// Component commun
|
||||
/// Filter
|
||||
CheckboxFilterComponent, |
||||
SelectFilterComponent, |
||||
|
||||
/// Nav menu
|
||||
NavMenuComponent,
|
||||
NavMenuAssistanteComponent,
|
||||
NavMenuCollaborateurComponent, |
||||
NavMenuCommercialComponent,
|
||||
NavMenuRHComponent, |
||||
|
||||
/// Affichage collab
|
||||
AffichageDetailsCollaborateurComponent, |
||||
DialogAssignationRapideReferentComponent, |
||||
DialogAssignationRapideCollaborateursComponent, |
||||
ProchainEpComponent, |
||||
|
||||
// Table commun
|
||||
CollaborateursTableComponent, |
||||
EngagementTableComponent, |
||||
FormationsTableComponent, |
||||
EpTableComponent, |
||||
ParticipationsFormationTableComponent, |
||||
DemandesFormationTableComponent, |
||||
], |
||||
entryComponents: [ |
||||
NavMenuComponent, |
||||
DialogAssignationRapideReferentComponent |
||||
] |
||||
}) |
||||
export class CommunUiModule { } |
||||
@ -1,24 +0,0 @@ |
||||
import { NgModule } from "@angular/core"; |
||||
import { CommonModule } from '@angular/common'; |
||||
import { FormsModule, ReactiveFormsModule} from '@angular/forms'; |
||||
import { RouterModule } from '@angular/router'; |
||||
|
||||
import { SelectFilterComponent } from "./select-filter/select-filter"; |
||||
import { CheckboxFilterComponent } from "./checkbox-filter/checkbox-filter"; |
||||
|
||||
|
||||
@NgModule({ |
||||
declarations: [
|
||||
|
||||
], |
||||
imports: [ |
||||
CommonModule, |
||||
FormsModule, |
||||
ReactiveFormsModule, |
||||
RouterModule |
||||
], |
||||
exports: [ |
||||
|
||||
] |
||||
}) |
||||
export class FilterModule {} |
||||
@ -1,13 +1,10 @@ |
||||
import { Component, Input, OnInit } from "@angular/core"; |
||||
import { CollaborateurDTO, CollaborateursService, ParticipationFormationDTO, ParticipationsFormationsService } from "@shared/api-swagger"; |
||||
import { Subscription } from "rxjs"; |
||||
import { collaborateurTypeRecherche, epTypeRecherche } from "@shared/utils/cles"; |
||||
import { MatDialog } from "@angular/material/dialog"; |
||||
import { DialogAssignationRapideReferentComponent, DialogAssignationRapideCollaborateursComponent } from "./dialog-assignation-rapide/dialog-assignation-rapide.component"; |
||||
import { Router } from "@angular/router"; |
||||
import { CollaborateurDTO } from "../model/collaborateurDTO"; |
||||
import { ParticipationFormationDTO } from "../model/participationFormationDTO"; |
||||
import { CollaborateursService } from "../services/collaborateurs.service"; |
||||
import { ParticipationsFormationsService } from "../services/participationsFormations.service"; |
||||
import { collaborateurTypeRecherche, epTypeRecherche } from "../utils/cles"; |
||||
|
||||
|
||||
@Component({ |
||||
@ -1,11 +1,8 @@ |
||||
import {Component, Inject, OnInit } from "@angular/core"; |
||||
import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; |
||||
import { MatSnackBar } from "@angular/material/snack-bar"; |
||||
import { CollaborateurDTO } from "app/commun/model/collaborateurDTO"; |
||||
import { ReferentEPDTO } from "app/commun/model/referentEPDTO"; |
||||
import { CollaborateursService } from "app/commun/services/collaborateurs.service"; |
||||
import { ReferentsEPService } from "app/commun/services/referentsEP.service"; |
||||
import { collaborateurTypeRecherche } from "app/commun/utils/cles"; |
||||
import { CollaborateurDTO, CollaborateursService, ReferentEPDTO, ReferentsEPService } from "@shared/api-swagger"; |
||||
import { collaborateurTypeRecherche, } from "@shared/utils/cles"; |
||||
import { Subscription } from "rxjs"; |
||||
|
||||
@Component({ |
||||
@ -1,6 +1,5 @@ |
||||
import { Component, Input, OnInit } from "@angular/core" |
||||
import { affichageStatut, EpInformationDTO, StatutEp } from "app/commun/model/models"; |
||||
import { EpService } from "app/commun/services/ep.service"; |
||||
import { affichageStatut, EpInformationDTO, EpService, StatutEp } from "@shared/api-swagger"; |
||||
import { Subscription } from "rxjs"; |
||||
|
||||
|
||||
@ -0,0 +1,59 @@ |
||||
import { NgModule } from "@angular/core"; |
||||
import { CommonModule } from "@angular/common"; |
||||
|
||||
import {MatCardModule} from '@angular/material/card'; |
||||
import { MatButtonModule } from '@angular/material/button'; |
||||
import {MatInputModule} from '@angular/material/input'; |
||||
import {MatIconModule} from '@angular/material/icon'; |
||||
import {MatMenuModule} from '@angular/material/menu'; |
||||
import {MatPaginatorModule} from '@angular/material/paginator'; |
||||
import {MatTableModule} from '@angular/material/table'; |
||||
import {MatSortModule} from '@angular/material/sort'; |
||||
import {MatListModule} from '@angular/material/list'; |
||||
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; |
||||
import {MatTabsModule} from '@angular/material/tabs'; |
||||
import {MatRadioModule} from '@angular/material/radio'; |
||||
import {MatFormFieldModule} from '@angular/material/form-field'; |
||||
import {MatDatepickerModule} from '@angular/material/datepicker'; |
||||
import {MatNativeDateModule} from '@angular/material/core'; |
||||
import {MatCheckboxModule} from '@angular/material/checkbox'; |
||||
import {MatSelectModule} from '@angular/material/select'; |
||||
import {MatStepperModule} from '@angular/material/stepper'; |
||||
import {MatChipsModule} from '@angular/material/chips'; |
||||
import {MatSnackBarModule} from '@angular/material/snack-bar'; |
||||
import {MatSlideToggleModule} from '@angular/material/slide-toggle'; |
||||
|
||||
|
||||
import { NgxMatDatetimePickerModule, NgxMatTimepickerModule, NgxMatNativeDateModule } from '@angular-material-components/datetime-picker'; |
||||
|
||||
|
||||
/** |
||||
* Module qui va faire l'import et l'export de tous les componsants material design qui seront utilisés dans les différents modules.
|
||||
*/ |
||||
@NgModule({ |
||||
imports : [MatCardModule, |
||||
MatButtonModule, MatMenuModule, |
||||
MatIconModule, MatPaginatorModule, |
||||
MatSortModule, MatTableModule, |
||||
MatInputModule, MatProgressSpinnerModule, |
||||
MatTabsModule, MatFormFieldModule, |
||||
NgxMatDatetimePickerModule, MatDatepickerModule, |
||||
NgxMatNativeDateModule, MatNativeDateModule, MatListModule, |
||||
MatCheckboxModule, MatSelectModule, MatStepperModule, |
||||
MatChipsModule, MatSnackBarModule, MatSlideToggleModule, |
||||
MatRadioModule |
||||
], |
||||
exports : [MatCardModule, |
||||
MatButtonModule, MatMenuModule, |
||||
MatIconModule, MatPaginatorModule, |
||||
MatSortModule, MatTableModule, |
||||
MatInputModule, MatProgressSpinnerModule, |
||||
MatTabsModule, MatFormFieldModule, |
||||
NgxMatDatetimePickerModule, MatDatepickerModule, |
||||
NgxMatNativeDateModule, MatNativeDateModule, MatListModule, |
||||
MatCheckboxModule, MatSelectModule, MatStepperModule, |
||||
MatChipsModule, MatSnackBarModule, MatSlideToggleModule, |
||||
MatRadioModule |
||||
] |
||||
}) |
||||
export class MaterialModule {} |
||||
@ -0,0 +1,5 @@ |
||||
wwwroot/*.js |
||||
node |
||||
node_modules |
||||
typings |
||||
dist |
||||
@ -0,0 +1,23 @@ |
||||
# Swagger Codegen Ignore |
||||
# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen |
||||
|
||||
# Use this file to prevent files from being overwritten by the generator. |
||||
# The patterns follow closely to .gitignore or .dockerignore. |
||||
|
||||
# As an example, the C# client generator defines ApiClient.cs. |
||||
# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line: |
||||
#ApiClient.cs |
||||
|
||||
# You can match any string of characters against a directory, file or extension with a single asterisk (*): |
||||
#foo/*/qux |
||||
# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux |
||||
|
||||
# You can recursively match patterns against a directory, file or extension with a double asterisk (**): |
||||
#foo/**/qux |
||||
# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux |
||||
|
||||
# You can also negate patterns with an exclamation (!). |
||||
# For example, you can ignore all files in a docs folder with the file extension .md: |
||||
#docs/*.md |
||||
# Then explicitly reverse the ignore rule for a single file: |
||||
#!docs/README.md |
||||
@ -0,0 +1 @@ |
||||
3.0.21 |
||||
@ -0,0 +1,51 @@ |
||||
import { NgModule, ModuleWithProviders, SkipSelf, Optional } from '@angular/core'; |
||||
import { Configuration } from './configuration'; |
||||
import { HttpClient } from '@angular/common/http'; |
||||
|
||||
|
||||
import { CollaborateursService } from './api/collaborateurs.service'; |
||||
import { DemandesDelegationService } from './api/demandesDelegation.service'; |
||||
import { DemandesEPIService } from './api/demandesEPI.service'; |
||||
import { DemandesFormationService } from './api/demandesFormation.service'; |
||||
import { EngagementsService } from './api/engagements.service'; |
||||
import { EpService } from './api/ep.service'; |
||||
import { FormationsService } from './api/formations.service'; |
||||
import { NotesService } from './api/notes.service'; |
||||
import { ParticipationsFormationsService } from './api/participationsFormations.service'; |
||||
import { ReferentsEPService } from './api/referentsEP.service'; |
||||
|
||||
@NgModule({ |
||||
imports: [], |
||||
declarations: [], |
||||
exports: [], |
||||
providers: [ |
||||
CollaborateursService, |
||||
DemandesDelegationService, |
||||
DemandesEPIService, |
||||
DemandesFormationService, |
||||
EngagementsService, |
||||
EpService, |
||||
FormationsService, |
||||
NotesService, |
||||
ParticipationsFormationsService, |
||||
ReferentsEPService ] |
||||
}) |
||||
export class ApiModule { |
||||
public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders<ApiModule> { |
||||
return { |
||||
ngModule: ApiModule, |
||||
providers: [ { provide: Configuration, useFactory: configurationFactory } ] |
||||
}; |
||||
} |
||||
|
||||
constructor( @Optional() @SkipSelf() parentModule: ApiModule, |
||||
@Optional() http: HttpClient) { |
||||
if (parentModule) { |
||||
throw new Error('ApiModule is already loaded. Import in your base AppModule only.'); |
||||
} |
||||
if (!http) { |
||||
throw new Error('You need to import the HttpClientModule in your AppModule! \n' + |
||||
'See also https://github.com/angular/angular/issues/20575'); |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,21 @@ |
||||
export * from './collaborateurs.service'; |
||||
import { CollaborateursService } from './collaborateurs.service'; |
||||
export * from './demandesDelegation.service'; |
||||
import { DemandesDelegationService } from './demandesDelegation.service'; |
||||
export * from './demandesEPI.service'; |
||||
import { DemandesEPIService } from './demandesEPI.service'; |
||||
export * from './demandesFormation.service'; |
||||
import { DemandesFormationService } from './demandesFormation.service'; |
||||
export * from './engagements.service'; |
||||
import { EngagementsService } from './engagements.service'; |
||||
export * from './ep.service'; |
||||
import { EpService } from './ep.service'; |
||||
export * from './formations.service'; |
||||
import { FormationsService } from './formations.service'; |
||||
export * from './notes.service'; |
||||
import { NotesService } from './notes.service'; |
||||
export * from './participationsFormations.service'; |
||||
import { ParticipationsFormationsService } from './participationsFormations.service'; |
||||
export * from './referentsEP.service'; |
||||
import { ReferentsEPService } from './referentsEP.service'; |
||||
export const APIS = [CollaborateursService, DemandesDelegationService, DemandesEPIService, DemandesFormationService, EngagementsService, EpService, FormationsService, NotesService, ParticipationsFormationsService, ReferentsEPService]; |
||||
@ -0,0 +1,5 @@ |
||||
export * from './api/api'; |
||||
export * from './model/models'; |
||||
export * from './variables'; |
||||
export * from './configuration'; |
||||
export * from './api.module'; |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue