Backups/Mango
1
0
Fork 0
mirror of https://github.com/hkalexling/Mango.git synced 2025-08-05 12:25:32 -04:00
Code Issues Projects Releases Wiki Activity

Use base url in views

Browse Source
This commit is contained in:
Alex Ling 2020-05-23 12:14:29 +00:00
parent 60d4cee0a9
commit 8fe2f3b4cc
14 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/admin.cr
View File

@ -96,7 +96,7 @@ class AdminRouter < Router
end end
get "/admin/downloads" do |env| get "/admin/downloads" do |env|
base_url = Config.current.mangadex["base_url"] mangadex_base_url = Config.current.mangadex["base_url"]
layout "download-manager" layout "download-manager"
end end
end end

3
src/routes/main.cr
View File

@ -3,6 +3,7 @@ require "./router"
class MainRouter < Router class MainRouter < Router
def initialize def initialize
get "/login" do |env| get "/login" do |env|
base_url = Config.current.base_url
render "src/views/login.ecr" render "src/views/login.ecr"
end end
@ -59,7 +60,7 @@ class MainRouter < Router
end end
get "/download" do |env| get "/download" do |env|
base_url = Config.current.mangadex["base_url"] mangadex_base_url = Config.current.mangadex["base_url"]
layout "download" layout "download"
end end
end end

1
src/routes/reader.cr
View File

@ -51,6 +51,7 @@ class ReaderRouter < Router
next_entry_url = "/reader/#{title.id}/#{next_entry.id}" next_entry_url = "/reader/#{title.id}/#{next_entry.id}"
end end
base_url = Config.current.base_url
render "src/views/reader.ecr" render "src/views/reader.ecr"
rescue e rescue e
@context.error e @context.error e

1
src/util.cr
View File

@ -4,6 +4,7 @@ IMGS_PER_PAGE = 5
UPLOAD_URL_PREFIX = "/uploads" UPLOAD_URL_PREFIX = "/uploads"
macro layout(name) macro layout(name)
base_url = Config.current.base_url
begin begin
cookie = env.request.cookies.find { |c| c.name == "token" } cookie = env.request.cookies.find { |c| c.name == "token" }
is_admin = false is_admin = false

8
src/views/admin.ecr
View File

@ -1,5 +1,5 @@
<ul class="uk-list uk-list-large uk-list-divider"> <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()}"> <li onclick="if(!scanning){scan()}">
<span id="scan">Scan Library Files</span> <span id="scan">Scan Library Files</span>
<span id="scan-status" class="uk-align-right"> <span id="scan-status" class="uk-align-right">
@ -7,12 +7,12 @@
<span hidden></span> <span hidden></span>
</span> </span>
</li> </li>
<li data-url="/admin/downloads">Download Manager</li> <li data-url="<%= base_url %>admin/downloads">Download Manager</li>
</ul> </ul>
<hr class="uk-divider-icon"> <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 %> <% content_for "script" do %>
<script src="/js/admin.js"></script> <script src="<%= base_url %>js/admin.js"></script>
<% end %> <% end %>

6
src/views/download-manager.ecr
View File

@ -24,9 +24,9 @@
<% content_for "script" do %> <% content_for "script" do %>
<script> <script>
var baseURL = "<%= base_url %>".replace(/\/$/, ""); var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
</script> </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/moment.js/2.24.0/moment.min.js"></script>
<script src="/js/alert.js"></script> <script src="<%= base_url %>js/alert.js"></script>
<script src="/js/download-manager.js"></script> <script src="<%= base_url %>js/download-manager.js"></script>
<% end %> <% end %>

6
src/views/download.ecr
View File

