From 72ab955469c7d537d6ef74b14545c18fc945e2e4 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 9 Dec 2020 18:02:51 +0100
Subject: [PATCH] FEAT #14565 TIME 1 fix script src fortify + fix css
---
angular.json | 11 ++++++++++-
src/frontend/app/app.module.ts | 2 +-
.../signature-method-modal.component.html | 19 +++++++++----------
.../signature-method-modal.component.ts | 2 +-
src/frontend/core/index.html | 6 +++---
5 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/angular.json b/angular.json
index 0c2c2f9da9..86f4b97a71 100755
--- a/angular.json
+++ b/angular.json
@@ -36,7 +36,16 @@
"input": "node_modules/ngx-extended-pdf-viewer/assets/",
"output": "/assets/"
},
- "./src/frontend/core/favicon.ico"
+ {
+ "glob": "*",
+ "input": "./node_modules/@peculiar/fortify-webcomponents/dist/peculiar/",
+ "output": "/assets/fortify"
+ },
+ {
+ "glob": "favicon.ico",
+ "input": "./src/frontend/core/",
+ "output": "/assets/"
+ }
],
"styles": [
{
diff --git a/src/frontend/app/app.module.ts b/src/frontend/app/app.module.ts
index 82d9e6e574..f60aa1d86c 100755
--- a/src/frontend/app/app.module.ts
+++ b/src/frontend/app/app.module.ts
@@ -2,7 +2,7 @@ import { BrowserModule, HammerModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
-import {CUSTOM_ELEMENTS_SCHEMA, NgModule} from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouteReuseStrategy } from '@angular/router';
import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
diff --git a/src/frontend/app/service/signature-method/signature-method-modal.component.html b/src/frontend/app/service/signature-method/signature-method-modal.component.html
index c2b36d2483..4c9254be76 100644
--- a/src/frontend/app/service/signature-method/signature-method-modal.component.html
+++ b/src/frontend/app/service/signature-method/signature-method-modal.component.html
@@ -1,11 +1,10 @@
<ion-content>
- <div class="content">
-<!-- <i *ngIf="status==='SUCCESS'" class="fas fa-check success"></i>-->
-<!-- <i *ngIf="status==='WAITING'" class="fas fa-plug bounce"></i>-->
-<!-- <i *ngIf="status==='ERROR'" class="fas fa-times danger"></i>-->
-<!-- <ion-label *ngIf="status==='WAITING'" style="padding: 10px;">En attente d'identification ...</ion-label>-->
-<!-- <ion-label *ngIf="status==='SUCCESS'" style="padding: 10px;">Identification réussie !</ion-label>-->
-<!-- <ion-label *ngIf="status==='ERROR'" style="padding: 10px;">Identification échouée !</ion-label>-->
- <peculiar-fortify-certificates style="height: 100%" language="fr" [filters]="filters" (continue)="continueSignature($event)" (cancel)="cancelSign($event)"></peculiar-fortify-certificates>
- </div>
-</ion-content>
+ <!-- <i *ngIf="status==='SUCCESS'" class="fas fa-check success"></i>-->
+ <!-- <i *ngIf="status==='WAITING'" class="fas fa-plug bounce"></i>-->
+ <!-- <i *ngIf="status==='ERROR'" class="fas fa-times danger"></i>-->
+ <!-- <ion-label *ngIf="status==='WAITING'" style="padding: 10px;">En attente d'identification ...</ion-label>-->
+ <!-- <ion-label *ngIf="status==='SUCCESS'" style="padding: 10px;">Identification réussie !</ion-label>-->
+ <!-- <ion-label *ngIf="status==='ERROR'" style="padding: 10px;">Identification échouée !</ion-label>-->
+ <peculiar-fortify-certificates style="height: 100%;width: 100%;" language="fr" [filters]="filters"
+ (continue)="continueSignature($event)" (cancel)="cancelSign($event)"></peculiar-fortify-certificates>
+</ion-content>
\ No newline at end of file
diff --git a/src/frontend/app/service/signature-method/signature-method-modal.component.ts b/src/frontend/app/service/signature-method/signature-method-modal.component.ts
index e6f28d2e52..910cf94685 100644
--- a/src/frontend/app/service/signature-method/signature-method-modal.component.ts
+++ b/src/frontend/app/service/signature-method/signature-method-modal.component.ts
@@ -107,7 +107,7 @@ export class SignatureMethodModalComponent implements OnInit {
this.modalController.dismiss(false);
}
- fromHex(hexString) {
+ fromHex(hexString: any) {
const res = new Uint8Array(hexString.length / 2);
for (let i = 0; i < hexString.length; i = i + 2) {
const c = hexString.slice(i, i + 2);
diff --git a/src/frontend/core/index.html b/src/frontend/core/index.html
index 518f839e6f..7d10beb6af 100644
--- a/src/frontend/core/index.html
+++ b/src/frontend/core/index.html
@@ -23,9 +23,9 @@
<link rel="icon" type="image/x-icon" href="frontend/core/favicon.ico">
<link rel="apple-touch-icon" href="frontend/assets/apple-touch-icon.png">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap" rel="stylesheet">
- <script type="module" src="https://unpkg.com/@peculiar/fortify-webcomponents@latest/dist/peculiar/peculiar.esm.js"></script>
- <script nomodule src="https://unpkg.com/@peculiar/fortify-webcomponents@latest/dist/peculiar/peculiar.js"></script>
- <link rel="stylesheet" href="https://unpkg.com/@peculiar/fortify-webcomponents@latest/dist/peculiar/peculiar.css">
+ <script type="module" src="./assets/fortify/peculiar.esm.js"></script>
+ <script nomodule src="./assets/fortify/peculiar.js"></script>
+ <link rel="stylesheet" href="./assets/fortify/peculiar.css">
</head>
<body>
<app-root></app-root>
--
GitLab