Folding lists and opened variables

Removing accordion on contract signature page
Spacing printed lis
2023-03-27 01:29:56 +02:00 · 2023-03-27 01:00:11 +02:00 · 2023-03-27 00:55:24 +02:00 · 2023-03-26 21:00:38 +02:00 · 2023-03-24 13:42:07 +01:00 · 2023-03-21 21:33:22 +01:00
32 changed files with 476 additions and 143 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
@@ -90,7 +90,7 @@ class DraftProvision(BaseModel):
    provision: ContractProvisionTemplateReference | ProvisionGenuine = Field(..., discriminator='type')

    class Config:
-        title = 'Provision'
+        title = 'Clause'


 class Provision(BaseModel):
@@ -166,6 +166,10 @@ class ContractDraft(CrudDocument):


 class Contract(CrudDocument):
+    """
+    Contrat publié. Les contrats ne peuvent pas être modifiés.
+    Ils peuvent seulement être signés par les parties et imprimés par l'avocat
+    """
    name: str = Field(title="Nom")
    title: str = Field(title="Titre")
    parties: List[Party] = Field(title="Parties")
@@ -177,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/contract/print/templates/styles.css
+++ b/back/app/contract/print/templates/styles.css
@@ -117,6 +117,10 @@ p {
    text-align: justify;
 }

