From 8fe2f3b4ccf8ace0fddd056321df54395642ab81 Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Sat, 23 May 2020 12:14:29 +0000
Subject: [PATCH] Use base url in views

---
 src/routes/admin.cr            |  2 +-
 src/routes/main.cr             |  3 ++-
 src/routes/reader.cr           |  1 +
 src/util.cr                    |  1 +
 src/views/admin.ecr            |  8 ++++----
 src/views/download-manager.ecr |  6 +++---
 src/views/download.ecr         |  6 +++---
 src/views/index.ecr            |  8 ++++----
 src/views/layout.ecr           | 27 ++++++++++++++-------------
 src/views/login.ecr            |  4 ++--
 src/views/reader.ecr           | 11 +++++++----
 src/views/title.ecr            | 16 ++++++++--------
 src/views/user-edit.ecr        |  6 +++---
 src/views/user.ecr             |  8 ++++----
 14 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/src/routes/admin.cr b/src/routes/admin.cr
index a095adc..1fbd978 100644
--- a/src/routes/admin.cr
+++ b/src/routes/admin.cr
@@ -96,7 +96,7 @@ class AdminRouter < Router
     end
 
     get "/admin/downloads" do |env|
-      base_url = Config.current.mangadex["base_url"]
+      mangadex_base_url = Config.current.mangadex["base_url"]
       layout "download-manager"
     end
   end
diff --git a/src/routes/main.cr b/src/routes/main.cr
index c4a0f0b..e739d82 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -3,6 +3,7 @@ require "./router"
 class MainRouter < Router
   def initialize
     get "/login" do |env|
+      base_url = Config.current.base_url
       render "src/views/login.ecr"
     end
 
@@ -59,7 +60,7 @@ class MainRouter < Router
     end
 
     get "/download" do |env|
-      base_url = Config.current.mangadex["base_url"]
+      mangadex_base_url = Config.current.mangadex["base_url"]
       layout "download"
     end
   end
diff --git a/src/routes/reader.cr b/src/routes/reader.cr
index c5ec819..905f359 100644
--- a/src/routes/reader.cr
+++ b/src/routes/reader.cr
@@ -51,6 +51,7 @@ class ReaderRouter < Router
           next_entry_url = "/reader/#{title.id}/#{next_entry.id}"
         end
 
+        base_url = Config.current.base_url
         render "src/views/reader.ecr"
       rescue e
         @context.error e
diff --git a/src/util.cr b/src/util.cr
index 4f02f56..bb6cd0f 100644
--- a/src/util.cr
+++ b/src/util.cr
@@ -4,6 +4,7 @@ IMGS_PER_PAGE     = 5
 UPLOAD_URL_PREFIX = "/uploads"
 
 macro layout(name)
+  base_url = Config.current.base_url
   begin
     cookie = env.request.cookies.find { |c| c.name == "token" }
     is_admin = false
diff --git a/src/views/admin.ecr b/src/views/admin.ecr
index be1e0cb..59c6c7a 100644
--- a/src/views/admin.ecr
+++ b/src/views/admin.ecr
@@ -1,5 +1,5 @@
 <ul class="uk-list uk-list-large uk-list-divider">
-  <li data-url="/admin/user">User Managerment</li>
+  <li data-url="<%= base_url %>admin/user">User Managerment</li>
   <li onclick="if(!scanning){scan()}">
     <span id="scan">Scan Library Files</span>
     <span id="scan-status" class="uk-align-right">
@@ -7,12 +7,12 @@
       <span hidden></span>
     </span>
   </li>
-  <li data-url="/admin/downloads">Download Manager</li>
+  <li data-url="<%= base_url %>admin/downloads">Download Manager</li>
 </ul>
 
 <hr class="uk-divider-icon">
-<a class="uk-button uk-button-danger" href="/logout">Log Out</a>
+<a class="uk-button uk-button-danger" href="<%= base_url %>logout">Log Out</a>
 
 <% content_for "script" do %>
