Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
7bba1f31e4
82 changed files with 17797 additions and 40 deletions
|
|
@ -1,6 +1,34 @@
|
||||||
from application import create_app
|
from flask import Flask
|
||||||
|
from flask_sqlalchemy import SQLAlchemy
|
||||||
|
from ddtrace import patch_all
|
||||||
|
import sys
|
||||||
|
import os
|
||||||
|
|
||||||
|
db = SQLAlchemy()
|
||||||
|
patch_all()
|
||||||
|
|
||||||
app = create_app()
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
app.run(host='0.0.0.0')
|
app = Flask(__name__)
|
||||||
|
FLASK_ENV = os.environ.get('FLASK_ENV', None)
|
||||||
|
if FLASK_ENV == 'production':
|
||||||
|
app.config.from_object("config.ProductionConfig")
|
||||||
|
elif FLASK_ENV == 'staging':
|
||||||
|
app.config.from_object("config.StagingConfig")
|
||||||
|
elif FLASK_ENV == 'development':
|
||||||
|
app.config.from_object("config.DevelopmentConfig")
|
||||||
|
else:
|
||||||
|
app.config.from_object("config.Config")
|
||||||
|
|
||||||
|
if app.config['SQLALCHEMY_DATABASE_URI_1'] is None or app.config['SQLALCHEMY_DATABASE_URI_2'] is None:
|
||||||
|
print('No ENV Variables for DATABASE_URL_1 or DATABASE_URL_2')
|
||||||
|
sys.exit(1)
|
||||||
|
else:
|
||||||
|
print('ENV Variables passed : ', app.config['SQLALCHEMY_BINDS'])
|
||||||
|
|
||||||
|
# db.init_app(app)
|
||||||
|
# with app.app_context():
|
||||||
|
# from . import routes
|
||||||
|
# db.create_all()
|
||||||
|
PORT = os.environ.get('PORT', 4999)
|
||||||
|
app.run(host='0.0.0.0', port=PORT)
|
||||||
|
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
from flask import Flask
|
|
||||||
from flask_sqlalchemy import SQLAlchemy
|
|
||||||
from ddtrace import patch_all
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
|
|
||||||
db = SQLAlchemy()
|
|
||||||
patch_all()
|
|
||||||
|
|
||||||
|
|
||||||
def create_app():
|
|
||||||
app = Flask(__name__)
|
|
||||||
FLASK_ENV = os.environ.get('FLASK_ENV', None)
|
|
||||||
if FLASK_ENV == 'production':
|
|
||||||
app.config.from_object("config.ProductionConfig")
|
|
||||||
elif FLASK_ENV == 'staging':
|
|
||||||
app.config.from_object("config.StagingConfig")
|
|
||||||
elif FLASK_ENV == 'development':
|
|
||||||
app.config.from_object("config.DevelopmentConfig")
|
|
||||||
else:
|
|
||||||
app.config.from_object("config.Config")
|
|
||||||
|
|
||||||
if app.config['SQLALCHEMY_DATABASE_URI_1'] is None or app.config['SQLALCHEMY_DATABASE_URI_2'] is None:
|
|
||||||
print('No ENV Variable for DATABASE_URL_1 or DATABASE_URL_2')
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
db.init_app(app)
|
|
||||||
with app.app_context():
|
|
||||||
from . import routes
|
|
||||||
db.create_all()
|
|
||||||
return app
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from . import db
|
from app import db
|
||||||
|
|
||||||
|
|
||||||
class Logs(db.Model):
|
class Logs(db.Model):
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
from flask import current_app as app
|
from flask import current_app as app
|
||||||
from flask import request
|
from flask import request
|
||||||
from .logs_model import Logs, db
|
from logs_model import db
|
||||||
from .users_model import Users, db
|
from users_model import Users, db
|
||||||
from .responses import send_message, send_error
|
from responses import send_message, send_error
|
||||||
|
|
||||||
|
|
||||||
# Login
|
# Login
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from . import db
|
from app import db
|
||||||
|
|
||||||
|
|
||||||
class Users(db.Model):
|
class Users(db.Model):
|
||||||
1
frontend
1
frontend
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit bddf2800b8a3733533e89812794de5beddaec56c
|
|
||||||
17
frontend/.browserslistrc
Normal file
17
frontend/.browserslistrc
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
|
||||||
|
# For additional information regarding the format and rule options, please see:
|
||||||
|
# https://github.com/browserslist/browserslist#queries
|
||||||
|
|
||||||
|
# For the full list of supported browsers by the Angular framework, please see:
|
||||||
|
# https://angular.io/guide/browser-support
|
||||||
|
|
||||||
|
# You can see what browsers were selected by your queries by running:
|
||||||
|
# npx browserslist
|
||||||
|
|
||||||
|
last 1 Chrome version
|
||||||
|
last 1 Firefox version
|
||||||
|
last 2 Edge major versions
|
||||||
|
last 2 Safari major versions
|
||||||
|
last 2 iOS major versions
|
||||||
|
Firefox ESR
|
||||||
|
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
|
||||||
16
frontend/.editorconfig
Normal file
16
frontend/.editorconfig
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
# Editor configuration, see https://editorconfig.org
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
charset = utf-8
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
insert_final_newline = true
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
|
[*.ts]
|
||||||
|
quote_type = single
|
||||||
|
|
||||||
|
[*.md]
|
||||||
|
max_line_length = off
|
||||||
|
trim_trailing_whitespace = false
|
||||||
46
frontend/.gitignore
vendored
Normal file
46
frontend/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,46 @@
|
||||||
|
# See http://help.github.com/ignore-files/ for more about ignoring files.
|
||||||
|
|
||||||
|
# compiled output
|
||||||
|
/dist
|
||||||
|
/tmp
|
||||||
|
/out-tsc
|
||||||
|
# Only exists if Bazel was run
|
||||||
|
/bazel-out
|
||||||
|
|
||||||
|
# dependencies
|
||||||
|
/node_modules
|
||||||
|
|
||||||
|
# profiling files
|
||||||
|
chrome-profiler-events*.json
|
||||||
|
|
||||||
|
# IDEs and editors
|
||||||
|
/.idea
|
||||||
|
.project
|
||||||
|
.classpath
|
||||||
|
.c9/
|
||||||
|
*.launch
|
||||||
|
.settings/
|
||||||
|
*.sublime-workspace
|
||||||
|
|
||||||
|
# IDE - VSCode
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/settings.json
|
||||||
|
!.vscode/tasks.json
|
||||||
|
!.vscode/launch.json
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.history/*
|
||||||
|
.idea/*
|
||||||
|
|
||||||
|
# misc
|
||||||
|
/.sass-cache
|
||||||
|
/connect.lock
|
||||||
|
/coverage
|
||||||
|
/libpeerconnection.log
|
||||||
|
npm-debug.log
|
||||||
|
yarn-error.log
|
||||||
|
testem.log
|
||||||
|
/typings
|
||||||
|
|
||||||
|
# System Files
|
||||||
|
.DS_Store
|
||||||
|
Thumbs.db
|
||||||
27
frontend/README.md
Normal file
27
frontend/README.md
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
# Frontend
|
||||||
|
|
||||||
|
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.2.10.
|
||||||
|
|
||||||
|
## Development server
|
||||||
|
|
||||||
|
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
|
||||||
|
|
||||||
|
## Code scaffolding
|
||||||
|
|
||||||
|
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
|
||||||
|
|
||||||
|
## Build
|
||||||
|
|
||||||
|
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
|
||||||
|
|
||||||
|
## Running unit tests
|
||||||
|
|
||||||
|
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
|
||||||
|
|
||||||
|
## Running end-to-end tests
|
||||||
|
|
||||||
|
Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
|
||||||
|
|
||||||
|
## Further help
|
||||||
|
|
||||||
|
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
|
||||||
113
frontend/angular.json
Normal file
113
frontend/angular.json
Normal file
|
|
@ -0,0 +1,113 @@
|
||||||
|
{
|
||||||
|
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||||
|
"version": 1,
|
||||||
|
"newProjectRoot": "projects",
|
||||||
|
"projects": {
|
||||||
|
"frontend": {
|
||||||
|
"projectType": "application",
|
||||||
|
"schematics": {
|
||||||
|
"@schematics/angular:component": {
|
||||||
|
"style": "scss"
|
||||||
|
},
|
||||||
|
"@schematics/angular:application": {
|
||||||
|
"strict": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "",
|
||||||
|
"sourceRoot": "src",
|
||||||
|
"prefix": "app",
|
||||||
|
"architect": {
|
||||||
|
"build": {
|
||||||
|
"builder": "@angular-devkit/build-angular:browser",
|
||||||
|
"options": {
|
||||||
|
"outputPath": "dist/frontend",
|
||||||
|
"index": "src/index.html",
|
||||||
|
"main": "src/main.ts",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"tsConfig": "tsconfig.app.json",
|
||||||
|
"inlineStyleLanguage": "scss",
|
||||||
|
"assets": [
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/assets"
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
|
||||||
|
"./node_modules/bootstrap/scss/bootstrap.scss",
|
||||||
|
"src/styles.scss"
|
||||||
|
],
|
||||||
|
"scripts": []
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"budgets": [
|
||||||
|
{
|
||||||
|
"type": "initial",
|
||||||
|
"maximumWarning": "500kb",
|
||||||
|
"maximumError": "1mb"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "anyComponentStyle",
|
||||||
|
"maximumWarning": "2kb",
|
||||||
|
"maximumError": "4kb"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"fileReplacements": [
|
||||||
|
{
|
||||||
|
"replace": "src/environments/environment.ts",
|
||||||
|
"with": "src/environments/environment.prod.ts"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outputHashing": "all"
|
||||||
|
},
|
||||||
|
"development": {
|
||||||
|
"buildOptimizer": false,
|
||||||
|
"optimization": false,
|
||||||
|
"vendorChunk": true,
|
||||||
|
"extractLicenses": false,
|
||||||
|
"sourceMap": true,
|
||||||
|
"namedChunks": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaultConfiguration": "production"
|
||||||
|
},
|
||||||
|
"serve": {
|
||||||
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"browserTarget": "frontend:build:production"
|
||||||
|
},
|
||||||
|
"development": {
|
||||||
|
"browserTarget": "frontend:build:development"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaultConfiguration": "development"
|
||||||
|
},
|
||||||
|
"extract-i18n": {
|
||||||
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "frontend:build"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"test": {
|
||||||
|
"builder": "@angular-devkit/build-angular:karma",
|
||||||
|
"options": {
|
||||||
|
"main": "src/test.ts",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"tsConfig": "tsconfig.spec.json",
|
||||||
|
"karmaConfig": "karma.conf.js",
|
||||||
|
"inlineStyleLanguage": "scss",
|
||||||
|
"assets": [
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/assets"
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"src/styles.scss"
|
||||||
|
],
|
||||||
|
"scripts": []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaultProject": "frontend"
|
||||||
|
}
|
||||||
44
frontend/karma.conf.js
Normal file
44
frontend/karma.conf.js
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
// Karma configuration file, see link for more information
|
||||||
|
// https://karma-runner.github.io/1.0/config/configuration-file.html
|
||||||
|
|
||||||
|
module.exports = function (config) {
|
||||||
|
config.set({
|
||||||
|
basePath: '',
|
||||||
|
frameworks: ['jasmine', '@angular-devkit/build-angular'],
|
||||||
|
plugins: [
|
||||||
|
require('karma-jasmine'),
|
||||||
|
require('karma-chrome-launcher'),
|
||||||
|
require('karma-jasmine-html-reporter'),
|
||||||
|
require('karma-coverage'),
|
||||||
|
require('@angular-devkit/build-angular/plugins/karma')
|
||||||
|
],
|
||||||
|
client: {
|
||||||
|
jasmine: {
|
||||||
|
// you can add configuration options for Jasmine here
|
||||||
|
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
|
||||||
|
// for example, you can disable the random execution with `random: false`
|
||||||
|
// or set a specific seed with `seed: 4321`
|
||||||
|
},
|
||||||
|
clearContext: false // leave Jasmine Spec Runner output visible in browser
|
||||||
|
},
|
||||||
|
jasmineHtmlReporter: {
|
||||||
|
suppressAll: true // removes the duplicated traces
|
||||||
|
},
|
||||||
|
coverageReporter: {
|
||||||
|
dir: require('path').join(__dirname, './coverage/frontend'),
|
||||||
|
subdir: '.',
|
||||||
|
reporters: [
|
||||||
|
{ type: 'html' },
|
||||||
|
{ type: 'text-summary' }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
reporters: ['progress', 'kjhtml'],
|
||||||
|
port: 9876,
|
||||||
|
colors: true,
|
||||||
|
logLevel: config.LOG_INFO,
|
||||||
|
autoWatch: true,
|
||||||
|
browsers: ['Chrome'],
|
||||||
|
singleRun: false,
|
||||||
|
restartOnFileChange: true
|
||||||
|
});
|
||||||
|
};
|
||||||
15214
frontend/package-lock.json
generated
Normal file
15214
frontend/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load diff
44
frontend/package.json
Normal file
44
frontend/package.json
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
{
|
||||||
|
"name": "frontend",
|
||||||
|
"version": "0.0.0",
|
||||||
|
"scripts": {
|
||||||
|
"ng": "ng",
|
||||||
|
"start": "ng serve",
|
||||||
|
"build": "ng build",
|
||||||
|
"watch": "ng build --watch --configuration development",
|
||||||
|
"test": "ng test"
|
||||||
|
},
|
||||||
|
"private": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@angular/animations": "~12.2.0",
|
||||||
|
"@angular/cdk": "^13.0.2",
|
||||||
|
"@angular/common": "~12.2.0",
|
||||||
|
"@angular/compiler": "~12.2.0",
|
||||||
|
"@angular/core": "~12.2.0",
|
||||||
|
"@angular/forms": "~12.2.0",
|
||||||
|
"@angular/material": "^13.0.2",
|
||||||
|
"@angular/platform-browser": "~12.2.0",
|
||||||
|
"@angular/platform-browser-dynamic": "~12.2.0",
|
||||||
|
"@angular/router": "~12.2.0",
|
||||||
|
"bootstrap": "^5.1.3",
|
||||||
|
"jquery": "^3.6.0",
|
||||||
|
"popper": "^1.0.1",
|
||||||
|
"rxjs": "~6.6.0",
|
||||||
|
"tslib": "^2.3.0",
|
||||||
|
"zone.js": "~0.11.4"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@angular-devkit/build-angular": "~12.2.10",
|
||||||
|
"@angular/cli": "~12.2.10",
|
||||||
|
"@angular/compiler-cli": "~12.2.0",
|
||||||
|
"@types/jasmine": "~3.8.0",
|
||||||
|
"@types/node": "^12.11.1",
|
||||||
|
"jasmine-core": "~3.8.0",
|
||||||
|
"karma": "~6.3.0",
|
||||||
|
"karma-chrome-launcher": "~3.1.0",
|
||||||
|
"karma-coverage": "~2.0.3",
|
||||||
|
"karma-jasmine": "~4.0.0",
|
||||||
|
"karma-jasmine-html-reporter": "~1.7.0",
|
||||||
|
"typescript": "~4.3.5"
|
||||||
|
}
|
||||||
|
}
|
||||||
7
frontend/src/app/admin/myProfil/commentary.txt
Normal file
7
frontend/src/app/admin/myProfil/commentary.txt
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
La page "admin/myProfil" contient:
|
||||||
|
- les informations de l'admin (composant "page-profil")
|
||||||
|
- un bouton "modifier profil" pour modifier les informations de l'admin (composant "popup-update-profil")
|
||||||
|
|
||||||
|
Cette page est la même que la page de la partie utilisateur.
|
||||||
|
|
||||||
|
Ainsi, on a rangé cette page dans le dossier "common/components/profil".
|
||||||
|
|
@ -0,0 +1,63 @@
|
||||||
|
<div>
|
||||||
|
|
||||||
|
<app-navbar pour="admin"></app-navbar>
|
||||||
|
|
||||||
|
|
||||||
|
<div>
|
||||||
|
|
||||||
|
<div class="btnContainer">
|
||||||
|
<button mat-button class="btnAjouter" (click)="onAdd()">
|
||||||
|
<mat-icon>add_circle</mat-icon> Ajouter un utilisateur
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<table mat-table [dataSource]="dataSource" matSort class="mat-elevation-z8">
|
||||||
|
|
||||||
|
<!-- Pseudo Column -->
|
||||||
|
<ng-container matColumnDef="login">
|
||||||
|
<th mat-header-cell *matHeaderCellDef mat-sort-header>Pseudo</th>
|
||||||
|
<td mat-cell *matCellDef="let person">{{person.login}}</td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<!-- Email Column -->
|
||||||
|
<ng-container matColumnDef="email">
|
||||||
|
<th mat-header-cell *matHeaderCellDef mat-sort-header>Email</th>
|
||||||
|
<td mat-cell *matCellDef="let person">{{person.email}}</td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<!-- Role Column -->
|
||||||
|
<ng-container matColumnDef="role">
|
||||||
|
<th mat-header-cell *matHeaderCellDef mat-sort-header>Rôle</th>
|
||||||
|
<td mat-cell *matCellDef="let person">
|
||||||
|
<span *ngIf="person.role === 'user'">utilisateur</span>
|
||||||
|
<span *ngIf="person.role === 'admin'">admin</span>
|
||||||
|
</td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<!-- Actions Column -->
|
||||||
|
<ng-container matColumnDef="actions">
|
||||||
|
<th mat-header-cell *matHeaderCellDef mat-sort-header>Actions</th>
|
||||||
|
<td mat-cell *matCellDef="let person">
|
||||||
|
<button mat-icon-button (click)="onUpdate(person)">
|
||||||
|
<mat-icon>edit</mat-icon>
|
||||||
|
</button>
|
||||||
|
<button mat-icon-button (click)="onDelete(person)">
|
||||||
|
<mat-icon>delete</mat-icon>
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
|
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<mat-paginator [pageSizeOptions]="[10, 20, 50, 100]"
|
||||||
|
showFirstLastButtons
|
||||||
|
aria-label="Select page of periodic elements"
|
||||||
|
class="mat-elevation-z8"></mat-paginator>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<br><br>
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
mat-paginator, table {
|
||||||
|
width: 80%;
|
||||||
|
margin: auto 10%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btnContainer {
|
||||||
|
margin: 50px 10% 20px 0px;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btnAjouter {
|
||||||
|
border: solid 1px black;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { PageUserListComponent } from './page-user-list.component';
|
||||||
|
|
||||||
|
describe('PageAdminComponent', () => {
|
||||||
|
let component: PageUserListComponent;
|
||||||
|
let fixture: ComponentFixture<PageUserListComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ PageUserListComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(PageUserListComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,127 @@
|
||||||
|
import {AfterViewInit, Component, ViewChild} from '@angular/core';
|
||||||
|
import {MatTableDataSource} from "@angular/material/table";
|
||||||
|
import {Person} from "../../../common/interfaces/Person";
|
||||||
|
import {FictitiousDatasService} from "../../../common/services/fictitiousDatas/fictitious-datas.service";
|
||||||
|
import {MatSort} from "@angular/material/sort";
|
||||||
|
import {MatPaginator} from "@angular/material/paginator";
|
||||||
|
import {MatDialog} from "@angular/material/dialog";
|
||||||
|
import {PopupCreatePersonComponent} from "../popup-create-person/popup-create-person.component";
|
||||||
|
import {MatSnackBar} from "@angular/material/snack-bar";
|
||||||
|
import {PopupUpdateProfilComponent} from "../../../common/components/profil/popup-update-profil/popup-update-profil.component";
|
||||||
|
import {PopupDeletePersonComponent} from "../popup-delete-person/popup-delete-person.component";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-page-user-list',
|
||||||
|
templateUrl: './page-user-list.component.html',
|
||||||
|
styleUrls: ['./page-user-list.component.scss']
|
||||||
|
})
|
||||||
|
export class PageUserListComponent implements AfterViewInit
|
||||||
|
{
|
||||||
|
displayedColumns: string[] = [ "login", "email", "role", "actions" ];
|
||||||
|
dataSource: MatTableDataSource<Person>;
|
||||||
|
@ViewChild(MatSort) sort: MatSort;
|
||||||
|
@ViewChild(MatPaginator) paginator: MatPaginator;
|
||||||
|
configSnackBar = { duration: 2000, panelClass: "custom-class" };
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
constructor( private fictitiousDatasService: FictitiousDatasService,
|
||||||
|
public dialog: MatDialog,
|
||||||
|
private snackBar: MatSnackBar) { }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ngAfterViewInit(): void
|
||||||
|
{
|
||||||
|
// Faux code
|
||||||
|
const tabPerson = this.fictitiousDatasService.getTabPerson(5);
|
||||||
|
|
||||||
|
// Vrai code ...
|
||||||
|
|
||||||
|
this.dataSource = new MatTableDataSource(tabPerson);
|
||||||
|
this.dataSource.sort = this.sort;
|
||||||
|
this.dataSource.paginator = this.paginator;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// Appuie sur le bouton "add"
|
||||||
|
onAdd(): void
|
||||||
|
{
|
||||||
|
const config = { width: '50%' };
|
||||||
|
this.dialog
|
||||||
|
.open(PopupCreatePersonComponent, config)
|
||||||
|
.afterClosed()
|
||||||
|
.subscribe( person => {
|
||||||
|
|
||||||
|
if((person === null) || (person === undefined)) {
|
||||||
|
this.snackBar.open( "Opération annulée", "", this.configSnackBar);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.dataSource.data.push(person);
|
||||||
|
this.dataSource.data = this.dataSource.data;
|
||||||
|
this.dataSource = this.dataSource
|
||||||
|
this.snackBar.open( "L'utilisateur a bien été créé ✔", "", this.configSnackBar);
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// Appuie sur le bouton "edit"
|
||||||
|
onUpdate(personToUpdate: Person): void
|
||||||
|
{
|
||||||
|
const config = {
|
||||||
|
width: '50%',
|
||||||
|
data: { person: personToUpdate }
|
||||||
|
};
|
||||||
|
this.dialog
|
||||||
|
.open(PopupUpdateProfilComponent, config)
|
||||||
|
.afterClosed()
|
||||||
|
.subscribe( personUpdated => {
|
||||||
|
|
||||||
|
if((personUpdated === null) || (personUpdated === undefined)) {
|
||||||
|
this.snackBar.open( "Opération annulée", "", this.configSnackBar);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
const index = this.dataSource.data.findIndex( elt => (elt.id === personToUpdate.id));
|
||||||
|
this.dataSource.data.splice(index, 1, personUpdated);
|
||||||
|
this.dataSource.data = this.dataSource.data;
|
||||||
|
this.dataSource = this.dataSource;
|
||||||
|
this.snackBar.open( "L'utilisateur a bien été modifié ✔", "", this.configSnackBar);
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// Appuie sur le bouton "delete"
|
||||||
|
onDelete(personToDelete: Person): void
|
||||||
|
{
|
||||||
|
const config = {
|
||||||
|
data: { person: personToDelete }
|
||||||
|
};
|
||||||
|
this.dialog
|
||||||
|
.open(PopupDeletePersonComponent, config)
|
||||||
|
.afterClosed()
|
||||||
|
.subscribe( personUpdated => {
|
||||||
|
|
||||||
|
if((personUpdated === null) || (personUpdated === undefined)) {
|
||||||
|
this.snackBar.open( "Opération annulée", "", this.configSnackBar);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
const index = this.dataSource.data.findIndex( elt => (elt.id === personToDelete.id));
|
||||||
|
this.dataSource.data.splice(index, 1);
|
||||||
|
this.dataSource.data = this.dataSource.data;
|
||||||
|
this.dataSource = this.dataSource;
|
||||||
|
this.snackBar.open( "L'utilisateur a bien été supprimé ✔", "", this.configSnackBar);
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,48 @@
|
||||||
|
<div class="myContainer">
|
||||||
|
|
||||||
|
<h3>Ajouter un utilisateur</h3>
|
||||||
|
|
||||||
|
<mat-divider style="margin: 20px 0px 20px 0px"></mat-divider>
|
||||||
|
|
||||||
|
<!-- login -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Pseudo</mat-label>
|
||||||
|
<input matInput type="text" [(ngModel)]="person.login" required>
|
||||||
|
</mat-form-field><br>
|
||||||
|
|
||||||
|
<!-- email -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Email</mat-label>
|
||||||
|
<input matInput type="text" [(ngModel)]="person.email" required>
|
||||||
|
</mat-form-field><br>
|
||||||
|
|
||||||
|
<!-- mot de passe -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Mot de passe</mat-label>
|
||||||
|
<input matInput type="password" [(ngModel)]="password" required>
|
||||||
|
</mat-form-field><br>
|
||||||
|
|
||||||
|
<!-- confirmation mot de passe -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Confirmation mot de passe</mat-label>
|
||||||
|
<input matInput type="password" [(ngModel)]="confirmPassword" required>
|
||||||
|
</mat-form-field><br>
|
||||||
|
|
||||||
|
<!-- role -->
|
||||||
|
<label id="label-radio-group">Rôle: </label>
|
||||||
|
<mat-radio-group aria-labelledby="label-radio-group" [(ngModel)]="person.role">
|
||||||
|
<mat-radio-button value="user" checked>Utilisateur </mat-radio-button>
|
||||||
|
<mat-radio-button value="admin">Admin</mat-radio-button>
|
||||||
|
</mat-radio-group><br><br>
|
||||||
|
|
||||||
|
<mat-divider style="margin-bottom: 10px"></mat-divider>
|
||||||
|
|
||||||
|
<!-- message d'erreur -->
|
||||||
|
<div *ngIf="hasError">
|
||||||
|
<mat-error>{{errorMessage}}</mat-error>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- bouton -->
|
||||||
|
<button mat-button (click)="onValider()">Valider</button>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
.myContainer {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
::ng-deep .mat-radio-inner-circle {
|
||||||
|
color: black !important;
|
||||||
|
background-color: black !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::ng-deep .mat-radio-outer-circle{
|
||||||
|
color: black !important;
|
||||||
|
border: solid 1px gray !important;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { PopupCreatePersonComponent } from './popup-create-person.component';
|
||||||
|
|
||||||
|
describe('PopupCreerUtilisateurComponent', () => {
|
||||||
|
let component: PopupCreatePersonComponent;
|
||||||
|
let fixture: ComponentFixture<PopupCreatePersonComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ PopupCreatePersonComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(PopupCreatePersonComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,96 @@
|
||||||
|
import {Component, Inject} from '@angular/core';
|
||||||
|
import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
|
||||||
|
import {CheckEmailService} from "../../../common/services/checkEmail/check-email.service";
|
||||||
|
import {HashageService} from "../../../common/services/hashage/hashage.service";
|
||||||
|
import {Person} from "../../../common/interfaces/Person";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-popup-create-person',
|
||||||
|
templateUrl: './popup-create-person.component.html',
|
||||||
|
styleUrls: ['./popup-create-person.component.scss']
|
||||||
|
})
|
||||||
|
export class PopupCreatePersonComponent
|
||||||
|
{
|
||||||
|
person: Person = {
|
||||||
|
id: "",
|
||||||
|
login: "",
|
||||||
|
email: "",
|
||||||
|
hashPass: "",
|
||||||
|
role: "user"
|
||||||
|
};
|
||||||
|
password: string = "";
|
||||||
|
confirmPassword: string = "" ;
|
||||||
|
changePassword: boolean = false ;
|
||||||
|
hasError: boolean = false;
|
||||||
|
errorMessage: string = "" ;
|
||||||
|
|
||||||
|
|
||||||
|
constructor( public dialogRef: MatDialogRef<PopupCreatePersonComponent>,
|
||||||
|
@Inject(MAT_DIALOG_DATA) public data: any,
|
||||||
|
private checkEmailService: CheckEmailService,
|
||||||
|
private hashageService: HashageService ) { }
|
||||||
|
|
||||||
|
|
||||||
|
// Appuie sur le bouton "valider"
|
||||||
|
onValider(): void
|
||||||
|
{
|
||||||
|
this.checkField();
|
||||||
|
if(!this.hasError)
|
||||||
|
{
|
||||||
|
if(this.changePassword) this.person.hashPass = this.hashageService.run(this.password);
|
||||||
|
const data = { user: this.person };
|
||||||
|
|
||||||
|
// ...
|
||||||
|
|
||||||
|
// Faux code
|
||||||
|
this.onValiderCallback({ status: "success", data: {}});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Callback de 'onValider'
|
||||||
|
onValiderCallback(retour: any)
|
||||||
|
{
|
||||||
|
if(retour.status === 'error')
|
||||||
|
{
|
||||||
|
console.log(retour);
|
||||||
|
this.dialogRef.close(null);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.dialogRef.close(this.person);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Check les champs saisis par l'utilisateur
|
||||||
|
checkField(): void
|
||||||
|
{
|
||||||
|
if(this.person.login.length === 0) {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ 'pseudo'.";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(this.person.email.length === 0) {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ 'email'.";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(!this.checkEmailService.isValidEmail(this.person.email)) {
|
||||||
|
this.errorMessage = "Email invalide.";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(this.password.length === 0) {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ 'mot de passe'.";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(this.password !== this.confirmPassword) {
|
||||||
|
this.errorMessage = "Le mot de passe est différent de sa confirmation.";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.errorMessage = "" ;
|
||||||
|
this.hasError = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
<mat-dialog-content class="mat-typography">
|
||||||
|
Êtes-vous sûr de vouloir supprimer <i>{{data.person.login}}</i> ?
|
||||||
|
</mat-dialog-content>
|
||||||
|
|
||||||
|
<mat-dialog-actions align="end">
|
||||||
|
<button mat-button (click)="dialogRef.close()">Annuler</button>
|
||||||
|
<button mat-button (click)="dialogRef.close(true)" cdkFocusInitial>Valider</button>
|
||||||
|
</mat-dialog-actions>
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { PopupDeletePersonComponent } from './popup-delete-person.component';
|
||||||
|
|
||||||
|
describe('PopupDeletePersonComponent', () => {
|
||||||
|
let component: PopupDeletePersonComponent;
|
||||||
|
let fixture: ComponentFixture<PopupDeletePersonComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ PopupDeletePersonComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(PopupDeletePersonComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
import {Component, Inject} from '@angular/core';
|
||||||
|
import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-popup-delete-person',
|
||||||
|
templateUrl: './popup-delete-person.component.html',
|
||||||
|
styleUrls: ['./popup-delete-person.component.scss']
|
||||||
|
})
|
||||||
|
export class PopupDeletePersonComponent
|
||||||
|
{
|
||||||
|
|
||||||
|
constructor( public dialogRef: MatDialogRef<PopupDeletePersonComponent>,
|
||||||
|
@Inject(MAT_DIALOG_DATA) public data: any ) { }
|
||||||
|
|
||||||
|
}
|
||||||
26
frontend/src/app/app-routing.module.ts
Normal file
26
frontend/src/app/app-routing.module.ts
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { RouterModule, Routes } from '@angular/router';
|
||||||
|
import {PageLoginComponent} from "./login/page-login/page-login.component";
|
||||||
|
import {PageRegisterComponent} from "./register/page-register/page-register.component";
|
||||||
|
import {PageProfilComponent} from "./common/components/profil/page-profil/page-profil.component";
|
||||||
|
import {PageUserListComponent} from "./admin/userList/page-user-list/page-user-list.component";
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
|
||||||
|
{ path: "", component: PageLoginComponent },
|
||||||
|
{ path: "login", component: PageLoginComponent },
|
||||||
|
|
||||||
|
{ path: "register", component: PageRegisterComponent },
|
||||||
|
|
||||||
|
{ path: "user", component: PageProfilComponent },
|
||||||
|
|
||||||
|
{ path: "admin", component: PageUserListComponent },
|
||||||
|
{ path: "admin/userList", component: PageUserListComponent },
|
||||||
|
{ path: "admin/myProfil", component: PageProfilComponent },
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forRoot(routes)],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
export class AppRoutingModule { }
|
||||||
2
frontend/src/app/app.component.html
Normal file
2
frontend/src/app/app.component.html
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
||||||
|
<router-outlet></router-outlet>
|
||||||
0
frontend/src/app/app.component.scss
Normal file
0
frontend/src/app/app.component.scss
Normal file
35
frontend/src/app/app.component.spec.ts
Normal file
35
frontend/src/app/app.component.spec.ts
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
|
import { AppComponent } from './app.component';
|
||||||
|
|
||||||
|
describe('AppComponent', () => {
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [
|
||||||
|
RouterTestingModule
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
AppComponent
|
||||||
|
],
|
||||||
|
}).compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create the app', () => {
|
||||||
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
|
const app = fixture.componentInstance;
|
||||||
|
expect(app).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should have as title 'frontend'`, () => {
|
||||||
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
|
const app = fixture.componentInstance;
|
||||||
|
expect(app.title).toEqual('frontend');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should render title', () => {
|
||||||
|
const fixture = TestBed.createComponent(AppComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
const compiled = fixture.nativeElement as HTMLElement;
|
||||||
|
expect(compiled.querySelector('.content span')?.textContent).toContain('frontend app is running!');
|
||||||
|
});
|
||||||
|
});
|
||||||
10
frontend/src/app/app.component.ts
Normal file
10
frontend/src/app/app.component.ts
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-root',
|
||||||
|
templateUrl: './app.component.html',
|
||||||
|
styleUrls: ['./app.component.scss']
|
||||||
|
})
|
||||||
|
export class AppComponent {
|
||||||
|
title = 'frontend';
|
||||||
|
}
|
||||||
64
frontend/src/app/app.module.ts
Normal file
64
frontend/src/app/app.module.ts
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { BrowserModule } from '@angular/platform-browser';
|
||||||
|
|
||||||
|
import { AppRoutingModule } from './app-routing.module';
|
||||||
|
import { AppComponent } from './app.component';
|
||||||
|
import { PageRegisterComponent } from './register/page-register/page-register.component';
|
||||||
|
import {FormsModule} from "@angular/forms";
|
||||||
|
import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
|
||||||
|
import {MatFormFieldModule} from "@angular/material/form-field";
|
||||||
|
import {MatInputModule} from "@angular/material/input";
|
||||||
|
import {PageLoginComponent} from "./login/page-login/page-login.component";
|
||||||
|
import { NavbarComponent } from './common/components/navbar/navbar.component';
|
||||||
|
import {MatButtonModule} from "@angular/material/button";
|
||||||
|
import { PageProfilComponent } from './common/components/profil/page-profil/page-profil.component';
|
||||||
|
import { PopupUpdateProfilComponent } from './common/components/profil/popup-update-profil/popup-update-profil.component';
|
||||||
|
import {MatDividerModule} from "@angular/material/divider";
|
||||||
|
import {MatCheckboxModule} from "@angular/material/checkbox";
|
||||||
|
import {MatDialogModule} from "@angular/material/dialog";
|
||||||
|
import {MatSnackBarModule} from "@angular/material/snack-bar";
|
||||||
|
import { PageUserListComponent } from './admin/userList/page-user-list/page-user-list.component';
|
||||||
|
import { PopupCreatePersonComponent } from './admin/userList/popup-create-person/popup-create-person.component';
|
||||||
|
import {MatTableModule} from "@angular/material/table";
|
||||||
|
import {MatPaginatorModule} from "@angular/material/paginator";
|
||||||
|
import { PopupConfirmRegisterComponent } from './register/popup-confirm-register/popup-confirm-register.component';
|
||||||
|
import { PopupDeletePersonComponent } from './admin/userList/popup-delete-person/popup-delete-person.component';
|
||||||
|
import {MatIconModule} from "@angular/material/icon";
|
||||||
|
import {MatRadioModule} from "@angular/material/radio";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
declarations: [
|
||||||
|
AppComponent,
|
||||||
|
PageLoginComponent,
|
||||||
|
PageRegisterComponent,
|
||||||
|
NavbarComponent,
|
||||||
|
PageProfilComponent,
|
||||||
|
PopupUpdateProfilComponent,
|
||||||
|
PageUserListComponent,
|
||||||
|
PopupCreatePersonComponent,
|
||||||
|
PopupConfirmRegisterComponent,
|
||||||
|
PopupDeletePersonComponent
|
||||||
|
],
|
||||||
|
imports: [
|
||||||
|
BrowserModule,
|
||||||
|
AppRoutingModule,
|
||||||
|
FormsModule,
|
||||||
|
BrowserAnimationsModule,
|
||||||
|
MatFormFieldModule,
|
||||||
|
MatInputModule,
|
||||||
|
MatButtonModule,
|
||||||
|
MatDividerModule,
|
||||||
|
MatCheckboxModule,
|
||||||
|
MatDialogModule,
|
||||||
|
MatSnackBarModule,
|
||||||
|
MatTableModule,
|
||||||
|
MatPaginatorModule,
|
||||||
|
MatIconModule,
|
||||||
|
MatRadioModule
|
||||||
|
],
|
||||||
|
providers: [],
|
||||||
|
bootstrap: [AppComponent]
|
||||||
|
})
|
||||||
|
export class AppModule { }
|
||||||
|
|
@ -0,0 +1,99 @@
|
||||||
|
<!-- Login -->
|
||||||
|
<div *ngIf="pour === 'login'">
|
||||||
|
<nav class="navbar navbar-expand-lg">
|
||||||
|
|
||||||
|
<!-- FlaskAled -->
|
||||||
|
<a class="navbar-brand" routerLink=""> FlaskAled </a>
|
||||||
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<!-- Rien -->
|
||||||
|
<div class="collapse navbar-collapse"></div>
|
||||||
|
|
||||||
|
<!-- S'inscrire -->
|
||||||
|
<button mat-button class="btnDeconnexion" routerLink="/register">
|
||||||
|
S'inscrire
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- --------------------------------------------------------------------------------------------------------- -->
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Register -->
|
||||||
|
<div *ngIf="pour === 'register'">
|
||||||
|
<nav class="navbar navbar-expand-lg">
|
||||||
|
|
||||||
|
<!-- FlaskAled -->
|
||||||
|
<a class="navbar-brand" routerLink=""> FlaskAled </a>
|
||||||
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<!-- Rien -->
|
||||||
|
<div class="collapse navbar-collapse"></div>
|
||||||
|
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- --------------------------------------------------------------------------------------------------------- -->
|
||||||
|
|
||||||
|
|
||||||
|
<!-- User -->
|
||||||
|
<div *ngIf="pour === 'user'">
|
||||||
|
<nav class="navbar navbar-expand-lg">
|
||||||
|
|
||||||
|
<!-- FlaskAled -->
|
||||||
|
<a class="navbar-brand" routerLink="/user"> FlaskAled </a>
|
||||||
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<!-- Rien -->
|
||||||
|
<div class="collapse navbar-collapse"></div>
|
||||||
|
|
||||||
|
<!-- Deconnexion -->
|
||||||
|
<button mat-button class="btnDeconnexion" (click)="onDeconnexion()" routerLink="/">
|
||||||
|
Deconnexion
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- --------------------------------------------------------------------------------------------------------- -->
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Admin -->
|
||||||
|
<div *ngIf="pour === 'admin'">
|
||||||
|
<nav class="navbar navbar-expand-lg">
|
||||||
|
|
||||||
|
<!-- FlaskAled -->
|
||||||
|
<a class="navbar-brand" routerLink="/admin/userList"> FlaskAled </a>
|
||||||
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<!-- [userList] [myProfil] -->
|
||||||
|
<div class="collapse navbar-collapse">
|
||||||
|
<ul class="navbar-nav">
|
||||||
|
<li class="nav-item active monLi">
|
||||||
|
<a class="nav-link" routerLink="/admin/userList">Liste des utillisateurs</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item active monLi">
|
||||||
|
<a class="nav-link" routerLink="/admin/myProfil">Mon profil</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Deconnexion -->
|
||||||
|
<button mat-button class="btnDeconnexion" (click)="onDeconnexion()" routerLink="/">
|
||||||
|
Deconnexion
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,59 @@
|
||||||
|
.navbar {
|
||||||
|
background-color: black;
|
||||||
|
height: 60px;
|
||||||
|
font-size: medium;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.navbar-expand-lg {
|
||||||
|
border-bottom: solid;
|
||||||
|
border-color: white;
|
||||||
|
border-bottom-width: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// PolyNotFound
|
||||||
|
.navbar-brand {
|
||||||
|
font-family: cursive;
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: x-large;
|
||||||
|
margin-left: 15px;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Recherche, Mes Playlists, Historique
|
||||||
|
.nav-link {
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
.nav-link:hover {
|
||||||
|
color: grey;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Bonton deconnexion
|
||||||
|
.btnDeconnexion {
|
||||||
|
font-size: medium;
|
||||||
|
margin: 0px 10px 0px 10px
|
||||||
|
}
|
||||||
|
.btnDeconnexion:hover {
|
||||||
|
color: grey;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.monLi {
|
||||||
|
margin: 0px 10px 0px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
img {
|
||||||
|
border: solid 2px white;
|
||||||
|
border-radius: 50px;
|
||||||
|
margin: 0px 10px 0px 15px;
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
}
|
||||||
|
img:hover {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { NavbarComponent } from './navbar.component';
|
||||||
|
|
||||||
|
describe('NavbarComponent', () => {
|
||||||
|
let component: NavbarComponent;
|
||||||
|
let fixture: ComponentFixture<NavbarComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ NavbarComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(NavbarComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
import {Component, Input, OnInit} from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-navbar',
|
||||||
|
templateUrl: './navbar.component.html',
|
||||||
|
styleUrls: ['./navbar.component.scss']
|
||||||
|
})
|
||||||
|
export class NavbarComponent implements OnInit
|
||||||
|
{
|
||||||
|
@Input() pour = "login";
|
||||||
|
|
||||||
|
constructor() { }
|
||||||
|
|
||||||
|
ngOnInit(): void {}
|
||||||
|
|
||||||
|
onDeconnexion(): void {}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
<div class="myContainer">
|
||||||
|
|
||||||
|
<!-- NavBar -->
|
||||||
|
<app-navbar [pour]="from"></app-navbar>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Boite -->
|
||||||
|
<div class="boite">
|
||||||
|
|
||||||
|
<!-- login -->
|
||||||
|
<div class="row myRow">
|
||||||
|
<div class="col-6 myLabel">Pseudo:</div>
|
||||||
|
<div class="col-6 myValue"> {{person.login}} </div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- email -->
|
||||||
|
<div class="row myRow">
|
||||||
|
<div class="col-6 myLabel">Mail:</div>
|
||||||
|
<div class="col-6 myValue"> {{person.email}} </div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- role -->
|
||||||
|
<div class="row myRow">
|
||||||
|
<div class="col-6 myLabel">Rôle:</div>
|
||||||
|
<div class="col-6 myValue">
|
||||||
|
<span *ngIf="person.role === 'user'">utilisateur</span>
|
||||||
|
<span *ngIf="person.role === 'admin'">admin</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Modifier profil -->
|
||||||
|
<div class="btnContainer">
|
||||||
|
<button mat-button class="myBtn" (click)="onModifier()">Modifier profil</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
.myContainer {
|
||||||
|
max-width: 100vw;
|
||||||
|
height: 100vh;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.boite {
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
width: 50%;
|
||||||
|
margin-top: 10vh;
|
||||||
|
border: solid 3px;
|
||||||
|
border-radius: 10px;
|
||||||
|
padding: 20px 40px 20px 40px;
|
||||||
|
background-color: #ffffff;
|
||||||
|
text-align: center;
|
||||||
|
box-shadow: 10px 5px 5px black;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.myRow {
|
||||||
|
margin: 15px 0px 15px 0px;
|
||||||
|
}
|
||||||
|
.myLabel {
|
||||||
|
text-align: right;
|
||||||
|
padding: 0px 5px 0px 0px;
|
||||||
|
margin: 0px;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
.myValue {
|
||||||
|
text-align: left;
|
||||||
|
padding: 0px 0px 0px 5px;
|
||||||
|
margin: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.btnContainer {
|
||||||
|
text-align: center;
|
||||||
|
margin-top: 40px;
|
||||||
|
}
|
||||||
|
.myBtn {
|
||||||
|
border: solid 1px black;
|
||||||
|
background-color: white;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { PageProfilComponent } from './page-profil.component';
|
||||||
|
|
||||||
|
describe('PageUtilisateurComponent', () => {
|
||||||
|
let component: PageProfilComponent;
|
||||||
|
let fixture: ComponentFixture<PageProfilComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ PageProfilComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(PageProfilComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,78 @@
|
||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import {Person} from "../../../interfaces/Person";
|
||||||
|
import {MatDialog} from "@angular/material/dialog";
|
||||||
|
import {MatSnackBar} from "@angular/material/snack-bar";
|
||||||
|
import {PopupUpdateProfilComponent} from "../popup-update-profil/popup-update-profil.component";
|
||||||
|
import {FictitiousDatasService} from "../../../services/fictitiousDatas/fictitious-datas.service";
|
||||||
|
import {Router} from "@angular/router";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-page-profil',
|
||||||
|
templateUrl: './page-profil.component.html',
|
||||||
|
styleUrls: ['./page-profil.component.scss']
|
||||||
|
})
|
||||||
|
export class PageProfilComponent implements OnInit
|
||||||
|
{
|
||||||
|
person: Person = {
|
||||||
|
id: "",
|
||||||
|
login: "",
|
||||||
|
email: "",
|
||||||
|
hashPass: "",
|
||||||
|
role: "user",
|
||||||
|
};
|
||||||
|
from: string = "" ;
|
||||||
|
|
||||||
|
|
||||||
|
constructor( public dialog: MatDialog,
|
||||||
|
private snackBar: MatSnackBar,
|
||||||
|
private fictitiousDatasService: FictitiousDatasService,
|
||||||
|
private router: Router ) { }
|
||||||
|
|
||||||
|
|
||||||
|
ngOnInit(): void
|
||||||
|
{
|
||||||
|
// faux code
|
||||||
|
if(this.router.url.startsWith("/user")) {
|
||||||
|
this.person = this.fictitiousDatasService.getUser();
|
||||||
|
this.from = "user" ;
|
||||||
|
}
|
||||||
|
else if(this.router.url.startsWith("/admin")){
|
||||||
|
this.person = this.fictitiousDatasService.getAdmin();
|
||||||
|
this.from = "admin" ;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Vrai code ...
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Appuie sur le bouton modifier
|
||||||
|
onModifier(): void
|
||||||
|
{
|
||||||
|
const config = {
|
||||||
|
width: '25%',
|
||||||
|
data: { person: this.person }
|
||||||
|
};
|
||||||
|
this.dialog
|
||||||
|
.open(PopupUpdateProfilComponent, config)
|
||||||
|
.afterClosed()
|
||||||
|
.subscribe(retour => this.onModifierCallback(retour));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Callback de onModifier
|
||||||
|
onModifierCallback(retour: any): void
|
||||||
|
{
|
||||||
|
if((retour === null) || (retour === undefined))
|
||||||
|
{
|
||||||
|
const config = { duration: 1000, panelClass: "custom-class" };
|
||||||
|
this.snackBar.open( "Opération annulé", "", config);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
this.person = retour;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,55 @@
|
||||||
|
<div class="myContainer">
|
||||||
|
<div class="boite">
|
||||||
|
|
||||||
|
<h3>Modifier</h3>
|
||||||
|
|
||||||
|
<!-- divider -->
|
||||||
|
<br><mat-divider></mat-divider><br>
|
||||||
|
|
||||||
|
<!-- login -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Pseudo</mat-label>
|
||||||
|
<input matInput type="text" [(ngModel)]="personCopy.login">
|
||||||
|
</mat-form-field><br>
|
||||||
|
|
||||||
|
<!-- divider -->
|
||||||
|
<mat-divider></mat-divider><br>
|
||||||
|
|
||||||
|
<!-- Modifier mot de passe -->
|
||||||
|
<div>
|
||||||
|
Modifier mot de passe:
|
||||||
|
<mat-checkbox [(ngModel)]="changePassword"></mat-checkbox>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- nouveau mot de passe -->
|
||||||
|
<div *ngIf="changePassword" style="margin-top: 10px">
|
||||||
|
<!-- Nouveau mot de passe -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Nouveau mot de passe</mat-label>
|
||||||
|
<input matInput type="password" [(ngModel)]="newPassword">
|
||||||
|
</mat-form-field>
|
||||||
|
<br>
|
||||||
|
<!-- Confirmation npuveau mot de passe -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Confirmation nouveau mot de passe</mat-label>
|
||||||
|
<input matInput type="password" [(ngModel)]="confirmNewPassword">
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
<div *ngIf="!changePassword"><br></div>
|
||||||
|
|
||||||
|
<!-- divider -->
|
||||||
|
<mat-divider></mat-divider><br>
|
||||||
|
|
||||||
|
<!-- message d'erreur -->
|
||||||
|
<div *ngIf="hasError" style="text-align: center; margin-bottom: 20px;">
|
||||||
|
<span class="mat-error">{{errorMessage}}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- boutons -->
|
||||||
|
<div style="width: 100%; text-align: right">
|
||||||
|
<button mat-button (click)="this.dialogRef.close(null)"> Annuler </button>
|
||||||
|
<button mat-button (click)="onValider()"> Enregistrer </button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
.boite {
|
||||||
|
font-size: small;
|
||||||
|
}
|
||||||
|
|
||||||
|
h3 {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
font-size: small;
|
||||||
|
}
|
||||||
|
|
||||||
|
img {
|
||||||
|
margin: 0px 0px 10px 0px;
|
||||||
|
width: 5vw;
|
||||||
|
height: 5vw;
|
||||||
|
border: solid 2px black;
|
||||||
|
border-radius: 50%;
|
||||||
|
font-size: xxx-large;
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// aura
|
||||||
|
::ng-deep .mat-checkbox-ripple .mat-ripple-element {
|
||||||
|
background-color: grey !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
// contenu coche
|
||||||
|
::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background {
|
||||||
|
background-color: black !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
// indeterminate
|
||||||
|
::ng-deep .mat-checkbox .mat-checkbox-frame {
|
||||||
|
background-color: white !important;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { PopupUpdateProfilComponent } from './popup-update-profil.component';
|
||||||
|
|
||||||
|
describe('PopupModifierUtilisateurComponent', () => {
|
||||||
|
let component: PopupUpdateProfilComponent;
|
||||||
|
let fixture: ComponentFixture<PopupUpdateProfilComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ PopupUpdateProfilComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(PopupUpdateProfilComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,104 @@
|
||||||
|
import {Component, Inject, OnInit} from '@angular/core';
|
||||||
|
import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
|
||||||
|
import {Person} from "../../../interfaces/Person";
|
||||||
|
import {CheckEmailService} from "../../../services/checkEmail/check-email.service";
|
||||||
|
import {HashageService} from "../../../services/hashage/hashage.service";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-popup-update-profil',
|
||||||
|
templateUrl: './popup-update-profil.component.html',
|
||||||
|
styleUrls: ['./popup-update-profil.component.scss']
|
||||||
|
})
|
||||||
|
export class PopupUpdateProfilComponent implements OnInit
|
||||||
|
{
|
||||||
|
personCopy: Person;
|
||||||
|
newPassword: string = "";
|
||||||
|
confirmNewPassword: string = "" ;
|
||||||
|
changePassword: boolean = false ;
|
||||||
|
hasError: boolean = false;
|
||||||
|
errorMessage: string = "" ;
|
||||||
|
|
||||||
|
|
||||||
|
constructor( public dialogRef: MatDialogRef<PopupUpdateProfilComponent>,
|
||||||
|
@Inject(MAT_DIALOG_DATA) public data: any,
|
||||||
|
private checkEmailService: CheckEmailService,
|
||||||
|
private hashageService: HashageService ) { }
|
||||||
|
|
||||||
|
|
||||||
|
ngOnInit(): void
|
||||||
|
{
|
||||||
|
const person = this.data.person;
|
||||||
|
this.personCopy = {
|
||||||
|
id: person.id,
|
||||||
|
login: person.login,
|
||||||
|
email: person.email,
|
||||||
|
hashPass: person.hashPass,
|
||||||
|
role: person.role
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Appuie sur le bouton "valider"
|
||||||
|
onValider(): void
|
||||||
|
{
|
||||||
|
this.checkField();
|
||||||
|
if(!this.hasError)
|
||||||
|
{
|
||||||
|
if(this.changePassword) this.personCopy.hashPass = this.hashageService.run(this.newPassword);
|
||||||
|
const data = { user: this.personCopy };
|
||||||
|
|
||||||
|
// ...
|
||||||
|
|
||||||
|
// Faux code
|
||||||
|
this.onValiderCallback({ status: "success"});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Callback de 'onValider'
|
||||||
|
onValiderCallback(retour: any)
|
||||||
|
{
|
||||||
|
if(retour.status === 'error')
|
||||||
|
{
|
||||||
|
console.log(retour);
|
||||||
|
this.dialogRef.close(null);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
this.dialogRef.close(this.personCopy);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Check les champs saisis par l'utilisateur
|
||||||
|
checkField(): void
|
||||||
|
{
|
||||||
|
if(this.personCopy.login.length === 0) {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ 'pseudo'" ;
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(this.personCopy.email.length === 0) {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ 'email'" ;
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(!this.checkEmailService.isValidEmail(this.personCopy.email)) {
|
||||||
|
this.errorMessage = "Email invalide" ;
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if((this.changePassword) && (this.newPassword.length === 0)) {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ 'mot de passe'";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if((this.changePassword) && (this.newPassword !== this.confirmNewPassword)) {
|
||||||
|
this.errorMessage = "Le mot de passe est différent de sa confirmation";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.errorMessage = "" ;
|
||||||
|
this.hasError = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
9
frontend/src/app/common/interfaces/Person.ts
Normal file
9
frontend/src/app/common/interfaces/Person.ts
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
// user or admin
|
||||||
|
export interface Person
|
||||||
|
{
|
||||||
|
id: string,
|
||||||
|
login: string,
|
||||||
|
email: string,
|
||||||
|
hashPass: string,
|
||||||
|
role: string,
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { CheckEmailService } from './check-email.service';
|
||||||
|
|
||||||
|
describe('CheckEmailService', () => {
|
||||||
|
let service: CheckEmailService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(CheckEmailService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class CheckEmailService
|
||||||
|
{
|
||||||
|
|
||||||
|
isValidEmail(email: string): boolean
|
||||||
|
{
|
||||||
|
let re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
|
||||||
|
return re.test(email);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { FictitiousDatasService } from './fictitious-datas.service';
|
||||||
|
|
||||||
|
describe('FictitiousDatasService', () => {
|
||||||
|
let service: FictitiousDatasService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(FictitiousDatasService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import {Person} from "../../interfaces/Person";
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class FictitiousDatasService
|
||||||
|
{
|
||||||
|
|
||||||
|
getUser(): Person
|
||||||
|
{
|
||||||
|
const id = (Math.floor(Math.random()*100000)).toString()
|
||||||
|
return {
|
||||||
|
id: id,
|
||||||
|
login: "Riri"+id,
|
||||||
|
email: "riri"+id+"@gmail.com",
|
||||||
|
hashPass: "blablabla",
|
||||||
|
role: "user",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getAdmin(): Person
|
||||||
|
{
|
||||||
|
const id = (Math.floor(Math.random()*100000)).toString()
|
||||||
|
return {
|
||||||
|
id: id,
|
||||||
|
login: "Fifi"+id,
|
||||||
|
email: "fifi"+id+"@gmail.com",
|
||||||
|
hashPass: "blablabla",
|
||||||
|
role: "admin",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getTabPerson(n: number): Person[]
|
||||||
|
{
|
||||||
|
let tab: Person[] = [];
|
||||||
|
|
||||||
|
for(let i=0 ; i<n ; i++)
|
||||||
|
{
|
||||||
|
if(Math.random() < 0.5) tab.push(this.getUser());
|
||||||
|
else tab.push(this.getAdmin());
|
||||||
|
}
|
||||||
|
|
||||||
|
return tab;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { HashageService } from './hashage.service';
|
||||||
|
|
||||||
|
describe('HashageService', () => {
|
||||||
|
let service: HashageService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(HashageService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
19
frontend/src/app/common/services/hashage/hashage.service.ts
Normal file
19
frontend/src/app/common/services/hashage/hashage.service.ts
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class HashageService
|
||||||
|
{
|
||||||
|
// Fonction de hashage (faible)
|
||||||
|
run(input: string): string
|
||||||
|
{
|
||||||
|
let hash = 0;
|
||||||
|
for (let i = 0; i < input.length; i++) {
|
||||||
|
let ch = input.charCodeAt(i);
|
||||||
|
hash = ((hash << 5) - hash) + ch;
|
||||||
|
hash = hash & hash;
|
||||||
|
}
|
||||||
|
return hash.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { MessageService } from './message.service';
|
||||||
|
|
||||||
|
describe('MessageService', () => {
|
||||||
|
let service: MessageService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(MessageService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class MessageService {
|
||||||
|
|
||||||
|
constructor() { }
|
||||||
|
}
|
||||||
40
frontend/src/app/login/page-login/page-login.component.html
Normal file
40
frontend/src/app/login/page-login/page-login.component.html
Normal file
|
|
@ -0,0 +1,40 @@
|
||||||
|
<div>
|
||||||
|
<div class="bg">
|
||||||
|
|
||||||
|
|
||||||
|
<!-- NavBar -->
|
||||||
|
<app-navbar pour="login"></app-navbar>
|
||||||
|
|
||||||
|
|
||||||
|
<!--contenu -->
|
||||||
|
<div class="wrapper fadeInDown">
|
||||||
|
<div id="formContent">
|
||||||
|
|
||||||
|
<!-- Icon -->
|
||||||
|
<div class="fadeIn first">
|
||||||
|
<h1 style="font-family: cursive; font-size: 45px; margin-top: 20px; margin-bottom: 10px">FlaskAled</h1>
|
||||||
|
<img src="/assets/logo.png" id="icon" alt="User Icon" style="margin-top: 10px"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Login Form -->
|
||||||
|
<form>
|
||||||
|
<input [(ngModel)]="email" type="text" id="email" class="fadeIn second" name="email" placeholder="Email">
|
||||||
|
<input [(ngModel)]="password" type="password" id="password" class="fadeIn third" name="password" placeholder="Mot de passe">
|
||||||
|
<!-- Message d'erreur -->
|
||||||
|
<div *ngIf="hasError" style="text-align: center; margin-bottom: 20px;">
|
||||||
|
<span class="mat-error"> {{errorMessage}} </span>
|
||||||
|
</div>
|
||||||
|
<input type="submit" class="fadeIn fourth" value="Se connecter" (click)="onSeConnecter()">
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<!-- Oubli mot de passe -->
|
||||||
|
<div id="formFooter">
|
||||||
|
<a class="underlineHover" href="https://disney.fandom.com/fr/wiki/Tristesse">J'ai oublié mon mot de passe</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
271
frontend/src/app/login/page-login/page-login.component.scss
Normal file
271
frontend/src/app/login/page-login/page-login.component.scss
Normal file
|
|
@ -0,0 +1,271 @@
|
||||||
|
html {
|
||||||
|
background-color: #56baed;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
font-family: "Poppins", sans-serif;
|
||||||
|
height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: #5E89FF;
|
||||||
|
display:inline-block;
|
||||||
|
text-decoration: none;
|
||||||
|
font-weight: 400;
|
||||||
|
}
|
||||||
|
|
||||||
|
h2 {
|
||||||
|
text-align: center;
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
text-transform: uppercase;
|
||||||
|
display:inline-block;
|
||||||
|
margin: 40px 8px 10px 8px;
|
||||||
|
color: #cccccc;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* STRUCTURE */
|
||||||
|
|
||||||
|
.wrapper {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
width: 100%;
|
||||||
|
min-height: 80%;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#formContent {
|
||||||
|
-webkit-border-radius: 10px 10px 10px 10px;
|
||||||
|
border-radius: 10px 10px 10px 10px;
|
||||||
|
background: #fff;
|
||||||
|
padding: 30px;
|
||||||
|
width: 90%;
|
||||||
|
max-width: 450px;
|
||||||
|
position: relative;
|
||||||
|
padding: 0px;
|
||||||
|
-webkit-box-shadow: 0 30px 60px 0 rgba(0,0,0,0.3);
|
||||||
|
box-shadow: 0 30px 60px 0 rgba(0,0,0,0.3);
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
#formFooter {
|
||||||
|
background-color: #f6f6f6;
|
||||||
|
border-top: 1px solid #dce8f1;
|
||||||
|
padding: 25px;
|
||||||
|
text-align: center;
|
||||||
|
-webkit-border-radius: 0 0 10px 10px;
|
||||||
|
border-radius: 0 0 10px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* TABS */
|
||||||
|
|
||||||
|
h2.inactive {
|
||||||
|
color: #cccccc;
|
||||||
|
}
|
||||||
|
|
||||||
|
h2.active {
|
||||||
|
color: #0d0d0d;
|
||||||
|
border-bottom: 2px solid #5fbae9;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* FORM TYPOGRAPHY*/
|
||||||
|
|
||||||
|
input[type=button], input[type=submit], input[type=reset] {
|
||||||
|
background-color: #5E89FF;
|
||||||
|
border: none;
|
||||||
|
color: white;
|
||||||
|
padding: 15px 80px;
|
||||||
|
text-align: center;
|
||||||
|
text-decoration: none;
|
||||||
|
display: inline-block;
|
||||||
|
text-transform: uppercase;
|
||||||
|
font-size: 13px;
|
||||||
|
-webkit-box-shadow: 0 10px 30px 0 rgba(95,186,233,0.4);
|
||||||
|
box-shadow: 0 10px 30px 0 rgba(95,186,233,0.4);
|
||||||
|
-webkit-border-radius: 5px 5px 5px 5px;
|
||||||
|
border-radius: 5px 5px 5px 5px;
|
||||||
|
margin: 5px 20px 40px 20px;
|
||||||
|
-webkit-transition: all 0.3s ease-in-out;
|
||||||
|
-moz-transition: all 0.3s ease-in-out;
|
||||||
|
-ms-transition: all 0.3s ease-in-out;
|
||||||
|
-o-transition: all 0.3s ease-in-out;
|
||||||
|
transition: all 0.3s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type=button]:hover, input[type=submit]:hover, input[type=reset]:hover {
|
||||||
|
background-color: #39ace7;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type=button]:active, input[type=submit]:active, input[type=reset]:active {
|
||||||
|
-moz-transform: scale(0.95);
|
||||||
|
-webkit-transform: scale(0.95);
|
||||||
|
-o-transform: scale(0.95);
|
||||||
|
-ms-transform: scale(0.95);
|
||||||
|
transform: scale(0.95);
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type=text], input[type=password] {
|
||||||
|
background-color: #f6f6f6;
|
||||||
|
border: none;
|
||||||
|
color: #0d0d0d;
|
||||||
|
padding: 15px 32px;
|
||||||
|
text-align: center;
|
||||||
|
text-decoration: none;
|
||||||
|
display: inline-block;
|
||||||
|
font-size: 16px;
|
||||||
|
margin: 5px;
|
||||||
|
width: 85%;
|
||||||
|
border: 2px solid #f6f6f6;
|
||||||
|
-webkit-transition: all 0.5s ease-in-out;
|
||||||
|
-moz-transition: all 0.5s ease-in-out;
|
||||||
|
-ms-transition: all 0.5s ease-in-out;
|
||||||
|
-o-transition: all 0.5s ease-in-out;
|
||||||
|
transition: all 0.5s ease-in-out;
|
||||||
|
-webkit-border-radius: 5px 5px 5px 5px;
|
||||||
|
border-radius: 5px 5px 5px 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
input[type=text]:focus, input[type=password]:focus {
|
||||||
|
background-color: #fff;
|
||||||
|
border-bottom: 2px solid #5fbae9;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type=text]::placeholder, input[type=password]::placeholder {
|
||||||
|
color: #cccccc;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bg{
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
height: 100vh;
|
||||||
|
width: 100vw;
|
||||||
|
overflow-y: hidden;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ANIMATIONS */
|
||||||
|
|
||||||
|
/* Simple CSS3 Fade-in-down Animation */
|
||||||
|
.fadeInDown {
|
||||||
|
-webkit-animation-name: fadeInDown;
|
||||||
|
animation-name: fadeInDown;
|
||||||
|
-webkit-animation-duration: 1s;
|
||||||
|
animation-duration: 1s;
|
||||||
|
-webkit-animation-fill-mode: both;
|
||||||
|
animation-fill-mode: both;
|
||||||
|
}
|
||||||
|
|
||||||
|
@-webkit-keyframes fadeInDown {
|
||||||
|
0% {
|
||||||
|
opacity: 0;
|
||||||
|
-webkit-transform: translate3d(0, -100%, 0);
|
||||||
|
transform: translate3d(0, -100%, 0);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
opacity: 1;
|
||||||
|
-webkit-transform: none;
|
||||||
|
transform: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fadeInDown {
|
||||||
|
0% {
|
||||||
|
opacity: 0;
|
||||||
|
-webkit-transform: translate3d(0, -100%, 0);
|
||||||
|
transform: translate3d(0, -100%, 0);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
opacity: 1;
|
||||||
|
-webkit-transform: none;
|
||||||
|
transform: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Simple CSS3 Fade-in Animation */
|
||||||
|
@-webkit-keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
|
||||||
|
@-moz-keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
|
||||||
|
@keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
|
||||||
|
|
||||||
|
.fadeIn {
|
||||||
|
opacity:0;
|
||||||
|
-webkit-animation:fadeIn ease-in 1;
|
||||||
|
-moz-animation:fadeIn ease-in 1;
|
||||||
|
animation:fadeIn ease-in 1;
|
||||||
|
|
||||||
|
-webkit-animation-fill-mode:forwards;
|
||||||
|
-moz-animation-fill-mode:forwards;
|
||||||
|
animation-fill-mode:forwards;
|
||||||
|
|
||||||
|
-webkit-animation-duration:1s;
|
||||||
|
-moz-animation-duration:1s;
|
||||||
|
animation-duration:1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fadeIn.first {
|
||||||
|
-webkit-animation-delay: 0.4s;
|
||||||
|
-moz-animation-delay: 0.4s;
|
||||||
|
animation-delay: 0.4s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fadeIn.second {
|
||||||
|
-webkit-animation-delay: 0.6s;
|
||||||
|
-moz-animation-delay: 0.6s;
|
||||||
|
animation-delay: 0.6s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fadeIn.third {
|
||||||
|
-webkit-animation-delay: 0.8s;
|
||||||
|
-moz-animation-delay: 0.8s;
|
||||||
|
animation-delay: 0.8s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fadeIn.fourth {
|
||||||
|
-webkit-animation-delay: 1s;
|
||||||
|
-moz-animation-delay: 1s;
|
||||||
|
animation-delay: 1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Simple CSS3 Fade-in Animation */
|
||||||
|
.underlineHover:after {
|
||||||
|
display: block;
|
||||||
|
left: 0;
|
||||||
|
bottom: -10px;
|
||||||
|
width: 0;
|
||||||
|
height: 2px;
|
||||||
|
//background-color: #5E89FF;
|
||||||
|
background-color: #5E89FF;
|
||||||
|
content: "";
|
||||||
|
transition: width 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.underlineHover:hover {
|
||||||
|
color: #0d0d0d;
|
||||||
|
}
|
||||||
|
|
||||||
|
.underlineHover:hover:after{
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1{
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* OTHERS */
|
||||||
|
|
||||||
|
*:focus {
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#icon {
|
||||||
|
width:30%;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { PageConnexionComponent } from './page-connexion.component';
|
||||||
|
|
||||||
|
describe('PageConnexionComponent', () => {
|
||||||
|
let component: PageConnexionComponent;
|
||||||
|
let fixture: ComponentFixture<PageConnexionComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ PageConnexionComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(PageConnexionComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
77
frontend/src/app/login/page-login/page-login.component.ts
Normal file
77
frontend/src/app/login/page-login/page-login.component.ts
Normal file
|
|
@ -0,0 +1,77 @@
|
||||||
|
import {Component} from '@angular/core';
|
||||||
|
import {Router} from "@angular/router";
|
||||||
|
import {MessageService} from "../../common/services/message/message.service";
|
||||||
|
import {HashageService} from "../../common/services/hashage/hashage.service";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-page-login',
|
||||||
|
templateUrl: './page-login.component.html',
|
||||||
|
styleUrls: ['./page-login.component.scss']
|
||||||
|
})
|
||||||
|
export class PageLoginComponent
|
||||||
|
{
|
||||||
|
email: string = "" ;
|
||||||
|
password: string = "" ;
|
||||||
|
hasError: boolean = false;
|
||||||
|
errorMessage: string = "";
|
||||||
|
|
||||||
|
|
||||||
|
constructor( private messageService: MessageService,
|
||||||
|
private router: Router,
|
||||||
|
private hashageService: HashageService ) { }
|
||||||
|
|
||||||
|
|
||||||
|
// Appuie sur le bouton "seConnecter"
|
||||||
|
onSeConnecter(): void
|
||||||
|
{
|
||||||
|
this.checkField();
|
||||||
|
if(!this.hasError)
|
||||||
|
{
|
||||||
|
let data = {
|
||||||
|
email: this.email,
|
||||||
|
hashPass: this.hashageService.run(this.password)
|
||||||
|
};
|
||||||
|
console.log(data);
|
||||||
|
/*
|
||||||
|
this.messageService
|
||||||
|
.sendMessage('user/auth', data)
|
||||||
|
.subscribe( retour => this.callbackSeConnecter(retour))
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Callback de "onSeConnecter"
|
||||||
|
callbackSeConnecter(retour: any): void
|
||||||
|
{
|
||||||
|
if(retour.status !== 200)
|
||||||
|
{
|
||||||
|
this.errorMessage = retour.error.data.reason;
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
//this.router.navigateByUrl( '/search' );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Check les champs saisis par l'utilisateur
|
||||||
|
checkField(): void
|
||||||
|
{
|
||||||
|
if(this.email === "") {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ email" ;
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(this.password === "") {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ mot de passe" ;
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.errorMessage = "" ;
|
||||||
|
this.hasError = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
<div class="myContainer">
|
||||||
|
|
||||||
|
|
||||||
|
<!-- navbar -->
|
||||||
|
<app-navbar pour="register"></app-navbar>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- contenu -->
|
||||||
|
<div class="boite">
|
||||||
|
|
||||||
|
<!-- login -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Pseudo</mat-label>
|
||||||
|
<input matInput type="text" [(ngModel)]="person.login" required>
|
||||||
|
</mat-form-field><br>
|
||||||
|
|
||||||
|
<!-- email -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Email</mat-label>
|
||||||
|
<input matInput type="text" [(ngModel)]="person.email" required>
|
||||||
|
</mat-form-field><br>
|
||||||
|
|
||||||
|
<!-- Mot de passe -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Mot de passe</mat-label>
|
||||||
|
<input matInput type="password" [(ngModel)]="password" required>
|
||||||
|
</mat-form-field><br>
|
||||||
|
|
||||||
|
<!-- Confirmation mot de passe -->
|
||||||
|
<mat-form-field appearance="fill">
|
||||||
|
<mat-label>Confirmation mot de passe</mat-label>
|
||||||
|
<input matInput type="password" [(ngModel)]="confirmPassword" required>
|
||||||
|
</mat-form-field><br>
|
||||||
|
|
||||||
|
<!-- Message d'erreur -->
|
||||||
|
<div *ngIf="hasError">
|
||||||
|
<mat-error>{{errorMessage}}</mat-error>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- bouton -->
|
||||||
|
<button mat-button style="border: solid 1px black" (click)="onValider()">
|
||||||
|
Valider
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
.contenuContainer {
|
||||||
|
padding: 20px 20px 20px 20px;
|
||||||
|
width: 30%;
|
||||||
|
margin: auto auto;
|
||||||
|
margin-top: 50px;
|
||||||
|
border: solid 1px black;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.boite {
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
width: 50%;
|
||||||
|
margin-top: 10vh;
|
||||||
|
border: solid 3px;
|
||||||
|
border-radius: 10px;
|
||||||
|
padding: 20px 40px 20px 40px;
|
||||||
|
background-color: #ffffff;
|
||||||
|
text-align: center;
|
||||||
|
box-shadow: 10px 5px 5px black;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { PageRegisterComponent } from './page-register.component';
|
||||||
|
|
||||||
|
describe('PageInscriptionComponent', () => {
|
||||||
|
let component: PageRegisterComponent;
|
||||||
|
let fixture: ComponentFixture<PageRegisterComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ PageRegisterComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(PageRegisterComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,105 @@
|
||||||
|
import { Component } from '@angular/core';
|
||||||
|
import {Person} from "../../common/interfaces/Person";
|
||||||
|
import {HashageService} from "../../common/services/hashage/hashage.service";
|
||||||
|
import {Router} from "@angular/router";
|
||||||
|
import {CheckEmailService} from "../../common/services/checkEmail/check-email.service";
|
||||||
|
import {MatDialog} from "@angular/material/dialog";
|
||||||
|
import {PopupConfirmRegisterComponent} from "../popup-confirm-register/popup-confirm-register.component";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-page-register',
|
||||||
|
templateUrl: './page-register.component.html',
|
||||||
|
styleUrls: ['./page-register.component.scss']
|
||||||
|
})
|
||||||
|
export class PageRegisterComponent
|
||||||
|
{
|
||||||
|
person: Person = {
|
||||||
|
id: "",
|
||||||
|
login: "",
|
||||||
|
email: "",
|
||||||
|
hashPass: "",
|
||||||
|
role: "user"
|
||||||
|
};
|
||||||
|
password: string = "";
|
||||||
|
confirmPassword: string = "";
|
||||||
|
hasError: boolean = false;
|
||||||
|
errorMessage: string = "";
|
||||||
|
|
||||||
|
|
||||||
|
constructor( private hashageService: HashageService,
|
||||||
|
private checkEmailService: CheckEmailService,
|
||||||
|
private router: Router,
|
||||||
|
public dialog: MatDialog ) { }
|
||||||
|
|
||||||
|
|
||||||
|
// Envoie de l'utilisateur au backend
|
||||||
|
onValider(): void
|
||||||
|
{
|
||||||
|
this.checkField();
|
||||||
|
if(!this.hasError)
|
||||||
|
{
|
||||||
|
this.person.hashPass = this.hashageService.run(this.password);
|
||||||
|
|
||||||
|
// FAUX CODE
|
||||||
|
const retour = { status: "succes", data: {} };
|
||||||
|
this.onValiderCallback(retour);
|
||||||
|
|
||||||
|
// VRAI CODE
|
||||||
|
/*
|
||||||
|
this.messageService
|
||||||
|
.sendMessage('register', this.user)
|
||||||
|
.subscribe(retour => this.onValiderCallback(retour));
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Callback de "onValider"
|
||||||
|
onValiderCallback(retour: any): void
|
||||||
|
{
|
||||||
|
if(retour.status === "error")
|
||||||
|
{
|
||||||
|
console.log(retour);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
this.dialog
|
||||||
|
.open(PopupConfirmRegisterComponent, {})
|
||||||
|
.afterClosed()
|
||||||
|
.subscribe(retour => this.router.navigateByUrl("/"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Check les champs saisis par l'utilisateur
|
||||||
|
checkField(): void
|
||||||
|
{
|
||||||
|
if(this.person.login.length === 0) {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ 'pseudo'.";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(this.person.email.length === 0) {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ 'email'.";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(!this.checkEmailService.isValidEmail(this.person.email)) {
|
||||||
|
this.errorMessage = "Email invalide.";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(this.password.length === 0) {
|
||||||
|
this.errorMessage = "Veuillez remplir le champ 'mot de passe'.";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else if(this.password !== this.confirmPassword) {
|
||||||
|
this.errorMessage = "Le mot de passe est différent de sa confirmation.";
|
||||||
|
this.hasError = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.errorMessage = "" ;
|
||||||
|
this.hasError = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
<p> Votre inscription a bien été pris en compte </p>
|
||||||
|
<button mat-button [mat-dialog-close]="true" cdkFocusInitial>Continuer</button>
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { PopupConfirmRegisterComponent } from './popup-confirm-register.component';
|
||||||
|
|
||||||
|
describe('PopupConfirmRegisterComponent', () => {
|
||||||
|
let component: PopupConfirmRegisterComponent;
|
||||||
|
let fixture: ComponentFixture<PopupConfirmRegisterComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ PopupConfirmRegisterComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(PopupConfirmRegisterComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
import {Component} from '@angular/core';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-popup-confirm-register',
|
||||||
|
templateUrl: './popup-confirm-register.component.html',
|
||||||
|
styleUrls: ['./popup-confirm-register.component.scss']
|
||||||
|
})
|
||||||
|
export class PopupConfirmRegisterComponent
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
7
frontend/src/app/user/commentary.txt
Normal file
7
frontend/src/app/user/commentary.txt
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
La partie utilisateur est composé uniquement d'une page contenant:
|
||||||
|
- les informations de l'utilisateur (composant "page-profil")
|
||||||
|
- un bouton "modifier profil" pour modifier les informations de l'utilisateur (composant "popup-update-profil")
|
||||||
|
|
||||||
|
Cette page est la même que la page "Mon Profil" de la partie admin.
|
||||||
|
|
||||||
|
Ainsi, on a rangé cette page dans le dossier "common/components/profil".
|
||||||
0
frontend/src/assets/.gitkeep
Normal file
0
frontend/src/assets/.gitkeep
Normal file
BIN
frontend/src/assets/logo.png
Normal file
BIN
frontend/src/assets/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 197 KiB |
BIN
frontend/src/assets/logo1.png
Normal file
BIN
frontend/src/assets/logo1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.7 KiB |
3
frontend/src/environments/environment.prod.ts
Normal file
3
frontend/src/environments/environment.prod.ts
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
export const environment = {
|
||||||
|
production: true
|
||||||
|
};
|
||||||
16
frontend/src/environments/environment.ts
Normal file
16
frontend/src/environments/environment.ts
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
// This file can be replaced during build by using the `fileReplacements` array.
|
||||||
|
// `ng build` replaces `environment.ts` with `environment.prod.ts`.
|
||||||
|
// The list of file replacements can be found in `angular.json`.
|
||||||
|
|
||||||
|
export const environment = {
|
||||||
|
production: false
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For easier debugging in development mode, you can import the following file
|
||||||
|
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
|
||||||
|
*
|
||||||
|
* This import should be commented out in production mode because it will have a negative impact
|
||||||
|
* on performance if an error is thrown.
|
||||||
|
*/
|
||||||
|
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
|
||||||
BIN
frontend/src/favicon.ico
Normal file
BIN
frontend/src/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 948 B |
13
frontend/src/index.html
Normal file
13
frontend/src/index.html
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>Frontend</title>
|
||||||
|
<base href="/">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<link rel="icon" type="image/x-icon" href="favicon.ico">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<app-root></app-root>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
12
frontend/src/main.ts
Normal file
12
frontend/src/main.ts
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
import { enableProdMode } from '@angular/core';
|
||||||
|
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
|
||||||
|
|
||||||
|
import { AppModule } from './app/app.module';
|
||||||
|
import { environment } from './environments/environment';
|
||||||
|
|
||||||
|
if (environment.production) {
|
||||||
|
enableProdMode();
|
||||||
|
}
|
||||||
|
|
||||||
|
platformBrowserDynamic().bootstrapModule(AppModule)
|
||||||
|
.catch(err => console.error(err));
|
||||||
65
frontend/src/polyfills.ts
Normal file
65
frontend/src/polyfills.ts
Normal file
|
|
@ -0,0 +1,65 @@
|
||||||
|
/**
|
||||||
|
* This file includes polyfills needed by Angular and is loaded before the app.
|
||||||
|
* You can add your own extra polyfills to this file.
|
||||||
|
*
|
||||||
|
* This file is divided into 2 sections:
|
||||||
|
* 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
|
||||||
|
* 2. Application imports. Files imported after ZoneJS that should be loaded before your main
|
||||||
|
* file.
|
||||||
|
*
|
||||||
|
* The current setup is for so-called "evergreen" browsers; the last versions of browsers that
|
||||||
|
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
|
||||||
|
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
|
||||||
|
*
|
||||||
|
* Learn more in https://angular.io/guide/browser-support
|
||||||
|
*/
|
||||||
|
|
||||||
|
/***************************************************************************************************
|
||||||
|
* BROWSER POLYFILLS
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* IE11 requires the following for NgClass support on SVG elements
|
||||||
|
*/
|
||||||
|
// import 'classlist.js'; // Run `npm install --save classlist.js`.
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Web Animations `@angular/platform-browser/animations`
|
||||||
|
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
|
||||||
|
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
|
||||||
|
*/
|
||||||
|
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
|
||||||
|
|
||||||
|
/**
|
||||||
|
* By default, zone.js will patch all possible macroTask and DomEvents
|
||||||
|
* user can disable parts of macroTask/DomEvents patch by setting following flags
|
||||||
|
* because those flags need to be set before `zone.js` being loaded, and webpack
|
||||||
|
* will put import in the top of bundle, so user need to create a separate file
|
||||||
|
* in this directory (for example: zone-flags.ts), and put the following flags
|
||||||
|
* into that file, and then add the following code before importing zone.js.
|
||||||
|
* import './zone-flags';
|
||||||
|
*
|
||||||
|
* The flags allowed in zone-flags.ts are listed here.
|
||||||
|
*
|
||||||
|
* The following flags will work for all browsers.
|
||||||
|
*
|
||||||
|
* (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
|
||||||
|
* (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
|
||||||
|
* (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
|
||||||
|
*
|
||||||
|
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
|
||||||
|
* with the following flag, it will bypass `zone.js` patch for IE/Edge
|
||||||
|
*
|
||||||
|
* (window as any).__Zone_enable_cross_context_check = true;
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/***************************************************************************************************
|
||||||
|
* Zone JS is required by default for Angular itself.
|
||||||
|
*/
|
||||||
|
import 'zone.js'; // Included with Angular CLI.
|
||||||
|
|
||||||
|
|
||||||
|
/***************************************************************************************************
|
||||||
|
* APPLICATION IMPORTS
|
||||||
|
*/
|
||||||
3
frontend/src/styles.scss
Normal file
3
frontend/src/styles.scss
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
/* You can add global styles to this file, and also import other style files */
|
||||||
|
html, body { height: 100%; }
|
||||||
|
body { margin: 0; }
|
||||||
27
frontend/src/test.ts
Normal file
27
frontend/src/test.ts
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
|
||||||
|
|
||||||
|
import 'zone.js/testing';
|
||||||
|
import { getTestBed } from '@angular/core/testing';
|
||||||
|
import {
|
||||||
|
BrowserDynamicTestingModule,
|
||||||
|
platformBrowserDynamicTesting
|
||||||
|
} from '@angular/platform-browser-dynamic/testing';
|
||||||
|
|
||||||
|
declare const require: {
|
||||||
|
context(path: string, deep?: boolean, filter?: RegExp): {
|
||||||
|
keys(): string[];
|
||||||
|
<T>(id: string): T;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
// First, initialize the Angular testing environment.
|
||||||
|
getTestBed().initTestEnvironment(
|
||||||
|
BrowserDynamicTestingModule,
|
||||||
|
platformBrowserDynamicTesting(),
|
||||||
|
{ teardown: { destroyAfterEach: true }},
|
||||||
|
);
|
||||||
|
|
||||||
|
// Then we find all the tests.
|
||||||
|
const context = require.context('./', true, /\.spec\.ts$/);
|
||||||
|
// And load the modules.
|
||||||
|
context.keys().map(context);
|
||||||
15
frontend/tsconfig.app.json
Normal file
15
frontend/tsconfig.app.json
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
|
{
|
||||||
|
"extends": "./tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "./out-tsc/app",
|
||||||
|
"types": []
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"src/main.ts",
|
||||||
|
"src/polyfills.ts"
|
||||||
|
],
|
||||||
|
"include": [
|
||||||
|
"src/**/*.d.ts"
|
||||||
|
]
|
||||||
|
}
|
||||||
33
frontend/tsconfig.json
Normal file
33
frontend/tsconfig.json
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
|
{
|
||||||
|
"compileOnSave": false,
|
||||||
|
"compilerOptions": {
|
||||||
|
"baseUrl": "./",
|
||||||
|
"outDir": "./dist/out-tsc",
|
||||||
|
"forceConsistentCasingInFileNames": true,
|
||||||
|
"strict": true,
|
||||||
|
"noImplicitReturns": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"sourceMap": true,
|
||||||
|
"declaration": false,
|
||||||
|
"downlevelIteration": true,
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"moduleResolution": "node",
|
||||||
|
"importHelpers": true,
|
||||||
|
"target": "es2017",
|
||||||
|
"module": "es2020",
|
||||||
|
"lib": [
|
||||||
|
"es2018",
|
||||||
|
"dom"
|
||||||
|
],
|
||||||
|
|
||||||
|
"strictPropertyInitialization": false
|
||||||
|
},
|
||||||
|
"angularCompilerOptions": {
|
||||||
|
"enableI18nLegacyMessageIdFormat": false,
|
||||||
|
"strictPropertyInitialization": false
|
||||||
|
//"strictInjectionParameters": true,
|
||||||
|
//"strictInputAccessModifiers": true,
|
||||||
|
//"strictTemplates": true
|
||||||
|
}
|
||||||
|
}
|
||||||
18
frontend/tsconfig.spec.json
Normal file
18
frontend/tsconfig.spec.json
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
|
{
|
||||||
|
"extends": "./tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "./out-tsc/spec",
|
||||||
|
"types": [
|
||||||
|
"jasmine"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"src/test.ts",
|
||||||
|
"src/polyfills.ts"
|
||||||
|
],
|
||||||
|
"include": [
|
||||||
|
"src/**/*.spec.ts",
|
||||||
|
"src/**/*.d.ts"
|
||||||
|
]
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue