Skip to content

Commit

Permalink
Update docker-compose.yml file
Browse files Browse the repository at this point in the history
  • Loading branch information
Wiran-Larbi committed Jun 21, 2024
1 parent 7b45f20 commit 548c69c
Show file tree
Hide file tree
Showing 23 changed files with 1,146 additions and 71 deletions.
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"cSpell.words": [
"Archivage"
"Archivage",
"Choisir",
"effet"
]
}
4 changes: 4 additions & 0 deletions app.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DB_URL=jdbc:mysql://suivie-physique-master.cbsqw4oegule.us-east-1.rds.amazonaws.com/sp
MAIL_HOST=sandbox.smtp.mailtrap.io
ACTIVE_PROFILE=dev
JAR_VERSION=0.0.1
8 changes: 5 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ version: '3.8'
services:
sp-api:
container_name: sp-api
image: sp/sp-api:0.0.1
image: suiviephysique/sp-api:latest
env_file:
- app.env
ports:
- "3008:3008"
networks:
- sp-network
sp-ui:
container_name: sp-ui
image: sp/sp-ui:0.0.1
image: suiviephysique/sp-ui:latest
depends_on:
- sp-api
ports:
Expand All @@ -19,4 +21,4 @@ services:

networks:
sp-network:
driver: bridge
driver: bridge
3 changes: 2 additions & 1 deletion frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@
"src/assets"
],
"styles": [
"src/custom-theme.scss",
"src/styles.css",
"node_modules/primeicons/primeicons.css",
"node_modules/primeng/resources/primeng.css",
"node_modules/primeng/resources/primeng.min.css",
"node_modules/ngx-spinner/animations/square-jelly-box.css"
"node_modules/ngx-spinner/animations/square-jelly-box.css"
],
"scripts": []
},
Expand Down
858 changes: 855 additions & 3 deletions frontend/package-lock.json

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
},
"private": true,
"dependencies": {
"ag-grid-community": "^31.3.1",
"@ag-grid-community/angular": "^31.3.1",
"@ag-grid-community/client-side-row-model": "^31.3.1",
"@ag-grid-community/core": "^31.3.1",
"@ag-grid-enterprise/charts-enterprise": "^31.3.1",
"@angular/animations": "^16.0.0",
"@angular/cdk": "^16.2.14",
"@angular/common": "^16.0.0",
"@angular/compiler": "^16.0.0",
"@angular/core": "^16.0.0",
"@angular/forms": "^16.0.0",
"@angular/material": "^16.2.14",
"@angular/platform-browser": "^16.0.0",
"@angular/platform-browser-dynamic": "^16.0.0",
"@angular/router": "^16.0.0",
Expand All @@ -34,6 +35,7 @@
"@types/jsonwebtoken": "^9.0.6",
"ag-grid-angular": "^31.3.1",
"ag-grid-charts-enterprise": "^31.3.1",
"ag-grid-community": "^31.3.1",
"ag-grid-enterprise": "^31.3.1",
"angular-calendar": "^0.31.1",
"angular-code-input": "^2.0.0",
Expand All @@ -44,6 +46,7 @@
"apexcharts": "^3.35.3",
"date-fns": "^3.6.0",
"file-saver": "^2.0.5",
"flatpickr": "^4.6.13",
"intersection-observer": "^0.12.2",
"jasmine-core": "^4.5.0",
"karma": "^6.4.1",
Expand Down Expand Up @@ -85,4 +88,4 @@
"tailwindcss": "^3.4.3",
"typescript": "~5.0.2"
}
}
}
7 changes: 0 additions & 7 deletions frontend/src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
<div>
<!-- <ngx-spinner type="ball-scale-multiple">
<div class="flex flex-col items-center justify-center gap-2">
<img src="../assets/trademark/logo_secondary.png" class="w-12 h-12">
<span class="text-md font-semibold text-transparent bg-clip-text bg-gradient-to-br from-sky-400 to-sky-700 drop-shadow-lg shadow-white">Suivie Physique</span>
</div>
</ngx-spinner> -->
<router-outlet></router-outlet>

