mirror of
https://github.com/internetee/registry.git
synced 2025-08-03 16:32:04 +02:00
Refactor sessions
This commit is contained in:
parent
e2507f8661
commit
744f29c674
18 changed files with 126 additions and 16 deletions
|
@ -20,3 +20,10 @@
|
|||
|
||||
.nowrap
|
||||
white-space: nowrap
|
||||
|
||||
.form-signin
|
||||
max-width: 330px
|
||||
padding: 15px
|
||||
margin: 0 auto
|
||||
input
|
||||
margin-bottom: 10px
|
||||
|
|
10
app/controllers/admin/sessions_controller.rb
Normal file
10
app/controllers/admin/sessions_controller.rb
Normal file
|
@ -0,0 +1,10 @@
|
|||
class Admin::SessionsController < SessionsController
|
||||
layout 'login'
|
||||
|
||||
def create
|
||||
super
|
||||
end
|
||||
|
||||
def login
|
||||
end
|
||||
end
|
|
@ -17,9 +17,14 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
def after_sign_in_path_for(_resource)
|
||||
if session[:user_return_to] && session[:user_return_to] != login_path
|
||||
return session[:user_return_to].to_s
|
||||
return session[:user_return_to].to_s
|
||||
end
|
||||
|
||||
if request.path.match('registrar')
|
||||
registrar_invoices_path
|
||||
elsif request.path.match('admin')
|
||||
admin_dashboard_path
|
||||
end
|
||||
admin_dashboard_path
|
||||
end
|
||||
|
||||
def user_for_paper_trail
|
||||
|
|
7
app/controllers/registrar/invoices_controller.rb
Normal file
7
app/controllers/registrar/invoices_controller.rb
Normal file
|
@ -0,0 +1,7 @@
|
|||
class Registrar::InvoicesController < RegistrarController
|
||||
load_and_authorize_resource
|
||||
|
||||
def index
|
||||
|
||||
end
|
||||
end
|
7
app/controllers/registrar/sessions_controller.rb
Normal file
7
app/controllers/registrar/sessions_controller.rb
Normal file
|
@ -0,0 +1,7 @@
|
|||
class Registrar::SessionsController < SessionsController
|
||||
layout 'registrar'
|
||||
|
||||
def login
|
||||
|
||||
end
|
||||
end
|
4
app/controllers/registrar_controller.rb
Normal file
4
app/controllers/registrar_controller.rb
Normal file
|
@ -0,0 +1,4 @@
|
|||
class RegistrarController < ApplicationController
|
||||
before_action :authenticate_user!
|
||||
layout 'registrar'
|
||||
end
|
|
@ -14,8 +14,4 @@ class SessionsController < Devise::SessionsController
|
|||
sign_in_and_redirect @user, event: :authentication
|
||||
# end
|
||||
end
|
||||
|
||||
def login
|
||||
render 'layouts/login', layout: false
|
||||
end
|
||||
end
|
||||
|
|
|
@ -40,6 +40,7 @@ class Ability
|
|||
|
||||
def user
|
||||
can :show, :dashboard
|
||||
can :manage, Invoice
|
||||
end
|
||||
|
||||
def customer_service
|
||||
|
|
3
app/models/invoice.rb
Normal file
3
app/models/invoice.rb
Normal file
|
@ -0,0 +1,3 @@
|
|||
class Invoice < ActiveRecord::Base
|
||||
|
||||
end
|
6
app/views/admin/sessions/login.haml
Normal file
6
app/views/admin/sessions/login.haml
Normal file
|
@ -0,0 +1,6 @@
|
|||
.form-signin
|
||||
/ TODO: Refactor this when ID card login is done
|
||||
= button_to 'ID card (user1)', 'sessions',
|
||||
class: 'btn btn-lg btn-primary btn-block', name: 'user1'
|
||||
= button_to 'ID card (user2)', 'sessions',
|
||||
class: 'btn btn-lg btn-primary btn-block', name: 'user2'
|
27
app/views/layouts/login_registrar.haml
Normal file
27
app/views/layouts/login_registrar.haml
Normal file
|
@ -0,0 +1,27 @@
|
|||
!!!
|
||||
%html{:lang => I18n.locale.to_s}
|
||||
%head
|
||||
%meta{:charset => "utf-8"}/
|
||||
%meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/
|
||||
%meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}/
|
||||
%meta{:content => "EIS Registrar portal", :name => "description"}/
|
||||
%meta{:content => "Gitlab Ltd", :name => "author"}/
|
||||
= csrf_meta_tags
|
||||
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
|
||||
= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
|
||||
%link{:href => "../../favicon.ico", :rel => "icon"}/
|
||||
%title EIS Registrar - Log In
|
||||
%body{:style => env_style}
|
||||
.container
|
||||
.form-signin
|
||||
- display = (flash.empty?) ? 'none' : 'block'
|
||||
#flash{style: "display: #{display};"}
|
||||
- type = (flash[:notice]) ? 'bg-success' : 'bg-danger'
|
||||
.alert{class: type}= flash[:notice] || flash[:alert]
|
||||
%h2.form-signin-heading.text-center Eesti Interneti SA
|
||||
%hr
|
||||
/ TODO: Refactor this when ID card login is done
|
||||
= button_to 'ID card (user1)', 'sessions',
|
||||
class: 'btn btn-lg btn-primary btn-block', name: 'user1'
|
||||
= button_to 'ID card (user2)', 'sessions',
|
||||
class: 'btn btn-lg btn-primary btn-block', name: 'user2'
|
|
@ -25,8 +25,9 @@
|
|||
- if unstable_env.present?
|
||||
.text-center
|
||||
%small{style: 'color: #0074B3;'}= unstable_env
|
||||
%ul.nav.navbar-nav.navbar-right
|
||||
%li= link_to t('log_out', user: current_user), '/logout'
|
||||
- if current_user
|
||||
%ul.nav.navbar-nav.navbar-right
|
||||
%li= link_to t('log_out', user: current_user), '/logout'
|
||||
|
||||
/ /.nav-collapse
|
||||
.container
|
||||
|
|
1
app/views/registrar/invoices/index.haml
Normal file
1
app/views/registrar/invoices/index.haml
Normal file
|
@ -0,0 +1 @@
|
|||
invoices
|
6
app/views/registrar/sessions/login.haml
Normal file
6
app/views/registrar/sessions/login.haml
Normal file
|
@ -0,0 +1,6 @@
|
|||
.form-signin
|
||||
/ TODO: Refactor this when ID card login is done
|
||||
= button_to 'ID card (user1)', 'sessions',
|
||||
class: 'btn btn-lg btn-primary btn-block', name: 'user1'
|
||||
= button_to 'ID card (user2)', 'sessions',
|
||||
class: 'btn btn-lg btn-primary btn-block', name: 'user2'
|
Loading…
Add table
Add a link
Reference in a new issue