@ -74,10 +74,10 @@
<% content_for "script" do %> <% content_for "script" do %>
<script> <script>
var baseURL = "<%= base_url %>".replace(/\/$/, ""); var baseURL = "<%= mangadex_base_url %>".replace(/\/$/, "");
</script> </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/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="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
<script src="/js/alert.js"></script> <script src="<%= base_url %>js/alert.js"></script>
<script src="/js/download.js"></script> <script src="<%= base_url %>js/download.js"></script>
<% end %> <% end %>

8
src/views/index.ecr
View File

@ -23,7 +23,7 @@
<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid> <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| -%> <%- titles.each_with_index do |t, i| -%>
<div class="item" data-mtime="<%= t.mtime.to_unix %>" data-progress="<%= percentage[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 uk-card-default">
<div class="uk-card-media-top"> <div class="uk-card-media-top">
<img data-src="<%= t.cover_url %>" data-width data-height alt="" uk-img> <img data-src="<%= t.cover_url %>" data-width data-height alt="" uk-img>
@ -43,7 +43,7 @@
<% content_for "script" do %> <% content_for "script" do %>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
<script src="/js/dots.js"></script> <script src="<%= base_url %>js/dots.js"></script>
<script src="/js/search.js"></script> <script src="<%= base_url %>js/search.js"></script>
<script src="/js/sort-items.js"></script> <script src="<%= base_url %>js/sort-items.js"></script>
<% end %> <% end %>

27
src/views/layout.ecr
View File

@ -7,11 +7,11 @@
<meta name="description" content="Mango Manga Server"> <meta name="description" content="Mango Manga Server">
<meta name="viewport" content="width=device-width, initial-scale=1"> <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="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" />
<script defer src="/js/fontawesome.min.js"></script> <script defer src="<%= base_url %>js/fontawesome.min.js"></script>
<script defer src="/js/solid.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="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> </head>
<body> <body>
@ -20,14 +20,14 @@
<div id="mobile-nav" uk-offcanvas="overlay: true"> <div id="mobile-nav" uk-offcanvas="overlay: true">
<div class="uk-offcanvas-bar uk-flex uk-flex-column"> <div class="uk-offcanvas-bar uk-flex uk-flex-column">
<ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical"> <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 %> <% if is_admin %>
<li><a href="/admin">Admin</a></li> <li><a href="<%= base_url %>admin">Admin</a></li>
<li><a href="/download">Download</a></li> <li><a href="<%= base_url %>download">Download</a></li>
<% end %> <% end %>
<hr uk-divider> <hr uk-divider>
<li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li> <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> </ul>
</div> </div>
</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 class="uk-navbar-toggle" uk-navbar-toggle-icon="uk-navbar-toggle-icon" uk-toggle="target: #mobile-nav"></div>
</div> </div>
<div class="uk-navbar-left uk-visible@s"> <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"> <ul class="uk-navbar-nav">
<li><a href="/">Home</a></li> <li><a href="<%= base_url %>">Home</a></li>
<% if is_admin %> <% if is_admin %>
<li><a href="/admin">Admin</a></li> <li><a href="<%= base_url %>admin">Admin</a></li>
<li><a href="/download">Download</a></li> <li><a href="<%= base_url %>download">Download</a></li>
<% end %> <% end %>
</ul> </ul>
</div> </div>
<div class="uk-navbar-right uk-visible@s"> <div class="uk-navbar-right uk-visible@s">
<ul class="uk-navbar-nav"> <ul class="uk-navbar-nav">
<li><a onclick="toggleTheme()"><i class="fas fa-adjust"></i></a></li> <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> </ul>
</div> </div>
</div> </div>
@ -66,6 +66,7 @@
</div> </div>
<script> <script>
setTheme(getTheme()); setTheme(getTheme());
const base_url = "<%= base_url %>";
</script> </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.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>

4
src/views/login.ecr
View File

@ -9,7 +9,7 @@
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <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" /> <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="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> </head>
<body> <body>
<div class="uk-section uk-flex uk-flex-middle uk-animation-fade" uk-height-viewport=""> <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-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"> <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> <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-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 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> </div>

