alexdbondoc17
/
cdao-pjet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Enhance ui for sessions

pull/41/head
janpaulo 4 years ago
parent
ffbff6dbf8
commit
acf73a15d0
No known key found for this signature in database
GPG Key ID: 50CA753050F1541C
9 changed files with 39 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 0
      app/javascript/images/.keep
  2. BIN
      app/javascript/images/application/cdao-bg.png
  3. BIN
      app/javascript/images/application/cdasiaonline_logo.png
  4. 3
      app/javascript/packs/application.js
  5. 8
      app/javascript/src/application.scss
  6. 17
      app/javascript/src/application/sessions.scss
  7. 4
      app/views/devise/passwords/new.html.erb
  8. 4
      app/views/devise/sessions/new.html.erb
  9. 10
      app/views/layouts/application.html.erb

0
app/javascript/images/.keep
Unescape View File

BIN
app/javascript/images/application/cdao-bg.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 867 KiB

BIN
app/javascript/images/application/cdasiaonline_logo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

3
app/javascript/packs/application.js
Unescape View File

@ -27,6 +27,9 @@ Rails.start()
Turbolinks.start() Turbolinks.start()
ActiveStorage.start() ActiveStorage.start()
const images = require.context('../images', true)
const imagePath = (name) => images(name, true)
$(document).on("ready turbolinks:load", function () { $(document).on("ready turbolinks:load", function () {
$('#toggleSideNav').on('click', function () { $('#toggleSideNav').on('click', function () {
$('#sidenav').toggleClass('active'); $('#sidenav').toggleClass('active');

8
app/javascript/src/application.scss
Unescape View File

@ -103,3 +103,11 @@
padding-left: 5px; padding-left: 5px;
background: #efefef; background: #efefef;
} }
.sessions-body-bg {
background-image: url('../../javascript/images/application/cdao-bg.png');
background-repeat: no-repeat;
background-size: cover;
overflow-x: hidden;
box-shadow: inset 0 0 0 2000px rgb(154 107 107 / 30%);
}

17
app/javascript/src/application/sessions.scss
Unescape View File

@ -1,6 +1,19 @@
.login-body-box .content-body { .login-body-box .content-body {
padding: 26px; padding: 26px;
background: #949494ba; background: #9494946b;
box-shadow: 10px 5px 5px #e8e8e8; box-shadow: 10px 5px 5px #7a6346;
border-radius: 4px; border-radius: 4px;
width: 350px;
margin-top: -100px;
}
.login-logo {
height: 100%;
}
.login-logo {
.app-logo {
width: 370px;
margin-top: 30px;
}
} }

4
app/views/devise/passwords/new.html.erb
Unescape View File

@ -1,4 +1,4 @@
<h3 class="text-center mb-3">Forgot your password?</h3> <h3 class="text-center mb-3 text-white">Forgot your password?</h3>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %> <%= render "devise/shared/error_messages", resource: resource %>
@ -9,7 +9,7 @@
</div> </div>
<div class="d-grid gap-2 mb-3"> <div class="d-grid gap-2 mb-3">
<%= f.submit "Send me reset password instructions", class: "btn btn-primary" %> <%= f.submit "Send me reset password instructions", class: "btn btn-danger" %>
</div> </div>
<% end %> <% end %>

4
app/views/devise/sessions/new.html.erb
Unescape View File

@ -1,4 +1,4 @@
<h2 class="text-center">Log in</h2> <h2 class="text-center text-white">Log in</h2>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
@ -22,7 +22,7 @@
<% end %> <% end %>
<div class="d-grid gap-2 mb-3"> <div class="d-grid gap-2 mb-3">
<%= f.submit "Log in", class: "btn btn-primary" %> <%= f.submit "Log in", class: "btn btn-danger" %>
</div> </div>
<% end %> <% end %>

10
app/views/layouts/application.html.erb
Unescape View File

@ -11,16 +11,20 @@
<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="container-fluid h-100 w-100 p-0" data-controller="selectize"> <body class="<%= current_user.present? ? 'container-fluid h-100 w-100 p-0' : 'container-fluid h-100 w-100 p-0 sessions-body-bg' %> " data-controller="selectize">
<div class="<%= current_user.present? ? 'row flex-nowrap h-100 w-100 p-0 ms-0' : 'row h-100 justify-content-end align-items-center' %>">
<div class="<%= current_user.present? ? 'row flex-nowrap h-100 w-100 p-0 ms-0' : 'row h-100 justify-content-center align-items-center' %>">
<% if current_user.present? %> <% if current_user.present? %>
<div class="col-auto col-md-3 col-xl-2 px-sm-2 px-0 bg-secondary min-vh-100" style="padding: 0 !important;"> <div class="col-auto col-md-3 col-xl-2 px-sm-2 px-0 bg-secondary min-vh-100" style="padding: 0 !important;">
<%= render(SidenavComponent.new(current_user: current_user))%> <%= render(SidenavComponent.new(current_user: current_user))%>
</div> </div>
<% end %> <% end %>
<div class="<%= current_user.present? ? 'col py-3 main-content-body' : 'col-sm-3 login-body-box' %>"> <div class="<%= current_user.present? ? 'd-none' : 'col-sm-8 login-logo' %>">
<%= image_pack_tag 'application/cdasiaonline_logo.png', class:"app-logo" %>
</div>
<div class="<%= current_user.present? ? 'col py-3 main-content-body' : 'col-sm-4 login-body-box' %>">
<div class="content-body"> <div class="content-body">
<%= yield %> <%= yield %>
</div> </div>

Write Preview
Loading…
Cancel
Save