Skip to content

Commit 7dd0e1c

Browse files
seanmarciaseanmarcia
authored
Some cleanup (#37)
1 parent 12fe384 commit 7dd0e1c

File tree

3 files changed

+127
-17
lines changed

3 files changed

+127
-17
lines changed

‎app/controllers/users_controller.rb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class UsersController < ApplicationController
2-
layout "mazer"
3-
42
def index
53
end
64
end

‎app/views/layouts/_sidebar.html.erb‎

Lines changed: 54 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1+
12
<div id="sidebar">
23
<div class="sidebar-wrapper active">
34
<div class="sidebar-header position-relative">
45
<div class="d-flex justify-content-between align-items-center">
56
<div class="logo">
6-
<a href="index.html"><img src="data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%20152%2034'%20fill-rule='evenodd'%20stroke-linejoin='round'%20stroke-miterlimit='2'%3e%3cpath%20d='M0%2027.472c0%204.409%206.18%205.552%2013.5%205.552%207.281%200%2013.5-1.103%2013.5-5.513s-6.179-5.552-13.5-5.552c-7.281%200-13.5%201.103-13.5%205.513z'%20fill='%23435ebe'%20fill-rule='nonzero'/%3e%3ccircle%20cx='13.5'%20cy='8.8'%20r='8.8'%20fill='%2341bbdd'/%3e%3cpath%20d='M71.676%203.22c.709%200%201.279.228%201.71.684.431.431.646%201.013.646%201.748v22.496c0%20.709-.203%201.267-.608%201.672s-.937.608-1.596.608-1.178-.203-1.558-.608-.57-.963-.57-1.672V12.492l-6.46%2012.236c-.304.557-.633.975-.988%201.254-.355.253-.773.38-1.254.38s-.899-.127-1.254-.38-.684-.671-.988-1.254l-6.498-12.046v15.466c0%20.684-.203%201.241-.608%201.672-.38.405-.899.608-1.558.608s-1.178-.203-1.558-.608-.57-.963-.57-1.672V5.652c0-.735.203-1.317.608-1.748.431-.456%201.001-.684%201.71-.684.988%200%201.761.545%202.318%201.634l8.436%2016.074%208.398-16.074c.557-1.089%201.305-1.634%202.242-1.634zm15.801%207.942c2.584%200%204.497.646%205.738%201.938%201.267%201.267%201.9%203.205%201.9%205.814v9.272c0%20.684-.203%201.229-.608%201.634-.405.38-.962.57-1.672.57-.658%200-1.203-.203-1.634-.608-.405-.405-.608-.937-.608-1.596v-.836c-.431.988-1.114%201.761-2.052%202.318-.912.557-1.976.836-3.192.836-1.241%200-2.368-.253-3.382-.76s-1.811-1.203-2.394-2.09-.874-1.875-.874-2.964c0-1.368.342-2.445%201.026-3.23.71-.785%201.85-1.355%203.42-1.71s3.737-.532%206.498-.532h.95v-.874c0-1.241-.266-2.141-.798-2.698-.532-.583-1.393-.874-2.584-.874a7.78%207.78%200%200%200-2.242.342c-.76.203-1.659.507-2.698.912-.658.329-1.14.494-1.444.494-.456%200-.836-.165-1.14-.494-.278-.329-.418-.76-.418-1.292%200-.431.102-.798.304-1.102.228-.329.596-.633%201.102-.912.887-.481%201.938-.861%203.154-1.14%201.242-.279%202.458-.418%203.648-.418zm-1.178%2015.922c1.267%200%202.293-.418%203.078-1.254.811-.861%201.216-1.963%201.216-3.306v-.798h-.684c-1.697%200-3.015.076-3.952.228s-1.608.418-2.014.798-.608.899-.608%201.558c0%20.811.279%201.482.836%202.014.583.507%201.292.76%202.128.76zm27.476-.456c1.418%200%202.128.595%202.128%201.786%200%20.557-.178%201.001-.532%201.33-.355.304-.887.456-1.596.456h-12.692c-.634%200-1.153-.203-1.558-.608a1.97%201.97%200%200%201-.608-1.444c0-.583.228-1.14.684-1.672l9.766-11.286h-8.474c-.71%200-1.242-.152-1.596-.456s-.532-.747-.532-1.33.177-1.026.532-1.33.886-.456%201.596-.456h12.274c.658%200%201.178.203%201.558.608.405.38.608.861.608%201.444%200%20.608-.216%201.165-.646%201.672l-9.804%2011.286h8.892zm19.762-1.52c.431%200%20.773.165%201.026.494.279.329.418.773.418%201.33%200%20.785-.468%201.444-1.406%201.976-.861.481-1.836.874-2.926%201.178-1.089.279-2.128.418-3.116.418-2.989%200-5.358-.861-7.106-2.584s-2.622-4.079-2.622-7.068c0-1.9.38-3.585%201.14-5.054s1.824-2.609%203.192-3.42c1.394-.811%202.964-1.216%204.712-1.216%201.672%200%203.129.367%204.37%201.102s2.204%201.773%202.888%203.116%201.026%202.926%201.026%204.75c0%201.089-.481%201.634-1.444%201.634h-11.21c.152%201.748.646%203.04%201.482%203.876.836.811%202.052%201.216%203.648%201.216.811%200%201.52-.101%202.128-.304.634-.203%201.343-.481%202.128-.836.76-.405%201.318-.608%201.672-.608zm-6.574-10.602c-1.292%200-2.33.405-3.116%201.216-.76.811-1.216%201.976-1.368%203.496h8.588c-.05-1.545-.43-2.711-1.14-3.496-.709-.811-1.697-1.216-2.964-1.216zm22.43-3.268c.658-.051%201.178.089%201.558.418s.57.823.57%201.482c0%20.684-.165%201.191-.494%201.52s-.925.545-1.786.646l-1.14.114c-1.495.152-2.597.659-3.306%201.52-.684.861-1.026%201.938-1.026%203.23v7.98c0%20.735-.228%201.305-.684%201.71-.456.38-1.026.57-1.71.57s-1.254-.19-1.71-.57c-.431-.405-.646-.975-.646-1.71V13.442c0-.709.215-1.254.646-1.634.456-.38%201.013-.57%201.672-.57s1.19.19%201.596.57c.405.355.608.874.608%201.558v1.52c.481-1.115%201.19-1.976%202.128-2.584.962-.608%202.026-.95%203.192-1.026l.532-.038z'%20fill='%23435ebe'%20fill-rule='nonzero'/%3e%3c/svg%3e" alt="Logo" srcset=""></a>
7+
<a href="index.html">Logo</a>
78
</div>
89
<div class="theme-toggle d-flex gap-2 align-items-center mt-2">
910
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true"
10-
role="img" class="iconify iconify--system-uicons" width="20" height="20"
11-
preserveAspectRatio="xMidYMid meet" viewBox="0 0 21 21">
11+
role="img" class="iconify iconify--system-uicons" width="20" height="20"
12+
preserveAspectRatio="xMidYMid meet" viewBox="0 0 21 21">
1213
<g fill="none" fill-rule="evenodd" stroke="currentColor" stroke-linecap="round"
13-
stroke-linejoin="round">
14-
<path d="M10.5 14.5c2.219 0 4-1.763 4-3.982a4.003 4.003 0 0 0-4-4.018c-2.219 0-4 1.781-4 4c0 2.219 1.781 4 4 4zM4.136 4.136L5.55 5.55m9.9 9.9l1.414 1.414M1.5 10.5h2m14 0h2M4.135 16.863L5.55 15.45m9.899-9.9l1.414-1.415M10.5 19.5v-2m0-14v-2" opacity=".3">
15-
</path>
14+
stroke-linejoin="round">
15+
<path
16+
d="M10.5 14.5c2.219 0 4-1.763 4-3.982a4.003 4.003 0 0 0-4-4.018c-2.219 0-4 1.781-4 4c0 2.219 1.781 4 4 4zM4.136 4.136L5.55 5.55m9.9 9.9l1.414 1.414M1.5 10.5h2m14 0h2M4.135 16.863L5.55 15.45m9.899-9.9l1.414-1.415M10.5 19.5v-2m0-14v-2"
17+
opacity=".3"></path>
1618
<g transform="translate(-210 -1)">
1719
<path d="M220.5 2.5v2m6.5.5l-1.5 1.5"></path>
1820
<circle cx="220.5" cy="11.5" r="4"></circle>
@@ -25,9 +27,10 @@
2527
<label class="form-check-label"></label>
2628
</div>
2729
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true"
28-
role="img" class="iconify iconify--mdi" width="20" height="20" preserveAspectRatio="xMidYMid meet"
29-
viewBox="0 0 24 24">
30-
<path fill="currentColor" d="m17.75 4.09l-2.53 1.94l.91 3.06l-2.63-1.81l-2.63 1.81l.91-3.06l-2.53-1.94L12.44 4l1.06-3l1.06 3l3.19.09m3.5 6.91l-1.64 1.25l.59 1.98l-1.7-1.17l-1.7 1.17l.59-1.98L15.75 11l2.06-.05L18.5 9l.69 1.95l2.06.05m-2.28 4.95c.83-.08 1.72 1.1 1.19 1.85c-.32.45-.66.87-1.08 1.27C15.17 23 8.84 23 4.94 19.07c-3.91-3.9-3.91-10.24 0-14.14c.4-.4.82-.76 1.27-1.08c.75-.53 1.93.36 1.85 1.19c-.27 2.86.69 5.83 2.89 8.02a9.96 9.96 0 0 0 8.02 2.89m-1.64 2.02a12.08 12.08 0 0 1-7.8-3.47c-2.17-2.19-3.33-5-3.49-7.82c-2.81 3.14-2.7 7.96.31 10.98c3.02 3.01 7.84 3.12 10.98.31Z">
30+
role="img" class="iconify iconify--mdi" width="20" height="20" preserveAspectRatio="xMidYMid meet"
31+
viewBox="0 0 24 24">
32+
<path fill="currentColor"
33+
d="m17.75 4.09l-2.53 1.94l.91 3.06l-2.63-1.81l-2.63 1.81l.91-3.06l-2.53-1.94L12.44 4l1.06-3l1.06 3l3.19.09m3.5 6.91l-1.64 1.25l.59 1.98l-1.7-1.17l-1.7 1.17l.59-1.98L15.75 11l2.06-.05L18.5 9l.69 1.95l2.06.05m-2.28 4.95c.83-.08 1.72 1.1 1.19 1.85c-.32.45-.66.87-1.08 1.27C15.17 23 8.84 23 4.94 19.07c-3.91-3.9-3.91-10.24 0-14.14c.4-.4.82-.76 1.27-1.08c.75-.53 1.93.36 1.85 1.19c-.27 2.86.69 5.83 2.89 8.02a9.96 9.96 0 0 0 8.02 2.89m-1.64 2.02a12.08 12.08 0 0 1-7.8-3.47c-2.17-2.19-3.33-5-3.49-7.82c-2.81 3.14-2.7 7.96.31 10.98c3.02 3.01 7.84 3.12 10.98.31Z">
3134
</path>
3235
</svg>
3336
</div>
@@ -39,12 +42,52 @@
3942

4043
<div class="sidebar-menu">
4144
<ul class="menu">
42-
<li class="sidebar-title">Menu</li>
45+
<li class="sidebar-title">Menu</li>
46+
4347
<li class="sidebar-item ">
44-
<a href="<%= users_path %>" class='sidebar-link'>
48+
<a href="index.html" class='sidebar-link'>
4549
<i class="bi bi-grid-fill"></i>
4650
<span>Dashboard</span>
4751
</a>
52+
53+
</li>
54+
55+
<li class="sidebar-title">Administration</li>
56+
57+
<li class="sidebar-item ">
58+
<a href="form-layout.html" class='sidebar-link'>
59+
<i class="bi bi-globe"></i>
60+
<span>Regions</span>
61+
</a>
62+
63+
</li>
64+
65+
<li class="sidebar-item ">
66+
<a href="table.html" class='sidebar-link'>
67+
<i class="bi bi-hospital-fill"></i>
68+
<span>Providers</span>
69+
</a>
70+
</li>
71+
72+
<li class="sidebar-item ">
73+
<a href="ui-file-uploader.html" class='sidebar-link'>
74+
<i class="bi bi-tags-fill"></i>
75+
<span>Topics</span>
76+
</a>
77+
</li>
78+
79+
<li class="sidebar-item ">
80+
<a href="application-email.html" class='sidebar-link'>
81+
<i class="bi bi-translate"></i>
82+
<span>Languages</span>
83+
</a>
84+
</li>
85+
86+
<li class="sidebar-item ">
87+
<a href="application-chat.html" class='sidebar-link'>
88+
<i class="bi bi-people"></i>
89+
<span>Users</span>
90+
</a>
4891
</li>
4992
</ul>
5093
</div>

‎app/views/layouts/application.html.erb‎

Lines changed: 73 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title><%= content_for(:title) || "Skillrx" %></title>
4+
<title><%= content_for(:title) || "SkillRx" %></title>
55
<meta name="viewport" content="width=device-width,initial-scale=1">
66
<meta name="apple-mobile-web-app-capable" content="yes">
77
<meta name="mobile-web-app-capable" content="yes">
@@ -18,11 +18,80 @@
1818
<link rel="apple-touch-icon" href="/icon.png">
1919

2020
<%# Includes all stylesheet files in app/assets/stylesheets %>
21-
<%= stylesheet_link_tag :app, "data-turbo-track": "reload" %>
22-
<%= javascript_importmap_tags %>
21+
<meta charset="UTF-8">
22+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
23+
<title>SkillRx</title>
24+
25+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/zuramai/mazer@docs/demo/assets/compiled/css/app.css">
26+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/zuramai/mazer@docs/demo/assets/compiled/css/app-dark.css">
27+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/zuramai/mazer@docs/demo/assets/compiled/css/iconly.css">
28+
29+
<style>
30+
#app {
31+
display: flex;
32+
min-height: 100vh;
33+
}
34+
35+
#main {
36+
flex: 1;
37+
display: flex;
38+
flex-direction: column;
39+
min-height: 100vh;
40+
position: relative;
41+
padding-bottom: 60px; /* Height of footer */
42+
}
43+
44+
#main-content {
45+
flex: 1;
46+
overflow-x: hidden; /* Prevent horizontal scroll */
47+
margin-bottom: 1rem;
48+
}
49+
50+
footer {
51+
position: absolute;
52+
bottom: 0;
53+
width: 100%;
54+
height: 60px; /* Fixed height */
55+
background: white;
56+
border-top: 1px solid #eee;
57+
padding: 1rem;
58+
z-index: 1000;
59+
}
60+
61+
.section {
62+
padding-bottom: 2rem; /* Add space before footer */
63+
}
64+
</style>
2365
</head>
2466

