Changing the contract file name to the contract label. Updating label content with a dash

Updating favicon
Square border radii
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 · 2023-03-20 14:05:25 +01:00
9 changed files with 86 additions and 5 deletions
--- a/back/app/contract/models.py
+++ b/back/app/contract/models.py
@@ -2,7 +2,7 @@ import datetime
 from typing import List, Literal
 from enum import Enum
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, validator
 from beanie.operators import ElemMatch
 from ..core.models import CrudDocument, RichtextSingleline, RichtextMultiline, DictionaryEntry
@@ -181,6 +181,19 @@ class Contract(CrudDocument):
    lawyer: Entity = Field(title="Avocat en charge")
    location: str = Field(title="Lieu")
    date: datetime.date = Field(title="Date")
    label: str = None
    @validator("label", always=True)
    def generate_label(cls, v, values, **kwargs):
        if not v:
            contract_label = values['title']
            for p in values['parties']:
                contract_label = contract_label + f" - {p.entity.label}"
            contract_label = contract_label + f" - {values['date'].strftime('%m/%d/%Y')}"
            return contract_label
        return v
    class Settings(CrudDocument.Settings):
        fulltext_search = ['name', 'title']
--- 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/entity/models.py
+++ b/back/app/entity/models.py
@@ -28,8 +28,8 @@ class Individual(EntityType):
    @property
    def label(self) -> str:
-        if len(self.surnames) > 0:
+        # if len(self.surnames) > 0:
-            return '{} "{}" {}'.format(self.firstname, self.surnames[0], self.lastname)
+        #     return '{} "{}" {}'.format(self.firstname, self.surnames[0], self.lastname)
        return '{} {}'.format(self.firstname, self.lastname)
--- 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	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
ewandor	2948e9b961	Adding metadata for social networks on signature page	2023-03-19 13:55:57 +01:00
ewandor	191a3d0018	Adding a label to signature read entities	2023-03-19 13:55:13 +01:00
ewandor	8885969a07	Removing nickname from individual's labels	2023-03-19 13:54:38 +01:00
ewandor	a997e54891	Adding an autogenerated label to contracts	2023-03-19 13:53:07 +01:00