Merge branch 'main' into branch_nova

Signed-off-by: Isaac  Pimentel  <[email protected]>

Author: IsaacPimentel73

.docker/php/Dockerfile

@@ -1,23 +1,9 @@
 FROM php:8.3-fpm
 
-ARG NODE_MAJOR=20
-
 RUN apt-get update \
     && apt-get install -y \
         git \
         espeak-ng \
-    # Install node
-        ca-certificates \
-        curl \
-        gnupg \
-    # see https://github.com/nodesource/distributions
-    && mkdir -p /etc/apt/keyrings \
-    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
-    && apt-get update \
-    && apt-get install nodejs -y \
-    && node --version \
-    && npm --version \
     # Clean package cache
     && rm -rf /var/lib/apt/lists/*
 
@@ -33,6 +19,17 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
 
 COPY xdebug.ini /usr/local/etc/php/conf.d/
 
+# Install NVM
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && export NVM_DIR="/root/.nvm" \
+    && . "$NVM_DIR/nvm.sh" \
+    && nvm install 20 \
+    && nvm alias default 20
+
+ENV NVM_DIR   /root/.nvm
+ENV NODE_PATH $NVM_DIR/v20/lib/node_modules
+ENV PATH      $NVM_DIR/v20/bin:$PATH
+
 RUN echo "alias jigsaw=./vendor/bin/jigsaw" >> /etc/bash.bashrc && \
     echo "alias compile='./vendor/bin/jigsaw build'" >> /etc/bash.bashrc && \
     /bin/bash -c "source /etc/bash.bashrc"

.docker/php/entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. "$NVM_DIR/nvm.sh"
+
 # Set uid of host machine
 usermod --non-unique --uid "${HOST_UID}" www-data
 groupmod --non-unique --gid "${HOST_GID}" www-data
@@ -12,4 +14,4 @@ if [[ "$SERVER_MODE" == 'watch' ]]; then
     npm run watch
 else
     php ./vendor/bin/jigsaw serve --host 0.0.0.0 --port 3000
-fi
+fi

docker-compose.yml

@@ -5,14 +5,12 @@ services:
     ports:
       - 127.0.0.1:${HTTP_PORT:-80}:80
     volumes:
-      - .docker/nginx/:/etc/nginx/conf.d/ 
+      - .docker/nginx/:/etc/nginx/conf.d/
       - ./build_local:/var/www/html
 
   php:
     build:
       context: .docker/php
-      args:
-        - NODE_MAJOR=${NODE_MAJOR:-20}
     ports:
       - "127.0.0.1:${HTTP_PORT:-3000}:3000"
       - "127.0.0.1:${HTTP_PORT_BROWSERSYNC:-3001}:3001"
@@ -29,4 +27,4 @@ services:
       - ASSIGNED_USER_ID=${ASSIGNED_USER_ID:-123}
       - CAMPAIGN_ID=${CAMPAIGN_ID:-123}
       - URL_SUITECRM=${URL_SUITECRM:-123}
-      - URL_SITE=${URL_SITE:-http://localhost}
+      - URL_SITE=${URL_SITE:-http://localhost}

lang/en/main.json

@@ -60,6 +60,10 @@
     "Legal validity of electronic signatures in Brazil and around the world": "Legal validity of electronic signatures in Brazil and around the world",
     "Let’s talk about digitally signing your documents!": "Let’s talk about digitally signing your documents!",
     "LibreCode, a Brazilian cooperative of free software developers.": "LibreCode, a Brazilian cooperative of free software developers.",
+    "LibreSign GitHub repository": "LibreSign GitHub repository",
+    "LibreSign Instagram profile": "LibreSign Instagram profile",
+    "LibreSign LinkedIn page": "LibreSign LinkedIn page",
+    "LibreSign Telegram group": "LibreSign Telegram group",
     "LibreSign allows documents to be signed securely and with legal validity, since the system generates hashing - an algorithm that ensures that the file has not been altered after being signed - as well as numbers and records the times of each signature carried out in the document. In this way, the system meets all the requirements of the GDPR - General Data Protection Law.": "LibreSign allows documents to be signed securely and with legal validity, since the system generates hashing - an algorithm that ensures that the file has not been altered after being signed - as well as numbers and records the times of each signature carried out in the document. In this way, the system meets all the requirements of the GDPR - General Data Protection Law.",
     "LibreSign frequently asked questions": "LibreSign frequently asked questions",
     "LibreSign is a web application for electronic signatures (e-Sign) developed by the LibreCode cooperative (Brazilian cooperative specialized in free software development). Its development began at the beginning of 2020, in the midst of the pandemic, when people and companies were migrating their physical documentation to digital, and then there was a need to develop a web solution that could offer the possibility of signing documents, contracts and proposals online with security and agility.": "LibreSign is a web application for electronic signatures (e-Sign) developed by the LibreCode cooperative (Brazilian cooperative specialized in free software development). Its development began at the beginning of 2020, in the midst of the pandemic, when people and companies were migrating their physical documentation to digital, and then there was a need to develop a web solution that could offer the possibility of signing documents, contracts and proposals online with security and agility.",
@@ -79,6 +83,7 @@
     "Our Pricing Plans": "Our Pricing Plans",
     "Our electronic signature and document management solution streamline workflows, reducing time spent on manual processes. Achieve greater productivity, promote document security, and ensure compliance with the General Data Protection Law (GDPR), providing an agile experience for your clients and collaborators.": "Our electronic signature and document management solution streamline workflows, reducing time spent on manual processes. Achieve greater productivity, promote document security, and ensure compliance with the General Data Protection Law (GDPR), providing an agile experience for your clients and collaborators.",
     "Outros Contatos": "Outros Contatos",
+    "Page to national movement that valozie cooperative initiatives.": "Page to national movement that valozie cooperative initiatives.",
     "Phone": "Phone",
     "Posts": "Posts",
     "Pricing": "Pricing",
@@ -106,6 +111,7 @@
     "Thank you!": "Thank you!",
     "The Digital Revolution in Public Administration - Integrating e-Cidade with LibreSign": "The Digital Revolution in Public Administration - Integrating e-Cidade with LibreSign",
     "The perfect tool to manage the signature flow of your documents": "The perfect tool to manage the signature flow of your documents",
+    "Toggle navigation menu": "Toggle navigation menu",
     "Transform document management in public organizations with LibreSign, monitoring signatures in real time, sending automatic reminders and optimizing your team's efficiency. Try our solution for transparent and productive administration.": "Transform document management in public organizations with LibreSign, monitoring signatures in real time, sending automatic reminders and optimizing your team's efficiency. Try our solution for transparent and productive administration.",
     "Transform your processes with more security and efficiency": "Transform your processes with more security and efficiency",
     "Type the code below": "Type the code below",