11
src/views/reader.ecr
View File

@ -7,11 +7,11 @@
<meta name="description" content="Mango Manga Server"> <meta name="description" content="Mango Manga Server">
<meta name="viewport" content="width=device-width, initial-scale=1"> <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="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> </head>
<body> <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-section uk-section-default uk-section-small reader-bg">
<div class="uk-container uk-container-small"> <div class="uk-container uk-container-small">
<%- urls.each_with_index do |url, i| -%> <%- urls.each_with_index do |url, i| -%>
@ -56,10 +56,13 @@
</div> </div>
</div> </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://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.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.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="https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
<script src="/js/reader.js"></script> <script src="<%= base_url %>js/reader.js"></script>
</body> </body>
</html> </html>

16
src/views/title.ecr
View File

@ -7,9 +7,9 @@
</h2> </h2>
</div> </div>
<ul class="uk-breadcrumb"> <ul class="uk-breadcrumb">
<li><a href="/">Library</a></li> <li><a href="<%= base_url %>">Library</a></li>
<%- title.parents.each do |t| -%> <%- 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 -%> <%- end -%>
<li class="uk-disabled"><a><%= title.display_name %></a></li> <li class="uk-disabled"><a><%= title.display_name %></a></li>
</ul> </ul>
@ -39,7 +39,7 @@
<div id="item-container" class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid> <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| -%> <%- title.titles.each_with_index do |t, i| -%>
<div class="item" data-mtime="<%= t.mtime.to_unix %>" data-progress="0.0"> <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 uk-card-default">
<div class="uk-card-media-top"> <div class="uk-card-media-top">
<img data-src="<%= t.cover_url %>" data-width data-height alt="" uk-img> <img data-src="<%= t.cover_url %>" data-width data-height alt="" uk-img>
@ -151,9 +151,9 @@
<% content_for "script" do %> <% content_for "script" do %>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.dotdotdot/4.0.11/dotdotdot.js"></script>
<script src="/js/dots.js"></script> <script src="<%= base_url %>js/dots.js"></script>
<script src="/js/alert.js"></script> <script src="<%= base_url %>js/alert.js"></script>
<script src="/js/title.js"></script> <script src="<%= base_url %>js/title.js"></script>
<script src="/js/search.js"></script> <script src="<%= base_url %>js/search.js"></script>
<script src="/js/sort-items.js"></script> <script src="<%= base_url %>js/sort-items.js"></script>
<% end %> <% end %>

6
src/views/user-edit.ecr
View File

@ -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"> <div class="uk-margin">
<label class="uk-form-label" for="form-stacked-text">Username</label> <label class="uk-form-label" for="form-stacked-text">Username</label>
@ -49,6 +49,6 @@
error = '<%= error %>'; error = '<%= error %>';
<%- end -%> <%- end -%>
</script> </script>
<script src="/js/alert.js"></script> <script src="<%= base_url %>js/alert.js"></script>
<script src="/js/user-edit.js"></script> <script src="<%= base_url %>js/user-edit.js"></script>
<% end %> <% end %>

8
src/views/user.ecr
View File

@ -12,7 +12,7 @@
<td><%= u[0] %></td> <td><%= u[0] %></td>
<td><%= u[1] %></td> <td><%= u[1] %></td>
<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 %> <%- if u[0] != username %>
<a href="#" onclick="remove('<%= u[0] %>');return false;" uk-icon="trash"></a> <a href="#" onclick="remove('<%= u[0] %>');return false;" uk-icon="trash"></a>
<%- end %> <%- end %>
@ -22,10 +22,10 @@
</tbody> </tbody>
</table> </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 %> <% content_for "script" do %>
<script src="/js/alert.js"></script> <script src="<%= base_url %>js/alert.js"></script>
<script src="/js/user.js"></script> <script src="<%= base_url %>js/user.js"></script>
<% end %> <% end %>