+li {
+    margin: 16px 0;
+}
+
 .footer {
    margin-top: 30px;
    page-break-inside: avoid;
--- 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:
-            return '{} "{}" {}'.format(self.firstname, self.surnames[0], self.lastname)
+        # if len(self.surnames) > 0:
+        #     return '{} "{}" {}'.format(self.firstname, self.surnames[0], self.lastname)

        return '{} {}'.format(self.firstname, self.lastname)

--- a/front/app/src/app/app-routing.module.ts
+++ b/front/app/src/app/app-routing.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import {ContractsModule} from "./views/contracts/contracts.module";

 const routes: Routes = [
    {
@@ -30,6 +29,11 @@ const routes: Routes = [
                loadChildren: () =>
                    import('./views/templates/templates.module').then((m) => m.TemplatesModule)
            },
+            {
+                path: 'contract-drafts',
+                loadChildren: () =>
+                    import('./views/contract-drafts/contract-drafts.module').then((m) => m.ContractDraftsModule)
+            },
            {
                path: 'contracts',
                loadChildren: () =>
--- a/front/app/src/app/app.component.css
+++ b/front/app/src/app/app.component.css
@@ -0,0 +1,5 @@
+.sidenav {
+    background-image: url("/assets/leather_texture.png");
+    background-size: 220px;
+    max-width: 220px;
+}
--- a/front/app/src/app/app.component.html
+++ b/front/app/src/app/app.component.html
@@ -3,7 +3,7 @@
 <main style="margin-top: 0px;">
  <div class="container-fluid">
    <div class="row flex-nowrap">
-      <div class="col-auto col-md-3 col-xl-2 px-sm-2 px-0 bg-dark" style="max-width: 200px;">
+      <div class="sidenav col-auto col-md-3 col-xl-2 px-sm-2 px-0 bg-dark">
        <sidenav class="sticky-top"></sidenav>
      </div>
      <div class="col py-3">
--- a/front/app/src/app/app.component.ts
+++ b/front/app/src/app/app.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import {Title} from "@angular/platform-browser";

@Component({
    selector: 'app-root',
@@ -8,5 +9,7 @@ import { Component } from '@angular/core';
 export class AppComponent {
    title = 'Cooper, Hillman & Toshi';

-    constructor() {}
+    constructor(private titleService: Title) {
+        titleService.setTitle(this.title)
+    }
 }
--- a/front/app/src/app/layout/sidenav/sidenav.component.css
+++ b/front/app/src/app/layout/sidenav/sidenav.component.css
@@ -0,0 +1,3 @@
+.logout {
+    margin-top: 25px;
+}
--- a/front/app/src/app/layout/sidenav/sidenav.component.html
+++ b/front/app/src/app/layout/sidenav/sidenav.component.html
@@ -11,6 +11,6 @@
                </a>
            </li>
        </ng-container>
-        <li><logout></logout></li>
+        <li class="logout"><logout></logout></li>
    </ul>
 </div>
--- a/front/app/src/app/layout/sidenav/sidenav.component.ts
+++ b/front/app/src/app/layout/sidenav/sidenav.component.ts
@@ -3,13 +3,21 @@ import { Router } from '@angular/router';
 import { IconNamesEnum } from "ngx-bootstrap-icons";
 import { AuthService } from "../auth/auth.service";

+
+interface MenuItem {
+    title: string,
+    link: string,
+    icon: IconNamesEnum
+}
+
+
@Component({
    selector: "sidenav",
    templateUrl: "./sidenav.component.html",
    styleUrls: ["./sidenav.component.css"]
 })
 export class SidenavComponent {
-    Menu = [
+    Menu: MenuItem[] = [
        {
            title: $localize`Dashboard`,
            link: "/dashboard",
@@ -32,7 +40,7 @@ export class SidenavComponent {
        },
        {
            title: $localize`Contracts&nbsp;Drafts`,
-            link: "/contracts/drafts",
+            link: "/contract-drafts",
            icon: IconNamesEnum.PencilSquare
        },
        {
@@ -54,7 +62,7 @@ export class SidenavComponent {
        })
    }

-    is_current_page(menu_item: any) {
-        return this.router.url.indexOf(menu_item.link) > -1;
+    is_current_page(menu_item: MenuItem) {
+        return this.router.url.startsWith(menu_item.link);
    }
 }
--- a/front/app/src/app/views/contract-drafts/contract-drafts-routing.module.ts
+++ b/front/app/src/app/views/contract-drafts/contract-drafts-routing.module.ts
@@ -0,0 +1,44 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DraftsCardComponent, DraftsListComponent, DraftsNewComponent } from "./drafts.component";
+
+
+const routes: Routes = [
+    {
+        path: '',
+        data: {
+            title: 'Contract Drafts',
+        },
+        children: [
+            { path: '', redirectTo: 'list', pathMatch: 'full' },
+            {
+                path: 'list',
+                component: DraftsListComponent,
+                data: {
+                    title: 'List',
+                },
+            },
+            {
+                path: 'new',
+                component: DraftsNewComponent,
+                data: {
+                    title: 'New',
+                },
+            },
+            {
+                path: ':id',
+                component: DraftsCardComponent,
+                data: {
+                    title: 'Card',
+                },
+            },
+        ],
+    }
+];
+
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule]
+})
+export class ContractDraftsRoutingModule {}
--- a/front/app/src/app/views/contract-drafts/contract-drafts.module.ts
+++ b/front/app/src/app/views/contract-drafts/contract-drafts.module.ts
@@ -0,0 +1,42 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { BaseViewModule } from "../base-view/base-view.module";
+import { ContractDraftsRoutingModule } from './contract-drafts-routing.module';
+import { DraftsCardComponent, DraftsListComponent, DraftsNewComponent, DraftsNewFormComponent } from "./drafts.component";
+import { FormlyModule } from "@ngx-formly/core";
+import { FormlyBootstrapModule } from "@ngx-formly/bootstrap";
+import { ForeignkeyTypeComponent } from "@common/crud/types/foreignkey.type";
+import { CrudService, ImageUploaderCrudService } from "@common/crud/crud.service";
+
+import { NgbAccordionModule, NgbCollapseModule } from "@ng-bootstrap/ng-bootstrap";
+import { allIcons, NgxBootstrapIconsModule } from "ngx-bootstrap-icons";
+import { ClipboardModule } from "@angular/cdk/clipboard";
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    BaseViewModule,
+    ContractDraftsRoutingModule,
+    NgbAccordionModule,
+    NgbCollapseModule,
+    NgxBootstrapIconsModule.pick(allIcons),
+    FormlyModule.forRoot({
+      types: [
+        { name: 'foreign-key', component: ForeignkeyTypeComponent }
+      ]
+    }),
+    FormlyBootstrapModule,
+    ClipboardModule,
+  ],
+  declarations: [
+    DraftsListComponent,
+    DraftsNewComponent,
+    DraftsCardComponent,
+    DraftsNewFormComponent
+  ],
+  providers: [CrudService, ImageUploaderCrudService]
+})
+export class ContractDraftsModule {
+}
--- a/front/app/src/app/views/contract-drafts/drafts.component.ts
+++ b/front/app/src/app/views/contract-drafts/drafts.component.ts
@@ -98,10 +98,10 @@ export class DraftsNewComponent extends BaseDraftsComponent implements OnInit {
            (resourceReceived)="this.onResourceReceived($event)"
        >
        </base-card>
-        <a class="btn btn-link" href="/api/v1/contract/print/preview/draft/{{this.resource_id}}" target="_blank">Preview</a>
+        <a class="btn btn-link" href="/api/v1/contract/print/preview/draft/{{this.resource_id}}" target="_blank"  i18n>Preview</a>
        <ng-container *ngIf="this.isReadyForPublication;">
            <formly-form [fields]="newContractFormfields" [form]="newContractForm" [model]="newContractModel"></formly-form>
-            <button class="btn btn-success" (click)="publish()">Publish</button>
+            <button class="btn btn-success" (click)="publish()" i18n>Publish</button>
        </ng-container>
    `
 })
@@ -162,7 +162,7 @@ export class DraftsCardComponent extends BaseDraftsComponent implements OnInit {

    publish() {
        this.crudService.create('contract', this.newContractModel).subscribe({
-            next: (response: any) => this.router.navigate([`../../${response.id}`], {relativeTo: this.route}),
+            next: (response: any) => this.router.navigate([`../../contracts/${response.id}`], {relativeTo: this.route}),
            error: (err) => this.flashService.error(err)
        });
    }
--- a/front/app/src/app/views/contracts/contracts-routing.module.ts
+++ b/front/app/src/app/views/contracts/contracts-routing.module.ts
@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';

-import { DraftsCardComponent, DraftsListComponent, DraftsNewComponent } from "./drafts.component";
 import { ContractsCardComponent, ContractsListComponent, ContractsNewComponent, ContractsSignatureComponent} from "./contracts.component";


@@ -13,6 +12,7 @@ const routes: Routes = [
        },
        children: [
            { path: '', redirectTo: 'list', pathMatch: 'full' },
+            { path: 'drafts', redirectTo: '/contract-drafts/list' },
            {
                path: 'list',
                component: ContractsListComponent,
@@ -34,36 +34,6 @@ const routes: Routes = [
                    title: 'New',
                },
            },
-            {
-                path: 'drafts',
-                data: {
-                    title: 'Drafts',
-                },
-                children: [
-                    { path: '', redirectTo: 'list', pathMatch: 'full' },
-                    {
-                        path: 'list',
-                        component: DraftsListComponent,
-                        data: {
-                            title: 'List',
-                        },
-                    },
-                    {
-                        path: 'new',
-                        component: DraftsNewComponent,
-                        data: {
-                            title: 'New',
-                        },
-                    },
-                    {
-                        path: ':id',
-                        component: DraftsCardComponent,
-                        data: {
-                            title: 'Card',
-                        },
-                    },
-                ],
-            },
            {
                path: ':id',
                component: ContractsCardComponent,
--- a/front/app/src/app/views/contracts/contracts.component.ts
+++ b/front/app/src/app/views/contracts/contracts.component.ts
@@ -78,37 +78,22 @@ export class ContractsCardComponent extends BaseContractsComponent{

@Component({
    template: `
-        <ngb-accordion #acc="ngbAccordion" activeIds="ngb-panel-1">
-            <ngb-panel>
-                <ng-template ngbPanelTitle>
-                    <span>Preview</span>
-                </ng-template>
-                <ng-template ngbPanelContent>
-                    <iframe width="100%" 
-                            [src]="getPreview()" 
-                            onload='javascript:(function(o){o.style.height=o.contentWindow.document.body.scrollHeight+"px";o.style.width=o.contentWindow.document.body.scrollWidth+"px";}(this));' style="height:200px;width:100%;border:none;overflow:hidden;"></iframe>
-                </ng-template>
-            </ngb-panel>
-            <ngb-panel>
-                <ng-template ngbPanelTitle>
-                    <span>Signature</span>
-                </ng-template>
-                <ng-template ngbPanelContent>
-                    <ng-container *ngIf="this.affixed">This Contract has already been signed by {{ this.signatory }}</ng-container>
-                    <div class="row" *ngIf="!this.affixed">
-                        <signature-drawer class="col-7"
-                         (signatureDrawn$)="postSignature($event)"></signature-drawer>
-                        <div class="col-5">
-                            <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>
-        </ngb-accordion>
-    `
+        <div>
+            <iframe width="100%" 
+                    [src]="getPreview()" 
+                    onload='javascript:(function(o){o.style.height=o.contentWindow.document.body.scrollHeight+"px";o.style.width=o.contentWindow.document.body.scrollWidth+"px";}(this));' style="height:200px;width:100%;border:none;overflow:hidden;">
+            </iframe>
+        </div>
+        <div class="row" *ngIf="!this.affixed">
+            <signature-drawer class="col-7"
+             (signatureDrawn$)="postSignature($event)"></signature-drawer>
+            <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>`
 })
 export class ContractsSignatureComponent implements OnInit {
    signature_id: string | null = null;
--- a/front/app/src/app/views/contracts/contracts.module.ts
+++ b/front/app/src/app/views/contracts/contracts.module.ts
@@ -3,7 +3,6 @@ import { NgModule } from '@angular/core';

 import { BaseViewModule } from "../base-view/base-view.module";
 import { ContractsRoutingModule } from './contracts-routing.module';
-import { DraftsCardComponent, DraftsListComponent, DraftsNewComponent, DraftsNewFormComponent } from "./drafts.component";
 import { FormlyModule } from "@ngx-formly/core";
 import { FormlyBootstrapModule } from "@ngx-formly/bootstrap";
 import { ForeignkeyTypeComponent } from "@common/crud/types/foreignkey.type";
@@ -33,10 +32,6 @@ import { ClipboardModule } from "@angular/cdk/clipboard";
    ClipboardModule,
  ],
  declarations: [
-    DraftsListComponent,
-    DraftsNewComponent,
-    DraftsCardComponent,
-    DraftsNewFormComponent,
    ContractsListComponent,
    ContractsNewComponent,
    ContractsCardComponent,
--- a/front/app/src/assets/leather_texture.png
+++ b/front/app/src/assets/leather_texture.png
--- a/front/app/src/common/crud/jsonschemas.service.ts
+++ b/front/app/src/common/crud/jsonschemas.service.ts
@@ -30,7 +30,7 @@ export class JsonschemasService {
    buildResource(resourceName: string) {
        let resource;

-        resource = { ... this.rawSchemas.components.schemas[resourceName]};
+        resource = structuredClone(this.rawSchemas.components.schemas[resourceName]);
        resource.components = { schemas: {} };
        for (let prop_name in resource.properties) {
            let prop = resource.properties[prop_name];
@@ -162,6 +162,14 @@ export class JsonschemasService {
                }
                return false;
            }
+        } else if (this.is_enum(resource)) {
+            for (const ref of resource.allOf!) {
+                // @ts-ignore
+                if (this.has_descendant(ref, property_name)) {
+                    return true;
+                }
+                return false;
+            }
        }
        throw new Error("Jsonschema format not implemented in property finder");
        return false;
@@ -186,6 +194,14 @@ export class JsonschemasService {
                    return this.get_descendant(ref, property_name);
                }
            }
+        } else if (this.is_enum(resource)) {
+            for (const ref of resource.allOf!) {
+                // @ts-ignore
+                if (this.has_descendant(ref, property_name)) {
+                    // @ts-ignore
+                    return this.get_descendant(ref, property_name);
+                }
+            }
        }
        throw new Error("property not found or Jsonschema format not implemented");
    }
