ikea-foundation
/
week_2024
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

na

main
Mattias Bodlund 1 week ago
parent
5cc24ca943
commit
62df5faa8e
6 changed files with 57 additions and 12 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +44
    -4
      app/controllers/admin/admin_controller.rb
  2. +3
    -0
      app/controllers/admin/leaderboard_controller.rb
  3. +1
    -1
      app/controllers/admin/sessions_controller.rb
  4. +6
    -4
      app/views/admin/leaderboard/index.html.erb
  5. +2
    -2
      app/views/layouts/admin.html.erb
  6. +1
    -1
      config/routes.rb

+ 44
- 4
app/controllers/admin/admin_controller.rb View File

@ -2,13 +2,22 @@ class Admin::AdminController < ApplicationController
layout 'admin' layout 'admin'
# The admin has two roles: Admin, who gets everything, and Guest (the `user`
# role), who gets a read-only slice -- the analytics dashboard and the
# published leaderboard. Listed by controller name.
GUEST_SECTIONS = %w[analytics leaderboard].freeze
# The nav sections in the order they appear in the sidebar.
ADMIN_SECTIONS = %i[analytics leaderboard nodes assets].freeze
before_action :authenticate_user! before_action :authenticate_user!
before_action :only_admin!
before_action :only_permitted_section!
before_action :set_locale_to_default before_action :set_locale_to_default
helper_method :current_user helper_method :current_user
helper_method :user_signed_in? helper_method :user_signed_in?
helper_method :form_locale, :available_locales helper_method :form_locale, :available_locales
helper_method :admin?, :permitted_admin_sections
# DELETE admin/cache/clear # DELETE admin/cache/clear
def clear_cache def clear_cache
@ -50,10 +59,41 @@ private
end end
def admin?
current_user&.admin_role?
end
# What a Guest is allowed to open. Anything else bounces them to analytics
# rather than out of the admin entirely, so every link in the nav they see
# actually works and a stray URL doesn't log them out.
def only_permitted_section!
return if admin?
return if GUEST_SECTIONS.include?(controller_name)
bounce_guest!
end
# For the handful of actions inside a Guest section that still change
# something -- clearing a cache, say. Guests may look, not touch, so this
# cannot lean on the section check: the section itself is permitted.
def only_admin! def only_admin!
unless current_user&.admin_role?
redirect_to root_path
end
return if admin?
bounce_guest!
end
def bounce_guest!
redirect_to admin_analytics_path(locale: params[:locale] || I18n.default_locale)
end
def permitted_admin_sections
return ADMIN_SECTIONS if admin?
ADMIN_SECTIONS.select { |section| GUEST_SECTIONS.include?(section.to_s) }
end end


+ 3
- 0
app/controllers/admin/leaderboard_controller.rb View File

@ -6,6 +6,9 @@
# preview of what the next API call will publish, and says so. # preview of what the next API call will publish, and says so.
class Admin::LeaderboardController < Admin::AdminController class Admin::LeaderboardController < Admin::AdminController
# Guests may read the leaderboard but not drop what the API is serving.
before_action :only_admin!, only: :expire
# GET /admin/:locale/leaderboard # GET /admin/:locale/leaderboard
def index def index
@published = LeaderboardPayload.published @published = LeaderboardPayload.published


+ 1
- 1
app/controllers/admin/sessions_controller.rb View File

@ -3,7 +3,7 @@ class Admin::SessionsController < Admin::AdminController
layout 'sessions' layout 'sessions'
skip_before_action :authenticate_user!, except: %i[destroy] skip_before_action :authenticate_user!, except: %i[destroy]
skip_before_action :only_admin!
skip_before_action :only_permitted_section!
def index def index
render action: 'new' render action: 'new'


+ 6
- 4
app/views/admin/leaderboard/index.html.erb View File

@ -7,10 +7,12 @@
<div class="list-title"> <div class="list-title">
<h1><%= yield(:title) %></h1> <h1><%= yield(:title) %></h1>
<%= link_to "Clear cache",
admin_leaderboard_cache_path,
class: "analytics-period",
data: { turbo_method: :delete, turbo_frame: "main" } %>
<% if admin? %>
<%= link_to "Clear cache",
admin_leaderboard_cache_path,
class: "analytics-period",
data: { turbo_method: :delete, turbo_frame: "main" } %>
<% end %>
</div> </div>
<div class="analytics leaderboard"> <div class="analytics leaderboard">


+ 2
- 2
app/views/layouts/admin.html.erb View File

@ -15,7 +15,7 @@
<body> <body>
<nav id="navbar"> <nav id="navbar">
<div class="navbar-upper"> <div class="navbar-upper">
<% %i[nodes assets analytics leaderboard].each do |c| %>
<% permitted_admin_sections.each do |c| %>
<%= link_to url_for(controller: c, action: 'index'), <%= link_to url_for(controller: c, action: 'index'),
class: (controller_name == c.to_s ? 'navbar-link current' : 'navbar-link'), class: (controller_name == c.to_s ? 'navbar-link current' : 'navbar-link'),
data: { data: {
@ -52,7 +52,7 @@
turbo_method: :delete turbo_method: :delete
} do %> } do %>
<span class="icon">bolt</span> <span class="icon">bolt</span>
<% end %>
<% end if admin? %>
<div data-controller="popup"> <div data-controller="popup">
<button class="navbar-link has-popup-menu open--right" data-action="click->popup#toggle"> <button class="navbar-link has-popup-menu open--right" data-action="click->popup#toggle">


+ 1
- 1
config/routes.rb View File

@ -45,7 +45,7 @@ Rails.application.routes.draw do
delete "leaderboard/cache", to: "leaderboard#expire", as: "leaderboard_cache" delete "leaderboard/cache", to: "leaderboard#expire", as: "leaderboard_cache"
# Root # Root
root to: "nodes#index"
root to: "analytics#index"
end end
# Cache # Cache


Write Preview
Loading…
Cancel
Save