ditty 0.8.0 → 0.10.2

data/views/auth/forgot_password.haml

@@ -1,16 +1,32 @@
-.row
-  .col-md-4
-  .col-md-4
-    .panel.panel-default
-      .panel-body
-        %p.text-center
-          Enter your email address and we will send you a link to reset your password if you've registered on the system.
-        = form_tag("#{settings.map_path}/auth/forgot-password") do
-          .form-group
-            .col-sm-12
-              %input.form-control{ name: 'email', type: 'text', placeholder: 'Enter your email address' }
-          .row.text-right
-            .col-md-12
-              %button.btn.btn-primary.btn-block{ type: 'submit' }
-                Email password reset link
-  .col-md-4
+.container
+  / Outer Row
+  .row.justify-content-center
+    .col-xl-10.col-lg-12.col-md-9
+      .card.card-default.o-hidden.border-0.shadow-lg.my-5
+        .card-body.p-0
+          / Nested Row within Card Body
+          .row
+            .col-lg-6.d-none.d-lg-block.bg-password-image
+            .col-lg-6
+              .p-5
+                .text-center
+                  %h1.h4.text-gray-900.mb-2
+                    Forgot Your Password?
+                  %p.mb-4
+                    We get it, stuff happens. Just enter your email address below and we'll send you a link to reset your password!
+                .small
+                  = haml :'partials/notifications'
+                = form_tag("#{settings.map_path}/auth/forgot-password", attributes: { class: 'user' }) do
+                  .form-group
+                    %input.form-control.form-control-user{ name: 'email', type: 'email',  placeholder: 'Enter Email Address...' }
+                  %button.btn.btn-primary.btn-user.btn-block{ type: 'submit' }
+                    Reset Password
+                %hr
+                - if policy(::Ditty::User).register?
+                  .text-center
+                    %a.small{ href: "#{settings.map_path}/auth/register" } Create an Account!
+                .text-center
+                  %a.small{ href: "#{settings.map_path}/auth/login" } Already have an account? Login!
+
+      .row.justify-content-center
+        .col-xl-10.col-lg-12.col-md-9

data/views/auth/identity.haml

@@ -1,15 +1,16 @@
-= form_tag("#{settings.map_path}/auth/identity/callback", attributes: { class: '' }) do
+= form_tag("#{settings.map_path}/auth/identity/callback", attributes: { class: 'user' }) do
   .form-group
-    %label.control-label Email
-    %input.form-control.border-input{ name: 'username', tabindex: '1' }
+    %input.form-control.form-control-user{ name: 'username', type: 'email', 'aria-describedby': 'emailHelp', placeholder: 'Enter Email Address...' }
   .form-group
-    %label.control-label{ style: 'display: block' }
-      Password
-      %a{ href: "#{settings.map_path}/auth/forgot-password", style: 'float: right', tabindex: '5' }
-        Forgot?
-    %input.form-control.border-input{ name: 'password', type: 'password', tabindex: '2' }
-  %button.btn.btn-primary{ type: 'submit', tabindex: '3' } Log In
-  - if policy(::Ditty::User).register?
-    .pull-right
-      No account yet?
-      %a.btn.btn-default{ href: "#{settings.map_path}/auth/register", tabindex: '4' } Register
+    %input.form-control.form-control-user{ name: 'password', type: 'password', placeholder: 'Password' }
+  / .form-group
+  /   .custom-control.custom-checkbox.small
+  /     <input type="checkbox" class="custom-control-input" id="customCheck">
+  /     <label class="custom-control-label" for="customCheck">Remember Me</label>
+  %button.btn.btn-primary.btn-user.btn-block{ type: 'submit' } Log In
+%hr
+.text-center
+  %a.small{ href: "#{settings.map_path}/auth/forgot-password" } Forgot Password?
+- if policy(::Ditty::User).register?
+  .text-center
+    %a.small{ href: "#{settings.map_path}/auth/register" } Create an Account!

data/views/auth/ldap.haml

@@ -1,8 +1,8 @@
 .row
   .col-sm-2
   .col-sm-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         = form_tag("#{settings.map_path}/auth/ldap/callback", attributes: { class: '' }) do
           .form-group
             %label.control-label Username

data/views/auth/login.haml

