From 036f6049a2adc3eb3c05733eabfdc5917a41cfed Mon Sep 17 00:00:00 2001
From: DocuSeal <dev@docuseal.co>
Date: Thu, 2 Nov 2023 13:37:57 +0200
Subject: [PATCH] Revert "add new signup page"

This reverts commit f7132445a12377956ebb1e2154c6a3c538fc16ed.
---
 app/views/devise/registrations/show.html.erb  | 81 +++++--------------
 app/views/devise/sessions/new.html.erb        |  2 +-
 .../devise/shared/_select_server.html.erb     | 18 ++---
 app/views/icons/_circle_check_filled.html.erb |  3 -
 4 files changed, 28 insertions(+), 76 deletions(-)
 delete mode 100644 app/views/icons/_circle_check_filled.html.erb

diff --git a/app/views/devise/registrations/show.html.erb b/app/views/devise/registrations/show.html.erb
index d3418a24..a152729c 100644
--- a/app/views/devise/registrations/show.html.erb
+++ b/app/views/devise/registrations/show.html.erb
@@ -1,67 +1,22 @@
-<% redir_new_params = params[:redir].to_s.starts_with?('/new') ? Rack::Utils.parse_query(params[:redir].split('?', 2).last.to_s) : {} %>
-<div class="mx-auto flex max-w-lg flex-col md:max-w-none md:flex-row">
-  <div class="hidden md:block max-w-md w-full rounded-3xl bg-base-200/50 px-4 py-10 text-neutral-700 sm:px-10 md:mr-8">
-    <% if redir_new_params['filename'].present? %>
-      <div class="flex items-center text-neutral-800 border border-base-content border-dashed rounded-xl p-4 mb-16 bg-base-100">
-        <div class="mr-3">
-          <%= svg_icon('file_text', class: 'w-10 h-10') %>
-        </div>
-        <div class="text-neutral-900 text-lg">
-          <%= redir_new_params['filename'] %>
-        </div>
-      </div>
-    <% else %>
-      <p class="mb-4 text-3xl font-bold md:text-4xl md:leading-snug">
-        #1 Open Source <br>
-        Document Signing
-      </p>
-      <p class="mb-8 leading-relaxed text-neutral-800">
-        DocuSeal allows you to create, fill and sign digital documents with ease.
-      </p>
+<div class="max-w-lg mx-auto px-2">
+  <%= render 'devise/shared/select_server' if Docuseal.multitenant? %>
+  <h1 class="text-3xl font-bold text-center mt-8 mb-6">Create Free Account</h1>
+  <%= form_for(User.new, html: { class: 'space-y-6' }, url: new_registration_path, data: { turbo: params[:redir].blank? }, method: :get) do |f| %>
+    <% if params[:redir].present? %>
+      <%= hidden_field_tag :redir, params[:redir] %>
     <% end %>
-    <ul class="space-y-2">
-      <li class="flex items-center space-x-2">
-        <%= svg_icon('circle_check_filled', class: 'w-6 h-6 text-neutral shrink-0') %>
-        <span class="text-body-color text-base">Start signing documents immediately</span>
-      </li>
-      <li class="flex items-center space-x-2">
-        <%= svg_icon('circle_check_filled', class: 'w-6 h-6 text-neutral shrink-0') %>
-        <span class="text-body-color text-base">Sign unlimited documents for free</span>
-      </li>
-      <li class="flex items-center space-x-2">
-        <%= svg_icon('circle_check_filled', class: 'w-6 h-6 text-neutral shrink-0') %>
-        <span class="text-body-color text-base">Try API, Webhooks and Embedding</span>
-      </li>
-      <li class="flex items-center space-x-2">
-        <%= svg_icon('circle_check_filled', class: 'w-6 h-6 text-neutral shrink-0') %>
-        <span class="text-body-color text-base">ESIGN, UETA, eIDAS compliant</span>
-      </li>
-      <li class="flex items-center space-x-2">
-        <%= svg_icon('circle_check_filled', class: 'w-6 h-6 text-neutral shrink-0') %>
-        <span class="text-body-color text-base">No CC required</span>
-      </li>
-    </ul>
-  </div>
-  <div class="w-full max-w-lg mt-8 md:px-4">
-    <h1 class="text-3xl md:text-4xl font-bold text-center md:text-left mb-6">Create Free Account</h1>
-    <%= render 'devise/shared/select_server' if Docuseal.multitenant? %>
-    <%= form_for(User.new, html: { class: 'space-y-6' }, url: new_registration_path, data: { turbo: params[:redir].blank? }, method: :get) do |f| %>
-      <% if params[:redir].present? %>
-        <%= hidden_field_tag :redir, params[:redir] %>
-      <% end %>
-      <div class="space-y-2">
-        <div class="form-control">
-          <%= f.label :email, class: 'label' %>
-          <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'base-input' %>
-        </div>
-      </div>
+    <div class="space-y-2">
       <div class="form-control">
