From 764759b4e258c0c592cb77e372d412da073f4ba8 Mon Sep 17 00:00:00 2001
From: Sigma9 <imdm@sigma9.pt>
Date: Wed, 14 Aug 2024 22:44:45 +0000
Subject: [PATCH] some changes to layout

---
 .gitignore                                |  1 +
 app/views/pages/landing.html.erb          |  2 +-
 app/views/shared/_navbar.html.erb         | 21 +------------------
 app/views/shared/_navbar_buttons.html.erb |  3 ---
 app/views/shared/_title.html.erb          |  2 +-
 app/views/users/_role_select.html.erb     |  9 ++------
 config/application.rb                     |  3 ++-
 docker-compose.yml                        | 25 ++++++++++++-----------
 8 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f01e718..6ebf0bb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ yarn-debug.log*
 /docuseal
 /ee
 dump.rdb
+pg_data
diff --git a/app/views/pages/landing.html.erb b/app/views/pages/landing.html.erb
index 20043af8..4c411272 100644
--- a/app/views/pages/landing.html.erb
+++ b/app/views/pages/landing.html.erb
@@ -5,7 +5,7 @@
         <div class="relative flex flex-col items-center">
           <%= render 'shared/logo', width: '100', height: '100' %>
           <h1 class="text-6xl font-bold mt-4 mb-4">
-            DocuSeal
+            Corsar
           </h1>
           <% if Docuseal.version.present? %>
             <a href="https://github.com/docusealco/docuseal/releases" target="_blank" class="badge badge-outline badge-lg block mx-auto">
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index 7434b175..09459900 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -3,25 +3,14 @@
     <a href="<%= root_path %>" class="text-2xl font-bold items-center flex space-x-2">
       <%= render 'shared/title' %>
     </a>
-    <span class="hidden sm:inline">
-      <%= render 'shared/github' %>
-    </span>
   </div>
   <% if signed_in? %>
     <div class="space-x-4 flex items-center">
-      <% if Docuseal.demo? %>
-        <a href="https://docuseal.co/sign_up" class="btn btn-neutral btn-sm btn-outline inline-flex items-center justify-center" style="height: 37px">
-          <%= t('sign_up') %>
-        </a>
-        <span class="hidden sm:inline">
-          <%= render 'shared/github_button' %>
-        </span>
-      <% else %>
+   
         <div class="flex items-center justify-center space-x-4 mr-1">
           <%= render 'shared/navbar_buttons' %>
           <%= link_to 'Settings', settings_profile_index_path, class: 'hidden md:inline-flex font-medium text-lg' %>
         </div>
-      <% end %>
       <div class="dropdown dropdown-end">
         <label tabindex="0" class="cursor-pointer bg-base-content text-purple-300 rounded-full p-2 w-9 justify-center flex">
           <span class="text-sm align-text-top"><%= current_user.initials %></span>
@@ -68,14 +57,6 @@
           </span>
         <% end %>
       <% end %>
-      <% if Docuseal.multitenant? && !request.path.in?([registration_path, new_registration_path]) %>
-        <%= link_to registration_path({ lang: params[:lang] }.compact_blank), class: 'btn btn-neutral btn-sm btn-outline' do %>
-          <span class="flex items-center justify-center space-x-1">
-            <span class="hidden sm:block"><%= t('create_free_account') %></span>
-            <span class="md:hidden"><%= t('sign_up') %></span>
-          </span>
-        <% end %>
-      <% end %>
     </div>
   <% end %>
 </div>
diff --git a/app/views/shared/_navbar_buttons.html.erb b/app/views/shared/_navbar_buttons.html.erb
index 4c81abd7..82aaca0c 100644
--- a/app/views/shared/_navbar_buttons.html.erb
+++ b/app/views/shared/_navbar_buttons.html.erb
@@ -1,6 +1,3 @@
-<%= link_to Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premise" }.to_query}", class: 'hidden md:inline-flex btn btn-warning btn-sm', data: { prefetch: false } do %>
-  Upgrade
-<% end %>
 <% if signed_in? && current_user != true_user %>
   <span class="hidden md:inline-flex h-3 border-r border-base-content"></span>
   <%= render 'shared/test_alert' %>
diff --git a/app/views/shared/_title.html.erb b/app/views/shared/_title.html.erb
index 9830a7ca..19f4c4a4 100644
--- a/app/views/shared/_title.html.erb
+++ b/app/views/shared/_title.html.erb
@@ -1,2 +1,2 @@
 <%= render 'shared/logo' %>
-<span>DocuSeal</span>
+<span>Corsar</span>
diff --git a/app/views/users/_role_select.html.erb b/app/views/users/_role_select.html.erb
index b1d26c0f..f7823577 100644
--- a/app/views/users/_role_select.html.erb
+++ b/app/views/users/_role_select.html.erb
@@ -2,12 +2,7 @@
   <%= f.label :role, class: 'label' %>
   <%= f.select :role, nil, {}, class: 'base-select' do %>
     <option value="admin">Admin</option>
-    <option value="editor" disabled>Editor</option>
-    <option value="viewer" disabled>Viewer</option>
+    <option value="editor">Editor</option>
+    <option value="viewer">Viewer</option>
   <% end %>
-  <a class="text-sm mt-3 px-4 py-2 bg-base-300 rounded-full block" target="_blank" href="<%= Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premise" }.to_query}" %>">
-    <%= svg_icon('info_circle', class: 'w-4 h-4 inline align-text-bottom') %>
-    Unlock more user roles with DocuSeal Pro.
-    <span class="link font-medium">Learn More</a>
-  </a>
 </div>
diff --git a/config/application.rb b/config/application.rb
index a120c74a..76cd22d5 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,7 +26,8 @@ module DocuSeal
     config.active_storage.draw_routes = ENV['MULTITENANT'] != 'true'
 
     config.i18n.available_locales = %i[en en-US en-GB es-ES fr-FR pt-PT de-DE it-IT es it de fr pl uk cs pt he nl ar ko]
-    config.i18n.fallbacks = [:en]
+    config.i18n.fallbacks = [:'pt-PT']
+    config.i18n.default_locale = :'pt-PT'
 
     config.exceptions_app = ->(env) { ErrorsController.action(:show).call(env) }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index a30ce3a6..d5cd1e98 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,12 +3,13 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
-    image: docuseal/docuseal:latest
+    build: .
     ports:
       - 3000:3000
     volumes:
       - ./docuseal:/data/docuseal
     environment:
+      - HOST=${HOST}
       - FORCE_SSL=${HOST}
       - DATABASE_URL=postgresql://postgres:postgres@postgres:5432/docuseal
 
@@ -26,14 +27,14 @@ services:
       timeout: 5s
       retries: 5
 
-  caddy:
-    image: caddy:latest
-    command: caddy reverse-proxy --from $HOST --to app:3000
-    ports:
-      - 80:80
-      - 443:443
-      - 443:443/udp
-    volumes:
-      - .:/data
-    environment:
-      - HOST=${HOST}
+        # caddy:
+        #   image: caddy:latest
+        #   command: caddy reverse-proxy --from $HOST --to app:3000
+        #   ports:
+        #     - 81:80
+        #     - 444:443
+        #     - 444:443/udp
+        #   volumes:
+        #     - .:/data
+        #   environment:
+        #     - HOST=${HOST}