From 3996d4c9dc73ee04cfb19795a413ec7633688918 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Sat, 12 Apr 2025 00:08:51 +0200
Subject: [PATCH] Add register link to login page

---
 Makefile                                | 6 ------
 app/views/devise/shared/_links.html.erb | 6 ++++++
 app/views/shared/_footer.html.erb       | 2 +-
 app/views/shared/_legal_footer.html.erb | 2 +-
 app/views/shared/_navbar.html.erb       | 3 +++
 config/initializers/01_constants.rb     | 2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index b4c221d0..e69de29b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +0,0 @@
-build_and_push:
-	git tag -a "$(version)" -f -m "$(version)"
-	docker build . -t dawarich:$(version) --platform=linux/amd64
-	docker tag dawarich:$(version) registry.chibi.rodeo/dawarich:$(version)
-	docker tag registry.chibi.rodeo/dawarich:$(version) registry.chibi.rodeo/dawarich:latest
-	docker push registry.chibi.rodeo/dawarich:$(version)
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
index 417b5fa0..4f3d81ac 100644
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -5,6 +5,12 @@
     </div>
   <% end %>
 
+  <% if !SELF_HOSTED && devise_mapping.registerable? && controller_name != 'registrations' %>
+    <div class='my-2'>
+      <%= link_to "Register", new_registration_path(resource_name) %>
+    </div>
+  <% end %>
+
   <% if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
     <div class='my-2'>
       <%= link_to "Forgot your password?", new_password_path(resource_name) %>
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index 33c13122..a069be2d 100644
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -1,4 +1,4 @@
-<footer class="footer bg-base-200 text-neutral p-4">
+<footer class="footer bg-base-200 text-content-neutral p-4">
   <aside>
     <p><a href="https://dawarich.app/" class="link hover:no-underline" target="_blank">Dawarich</a> 2023-<%=Time.zone.now.year %></p>
   </aside>
diff --git a/app/views/shared/_legal_footer.html.erb b/app/views/shared/_legal_footer.html.erb
index 2d04d625..9fbecb71 100644
--- a/app/views/shared/_legal_footer.html.erb
+++ b/app/views/shared/_legal_footer.html.erb
@@ -1,4 +1,4 @@
-<footer class="footer bg-base-200 text-neutral p-4">
+<footer class="footer bg-base-200 text-content-neutral p-4">
   <nav>
     <h6 class="footer-title"><strong>Dawarich</strong></h6>
     <p>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index a01507e4..802bc92b 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -126,6 +126,9 @@
         </li>
       <% else %>
         <li><%= link_to 'Login', new_user_session_path %></li>
+        <% if !SELF_HOSTED && devise_mapping.registerable? && controller_name != 'registrations' %>
+          <li><%= link_to 'Register', new_user_registration_path %></li>
+        <% end %>
       <% end %>
     </ul>
   </div>
diff --git a/config/initializers/01_constants.rb b/config/initializers/01_constants.rb
index 8993506d..6a475aa2 100644
--- a/config/initializers/01_constants.rb
+++ b/config/initializers/01_constants.rb
@@ -20,4 +20,4 @@ GEOAPIFY_API_KEY = ENV.fetch('GEOAPIFY_API_KEY', nil)
 # /Reverse geocoding settings
 
 SENTRY_DSN = ENV.fetch('SENTRY_DSN', nil)
-MANAGER_URL = SELF_HOSTED ? nil : ENV.fetch('MANAGER_URL', raise('MANAGER_URL is not set'))
+MANAGER_URL = SELF_HOSTED ? nil : ENV.fetch('MANAGER_URL', nil)