@@ -1,18 +1,24 @@
-.row
-  .col-sm-2
-  .col-sm-8
-    .panel.panel-default
-      .panel-body
-        - if Ditty::Services::Authentication.provides? 'identity'
-          = haml :'auth/identity'
+.container
+  / Outer Row
+  .row.justify-content-center
+    .col-xl-10.col-lg-12.col-md-9
+      .card.card-default.o-hidden.border-0.shadow-lg.my-5
+        .card-body.p-0
+          / Nested Row within Card Body
           .row
-            .col-sm-12= " "
-        .row
-          .col-sm-8.col-sm-push-2
-            - Ditty::Services::Authentication.providers.each do |name|
-              - provider = Ditty::Services::Authentication[name]
-              - next if provider[:login_prompt].nil?
-              %a.btn.btn-block.btn-default{ href: "#{settings.map_path}/auth/#{name}" }
-                %i.fa{ class: "fa-#{provider[:icon] || 'key'}"}
-                = provider[:login_prompt]
-  .col-sm-2
+            .col-lg-6.d-none.d-lg-block.bg-login-image
+            .col-lg-6
+              .p-5
+                .text-center
+                  %h1.h4.text-gray-900.mb-4 Welcome Back!
+                .small
+                  = haml :'partials/notifications'
+                - ::Ditty::Services::Authentication.providers.each do |name|
+                  - provider = ::Ditty::Services::Authentication[name]
+                  - next if provider[:login_prompt].nil?
+                  %p
+                    %a.btn.btn-block.btn-secondary{ href: "#{settings.map_path}/auth/#{name}" }
+                      %i.fab.fw{ class: "fa-#{provider[:icon] || 'key'}"}
+                      = provider[:login_prompt]
+                - if ::Ditty::Services::Authentication.provides? 'identity'
+                  = haml :'auth/identity'

data/views/auth/register.haml

@@ -1,19 +1,21 @@
-/ TODO: How can we detect a google registration? Extra parameter to the callback? Or a custom callback page?
-.row
-  .col-md-2
-  .col-md-8
-    .panel.panel-default
-      .panel-body
-        - if Ditty::Services::Authentication.provides? 'identity'
-          = haml :'auth/register_identity', locals: { identity: identity }
-          .row
-            .col-sm-12= " "
-        .row
-          .col-sm-8.col-sm-push-2
-            - Ditty::Services::Authentication.providers.each do |name|
-              - provider = Ditty::Services::Authentication[name]
+.container
+  .card.card-default.o-hidden.border-0.shadow-lg.my-5
+    .card-body.p-0
+      / Nested Row within Card Body
+      .row
+        .col-lg-5.d-none.d-lg-block.bg-register-image
+        .col-lg-7
+          .p-5
+            .text-center
+              %h1.h4.text-gray-900.mb-4 Create an Account!
+            .small
+              = haml :'partials/notifications'
+            - ::Ditty::Services::Authentication.providers.each do |name|
+              - provider = ::Ditty::Services::Authentication[name]
               - next if provider[:register_prompt].nil?
-              %a.btn.btn-block.btn-default{ href: "#{settings.map_path}/auth/#{name}" }
-                %i.fa{ class: "fa-#{provider[:icon] || 'key'}"}
-                = provider[:register_prompt]
-  .col-md-2
+              %p
+                %a.btn.btn-user.btn-block{ href: "#{settings.map_path}/auth/#{name}", class: "btn-#{provider[:icon] || 'key'}" }
+                  %i.fab.fa-fw{ class: "fa-#{provider[:icon] || 'key'}"}
+                  = provider[:register_prompt]
+            - if ::Ditty::Services::Authentication.provides? 'identity'
+              = haml :'auth/register_identity', locals: { identity: identity }

data/views/auth/register_identity.haml

@@ -1,14 +1,29 @@
-= form_tag("#{settings.map_path}/auth/register/identity") do
-  = form_control(:username, identity, label: 'Email', placeholder: 'your@email.com')
-  = form_control(:password, identity, label: 'Password', type: :password)
-  = form_control(:password_confirmation, identity, label: 'Confirm Password', type: :password)
+- if identity.errors[:password] && identity.errors[:password].include?('is not strong enough')
+  .alert.alert-warning
+    %p Make sure your password is at least 8 characters long, and including the following
+    %ul
+      %li Upper- and lowercase letters
+      %li Numbers
+      %li Special Characters
 
