Merge branch 'master' of git.dorfsvald.net:ewandor/cht-lawfirm

Makefile

@@ -0,0 +1,12 @@
+
+publish:
+	git checkout $(TAG)
+	docker build -f back/Dockerfile.prod -t git.dorfsvald.net/ewandor/cht-lawfirm-back-prod back
+	docker tag git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:latest git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:$(TAG)
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:latest
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:$(TAG)
+	docker build -f front/Dockerfile.prod -t git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod front
+	docker tag git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:latest git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:$(TAG)
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:latest
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:$(TAG)
+	git switch -

back/Dockerfile

@@ -5,13 +5,10 @@ RUN apt update && apt install -y xfonts-base xfonts-75dpi python3-pip python3-cf
 
 WORKDIR /code
 
-# copy both 'package.json' and 'package-lock.json' (if available)
 COPY ./requirements.txt /code/requirements.txt
 
-# install project dependencies
 RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 
-# copy project files and folders to the current working directory (i.e. 'app' folder)
 COPY ./app /code/app
 
 EXPOSE 8000

back/Dockerfile.prod

@@ -0,0 +1,15 @@
+FROM python:3.10
+
+RUN apt update && apt install -y xfonts-base xfonts-75dpi python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0 \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /code
+
+COPY ./requirements.txt /code/requirements.txt
+
+RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+
+COPY ./app /code/app
+
+EXPOSE 8000
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

back/app/contract/print/__init__.py

@@ -81,7 +81,7 @@ async def render_css(root_url, contract):
 async def preview_draft(draft_id: str, request: Request) -> str:
     draft = await build_model(await ContractDraft.get(draft_id))
 
-    return await render_print(f'{request.url.scheme}://{request.url.hostname}', draft)
+    return await render_print('', draft)
 
 
 @print_router.get("/preview/signature/{signature_id}", response_class=HTMLResponse)
@@ -91,7 +91,7 @@ async def preview_contract_by_signature(signature_id: str, request: Request) ->
         if p.signature_affixed:
             p.signature_png = retrieve_signature_png(f'media/signatures/{p.signature_uuid}.png')
 
-    return await render_print(f'{request.url.scheme}://{request.url.hostname}', contract)
+    return await render_print('', contract)
 
 
 @print_router.get("/preview/{contract_id}", response_class=HTMLResponse)
@@ -101,7 +101,7 @@ async def preview_contract(contract_id: str, request: Request) -> str:
         if p.signature_affixed:
             p.signature_png = retrieve_signature_png(f'media/signatures/{p.signature_uuid}.png')
 
-    return await render_print(f'{request.url.scheme}://{request.url.hostname}', contract)
+    return await render_print('', contract)
 
 
 @print_router.get("/pdf/{contract_id}", response_class=FileResponse)

back/app/core/routes.py

@@ -39,7 +39,10 @@ def parse_query(query: str, model):
 
             or_array = []
             for field in model.Settings.fulltext_search:
-                or_array.append(RegEx(field, value, 'i'))
+                words_and_array = []
+                for word in value.split(' '):
+                    words_and_array.append(RegEx(field, word, 'i'))
+                or_array.append(And(*words_and_array) if len(words_and_array) > 1 else words_and_array[0])
             operand = Or(or_array) if len(or_array) > 1 else or_array[0]
 
         elif operator == 'eq':

back/app/db.py

@@ -5,10 +5,11 @@ from beanie import init_beanie
 from .user import User, AccessToken
 from .entity.models import Entity
 from .template.models import ContractTemplate, ProvisionTemplate
-from .order.models import Order
 from .contract.models import ContractDraft, Contract
+# from .order.models import Order
 
-DATABASE_URL = "mongodb://root:example@mongo:27017/"
+DB_PASSWORD = "IBO3eber0mdw2R9pnInLdtFykQFY2f06"
+DATABASE_URL = f"mongodb://root:{DB_PASSWORD}@mongo:27017/"
 
 
 async def init_db():

back/app/user/manager.py

@@ -1,5 +1,5 @@
 import uuid
-from typing import Any, Dict, Generic, Optional
+from typing import Any
 from bson import ObjectId
 
 from fastapi import Depends

back/migration.py

@@ -3,10 +3,10 @@ import asyncio
 import json
 from os import path
 
-from app.db import init_db, Entity, Order, Contract, User, AccessToken
+from app.db import init_db, Entity, Contract, ContractTemplate, ProvisionTemplate, User
 
 
-models = [Entity, Order, Contract, User]
+models = [Entity, Contract, User, ContractTemplate, ProvisionTemplate]
 
 
 async def handle_migration(args):