2567
<body>
26-
<%= yield %>
68+
<script src="https://cdn.jsdelivr.net/gh/zuramai/mazer@docs/demo/assets/static/js/initTheme.js"></script>
69+
<script src="https://cdn.jsdelivr.net/gh/zuramai/mazer@docs/demo/assets/static/js/components/dark.js"></script>
70+
<script src="https://cdn.jsdelivr.net/gh/zuramai/mazer@docs/demo/assets/extensions/perfect-scrollbar/perfect-scrollbar.min.js"></script>
71+
<script src="https://cdn.jsdelivr.net/gh/zuramai/mazer@docs/demo/assets/compiled/js/app.js"></script>
72+
<div id="app">
73+
<%= render "layouts/sidebar" %>
74+
<div id="main" class='layout-navbar navbar-fixed'>
75+
<div id="main-content">
76+
<%= yield %>
77+
</div>
78+
<footer>
79+
<div class="footer clearfix mb-0 text-muted">
80+
<div class="float-start">
81+
<p></p>
82+
</div>
83+
<div class="float-end">
84+
<p>Built with <span class="text-danger"><i class="bi bi-heart-fill icon-mid"></i></span>
85+
by <a href="https://rubyforgood.org">Ruby for Good</a></p>
86+
</div>
87+
</div>
88+
</footer>
89+
</div>
90+
</div>
91+
92+
<!-- Need: Apexcharts -->
93+
<script src="https://cdn.jsdelivr.net/gh/zuramai/mazer@docs/demo/assets/extensions/apexcharts/apexcharts.min.js"></script>
94+
<script src="https://cdn.jsdelivr.net/gh/zuramai/mazer@docs/demo/assets/static/js/pages/dashboard.js"></script>
95+
2796
</body>
2897
</html>

0 commit comments

Comments
 (0)