-  - if identity.errors[:password] && identity.errors[:password].include?('is not strong enough')
-    .alert.alert-warning
-      %p Make sure your password is at least 8 characters long, and including the following
-      %ul
-        %li Upper- and lowercase letters
-        %li Numbers
-        %li Special Characters
+= form_tag("#{settings.map_path}/auth/register/identity", attributes: { class: 'user' }) do
+  .form-group
+    %input.form-control.form-control-user{ name: 'identity[username]', type: 'email', placeholder: 'Email Address', class: identity.errors[:username] ? 'is-invalid' : 'is-valid' }
+    - if identity.errors[:username]
+      .invalid-feedback= identity.errors[:username].join(', ')
+  .form-group.row
+    .col-sm-6.mb-3.mb-sm-0
+      %input.form-control.form-control-user{ name: 'identity[password]', type: 'password', placeholder: 'Password', class: identity.errors[:password] ? 'is-invalid' : 'is-valid' }
+      - if identity.errors[:password]
+        .invalid-feedback= identity.errors[:password].join(', ')
+    .col-sm-6
+      %input.form-control.form-control-user{ name: 'identity[password_confirmation]', type: 'password', placeholder: 'Repeat Password', class: identity.errors[:password_confirmation] ? 'is-invalid' : 'is-valid' }
+      - if identity.errors[:password_confirmation]
+        .invalid-feedback= identity.errors[:password_confirmation].join(', ')
 
-  %button.btn.btn-primary{ type: 'submit' } Register
+  %button.btn.btn-primary.btn-user.btn-block{ type: 'submit' } Register
+%hr
+.text-center
+  %a.small{ href: "#{settings.map_path}/auth/forgot-password" } Forgot Password?
+.text-center
+  %a.small{ href: "#{settings.map_path}/auth/login" } Already have an account? Login!

data/views/auth/reset_password.haml

