bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement close window on server level

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-09-05 16:00:44 +02:00
parent 0c49a9fa4d
commit ad7b396dd1
5 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/dashboard_controller.rb
+4
View File
@@ -12,6 +12,10 @@ class DashboardController < ApplicationController
log.save log.save
end end
def close_window
render layout: false
end
# Testing action # Testing action
def select_qrcode def select_qrcode
#@tables = Table.all.sample(2) | List.active.map(&:table) #@tables = Table.all.sample(2) | List.active.map(&:table)
app/views/dashboard/close_window.html.erb
+7
View File
@@ -0,0 +1,7 @@
<!doctype html>
<html>
<head>
<script>localStorage.setItem('auth_token', '<%= params[:authentication_token] %>'); localStorage.setItem('user_id', '<%= params[:user_id] %>');window.close()</script>
</head>
<body></body>
</html>
config/routes.rb
+1
View File
@@ -71,6 +71,7 @@ Qwaiter::Application.routes.draw do
post '/user/check_table_join_status' => 'user#check_table_join_status' post '/user/check_table_join_status' => 'user#check_table_join_status'
get '/user/obtain_token' => 'user#obtain_token', as: :user_obtain_token get '/user/obtain_token' => 'user#obtain_token', as: :user_obtain_token
post '/user/obtain_token' => 'user#obtain_token', constraints: {format: :json} post '/user/obtain_token' => 'user#obtain_token', constraints: {format: :json}
get '/close_window' => 'dashboard#close_window'
namespace :users, path: '/user' do namespace :users, path: '/user' do
resources :product_categories, only: [:index] resources :product_categories, only: [:index]
spec/acceptance_steps/users/authentication_steps.rb
+1 -1
View File
@@ -7,7 +7,7 @@ step "There is no user information stored in the local storage" do
end end
step "I visit the user obtain token path" do step "I visit the user obtain token path" do
visit user_obtain_token_path visit user_root_path # obtain token through ember application
end end
step "I am signed in as a user" do step "I am signed in as a user" do
wip.md
+2 -2
View File
@@ -16,7 +16,7 @@ User
---- ----
- test met veel producten - test met veel producten
- Only show join requests menu when there actually are join requests - splash screen
Bugs Bugs
---- ----
@@ -71,5 +71,5 @@ User
Integrations Integrations
------------ ------------
- Payleven? Payment
- Bonnetjes machine - Bonnetjes machine
- Payleven? Payment