--- a/front/app/src/common/crud/list/filter-list.component.ts
+++ b/front/app/src/common/crud/list/filter-list.component.ts
@@ -14,13 +14,14 @@ import {CrudFormlyJsonschemaService} from "@common/crud/crud-formly-jsonschema.s
 export class FilterListComponent implements OnInit {
    @Input() filters: string[] = [];
    @Input() schema = "";
+    @Input() values = {};

    @Output() filterChange: EventEmitter<{[key: string]: any}> = new EventEmitter();

    form = new FormGroup({});
    fields: FormlyFieldConfig[] = [];

-    searchTerms = {}
+    searchTerms: {[key: string]: string | {}} = {}

    public fieldJson = {
        components: {},
@@ -48,6 +49,16 @@ export class FilterListComponent implements OnInit {
                    prop = schema.components.schemas[prop.allOf![0]['$ref'].replace('#/components/schemas/', '')];
                    prop.type = "array";
                    prop.items = {"type": "string", "enum": prop.enum};
+
+                    if (filter in this.values) {
+                        this.searchTerms[filter] = {};
+                        // @ts-ignore
+                        for (let val of this.values[filter]) {
+                            // @ts-ignore
+                            this.searchTerms[filter][val] = true;
+                        }
+                    }
+                } else if(true) {
                }

                if (prop.hasOwnProperty('readOnly') && prop.readOnly) {
--- a/front/app/src/common/crud/list/list.component.html
+++ b/front/app/src/common/crud/list/list.component.html
@@ -14,9 +14,13 @@
 			/>
 		</div>
 		<div class="col-xs-3 col-sm-auto">
-			<crud-list-filter-list [filters]="this.filters" [schema]="this.schema!" (filterChange)="onFilterChange($event)"></crud-list-filter-list>
+			<crud-list-filter-list
+					[filters]="this.filters"
+					[schema]="this.schema!"
+					[values]="this.searchFilters"
+					(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">
@@ -26,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>
@@ -35,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
@@ -40,7 +40,6 @@ export class ListComponent implements OnInit {
    public displayedColumns: Column[] = [];

    private _loading$ = new BehaviorSubject<boolean>(true);
-    //private _search$ = new Subject<void>();
    private _listData$ = new BehaviorSubject<any[]>([]);
    private _total$ = new BehaviorSubject<number>(0);

@@ -64,7 +63,13 @@ export class ListComponent implements OnInit {
            next: (schema: any) => this.getColumnDefinition(schema),
            error: (err) => this.error.emit("Error loading the schema:" + err)
        });
-        this._search();
+        this.route.queryParams.subscribe(params => {
+            let parsedParams = {...params};
+            if (parsedParams.hasOwnProperty('searchFilters')) {
+                parsedParams['searchFilters'] = JSON.parse(parsedParams['searchFilters']);
+            }
+            this._set(parsedParams)
+        });
    }

    getColumnDefinition(schema: JSONSchema7) {
@@ -149,7 +154,7 @@ export class ListComponent implements OnInit {
  }

  onRowMiddleClick(id: string) {
-      let newUrl = window.location.href.replace('list', id)
+      let newUrl = window.location.href.replace('list', id).split('?')[0]
      window.open(newUrl, '_blank');
  }

@@ -182,30 +187,43 @@ export class ListComponent implements OnInit {
      return this._state.searchTerm;
  }
  get searchFilters() {
-        return this._state.searchFilters;
+      return this._state.searchFilters;
  }

-  set page(page: number) {
-      this._set({ page });
-  }
-  set pageSize(pageSize: number) {
-      this._set({ pageSize });
-  }
-  set searchTerm(searchTerm: string) {
-      this._set({ searchTerm });
-  }
-  set searchFilters(searchFilters: {[key: string]: any}) {
-        this._set({ searchFilters });
-  }
-  set sortColumn(sortColumn: SortColumn) {
-      this._set({ sortColumn });
-  }
-  set sortDirection(sortDirection: SortDirection) {
-      this._set({ sortDirection });
-  }
+    set page(page: number) {
+        this.updateState({ page });
+    }
+    
+    set pageSize(pageSize: number) {
+        this.updateState({ pageSize });
+    }
+    
+    set searchTerm(searchTerm: string) {
+        this.updateState({ searchTerm });
+    }

-  private _set(patch: Partial<State>) {
-      Object.assign(this._state, patch);
-      this._search();
-  }
+    set searchFilters(searchFilters: {[key: string]: any}) {
+        this.updateState({ searchFilters: JSON.stringify(searchFilters) });
+    }
+
+    set sortColumn(sortColumn: SortColumn) {
+        this.updateState({ sortColumn });
+    }
+
+    set sortDirection(sortDirection: SortDirection) {
+        this.updateState({ sortDirection });
+    }
+
+    private updateState(patch: any) {
+        this.router.navigate([], {
+            relativeTo: this.route,
+            queryParams: patch ,
+            queryParamsHandling: 'merge'
+        });
+    }
+
+    private _set(patch: Partial<State>) {
+        Object.assign(this._state, patch);
+        this._search();
+    }
 }
--- a/front/app/src/common/crud/types/array.type.ts
+++ b/front/app/src/common/crud/types/array.type.ts
@@ -2,36 +2,44 @@ import {Component, OnInit} from '@angular/core';
 import { FieldArrayType } from '@ngx-formly/core';

@Component({
-  selector: 'formly-array-type',
-  template: `
-    <div>
-      <label *ngIf="props.label" class="form-label">{{ props.label }}</label>
-      <p *ngIf="props.description">{{ props.description }}</p>
-      <div class="alert alert-danger" role="alert" *ngIf="showError && formControl.errors">
-        <formly-validation-message [field]="field"></formly-validation-message>
-      </div>
-      <div class="row row-cols-1 row-cols-md-{{this.itemsPerRow}} g-1">
-          <div *ngFor="let entry of field.fieldGroup; let i = index" class="col">
-                <div class="card">
-                    <div class="card-header">
-                        <div *ngIf="props['numbered']" class="float-start">
-                            <strong>{{ i + 1 }}</strong>
+    selector: 'formly-array-type',
+    template: `
+        <div class="mb-3">
+            <ngb-accordion #acc="ngbAccordion" activeIds="ngb-panel-0">
+                <ngb-panel id="ngb-panel-0">
+                    <ng-template ngbPanelTitle>
+                        <label *ngIf="props.label" class="form-label">{{ props.label }}</label>
+                        <p *ngIf="props.description">{{ props.description }}</p>
+                        <div class="alert alert-danger" role="alert" *ngIf="showError && formControl.errors">
+                            <formly-validation-message [field]="field"></formly-validation-message>
                        </div>
-                        <div *ngIf="! this.field.props.readonly" class="btn-group float-end">
-                            <button class="btn btn-primary btn-sm" [attr.disabled]="i == 0 ? 'disabled' : null" type="button" (click)="move(i, i-1)"><i-bs name="caret-up-fill"></i-bs></button>
-                            <button class="btn btn-primary btn-sm" [attr.disabled]="i == this.field.fieldGroup!.length-1 ? 'disabled' : null" type="button" (click)="move(i, i+1)"><i-bs name="caret-down-fill"></i-bs></button>
-                            <button class="btn btn-danger btn-sm" [attr.disabled]="field.props!['removable'] === false ? 'disabled' : null" type="button" (click)="remove(i)"><i-bs name="x-octagon-fill"></i-bs></button>
+                    </ng-template>
+                    <ng-template ngbPanelContent>
+                        <div class="row row-cols-1 row-cols-md-{{this.itemsPerRow}} g-1">
+                            <div *ngFor="let entry of field.fieldGroup; let i = index" class="col">
+                                <div class="card">
+                                    <div class="card-header">
+                                        <div *ngIf="props['numbered']" class="float-start">
+                                            <strong>{{ i + 1 }}</strong>
+                                        </div>
+                                        <div *ngIf="! this.field.props.readonly" class="btn-group float-end">
+                                            <button class="btn btn-primary btn-sm" [attr.disabled]="i == 0 ? 'disabled' : null" type="button" (click)="move(i, i-1)"><i-bs name="caret-up-fill"></i-bs></button>
+                                            <button class="btn btn-primary btn-sm" [attr.disabled]="i == this.field.fieldGroup!.length-1 ? 'disabled' : null" type="button" (click)="move(i, i+1)"><i-bs name="caret-down-fill"></i-bs></button>
+                                            <button class="btn btn-danger btn-sm" [attr.disabled]="field.props!['removable'] === false ? 'disabled' : null" type="button" (click)="remove(i)"><i-bs name="x-octagon-fill"></i-bs></button>
+                                        </div>
+                                    </div>
+                                    <div class="card-body">
+                                        <formly-field class="col" [field]="entry"></formly-field>
+                                    </div>
+                                </div>
+                            </div>
                        </div>
-                    </div>
-                    <div class="card-body">
-                        <formly-field class="col" [field]="entry"></formly-field>
-                    </div>
-                </div>
-            </div>
+                        <button *ngIf="! this.field.props.readonly" class="btn btn-success col-sm-12 gap-3" type="button" (click)="add()"><i-bs name="plus-square-fill"></i-bs></button>
+                    </ng-template>
+                </ngb-panel>
+            </ngb-accordion>
        </div>
-        <button *ngIf="! this.field.props.readonly" class="btn btn-success col-sm-12" type="button" (click)="add()"><i-bs name="plus-square-fill"></i-bs></button>
-    </div>
-  `,
+    `,
 })
 export class ArrayTypeComponent extends FieldArrayType implements OnInit {
    colSm: string = "col-sm-6"
--- a/front/app/src/common/crud/types/dictionary.type.ts
+++ b/front/app/src/common/crud/types/dictionary.type.ts
@@ -10,7 +10,7 @@ import {FormlyJsonschema} from "@ngx-formly/core/json-schema";
    template: `
        <div class="mb-3">
            <ngb-accordion #acc="ngbAccordion" activeIds="ngb-panel-0">
-                <ngb-panel>
+                <ngb-panel id="ngb-panel-0">
                    <ng-template ngbPanelTitle>
                        <label *ngIf="props.label && props['hideLabel'] !== true" [attr.for]="id"
                               class="form-label">{{ props.label }}
--- 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/locale/messages.fr.xlf
+++ b/front/app/src/locale/messages.fr.xlf
@@ -354,5 +354,69 @@
        <target>Mettre à jour</target>
      </segment>
    </unit>
+    <unit id="6061331044524123789">
+      <segment state="initial">
+        <source>Authentication required</source>
+        <target>Authentification nécessaire</target>
+      </segment>
+    </unit>
+    <unit id="3624268617519726175">
+      <segment state="initial">
+        <source>Permissions too low</source>
+        <target>Permissions trop basses</target>
+      </segment>
+    </unit>
+    <unit id="6833883791906187270">
+      <segment state="initial">
+        <source>Download Link:</source>
+        <target>Lien de téléchargement:</target>
+      </segment>
+    </unit>
+    <unit id="8168599357858858911">
+      <segment state="initial">
+        <source>Preview Link:</source>
+        <target>Lien de prévisualisation:</target>
+      </segment>
+    </unit>
+    <unit id="1295614462098694869">
+      <segment state="initial">
+        <source>Preview</source>
+        <target>Prévisualisation</target>
+      </segment>
+    </unit>
+    <unit id="2445188258613609179">
+      <segment state="initial">
+        <source>Signature</source>
+        <target>Signature</target>
+      </segment>
+    </unit>
+    <unit id="8474971383445371291">
+      <segment state="initial">
+        <source>
+          <pc id="0" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">Cette page est à la destination exclusive de <pc id="1" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;"><ph id="2" equiv="INTERPOLATION" disp="{{ this.signatory }}"/></pc></pc>
+          <pc id="3" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">Si vous n&apos;êtes <pc id="4" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;">pas</pc> <ph id="5" equiv="INTERPOLATION" disp="{{ this.signatory }}"/>, veuillez <pc id="6" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;">fermer cette page immédiatement</pc> et surpprimer tous les liens en votre possession menant vers celle-ci.</pc>
+          <pc id="7" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">En vous maintenant et/ou en interagissant avec cette page, vous enfreignez l&apos;article L.229 du code pénal de l&apos;Etat de San Andreas pour <pc id="8" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;">usurpation d&apos;identité</pc> et vous vous exposez ainsi à une amende de 20 000$ ainsi qu&apos;à des poursuites civiles.</pc>
+          <pc id="9" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">Le cabinet Cooper, Hillman &amp; Toshi LLC</pc>
+        </source>
+        <target>
+          <pc id="0" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">Cette page est à la destination exclusive de <pc id="1" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;"><ph id="2" equiv="INTERPOLATION" disp="{{ this.signatory }}"/></pc></pc>
+          <pc id="3" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">Si vous n&apos;êtes <pc id="4" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;">pas</pc> <ph id="5" equiv="INTERPOLATION" disp="{{ this.signatory }}"/>, veuillez <pc id="6" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;">fermer cette page immédiatement</pc> et surpprimer tous les liens en votre possession menant vers celle-ci.</pc>
+          <pc id="7" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">En vous maintenant et/ou en interagissant avec cette page, vous enfreignez l&apos;article L.229 du code pénal de l&apos;Etat de San Andreas pour <pc id="8" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;">usurpation d&apos;identité</pc> et vous vous exposez ainsi à une amende de 20 000$ ainsi qu&apos;à des poursuites civiles.</pc>
+          <pc id="9" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">Le cabinet Cooper, Hillman &amp; Toshi LLC</pc>
+        </target>
+      </segment>
+    </unit>
+    <unit id="7430416142942514215">
+      <segment state="initial">
+        <source>Publish</source>
+        <target>Publier</target>
+      </segment>
+    </unit>
+    <unit id="2990108023996257960">
+      <segment state="initial">
+        <source>This Contract has already been signed by</source>
+        <target>Ce contrat a déjà été signé par</target>
+      </segment>
+    </unit>
  </file>
 </xliff>
--- a/front/app/src/locale/messages.xlf
+++ b/front/app/src/locale/messages.xlf
@@ -292,5 +292,55 @@
        <source>100 items per page</source>
      </segment>
    </unit>
+    <unit id="3624268617519726175">
+      <segment>
+        <source>Permissions too low</source>
+      </segment>
+    </unit>
+    <unit id="6061331044524123789">
+      <segment>
+        <source>Authentication required</source>
+      </segment>
+    </unit>
+    <unit id="6833883791906187270">
+      <segment>
+        <source>Download Link:</source>
+      </segment>
+    </unit>
+    <unit id="8168599357858858911">
+      <segment>
+        <source>Preview Link:</source>
+      </segment>
+    </unit>
+    <unit id="1295614462098694869">
+      <segment>
+        <source>Preview</source>
+      </segment>
+    </unit>
+    <unit id="2445188258613609179">
+      <segment>
+        <source>Signature</source>
+      </segment>
+    </unit>
+    <unit id="7430416142942514215">
+      <segment>
+        <source>Publish</source>
+      </segment>
+    </unit>
+    <unit id="8474971383445371291">
+      <segment>
+        <source>
+          <pc id="0" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">Cette page est à la destination exclusive de <pc id="1" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;"><ph id="2" equiv="INTERPOLATION" disp="{{ this.signatory }}"/></pc></pc>
+          <pc id="3" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">Si vous n&apos;êtes <pc id="4" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;">pas</pc> <ph id="5" equiv="INTERPOLATION" disp="{{ this.signatory }}"/>, veuillez <pc id="6" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;">fermer cette page immédiatement</pc> et surpprimer tous les liens en votre possession menant vers celle-ci.</pc>
+          <pc id="7" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">En vous maintenant et/ou en interagissant avec cette page, vous enfreignez l&apos;article L.229 du code pénal de l&apos;Etat de San Andreas pour <pc id="8" equivStart="START_TAG_STRONG" equivEnd="CLOSE_TAG_STRONG" type="other" dispStart="&lt;strong&gt;" dispEnd="&lt;/strong&gt;">usurpation d&apos;identité</pc> et vous vous exposez ainsi à une amende de 20 000$ ainsi qu&apos;à des poursuites civiles.</pc>
+          <pc id="9" equivStart="START_PARAGRAPH" equivEnd="CLOSE_PARAGRAPH" type="other" dispStart="&lt;p&gt;" dispEnd="&lt;/p&gt;">Le cabinet Cooper, Hillman &amp; Toshi LLC</pc>
+        </source>
+      </segment>
+    </unit>
+    <unit id="2990108023996257960">
+      <segment>
+        <source>This Contract has already been signed by</source>
+      </segment>
+    </unit>
  </file>
 </xliff>
--- a/front/app/src/styles.css
+++ b/front/app/src/styles.css
@@ -26,3 +26,15 @@
 .contract-body {
    font-family: 'Century Schoolbook';
 }
+
+.nav-link {
+    color: #D2BA6F;
+    --bs-nav-link-hover-color: #9c8a51;
+    --bs-nav-pills-link-active-color: #D2BA6F;
+    --bs-nav-pills-link-active-bg: #114856;
+}
+
+.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	5c276faf78	Folding lists and opened variables	2023-03-27 01:29:56 +02:00
ewandor	95b17947b2	Removing accordion on contract signature page	2023-03-27 01:00:11 +02:00
ewandor	f20635e10e	Spacing printed lis	2023-03-27 00:55:24 +02:00
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
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
ewandor	0b12f8718a	Decorating the sidenav	2023-03-18 18:29:37 +01:00
ewandor	d5d2f31178	Correcting signature translation bug	2023-03-18 17:35:06 +01:00
ewandor	1bd2774cdd	Correcting redirection error after contract creation	2023-03-18 17:27:35 +01:00
ewandor	e5375edda8	Changing website title	2023-03-18 17:20:08 +01:00
ewandor	ae306bb89e	Correcting overselecting menue	2023-03-18 17:13:36 +01:00
ewandor	e877c36a3d	Moving contracts/drafts to contract-drafts	2023-03-18 17:07:29 +01:00
ewandor	7f639fc5a0	Correcting overselecting menue	2023-03-18 17:05:58 +01:00
ewandor	7fbba953cd	separating logoutbutton from rest of menu	2023-03-18 16:28:18 +01:00
ewandor	4e52999b5d	Progression translations	2023-03-18 16:21:55 +01:00
ewandor	392d66b03e	Correcting bug caused by not deep enough clones	2023-03-18 16:12:54 +01:00
ewandor	dc6616bba6	Use address bar to remember list params	2023-03-17 17:45:50 +01:00
ewandor	f3f0ddc004	Implementing enus is jsonschema utilities	2023-03-17 17:39:20 +01:00