Skip to content

Commit

Permalink
Merge pull request #84 from kaishuu0123/master
Browse files Browse the repository at this point in the history 
Release
  • Loading branch information
@kaishuu0123
kaishuu0123 authored Jul 7, 2020
2 parents fcfd360 + b6fccb9 commit 9d9121a
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 36 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,5 @@ gem 'omniauth-google-oauth2', '~> 0.8'

gem 'config'

gem 'kaminari', '~> 1.1'
gem 'kaminari', '~> 1.2'
gem 'gravatar_image_tag'
44 changes: 22 additions & 22 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ GEM
bindex (0.8.1)
bootsnap (1.4.5)
msgpack (~> 1.0)
builder (3.2.3)
builder (3.2.4)
byebug (11.0.1)
cancancan (3.0.1)
capybara (3.29.0)
Expand All @@ -84,12 +84,12 @@ GEM
rake (< 13.0)
chunky_png (1.3.11)
coderay (1.1.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
config (2.0.0)
activesupport (>= 4.2)
deep_merge (~> 1.2, >= 1.2.1)
dry-schema (~> 1.0)
crass (1.0.5)
crass (1.0.6)
deep_merge (1.2.1)
devise (4.7.1)
bcrypt (~> 3.0)
Expand Down Expand Up @@ -138,7 +138,7 @@ GEM
gravatar_image_tag (1.2.0)
hashie (3.6.0)
htmlentities (4.3.4)
i18n (1.7.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
identicon (0.0.5)
chunky_png
Expand All @@ -147,18 +147,18 @@ GEM
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jwt (2.2.1)
kaminari (1.1.1)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.1)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
kramdown (1.17.0)
launchy (2.4.3)
addressable (~> 2.3)
Expand All @@ -172,7 +172,7 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.3.1)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -183,13 +183,13 @@ GEM
mimemagic (0.3.3)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.12.2)
minitest (5.14.1)
msgpack (1.3.1)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.1.1)
nio4r (2.5.1)
nokogiri (1.10.5)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
oauth (0.5.4)
oauth2 (1.4.2)
Expand Down Expand Up @@ -229,8 +229,8 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.1)
puma (3.12.2)
rack (2.0.8)
puma (3.12.6)
rack (2.2.3)
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
Expand Down Expand Up @@ -339,7 +339,7 @@ GEM
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
tzinfo (1.2.5)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
warden (1.2.8)
Expand All @@ -359,11 +359,11 @@ GEM
railties (>= 4.2)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.20)
zeitwerk (2.2.0)
zeitwerk (2.3.0)

PLATFORMS
ruby
Expand All @@ -382,7 +382,7 @@ DEPENDENCIES
identicon
initial_avatar
jbuilder (~> 2.7)
kaminari (~> 1.1)
kaminari (~> 1.2)
letter_opener_web
listen (>= 3.0.5, < 3.2)
omniauth (~> 1.9)
Expand Down
4 changes: 3 additions & 1 deletion app/controllers/application_settings/group_managements_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ class ApplicationSettings::GroupManagementsController < ApplicationController
:show, :edit, :update, :destroy, :add_user, :remove_user
]

GROUP_PER_PAGE = 25

def index
@groups = Group.all
@groups = Group.page(params[:page]).per(GROUP_PER_PAGE)

@group = Group.new
end
Expand Down
4 changes: 3 additions & 1 deletion app/controllers/application_settings/user_managements_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ class ApplicationSettings::UserManagementsController < ApplicationController
:update_role, :destroy_image
]

USER_PER_PAGE = 25

def index
@users = User.all
@users = User.page(params[:page]).per(USER_PER_PAGE)
end

def edit
Expand Down
5 changes: 5 additions & 0 deletions app/views/application_settings/group_managements/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
</div>
</div>
</div>
<div class="row mt-4">
<div class="mx-auto">
<%= paginate @groups %>
</div>
</div>
</div>
</div>
</div>
6 changes: 6 additions & 0 deletions app/views/application_settings/user_managements/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
</div>
</div>
</div>
<div class="row mt-4">
<div class="mx-auto">
<%= paginate @users %>
</div>
</div>

</div>
</div>
</div>
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"color": "^3.1.2",
"highlight.js": "^9.15.10",
"install": "^0.13.0",
"jquery": "^3.4.1",
"jquery": "^3.5.0",
"markdown-it": "^10.0.0",
"markdown-it-ins": "^3.0.0",
"markdown-it-sanitizer": "^0.4.3",
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1007,9 +1007,9 @@ acorn-walk@^6.1.1:
integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==

acorn@^6.0.7, acorn@^6.2.1:
version "6.3.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==
version "6.4.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==

ajv-errors@^1.0.0:
version "1.0.1"
Expand Down Expand Up @@ -3916,10 +3916,10 @@ isstream@~0.1.2:
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=

jquery@>=1.12.0, jquery@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
jquery@>=1.12.0, jquery@^3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==

js-base64@^2.1.8:
version "2.5.1"
Expand Down Expand Up @@ -7602,9 +7602,9 @@ websocket-driver@>=0.5.1:
websocket-extensions ">=0.1.1"

websocket-extensions@>=0.1.1:
version "0.1.3"
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
version "0.1.4"
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==

which-module@^1.0.0:
version "1.0.0"
Expand Down

0 comments on commit 9d9121a

Please sign in to comment.