tokite 0.1.4 → 0.1.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/tokite/rules_controller.rb +4 -5
- data/app/controllers/tokite/sessions_controller.rb +8 -7
- data/app/controllers/tokite/users_controller.rb +9 -2
- data/app/views/layouts/tokite/application.html.haml +3 -0
- data/app/views/tokite/users/index.html.haml +1 -3
- data/app/views/tokite/users/show.html.haml +5 -0
- data/config/initializers/omniauth.rb +1 -1
- data/config/routes.rb +2 -2
- data/lib/tokite/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cd4cf7e3df9af634d1a79b71996448181b6d3992
|
4
|
+
data.tar.gz: 99655b09461cd497c09704ae861a43f72b4bd429
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b1faa8d9d5bef41d2fe78b5929d4f9d7e307bb616c827e179d755a5d3787cb48953d86b16afe0ccc39a1b1c22de5627561c803fd917c8229166be1f4c9bb2ca2
|
7
|
+
data.tar.gz: 55b16a25db1f016a4e94f116d88d07124f475d790acdd5e9dc1367da895a10189cd38c71665235f8b75ce3da8fcfecd23340ede0fd4af359241fb7d9ebe8714b
|
@@ -1,11 +1,7 @@
|
|
1
1
|
module Tokite
|
2
2
|
class RulesController < ApplicationController
|
3
3
|
def index
|
4
|
-
|
5
|
-
@users = User.where(id: params[:user_id]).includes(:rules)
|
6
|
-
else
|
7
|
-
@users = User.all.includes(:rules)
|
8
|
-
end
|
4
|
+
@users = User.all.includes(:rules)
|
9
5
|
end
|
10
6
|
|
11
7
|
def new
|
@@ -15,6 +11,7 @@ module Tokite
|
|
15
11
|
def create
|
16
12
|
@rule = rule_user.rules.new(rule_params)
|
17
13
|
if @rule.save
|
14
|
+
flash[:info] = "Rule created."
|
18
15
|
redirect_to edit_user_rule_path(params[:user_id], @rule)
|
19
16
|
else
|
20
17
|
render "new"
|
@@ -29,6 +26,7 @@ module Tokite
|
|
29
26
|
@rule = rule_user.rules.find(params[:id])
|
30
27
|
@rule.assign_attributes(rule_params)
|
31
28
|
if @rule.save
|
29
|
+
flash[:info] = "Rule updated."
|
32
30
|
redirect_to edit_user_rule_path(params[:user_id], @rule)
|
33
31
|
else
|
34
32
|
render "edit"
|
@@ -38,6 +36,7 @@ module Tokite
|
|
38
36
|
def destroy
|
39
37
|
@rule = rule_user.rules.find(params[:id])
|
40
38
|
@rule.destroy!
|
39
|
+
flash[:info] = "Rule deleted."
|
41
40
|
redirect_to user_rules_path(params[:user_id])
|
42
41
|
end
|
43
42
|
|
@@ -11,13 +11,14 @@ module Tokite
|
|
11
11
|
provider: auth[:provider],
|
12
12
|
uid: auth[:uid],
|
13
13
|
)
|
14
|
-
user.
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
14
|
+
unless user.persisted?
|
15
|
+
user.update!(
|
16
|
+
name: auth[:info][:name],
|
17
|
+
email: auth[:info][:email],
|
18
|
+
image_url: auth[:info][:image],
|
19
|
+
)
|
20
|
+
end
|
21
|
+
|
21
22
|
session[:user_id] = user.id
|
22
23
|
redirect_to root_path
|
23
24
|
end
|
@@ -3,9 +3,14 @@ module Tokite
|
|
3
3
|
def index
|
4
4
|
@users = User.all.order(:id)
|
5
5
|
end
|
6
|
-
|
6
|
+
|
7
|
+
def show
|
8
|
+
@user = User.find(params[:id])
|
9
|
+
end
|
10
|
+
|
7
11
|
def create
|
8
12
|
@user = User.create_group_user!("group name")
|
13
|
+
flash[:info] = "User created."
|
9
14
|
redirect_to edit_user_path(@user)
|
10
15
|
end
|
11
16
|
|
@@ -16,13 +21,15 @@ module Tokite
|
|
16
21
|
def update
|
17
22
|
@user = User.find(params[:id])
|
18
23
|
@user.update!(user_params)
|
19
|
-
|
24
|
+
flash[:info] = "User updated."
|
25
|
+
redirect_to user_path(@user)
|
20
26
|
end
|
21
27
|
|
22
28
|
def destroy
|
23
29
|
@user = User.find(params[:id])
|
24
30
|
if @user.group_user?
|
25
31
|
@user.destroy!
|
32
|
+
flash[:info] = "User deleted."
|
26
33
|
redirect_to users_path
|
27
34
|
else
|
28
35
|
head 400
|
@@ -8,9 +8,7 @@
|
|
8
8
|
%tr
|
9
9
|
%td= user.id
|
10
10
|
%td
|
11
|
-
|
12
|
-
= link_to user.name, edit_user_path(user)
|
13
|
-
= link_to "Rules", [user, :rules], class: "button is-small"
|
11
|
+
= link_to user.name, user_path(user)
|
14
12
|
|
15
13
|
= link_to "Create group", users_path, method: :post, data: { confirm: %(Create Group?) }, class: "button is-primary"
|
16
14
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
require "omniauth-google-oauth2"
|
2
2
|
|
3
|
-
|
3
|
+
Tokite::Engine.config.middleware.use OmniAuth::Builder do
|
4
4
|
provider :google_oauth2, ENV["GOOGLE_CLIENT_ID"], ENV["GOOGLE_CLIENT_SECRET"], {
|
5
5
|
hd: ENV["GOOGLE_HOSTED_DOMAIN"].present? ? ENV["GOOGLE_HOSTED_DOMAIN"] : nil,
|
6
6
|
}
|
data/config/routes.rb
CHANGED
@@ -2,8 +2,8 @@ Tokite::Engine.routes.draw do
|
|
2
2
|
root to: "top#show"
|
3
3
|
|
4
4
|
resources :hooks, only: %w(create)
|
5
|
-
resources :users, only: %w(index create edit update destroy) do
|
6
|
-
resources :rules, only: %w(
|
5
|
+
resources :users, only: %w(index show create edit update destroy) do
|
6
|
+
resources :rules, only: %w(new create edit update destroy)
|
7
7
|
end
|
8
8
|
resources :rules, only: %w(index)
|
9
9
|
|
data/lib/tokite/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tokite
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- hogelog
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-07-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -211,6 +211,7 @@ files:
|
|
211
211
|
- app/views/tokite/users/_form.html.haml
|
212
212
|
- app/views/tokite/users/edit.html.haml
|
213
213
|
- app/views/tokite/users/index.html.haml
|
214
|
+
- app/views/tokite/users/show.html.haml
|
214
215
|
- config/initializers/omniauth.rb
|
215
216
|
- config/initializers/slack_notifier.rb
|
216
217
|
- config/routes.rb
|