@@ -1,19 +1,36 @@
-.row
-  .col-md-2
-  .col-md-8
-    .panel.panel-default
-      .panel-body
-        = edit_form_tag("#{settings.map_path}/auth/reset-password") do
-          %input{ name: 'token', value: params[:token], type: 'hidden' }
-          - if identity.errors[:password] && identity.errors[:password].include?('is not strong enough')
-            .alert.alert-warning
-              %p Make sure your password is at least 8 characters long, and including the following
-              %ul
-                %li Upper- and lowercase letters
-                %li Numbers
-                %li Special Characters
-          = form_control(:password, identity, type: 'password', placeholder: 'Your password', group: 'identity')
-          = form_control(:password_confirmation, identity, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password', group: 'identity')
-          %button.btn.btn-primary{ type: 'submit' }
-            Reset Password
-  .col-md-2
+.container
+  / Outer Row
+  .row.justify-content-center
+    .col-xl-10.col-lg-12.col-md-9
+      .card.card-default.o-hidden.border-0.shadow-lg.my-5
+        .card-body.p-0
+          / Nested Row within Card Body
+          .row
+            .col-lg-6.d-none.d-lg-block.bg-password-image
+            .col-lg-6
+              .p-5
+                .text-center
+                  %h1.h4.text-gray-900.mb-2
+                    Reset your Password
+                = edit_form_tag("#{settings.map_path}/auth/reset-password") do
+                  %input{ name: 'token', value: params[:token], type: 'hidden' }
+                  - if identity.errors[:password] && identity.errors[:password].include?('is not strong enough')
+                    .alert.alert-warning
+                      %p Make sure your password is at least 8 characters long, and including the following
+                      %ul
+                        %li Upper- and lowercase letters
+                        %li Numbers
+                        %li Special Characters
+                  = form_control(:password, identity, type: 'password', placeholder: 'Your password', group: 'identity')
+                  = form_control(:password_confirmation, identity, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password', group: 'identity')
+                  %button.btn.btn-primary{ type: 'submit' }
+                    Reset Password
+                %hr
+                - if policy(::Ditty::User).register?
+                  .text-center
+                    %a.small{ href: "#{settings.map_path}/auth/register" } Create an Account!
+                .text-center
+                  %a.small{ href: "#{settings.map_path}/auth/login" } Already have an account? Login!
+
+      .row.justify-content-center
+        .col-xl-10.col-lg-12.col-md-9

data/views/blank.haml

@@ -0,0 +1,43 @@
+!!! 5
+%html{ lang: 'en' }
+  %head
+    %meta{ charset: 'utf-8' }
+    %meta{ 'http-equiv' => 'X-UA-Compatible', 'content' => 'IE=edge,chrome=1' }
+    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
+    %meta{ name: 'theme-color', content: '#ffffff' }
+    = Rack::Csrf.csrf_metatag(env)
+    %link{ rel: 'manifest', href: '/manifest.json' }
+    %link{ rel: 'icon', type: 'image/png', sizes: '32x32', href: '/images/favicon-32x32.png' }
+    %link{ rel: 'icon', type: 'image/png', sizes: '16x16', href: '/images/favicon-16x16.png' }
+    %link{ rel: 'apple-touch-icon', sizes: '76x76', href: '/images/apple-icon.png' }
+    %link{ rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5' }
+
+    %title
+      = config('ditty.title', 'Ditty')
+      - if defined? title
+        = "- #{title}"
+
+    %meta{ name: 'description', content: '' }
+    %meta{ name: 'author', content: '' }
+
+    / Le styles
+    %link{ rel: 'stylesheet', href: '/css/sb-admin-2.min.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: '/css/styles.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/all.min.css', media: 'screen' }
+  %body.bg-gradient-primary
+    = yield
+
+    / Placed at the end of the document so the pages load faster
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/js/bootstrap.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.min.js' }
+    / %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/react/16.8.6/umd/react.production.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.7/js/select2.min.js' }
+    %script{ type: 'text/javascript', src: '/js/sb-admin-2.min.js' }
+    %script{ type: 'text/javascript', src: '/js/scripts.js' }
+    :javascript
+        $(function() {
+            $('.select2').select2();
+        });
+

data/views/embedded.haml

@@ -5,6 +5,7 @@
     %meta{ 'http-equiv' => 'X-UA-Compatible', 'content' => 'IE=edge,chrome=1' }
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
     %meta{ name: 'theme-color', content: '#ffffff' }
+    = Rack::Csrf.csrf_metatag(env)
     %link{ rel: 'manifest', href: '/manifest.json' }
     %link{ rel: 'icon', type: 'image/png', sizes: '32x32', href: '#{request.base_url}/images/favicon-32x32.png' }
     %link{ rel: 'icon', type: 'image/png', sizes: '16x16', href: '#{request.base_url}/images/favicon-16x16.png' }
@@ -20,14 +21,9 @@
     %meta{ name: 'author', content: '' }
 
     / Le styles
-    %link{ rel: 'stylesheet', href: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css', media: 'screen' }
-    %link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/startbootstrap-sb-admin-2/3.3.7+1/css/sb-admin-2.min.css', media: 'screen' }
-    %link{ rel: 'stylesheet', href: 'https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', media: 'screen' }
-    /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
-    /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
-
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js' }
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/startbootstrap-sb-admin-2/3.3.7+1/js/sb-admin-2.min.js' }
+    %link{ rel: 'stylesheet', href: '/css/sb-admin-2.min.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: '/css/styles.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/all.min.css', media: 'screen' }
   %body
     .container-fluid
       .row
@@ -37,6 +33,16 @@
       = yield
 
     / Placed at the end of the document so the pages load faster
-    %script{ type: 'text/javascript', src: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js' }
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/react/15.4.1/react.min.js' }
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.6.0/Chart.bundle.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/js/bootstrap.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.min.js' }
+    / %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/react/16.8.6/umd/react.production.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.7/js/select2.min.js' }
+    %script{ type: 'text/javascript', src: '/js/sb-admin-2.min.js' }
+    %script{ type: 'text/javascript', src: '/js/scripts.js' }
+    :javascript
+        $(function() {
+            $('.select2').select2();
+        });

data/views/index.haml

@@ -1 +1 @@
-%h2 Hello! Ready to get this Ditty started?
+%h1.h3.mb-4.text-gray-800 Home Page

data/views/layout.haml

@@ -5,6 +5,7 @@
     %meta{ 'http-equiv' => 'X-UA-Compatible', 'content' => 'IE=edge,chrome=1' }
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
     %meta{ name: 'theme-color', content: '#ffffff' }
+    = Rack::Csrf.csrf_metatag(env)
     %link{ rel: 'manifest', href: '/manifest.json' }
     %link{ rel: 'icon', type: 'image/png', sizes: '32x32', href: '/images/favicon-32x32.png' }
     %link{ rel: 'icon', type: 'image/png', sizes: '16x16', href: '/images/favicon-16x16.png' }
@@ -12,7 +13,7 @@
     %link{ rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5' }
 
     %title
-      Ditty
+      = config('ditty.title', 'Ditty')
       - if defined? title
         = "- #{title}"
 
@@ -20,43 +21,57 @@
     %meta{ name: 'author', content: '' }
 
     / Le styles
-    %link{ rel: 'stylesheet', href: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css', media: 'screen' }
-    %link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/startbootstrap-sb-admin-2/3.3.7+1/css/sb-admin-2.min.css', media: 'screen' }
-    %link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/metisMenu/2.5.2/metisMenu.min.css', media: 'screen' }
-    %link{ rel: 'stylesheet', href: 'https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', media: 'screen' }
-    /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
-    /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
-
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js' }
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/startbootstrap-sb-admin-2/3.3.7+1/js/sb-admin-2.min.js' }
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/metisMenu/2.5.2/metisMenu.min.js' }
-  %body
+    %link{ rel: 'stylesheet', href: '/css/sb-admin-2.min.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: '/css/styles.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/all.min.css', media: 'screen' }
+  %body#page-top
+    / Logout Modal
+    #logoutModal.modal.fade{ tabindex: -1, role: 'dialog', 'aria-hidden': 'true' }
+      .modal-dialog{ role: 'document' }
+        .modal-content
+          .modal-header
+            %h5.modal-title Ready to Leave?
+            %button.close{ type: 'button', 'data-dismiss': 'modal', 'aria-label': 'Close' }
+              %span{ 'aria-hidden': 'true' } ×
+          .modal-body
+            Select "Logout" below if you are ready to end your current session.
+          .modal-footer
+            %button.btn.btn-secondary{ type: 'button', 'data-dismiss': 'modal' } Cancel
+            = delete_form_tag("#{settings.map_path}/auth") do
+              %button.btn.btn-primary{ type: 'submit' } Logout
+    / Page Wrapper
     #wrapper
-      = haml :'partials/navbar', locals: { title: (defined?(title) ? title : 'Ditty') }
-      #page-wrapper
-        -if defined?(title) || defined?(actions)
-          .row
-            %h1.col-md-9= defined?(title) ? title : '&nbsp;'
-            .col-md-3.text-right{ style: 'margin-top: 20px' }
-              = haml :'partials/actions', locals: { actions: defined?(actions) ? actions : {} }
-        -else
-          %div{ style: 'padding-top: 20px' }
-
-        .row
-          .col-md-12
+      = haml :'partials/sidebar', locals: { title: (defined?(title) ? title : 'Ditty') }
+
+      #content-wrapper.d-flex.flex-column
+        #content
+          = haml :'partials/topbar'
+          .container-fluid
+            / TODO
+            / .row
+            /   .col-md-12
             = haml :'partials/notifications'
 
-        = yield
+            = yield
+
         = haml :'partials/footer'
 
+    / Scroll to Top Button
+    %a.scroll-to-top.rounded{ href: '#page-top' }
+      %i.fas.fa-angle-up
+
     / Placed at the end of the document so the pages load faster
-    %script{ type: 'text/javascript', src: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js' }
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/react/15.4.1/react.min.js' }
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.6.0/Chart.bundle.min.js' }
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/js/bootstrap.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.min.js' }
+    / %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/react/16.8.6/umd/react.production.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.7/js/select2.min.js' }
+    %script{ type: 'text/javascript', src: '/js/sb-admin-2.min.js' }
+    %script{ type: 'text/javascript', src: '/js/scripts.js' }
     :javascript
         $(function() {
-            $('.sidebar-nav').metisMenu();
             $('.select2').select2();
         });