-<script src="/js/admin.js"></script>
+<script src="<%= base_url %>js/admin.js"></script>
 <% end %>
diff --git a/src/views/download-manager.ecr b/src/views/download-manager.ecr
index a9ea41d..0786ec7 100644
--- a/src/views/download-manager.ecr
+++ b/src/views/download-manager.ecr
@@ -24,9 +24,9 @@
 
 <% content_for "script" do %>
 <script>
-	var baseURL = "<%= base_url %>".replace(/\/$/, "");
+	var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
 </script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
-<script src="/js/alert.js"></script>
-<script src="/js/download-manager.js"></script>
+<script src="<%= base_url %>js/alert.js"></script>
+<script src="<%= base_url %>js/download-manager.js"></script>
 <% end %>
diff --git a/src/views/download.ecr b/src/views/download.ecr
index 90e9fdd..71f750e 100644
--- a/src/views/download.ecr
+++ b/src/views/download.ecr
@@ -74,10 +74,10 @@
 
 <% content_for "script" do %>
 <script>
-	var baseURL = "<%= base_url %>".replace(/\/$/, "");
+	var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
 </script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
-<script src="/js/alert.js"></script>
-<script src="/js/download.js"></script>
+<script src="<%= base_url %>js/alert.js"></script>
+<script src="<%= base_url %>js/download.js"></script>
 <% end %>
diff --git a/src/views/index.ecr b/src/views/index.ecr
index 63508bb..8072968 100644
--- a/src/views/index.ecr
+++ b/src/views/index.ecr
@@ -23,7 +23,7 @@
 <div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
   <%- titles.each_with_index do |t, i| -%>
   <div class="item" data-mtime="<%= t.mtime.to_unix %>" data-progress="<%= percentage[i] %>">
-      <a class="acard" href="/book/<%= t.id %>">
+	  <a class="acard" href="<%= base_url %>book/<%= t.id %>">
         <div class="uk-card uk-card-default">
             <div class="uk-card-media-top">
               <img data-src="<%= t.cover_url %>" data-width data-height alt="" uk-img>
@@ -43,7 +43,7 @@
 
 <% content_for "script" do %>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
-<script src="/js/dots.js"></script>
-<script src="/js/search.js"></script>
-<script src="/js/sort-items.js"></script>
+<script src="<%= base_url %>js/dots.js"></script>
+<script src="<%= base_url %>js/search.js"></script>
+<script src="<%= base_url %>js/sort-items.js"></script>
 <% end %>
diff --git a/src/views/layout.ecr b/src/views/layout.ecr
index cbd6ead..5e5ed23 100644
--- a/src/views/layout.ecr
+++ b/src/views/layout.ecr
@@ -7,11 +7,11 @@
     <meta name="description" content="Mango Manga Server">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/css/uikit.min.css" />
-    <link rel="stylesheet" href="/css/mango.css" />
-	<script defer src="/js/fontawesome.min.js"></script>
-	<script defer src="/js/solid.min.js"></script>
+	<link rel="stylesheet" href="<%= base_url %>css/mango.css" />
+	<script defer src="<%= base_url %>js/fontawesome.min.js"></script>
+	<script defer src="<%= base_url %>js/solid.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-	<script src="/js/theme.js"></script>
+	<script src="<%= base_url %>js/theme.js"></script>
   </head>
 
   <body>
@@ -20,14 +20,14 @@
         <div id="mobile-nav" uk-offcanvas="overlay: true">
           <div class="uk-offcanvas-bar uk-flex uk-flex-column">
             <ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical">
-              <li><a href="/">Home</a></li>
+				<li><a href="<%= base_url %>">Home</a></li>
 			  <% if is_admin %>
-				  <li><a href="/admin">Admin</a></li>
-				  <li><a href="/download">Download</a></li>
+			  <li><a href="<%= base_url %>admin">Admin</a></li>
+			  <li><a href="<%= base_url %>download">Download</a></li>
 			  <% end %>
               <hr uk-divider>
 			  <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
