diff options
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 13 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/admin/accounts_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/accounts/index.html.haml | 0 | ||||
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 0 | ||||
| -rw-r--r-- | config/locales/simple_form.fr.yml | 6 | ||||
| -rw-r--r-- | config/routes.rb | 1 | ||||
| -rw-r--r-- | spec/controllers/admin/accounts_controller_spec.rb | 21 | ||||
| -rw-r--r-- | spec/helpers/admin/accounts_helper_spec.rb | 15 |
9 files changed, 56 insertions, 4 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb new file mode 100644 index 000000000..e84799040 --- /dev/null +++ b/app/controllers/admin/accounts_controller.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class Admin::AccountsController < ApplicationController + before_action :require_admin! + + layout 'public' + + def index + end + + def show + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bb52646a7..5243bc446 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -37,7 +37,7 @@ class ApplicationController < ActionController::Base end def set_user_activity - current_user.touch(:current_sign_in_at) if !current_user.nil? && current_user.current_sign_in_at < 24.hours.ago + current_user.touch(:current_sign_in_at) if !current_user.nil? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < 24.hours.ago) end protected diff --git a/app/helpers/admin/accounts_helper.rb b/app/helpers/admin/accounts_helper.rb new file mode 100644 index 000000000..5b9cbbacd --- /dev/null +++ b/app/helpers/admin/accounts_helper.rb @@ -0,0 +1,2 @@ +module Admin::AccountsHelper +end diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/app/views/admin/accounts/index.html.haml diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/app/views/admin/accounts/show.html.haml diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 73905a7b3..fd20056d7 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -16,14 +16,14 @@ fr: password: Mot de passe silenced: Ne pas apparaître dans le fil public username: Identifiant + interactions: + must_be_follower: Masquer les notifications des personnes qui ne vous suivent pas + must_be_following: Masquer les notifications des personnes que vous ne suivez pas notification_emails: favourite: Envoyer un courriel lorsque quelqu’un ajoute mes statut à ses favoris follow: Envoyer un courriel lorsque quelqu’un me suit mention: Envoyer un courriel lorsque quelqu’un me mentionne reblog: Envoyer un courriel lorsque quelqu’un partage mes statuts - interactions: - must_be_follower: Masquer les notifications des personnes qui ne vous suivent pas - must_be_following: Masquer les notifications des personnes que vous ne suivez pas 'no': Non required: mark: "*" diff --git a/config/routes.rb b/config/routes.rb index cd544a62b..f956e99be 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -46,6 +46,7 @@ Rails.application.routes.draw do namespace :admin do resources :pubsubhubbub, only: [:index] + resources :accounts, only: [:index, :show] end namespace :api do diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb new file mode 100644 index 000000000..485310495 --- /dev/null +++ b/spec/controllers/admin/accounts_controller_spec.rb @@ -0,0 +1,21 @@ +require 'rails_helper' + +RSpec.describe Admin::AccountsController, type: :controller do + before do + sign_in Fabricate(:user, admin: true), scope: :user + end + + describe 'GET #index' do + it 'returns http success' do + get :index + expect(response).to have_http_status(:success) + end + end + + describe 'GET #show' do + it 'returns http success' do + get :show, params: { id: 1 } + expect(response).to have_http_status(:success) + end + end +end diff --git a/spec/helpers/admin/accounts_helper_spec.rb b/spec/helpers/admin/accounts_helper_spec.rb new file mode 100644 index 000000000..92e29a222 --- /dev/null +++ b/spec/helpers/admin/accounts_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Admin::AccountsHelper. For example: +# +# describe Admin::AccountsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Admin::AccountsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end |