Correcting list navigation

Changing the contract file name to the contract label. Updating label content with a dash
Updating favicon
2023-03-26 21:00:38 +02:00 · 2023-03-24 13:42:07 +01:00 · 2023-03-21 21:33:22 +01:00 · 2023-03-20 16:02:27 +01:00 · 2023-03-20 16:00:46 +01:00 · 2023-03-20 14:30:43 +01:00
13 changed files with 88 additions and 46 deletions
--- a/back/app/contract/init.py
+++ b/back/app/contract/init.py
@@ -7,7 +7,7 @@ from .routes_draft import draft_router
 from .print import print_router

 from .models import Contract, ContractDraft, ContractDraftStatus, Party, replace_variables_in_value
-from .schemas import ContractCreate, ContractRead, ContractUpdate, SignatureRead
+from .schemas import ContractCreate, ContractRead, ContractUpdate

 from ..entity.models import Entity
 from ..template.models import ProvisionTemplate
@@ -75,12 +75,10 @@ async def update(id: str, contract_form: ContractUpdate, user=Depends(get_curren


@contract_router.get("/signature/{signature_id}", response_description="")
-async def get_signature(signature_id: str) -> SignatureRead:
+async def get_signature(signature_id: str) -> Party:
    contract = await Contract.find_by_signature_id(signature_id)
    signature = contract.get_signature(signature_id)
-    signature_dict = signature.dict()
-    signature_dict['contract_label'] = contract.label
-    return signature_dict
+    return signature


@contract_router.post("/signature/{signature_id}", response_description="")
--- a/back/app/contract/models.py
+++ b/back/app/contract/models.py
@@ -190,7 +190,7 @@ class Contract(CrudDocument):
            for p in values['parties']:
                contract_label = contract_label + f" - {p.entity.label}"

-            contract_label = contract_label + f" {values['date'].strftime('%m/%d/%Y')}"
+            contract_label = contract_label + f" - {values['date'].strftime('%m/%d/%Y')}"
            return contract_label

        return v
--- a/back/app/contract/print/init.py
+++ b/back/app/contract/print/init.py
@@ -130,7 +130,7 @@ async def create_pdf(contract_id: str) -> str:
    return FileResponse(
        contract_path,
        media_type="application/pdf",
-        filename=contract.name)
+        filename=contract.label)


 def retrieve_signature_png(filepath):
@@ -139,3 +139,18 @@ def retrieve_signature_png(filepath):
    base64_utf8_str = base64.b64encode(b_content).decode('utf-8')
    ext = filepath.split('.')[-1]
    return f'data:image/{ext};base64,{base64_utf8_str}'
+
+
+@print_router.get("/opengraph/{signature_id}", response_class=HTMLResponse)
+async def get_signature_opengraph(signature_id: str, request: Request) -> str:
+    contract = await Contract.find_by_signature_id(signature_id)
+    signature = contract.get_signature(signature_id)
+    template = templates.get_template("opengraph.html")
+
+    signatory = signature.representative.label if signature.representative else signature.entity.label
+
+    return template.render({
+        "signatory": signatory,
+        "title": contract.label,
+        "origin_url": f"{request.url.scheme}://{request.url.hostname}"
+    })
--- a/back/app/contract/print/templates/opengraph.html
+++ b/back/app/contract/print/templates/opengraph.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+    <meta property="og:title" content="{{ title }}" />
+    <meta property="og:description" content="Cette page est à la destination exclusive de {{ signatory }}
+                    Si vous n'êtes pas {{ signatory }}, veuillez fermer cette page immédiatement et surpprimer tous les liens en votre possession menant vers celle-ci.
+                    En vous maintenant et/ou en interagissant avec cette page, vous enfreignez l'article L.229 du code pénal de l'Etat de San Andreas pour usurpation d'identité et vous vous exposez ainsi à une amende de 20 000$ ainsi qu'à des poursuites civiles.
+                    Le cabinet Cooper, Hillman & Toshi LLC" />
+    <meta property="og:image" content="{{ origin_url }}/assets/logo.png" />
+</head>
+</html>
--- a/back/app/contract/schemas.py
+++ b/back/app/contract/schemas.py
@@ -73,12 +73,3 @@ class ContractCreate(Writer):

 class ContractUpdate(BaseModel):
    pass
-
-
-class SignatureRead(BaseModel):
-    signature_uuid: str
-    entity: Entity
-    part: str
-    representative: Entity = None
-    signature_affixed: bool
-    contract_label: str
--- a/front/app/src/app/views/contracts/contracts.component.ts
+++ b/front/app/src/app/views/contracts/contracts.component.ts
@@ -1,6 +1,6 @@
-import { Component, ElementRef, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { ActivatedRoute, ParamMap } from "@angular/router";
-import { DomSanitizer, Meta } from "@angular/platform-browser";
+import { DomSanitizer } from "@angular/platform-browser";
 import { ImageUploaderCrudService } from "@common/crud/crud.service";


@@ -98,7 +98,12 @@ export class ContractsCardComponent extends BaseContractsComponent{
                    <div class="row" *ngIf="!this.affixed">
                        <signature-drawer class="col-7"
                         (signatureDrawn$)="postSignature($event)"></signature-drawer>
-                        <div class="col-5" i18n [innerHTML]="this.legalText"></div>
+                        <div class="col-5" i18n>
+                            <p>Cette page est à la destination exclusive de <strong>{{ this.signatory }}</strong></p>
+                            <p>Si vous n'êtes <strong>pas</strong> {{ this.signatory }}, veuillez <strong>fermer cette page immédiatement</strong> et surpprimer tous les liens en votre possession menant vers celle-ci.</p>
+                            <p>En vous maintenant et/ou en interagissant avec cette page, vous enfreignez l'article L.229 du code pénal de l'Etat de San Andreas pour <strong>usurpation d'identité</strong> et vous vous exposez ainsi à une amende de 20 000$ ainsi qu'à des poursuites civiles.</p>
+                            <p>Le cabinet Cooper, Hillman & Toshi LLC</p>
+                        </div>
                    </div>
                </ng-template>
            </ngb-panel>
@@ -112,13 +117,10 @@ export class ContractsSignatureComponent implements OnInit {

    affixed = false;

-    public legalText: string = "";
-
    constructor(
        private route: ActivatedRoute,
        private sanitizer: DomSanitizer,
        private crudService: ImageUploaderCrudService,
-        private meta: Meta,
    ) {}

    ngOnInit() {
@@ -132,26 +134,8 @@ export class ContractsSignatureComponent implements OnInit {
                } else {
                    this.signatory = this.signature.entity.entity_data.firstname  + " " +  this.signature.entity.entity_data.lastname;
                }
-
-                this.legalText = `
-                    <p>Cette page est à la destination exclusive de <strong>${ this.signatory }</strong></p>
-                    <p>Si vous n'êtes <strong>pas</strong> ${ this.signatory }, veuillez <strong>fermer cette page immédiatement</strong> et surpprimer tous les liens en votre possession menant vers celle-ci.</p>
-                    <p>En vous maintenant et/ou en interagissant avec cette page, vous enfreignez l'article L.229 du code pénal de l'Etat de San Andreas pour <strong>usurpation d'identité</strong> et vous vous exposez ainsi à une amende de 20 000$ ainsi qu'à des poursuites civiles.</p>
-                    <p>Le cabinet Cooper, Hillman & Toshi LLC</p>
-                `
-
-                this.meta.updateTag({
-                    name: 'og:title',
-                    property: 'og:title',
-                    content: this.signature.contract_label});
-                this.meta.updateTag({
-                    name: 'og:description',
-                    property: 'og:description',
-                    content: this.legalText.replace(/<[^>]*>/g, '').trim()
-                });
-                this.meta.updateTag({ name: 'og:image', content: `${location.origin}/assets/logo.png` });
-            });
-        });
+            })
+        })
    }

    getPreview() {
--- a/front/app/src/common/crud/list/list.component.html
+++ b/front/app/src/common/crud/list/list.component.html
@@ -21,7 +21,6 @@
 					(filterChange)="onFilterChange($event)"
 			></crud-list-filter-list>
 		</div>
-		<span class="col col-form-label" i18n *ngIf="loading$ | async">Loading...</span>
 	</div>
 	<div class="table-responsive-md">
 		<table class="table table-striped table-hover">
@@ -31,6 +30,9 @@
 				</tr>
 			</thead>
 			<tbody>
+				<tr *ngIf="loading$ | async">
+					<td class="text-center" [attr.colspan]="this.displayedColumns.length" i18n>Loading...</td>
+				</tr>
 				<tr *ngFor="let row of listData$ | async" (click)="onRowClick(row._id)" (auxclick)="onRowMiddleClick(row._id);" class="table-row-link">
 					<td class="text-truncate" *ngFor="let col of this.displayedColumns"  style="max-width: 150px;">
 						<ngb-highlight [result]="getColumnValue(row, col.path)" [term]="searchTerm"></ngb-highlight>
@@ -40,7 +42,7 @@
 		</table>
 	</div>

-	<div class="d-flex justify-content-between p-2">
+	<div class="d-flex justify-content-between p-2" *ngIf="! (loading$ | async)" >
 		<ngb-pagination [collectionSize]="(total$ | async)!" [(page)]="page" [pageSize]="pageSize">
 		</ngb-pagination>

--- a/front/app/src/common/crud/list/list.component.ts
+++ b/front/app/src/common/crud/list/list.component.ts
@@ -68,7 +68,6 @@ export class ListComponent implements OnInit {
            if (parsedParams.hasOwnProperty('searchFilters')) {
                parsedParams['searchFilters'] = JSON.parse(parsedParams['searchFilters']);
            }
-            this._total$.next(this.page * this.pageSize);
            this._set(parsedParams)
        });
    }