docker-compose.prod.yml

@@ -0,0 +1,27 @@
+version: "3.9"
+services:
+  back:
+    image: git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:latest
+    restart: always
+    volumes:
+      - ${ROOT_PATH}/back/media:/code/media
+
+  nginx:
+    image: git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:latest
+    restart: always
+    ports:
+      - "3820:80"
+
+  mongo:
+    image: "mongo:4.4.19"
+    restart: always
+    ports:
+      - "27017:27017"
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: IBO3eber0mdw2R9pnInLdtFykQFY2f06
+    volumes:
+      - database:/data/db
+
+volumes:
+  database:

docker-compose.prod.yml.back

@@ -0,0 +1,42 @@
+version: "3.9"
+services:
+  back:
+    build:
+      context: ${ROOT_PATH}/back
+    restart: always
+    ports:
+      - "8000:8000"
+    volumes:
+      - ${ROOT_PATH}/back/app:/code/app
+      - ${ROOT_PATH}/back/media:/code/media
+
+  front:
+    build:
+      context: ${ROOT_PATH}/front
+    restart: always
+    ports:
+      - "4200:4200"
+    volumes:
+      - ${ROOT_PATH}/front/app/src:/app/src
+      - ${ROOT_PATH}/front/app/public:/app/public
+
+  nginx:
+    build:
+      context: ${ROOT_PATH}/nginx
+    restart: always
+    ports:
+      - "3820:80"
+
+  mongo:
+    image: "mongo:4.4.18"
+    restart: always
+    ports:
+      - "27017:27017"
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: IBO3eber0mdw2R9pnInLdtFykQFY2f06
+    volumes:
+    - database:/data/db
+
+volumes:
+  database:

docker-compose.yml

@@ -3,6 +3,7 @@ services:
   back:
     build:
       context: ./back
+    image: cht-lawfirm-back-dev
     restart: always
     ports:
       - "8000:8000"
@@ -13,6 +14,7 @@ services:
   front:
     build:
       context: ./front
+    image: cht-lawfirm-front-dev
     restart: always
     ports:
       - "4200:4200"
@@ -23,18 +25,19 @@ services:
   nginx:
     build:
       context: ./nginx
+    image: cht-lawfirm-nginx-dev
     restart: always
     ports:
       - "80:80"
 
   mongo:
-    image: "mongo:4.4.18"
+    image: "mongo:4.4.19"
     restart: always
     ports:
       - "27017:27017"
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: example
+      MONGO_INITDB_ROOT_PASSWORD: IBO3eber0mdw2R9pnInLdtFykQFY2f06
     volumes:
     - database:/data/db
 

front/Dockerfile

@@ -1,22 +1,11 @@
 FROM node:lts-alpine
 
-# install simple http server for serving static content
-RUN npm install -g http-server
-
-# make the 'app' folder the current working directory
 WORKDIR /app
-
-RUN npm install -g @angular/cli
-# copy both 'package.json' and 'package-lock.json' (if available)
+RUN npm install -g @angular/cli http-server
 COPY app/package*.json ./
-
-# install project dependencies
 RUN npm install
-
-# copy project files and folders to the current working directory (i.e. 'app' folder)
 COPY app/ .
 
-# build app for production with minification
 RUN npm run build
 
 EXPOSE 4200

front/Dockerfile.prod

@@ -0,0 +1,17 @@
+FROM node:lts-alpine AS builder
+
+WORKDIR /app
+
+RUN npm install -g @angular/cli
+
+COPY app/package*.json ./
+RUN npm install
+
+COPY app/ .
+
+RUN npm run build --prod
+
+FROM nginx:alpine
+COPY nginx.prod.conf /etc/nginx/nginx.conf
+
+COPY --from=builder /app/dist/app/fr/ /usr/share/nginx/html/

front/app/angular.json

@@ -13,7 +13,8 @@
         "sourceLocale": "en-US",
         "locales": {
           "fr": {
-            "translation": "src/locale/messages.fr.xlf"
+            "translation": "src/locale/messages.fr.xlf",
+            "baseHref": ""
           }
         }
       },
@@ -63,9 +64,6 @@
               "extractLicenses": false,
               "sourceMap": true,
               "namedChunks": true
-            },
-            "fr": {
-              "localize": ["fr"]
             }
           },
           "defaultConfiguration": "production"
@@ -80,7 +78,7 @@
               "browserTarget": "app:build:development"
             },
             "fr": {
-              "browserTarget": "App:build:fr"
+              "browserTarget": "app:build:fr"
             }
           },
           "defaultConfiguration": "development"