-              <li><a href="/logout">Logout</a></li>
+			  <li><a href="<%= base_url %>logout">Logout</a></li>
             </ul>
           </div>
         </div>
@@ -39,19 +39,19 @@
           <div class="uk-navbar-toggle" uk-navbar-toggle-icon="uk-navbar-toggle-icon" uk-toggle="target: #mobile-nav"></div>
         </div>
         <div class="uk-navbar-left uk-visible@s">
-          <a class="uk-navbar-item uk-logo" href="/"><img src="/img/icon.png"></a>
+			<a class="uk-navbar-item uk-logo" href="<%= base_url %>"><img src="<%= base_url %>img/icon.png"></a>
           <ul class="uk-navbar-nav">
-            <li><a href="/">Home</a></li>
+			  <li><a href="<%= base_url %>">Home</a></li>
 			<% if is_admin %>
-				<li><a href="/admin">Admin</a></li>
-				<li><a href="/download">Download</a></li>
+			<li><a href="<%= base_url %>admin">Admin</a></li>
+			<li><a href="<%= base_url %>download">Download</a></li>
 			<% end %>
           </ul>
         </div>
         <div class="uk-navbar-right uk-visible@s">
           <ul class="uk-navbar-nav">
 			  <li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li>
-            <li><a href="/logout">Logout</a></li>
+			  <li><a href="<%= base_url %>logout">Logout</a></li>
           </ul>
         </div>
       </div>
@@ -66,6 +66,7 @@
     </div>
 	<script>
 		setTheme(getTheme());
+		const base_url = "<%= base_url %>";
 	</script>
     <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
diff --git a/src/views/login.ecr b/src/views/login.ecr
index 80afeb6..0d07a79 100644
--- a/src/views/login.ecr
+++ b/src/views/login.ecr
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/css/uikit.min.css" />
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-	<script src="/js/theme.js"></script>
+	<script src="<%= base_url %>js/theme.js"></script>
 </head>
 <body>
     <div class="uk-section uk-flex uk-flex-middle uk-animation-fade" uk-height-viewport="">
@@ -19,7 +19,7 @@
                     <div class="uk-width-1-1@m">
                         <div class="uk-margin uk-width-large uk-margin-auto uk-card uk-card-default uk-card-body uk-box-shadow-large">
                             <h3 class="uk-card-title uk-text-center">Log In</h3>
-                            <form action="/login" method="post">
+                            <form action="<%= base_url %>login" method="post">
                                 <div class="uk-margin">
                                     <div class="uk-inline uk-width-1-1"><span class="uk-form-icon" uk-icon="icon:user"></span><input class="uk-input uk-form-large" type="text" name="username"></div>
                                 </div>
diff --git a/src/views/reader.ecr b/src/views/reader.ecr
index d186adc..b24b153 100644
--- a/src/views/reader.ecr
+++ b/src/views/reader.ecr
@@ -7,11 +7,11 @@
     <meta name="description" content="Mango Manga Server">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/css/uikit.min.css" />
-    <link rel="stylesheet" href="/css/mango.css" />
+	<link rel="stylesheet" href="<%= base_url %>css/mango.css" />
   </head>
 
   <body>
-	  <script src="/js/theme.js"></script>
+	  <script src="<%= base_url %>js/theme.js"></script>
     <div class="uk-section uk-section-default uk-section-small reader-bg">
       <div class="uk-container uk-container-small">
           <%- urls.each_with_index do |url, i| -%>
@@ -56,10 +56,13 @@
         </div>
       </div>
     </div>
+	<script>
+		const base_url = "<%= base_url %>"
+	</script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
-    <script src="/js/reader.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
+    <script src="<%= base_url %>js/reader.js"></script>
   </body>
 </html>