</div>
4 changes: 2 additions & 2 deletions frontend/src/app/core/constants/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export class Menu {
label: 'Dashboard',
route: '/dashboard',
children: [
{ label: 'Traitement chèque', route: '/dashboard/cheque' },
{ label: 'Traitement effet', route: '/dashboard/effet' },
{ label: 'Traitement chèque', route: '/dashboard/traitement/cheque' },
{ label: 'Traitement effet', route: '/dashboard/traitement/effet' },
],
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const routes: Routes = [
component: DashboardComponent
},
{
path: 'dashboard/traitement',
path: 'traitement',
loadChildren: () => import('./traitement/traitement.module').then((m) => m.TraitementModule)
},
{
Expand Down
38 changes: 0 additions & 38 deletions frontend/src/app/modules/dashboard/dashboard.component.html
Original file line number Diff line number Diff line change
@@ -1,39 +1 @@

<div class="grid grid-nogutter">
<div class="w-full xl:w-6 p-3">
<h5>Rectangle</h5>
<p-skeleton styleClass="mb-2"></p-skeleton>
<p-skeleton width="10rem" styleClass="mb-2"></p-skeleton>
<p-skeleton width="5rem" styleClass="mb-2"></p-skeleton>
<p-skeleton height="2rem" styleClass="mb-2"></p-skeleton>
<p-skeleton width="10rem" height="4rem"></p-skeleton>
</div>
<div class="w-full xl:w-6 p-3">
<h5>Rounded</h5>
<p-skeleton styleClass="mb-2" borderRadius="16px"></p-skeleton>
<p-skeleton width="10rem" styleClass="mb-2" borderRadius="16px"></p-skeleton>
<p-skeleton width="5rem" styleClass="mb-2" borderRadius="16px"></p-skeleton>
<p-skeleton height="2rem" styleClass="mb-2" borderRadius="16px"></p-skeleton>
<p-skeleton width="10rem" height="4rem" borderRadius="16px"></p-skeleton>
</div>
<div class="w-full xl:w-6 p-3">
<h5 class="mt-3">Square</h5>
<div class="flex align-items-end">
<p-skeleton size="2rem" styleClass="mr-2"></p-skeleton>
<p-skeleton size="3rem" styleClass="mr-2"></p-skeleton>
<p-skeleton size="4rem" styleClass="mr-2"></p-skeleton>
<p-skeleton size="5rem"></p-skeleton>
</div>
</div>
<div class="field w-full xl:w-6 p-3">
<h5 class="mt-3">Circle</h5>
<div class="flex align-items-end">
<p-skeleton shape="circle" size="2rem" styleClass="mr-2"></p-skeleton>
<p-skeleton shape="circle" size="3rem" styleClass="mr-2"></p-skeleton>
<p-skeleton shape="circle" size="4rem" styleClass="mr-2"></p-skeleton>
<p-skeleton shape="circle" size="5rem"></p-skeleton>
</div>
</div>
</div>

<router-outlet></router-outlet>
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@


<mat-stepper
class="full-screen"
[orientation]="(stepperOrientation | async)!">
<mat-step [stepControl]="dateTraitementFormGroup" label="Choisir date de traitement" state="dateTraitement">
<h2 class="mb-4 border-b-2 border-gray-200 py-2 text-2xl font-bold dark:border-gray-700 lg:mb-8">
Choisir date de traitement
</h2>
<span class="block text-lg font-medium text-gray-600 dark:text-gray-400 sm:inline-block">
la date de traitement correspond au jour de traitement des valeurs financière or il nous apporte l'abilité a traiter les données du jour.
</span>


<div class="flex items-center justify-center rounded-xl border-2 border-dashed border-gray-200 bg-gray-50 py-32 text-gray-400 dark:border-gray-700 dark:bg-gray-800">
<form [formGroup]="dateTraitementFormGroup" class="w-full h-full flex flex-col border items-center">
<mat-form-field>
<mat-label>Date de traitement</mat-label>
<input matInput type="date" placeholder="Entrer date de traitement" formControlName="firstCtrl" required>
</mat-form-field>
<div>
<button mat-button matStepperNext>Next</button>
</div>
</form>
</div>

</mat-step>
<mat-step [stepControl]="secondFormGroup" label="Fill out your address">
<form [formGroup]="secondFormGroup">
<mat-form-field>
<mat-label>Address</mat-label>
<input matInput formControlName="secondCtrl" placeholder="Ex. 1 Main St, New York, NY"
required>
</mat-form-field>
<div>
<button mat-button matStepperPrevious>Back</button>
<button mat-button matStepperNext>Next</button>
</div>
</form>
</mat-step>
<mat-step [stepControl]="thirdFormGroup" label="Fill out your phone number">
<form [formGroup]="thirdFormGroup">
<mat-form-field>
<mat-label>Phone number</mat-label>
<input matInput formControlName="thirdCtrl" placeholder="Ex. 12345678" required>
</mat-form-field>
<div>
<button mat-button matStepperPrevious>Back</button>
<button mat-button matStepperNext>Next</button>
</div>
</form>
</mat-step>
<mat-step>
<ng-template matStepLabel>Done</ng-template>
<p>You are now done.</p>
<div>
<button mat-button matStepperPrevious>Back</button>
</div>
</mat-step>


<ng-template matStepperIcon="chat">
<mat-icon aria-hidden="false" aria-label="Example home icon" fontIcon="home"></mat-icon>
</ng-template>
</mat-stepper>

Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import {Component} from '@angular/core';
import {FormBuilder, Validators, FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreakpointObserver} from '@angular/cdk/layout';
import {StepperOrientation, MatStepperModule} from '@angular/material/stepper';
import {Observable} from 'rxjs';
import {map} from 'rxjs/operators';
import {MatButtonModule} from '@angular/material/button';
import {MatInputModule} from '@angular/material/input';
import {MatFormFieldModule} from '@angular/material/form-field';
import {MatIconModule} from '@angular/material/icon';
import {NgSwitch, NgSwitchCase, AsyncPipe} from '@angular/common';

@Component({
selector: 'app-cheque',
templateUrl: './cheque.component.html',
styles: [`
.full-screen {
width: 100%;
height: 80vh;
}
`],
standalone: true,
imports: [
NgSwitch,
NgSwitchCase,
MatStepperModule,
FormsModule,
ReactiveFormsModule,
MatFormFieldModule,
MatInputModule,
MatButtonModule,
MatIconModule,
AsyncPipe,
]
})
export class ChequeComponent {
dateTraitementFormGroup = this._formBuilder.group({
firstCtrl: ['', Validators.required],
});
secondFormGroup = this._formBuilder.group({
secondCtrl: ['', Validators.required],
});
thirdFormGroup = this._formBuilder.group({
thirdCtrl: ['', Validators.required],
});
stepperOrientation: Observable<StepperOrientation>;

constructor(private _formBuilder: FormBuilder, breakpointObserver: BreakpointObserver) {
this.stepperOrientation = breakpointObserver
.observe('(min-width: 800px)')
.pipe(map(({matches}) => (matches ? 'horizontal' : 'vertical')));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<ng-container [ngSwitch]="stepperOrientation | async">
<div *ngSwitchCase="'horizontal'">Make your screen smaller to see a vertical stepper</div>
<div *ngSwitchCase="'vertical'">Make your screen larger to see a horizontal stepper</div>
</ng-container>

<mat-stepper
class="example-stepper"
[orientation]="(stepperOrientation | async)!">
<mat-step [stepControl]="firstFormGroup" label="Fill out your name">
<form [formGroup]="firstFormGroup">
<mat-form-field>
<mat-label>Name</mat-label>
<input matInput placeholder="Last name, First name" formControlName="firstCtrl" required>
</mat-form-field>
<div>
<button mat-button matStepperNext>Next</button>
</div>
</form>
</mat-step>
<mat-step [stepControl]="secondFormGroup" label="Fill out your address">
<form [formGroup]="secondFormGroup">
<mat-form-field>
<mat-label>Address</mat-label>
<input matInput formControlName="secondCtrl" placeholder="Ex. 1 Main St, New York, NY"
required>
</mat-form-field>
<div>
<button mat-button matStepperPrevious>Back</button>
<button mat-button matStepperNext>Next</button>
</div>
</form>
</mat-step>
<mat-step [stepControl]="thirdFormGroup" label="Fill out your phone number">
<form [formGroup]="thirdFormGroup">
<mat-form-field>
<mat-label>Phone number</mat-label>
<input matInput formControlName="thirdCtrl" placeholder="Ex. 12345678" required>
</mat-form-field>
<div>
<button mat-button matStepperPrevious>Back</button>
<button mat-button matStepperNext>Next</button>
</div>
</form>
</mat-step>
<mat-step>
<ng-template matStepLabel>Done</ng-template>
<p>You are now done.</p>
<div>
<button mat-button matStepperPrevious>Back</button>
</div>
</mat-step>
</mat-stepper>

Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import {Component} from '@angular/core';
import {FormBuilder, Validators, FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreakpointObserver} from '@angular/cdk/layout';
import {StepperOrientation, MatStepperModule} from '@angular/material/stepper';
import {Observable} from 'rxjs';
import {map} from 'rxjs/operators';
import {MatButtonModule} from '@angular/material/button';
import {MatInputModule} from '@angular/material/input';
import {MatFormFieldModule} from '@angular/material/form-field';
import {NgSwitch, NgSwitchCase, AsyncPipe} from '@angular/common';

@Component({
selector: 'app-effet',
templateUrl: './effet.component.html',
standalone: true,
imports: [
NgSwitch,
NgSwitchCase,
MatStepperModule,
FormsModule,
ReactiveFormsModule,
MatFormFieldModule,
MatInputModule,
MatButtonModule,
AsyncPipe,
]
})
export class EffetComponent {
firstFormGroup = this._formBuilder.group({
firstCtrl: ['', Validators.required],
});
secondFormGroup = this._formBuilder.group({
secondCtrl: ['', Validators.required],
});
thirdFormGroup = this._formBuilder.group({
thirdCtrl: ['', Validators.required],
});
stepperOrientation: Observable<StepperOrientation>;

constructor(private _formBuilder: FormBuilder, breakpointObserver: BreakpointObserver) {
this.stepperOrientation = breakpointObserver
.observe('(min-width: 800px)')
.pipe(map(({matches}) => (matches ? 'horizontal' : 'vertical')));
}
}
Loading

0 comments on commit 548c69c

Please sign in to comment.