--- a/front/app/src/favicon.ico
+++ b/front/app/src/favicon.ico
--- a/front/app/src/index.html
+++ b/front/app/src/index.html
@@ -2,10 +2,13 @@
 <html lang="en">
 <head>
  <meta charset="utf-8">
-  <title>App</title>
+  <title>Cooper, Hillman & Toshi</title>
  <base href="/">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <meta property="og:title" content="Cooper, Hillman & Toshi">
+  <meta property="og:description" content="Interface d'administration des contrats">
+  <meta property="og:image" content="/assets/logo.png">
 </head>
 <body>
  <app-root></app-root>
--- a/front/app/src/styles.css
+++ b/front/app/src/styles.css
@@ -36,4 +36,5 @@

 .nav-link.active {
    border: #D2BA6F solid 2px;
+    border-radius: 0;
 }
--- a/front/nginx.prod.conf
+++ b/front/nginx.prod.conf
@@ -41,6 +41,25 @@ http {
            default_type text/javascript;
        }

+        location /contracts/signature/ {
+            set $is_robot 0;
+            if ($http_user_agent ~* "Discordbot|googlebot|bingbot|yandex|baiduspider|twitterbot|facebookexternalhit|rogerbot|linkedinbot|embedly|quora link preview|showyoubot|outbrain|pinterest\/0\.|pinterestbot|slackbot|vkShare|W3C_Validator|whatsapp") {
+                rewrite /contracts/signature/(.*) /api/v1/contract/print/opengraph/$1 last;
+                proxy_pass         http://docker-back;
+                set $is_robot 1;
+            }
+
+            if ($is_robot = 0) {
+                rewrite ^ /index.html?$args last;
+            }
+
+            proxy_redirect     off;
+            proxy_set_header   Host $host;
+            proxy_set_header   X-Real-IP $remote_addr;
+            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header   X-Forwarded-Host $server_name;
+        }
+
        location /api/v1/ {
            proxy_pass         http://docker-back/;
            proxy_redirect     off;
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -26,6 +26,26 @@ http {
            proxy_set_header   X-Forwarded-Host $server_name;
        }

+        location /contracts/signature/ {
+            set $is_robot 0;
+            if ($http_user_agent ~* "Discordbot|googlebot|bingbot|yandex|baiduspider|twitterbot|facebookexternalhit|rogerbot|linkedinbot|embedly|quora link preview|showyoubot|outbrain|pinterest\/0\.|pinterestbot|slackbot|vkShare|W3C_Validator|whatsapp") {
+                rewrite /contracts/signature/(.*) /api/v1/contract/print/opengraph/$1 last;
+                proxy_pass         http://docker-back;
+                break;
+                set $is_robot 1;
+            }
+
+            if ($is_robot = 0) {
+                proxy_pass         http://docker-front;
+            }
+
+            proxy_redirect     off;
+            proxy_set_header   Host $host;
+            proxy_set_header   X-Real-IP $remote_addr;
+            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header   X-Forwarded-Host $server_name;
+        }
+
        location /api/v1/ {
            proxy_pass         http://docker-back/;
            proxy_redirect     off;
Author	SHA1	Message	Date
ewandor	8d4d64076a	Correcting list navigation	2023-03-26 21:00:38 +02:00
ewandor	f9867b3e2b	Changing the contract file name to the contract label. Updating label content with a dash	2023-03-24 13:42:07 +01:00
ewandor	b89d043880	Updating favicon	2023-03-21 21:33:22 +01:00
ewandor	0ecbb99423	Square border radii	2023-03-20 16:02:27 +01:00
ewandor	61bd5589ff	Adding static meta to index.html	2023-03-20 16:00:46 +01:00
ewandor	72065c0d0d	Adding static meta data on signatures	2023-03-20 14:30:43 +01:00
ewandor	cd8bb58dfb	Revert "Adding a label to signature read entities" This reverts commit `191a3d0018`.	2023-03-20 14:05:25 +01:00
ewandor	9ab1571067	Revert "Adding metadata for social networks on signature page" This reverts commit `2948e9b961`.	2023-03-20 14:04:27 +01:00