diff --git a/src/views/title.ecr b/src/views/title.ecr
index c6ade3a..a4d4401 100644
--- a/src/views/title.ecr
+++ b/src/views/title.ecr
@@ -7,9 +7,9 @@
 	</h2>
 </div>
 <ul class="uk-breadcrumb">
-	<li><a href="/">Library</a></li>
+	<li><a href="<%= base_url %>">Library</a></li>
 	<%- title.parents.each do |t| -%>
-	<li><a href="/book/<%= t.id %>"><%= t.display_name %></a></li>
+	<li><a href="<%= base_url %>book/<%= t.id %>"><%= t.display_name %></a></li>
 	<%- end -%>
 	<li class="uk-disabled"><a><%= title.display_name %></a></li>
 </ul>
@@ -39,7 +39,7 @@
 <div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
 	<%- title.titles.each_with_index do |t, i| -%>
 	<div class="item" data-mtime="<%= t.mtime.to_unix %>" data-progress="0.0">
-      <a class="acard" href="/book/<%= t.id %>">
+		<a class="acard" href="<%= base_url %>book/<%= t.id %>">
         <div class="uk-card uk-card-default">
             <div class="uk-card-media-top">
               <img data-src="<%= t.cover_url %>" data-width data-height alt="" uk-img>
@@ -151,9 +151,9 @@
 
 <% content_for "script" do %>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
-<script src="/js/dots.js"></script>
-<script src="/js/alert.js"></script>
-<script src="/js/title.js"></script>
-<script src="/js/search.js"></script>
-<script src="/js/sort-items.js"></script>
+<script src="<%= base_url %>js/dots.js"></script>
+<script src="<%= base_url %>js/alert.js"></script>
+<script src="<%= base_url %>js/title.js"></script>
+<script src="<%= base_url %>js/search.js"></script>
+<script src="<%= base_url %>js/sort-items.js"></script>
 <% end %>
diff --git a/src/views/user-edit.ecr b/src/views/user-edit.ecr
index f7ea939..7598002 100644
--- a/src/views/user-edit.ecr
+++ b/src/views/user-edit.ecr
@@ -1,4 +1,4 @@
-<form action="/admin/user/edit" method="post" accept-charset="utf-8">
+<form action="<%= base_url %>admin/user/edit" method="post" accept-charset="utf-8">
 
   <div class="uk-margin">
     <label class="uk-form-label" for="form-stacked-text">Username</label>
@@ -49,6 +49,6 @@
     error = '<%= error %>';
   <%- end -%>
 </script>
-<script src="/js/alert.js"></script>
-<script src="/js/user-edit.js"></script>
+<script src="<%= base_url %>js/alert.js"></script>
+<script src="<%= base_url %>js/user-edit.js"></script>
 <% end %>
diff --git a/src/views/user.ecr b/src/views/user.ecr
index 7207d91..295db45 100644
--- a/src/views/user.ecr
+++ b/src/views/user.ecr
@@ -12,7 +12,7 @@
 		<td><%= u[0] %></td>
 		<td><%= u[1] %></td>
 		<td>
-			<a href="/admin/user/edit?username=<%= u[0] %>&admin=<%= u[1] %>" uk-icon="file-edit"></a>
+			<a href="<%= base_url %>admin/user/edit?username=<%= u[0] %>&admin=<%= u[1] %>" uk-icon="file-edit"></a>
 			<%- if u[0] != username %>
 			<a href="#" onclick="remove('<%= u[0] %>');return false;" uk-icon="trash"></a>
 			<%- end %>
@@ -22,10 +22,10 @@
   </tbody>
 </table>
 
-<a href="/admin/user/edit" class="uk-button uk-button-primary">New User</a>
+<a href="<%= base_url %>admin/user/edit" class="uk-button uk-button-primary">New User</a>
 
 
 <% content_for "script" do %>
-<script src="/js/alert.js"></script>
-<script src="/js/user.js"></script>
+<script src="<%= base_url %>js/alert.js"></script>
+<script src="<%= base_url %>js/user.js"></script>
 <% end %>