-        <%= f.button button_title(title: 'Sign up', disabled_with: 'Sign up'), name: 'sign_up', value: true, class: 'base-button' %>
+        <%= f.label :email, class: 'label' %>
+        <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'base-input' %>
       </div>
-    <% end %>
-    <% if devise_mapping.omniauthable? %>
-      <%= button_to button_title(title: 'Sign up with Google', icon: svg_icon('brand_google', class: 'w-6 h-6')), omniauth_authorize_path(resource_name, :google_oauth2), class: 'white-button w-full mt-4', data: { turbo: false }, method: :post %>
-    <% end %>
-    <%= render 'devise/shared/links' %>
-  </div>
+    </div>
+    <div class="form-control">
+      <%= f.button button_title(title: 'Sign up', disabled_with: 'Sign up'), name: 'sign_up', value: true, class: 'base-button' %>
+    </div>
+  <% end %>
+  <% if devise_mapping.omniauthable? %>
+    <%= button_to button_title(title: 'Sign up with Google', icon: svg_icon('brand_google', class: 'w-6 h-6')), omniauth_authorize_path(resource_name, :google_oauth2), class: 'white-button w-full mt-4', data: { turbo: false }, method: :post %>
+  <% end %>
+  <%= render 'devise/shared/links' %>
 </div>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index b19b884c..09c51d0c 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,6 +1,6 @@
 <div class="max-w-lg mx-auto px-2">
-  <h1 class="text-4xl font-bold text-center mt-8">Sign In</h1>
   <%= render 'devise/shared/select_server' if Docuseal.multitenant? %>
+  <h1 class="text-4xl font-bold text-center mt-8">Sign In</h1>
   <%= form_for(resource, as: resource_name, html: { class: 'space-y-6' }, data: { turbo: params[:redir].blank? }, url: session_path(resource_name)) do |f| %>
     <% if params[:redir].present? %>
       <%= hidden_field_tag :redir, params[:redir] %>
diff --git a/app/views/devise/shared/_select_server.html.erb b/app/views/devise/shared/_select_server.html.erb
index c433adbf..866f0b92 100644
--- a/app/views/devise/shared/_select_server.html.erb
+++ b/app/views/devise/shared/_select_server.html.erb
@@ -1,10 +1,10 @@
-<div class="flex space-x-4 my-4">
-  <a href="https://docuseal.co<%= request.fullpath.gsub('docuseal.eu', 'docuseal.co') %>" class="<%= request.hostname == 'docuseal.co' ? 'ring-base-content/50 ring-1' : '' %> w-1/2 p-4 bg-base-200/50 text-left rounded-2xl hover:ring-base-content/50 hover:ring-1">
-    <p class="text-lg font-bold mb-2 text-neutral-800">🌎 Global</p>
-    <div class="text-xs text-neutral-700">Servers located in the US to serve clients worldwide</div>
-  </a>
-  <a href="https://docuseal.eu<%= request.fullpath.gsub('docuseal.co', 'docuseal.eu') %>" class="<%= request.hostname == 'docuseal.eu' ? 'ring-base-content/50 ring-1' : '' %> w-1/2 p-4 bg-base-200/50 text-left rounded-2xl hover:ring-base-content/50 hover:ring-1">
-    <p class="text-lg font-bold mb-2 text-neutral-800">🇪🇺 Europe</p>
-    <div class="text-xs text-neutral-700">GDPR-ready Cloud with servers located in Dublin</div>
-  </a>
+<div class="text-center">
+  <div class="join">
+    <a href="https://docuseal.co<%= request.fullpath.gsub('docuseal.eu', 'docuseal.co') %>" class="btn bg-base-200 join-item w-32  <%= 'bg-base-300' if request.host == 'docuseal.co' %>">
+      🌎 Global
+    </a>
+    <a href="https://docuseal.eu<%= request.fullpath.gsub('docuseal.co', 'docuseal.eu') %>" class="btn bg-base-200 join-item w-32 <%= 'bg-base-300' if request.host == 'docuseal.eu' %>">
+      🇪🇺 Europe
+    </a>
+  </div>
 </div>
diff --git a/app/views/icons/_circle_check_filled.html.erb b/app/views/icons/_circle_check_filled.html.erb
deleted file mode 100644
index 9fe0e7dd..00000000
--- a/app/views/icons/_circle_check_filled.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" aria-hidden="true" viewBox="0 0 20 20" fill="currentColor">
-  <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd"></path>
-</svg>