front/app/src/common/crud/crud-routing.module.ts

@@ -6,7 +6,7 @@ import { ListComponent } from "./list/list.component";
 const routes: Routes = [
   { path: '', component: ListComponent },
   { path: ':id', component: CardComponent },
-];;
+];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],

front/app/src/common/crud/types/richtext.type.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import { FormlyFieldInput } from "@ngx-formly/bootstrap/input";
 
+
 @Component({
     selector: 'formly-richtext-type',
     template: `        
@@ -42,11 +43,19 @@ export class RichtextTypeComponent extends FormlyFieldInput implements OnInit {
         statusbar: false,
         autoresize_bottom_margin: 0,
         body_class: "contract-body",
-        content_style: ".contract-body { font-family: 'Century Schoolbook', 'sans-serif' }"
+        content_style: ".contract-body { font-family: 'Century Schoolbook', 'sans-serif' }",
+        paste_preprocess: function (plugin: any, args: any) {
+            console.log(args.content)
+            let container = document.createElement('div');
+            container.innerHTML = args.content.trim();
+            cleanPastedElement(container)
+            console.log(container.innerHTML);
+            args.content = container.innerHTML;
+        }
     }
 
     init_multiline = {
-        plugins: 'lists image imagetools table code searchreplace autoresize',
+        plugins: 'lists image imagetools table code searchreplace paste autoresize',
         menubar: 'edit insert format tools table',
         menu: {
             edit: { title: 'Edit', items: 'undo redo | cut copy paste | selectall | searchreplace' },
@@ -59,7 +68,7 @@ export class RichtextTypeComponent extends FormlyFieldInput implements OnInit {
     }
 
     init_singleline = {
-        plugins: 'autoresize',
+        plugins: 'paste autoresize',
         menubar: '',
         toolbar: 'undo redo | bold italic underline',
     }
@@ -92,7 +101,49 @@ export class RichtextTypeComponent extends FormlyFieldInput implements OnInit {
             }
         }
     }
-
-
-
+}
+
+function cleanPastedElement(htmlElement: HTMLElement): string {
+    if (! htmlElement.innerHTML) {
+        return "";
+    }
+
+    let innerHtml = ""
+    for(let i = 0; i < htmlElement.childNodes.length; i++){
+        const childNode = htmlElement.childNodes[i] as HTMLElement
+        if (childNode.nodeName == "#text") {
+            innerHtml += childNode.nodeValue;
+        } else {
+            innerHtml += cleanPastedElement(childNode);
+        }
+    }
+    htmlElement.innerHTML = innerHtml
+
+    if (htmlElement.tagName == "SPAN") {
+        let text = htmlElement.innerHTML
+        const style = htmlElement.style
+
+        if (style.fontWeight == "700") {
+            let strong = document.createElement('b');
+            strong.innerHTML = text
+            text = strong.outerHTML;
+        }
+        if (style.textDecoration == "underline") {
+            let underline = document.createElement('u');
+            underline.innerHTML = text;
+            text = underline.outerHTML;
+        }
+        if (style.fontStyle == "italic") {
+            let italic = document.createElement('em');
+            italic.innerHTML = text;
+            text = italic.outerHTML;
+        }
+
+        return text;
+    }
+
+    htmlElement.style.removeProperty("line-height")
+    htmlElement.style.removeProperty("margin")
+
+    return htmlElement.outerHTML
 }

front/nginx.prod.conf

@@ -0,0 +1,53 @@
+worker_processes 1;
+
+events { worker_connections 1024; }
+
+http {
+
+    sendfile on;
+
+    upstream docker-back {
+        server back:8000;
+    }
+
+    types {
+        module js;
+    }
+    include       /etc/nginx/mime.types;
+
+    server {
+        listen 80;
+
+        gzip on;
+        gzip_http_version 1.1;
+        gzip_disable      "MSIE [1-6]\.";
+        gzip_min_length   256;
+        gzip_vary         on;
+        gzip_proxied      expired no-cache no-store private auth;
+        gzip_types        text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+        gzip_comp_level   9;
+
+        root /usr/share/nginx/html;
+
+        location / {
+            try_files $uri $uri/ /index.html?$args;
+        }
+
+        location ~* ^.+\.css$ {
+            default_type text/css;
+        }
+
+        location ~* ^.+\.js$ {
+            default_type text/javascript;
+        }
+
+        location /api/v1/ {
+            proxy_pass         http://docker-back/;
+            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;
+        }
+    }
+}