Normalize localizations, add stub for admin/accounts
This commit is contained in:
		
							
								
								
									
										13
									
								
								app/controllers/admin/accounts_controller.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								app/controllers/admin/accounts_controller.rb
									
									
									
									
									
										Normal file
									
								
							| @@ -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 | ||||
| @@ -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 | ||||
|   | ||||
							
								
								
									
										2
									
								
								app/helpers/admin/accounts_helper.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								app/helpers/admin/accounts_helper.rb
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,2 @@ | ||||
| module Admin::AccountsHelper | ||||
| end | ||||
							
								
								
									
										0
									
								
								app/views/admin/accounts/index.html.haml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								app/views/admin/accounts/index.html.haml
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								app/views/admin/accounts/show.html.haml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								app/views/admin/accounts/show.html.haml
									
									
									
									
									
										Normal file
									
								
							| @@ -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: "*" | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
							
								
								
									
										21
									
								
								spec/controllers/admin/accounts_controller_spec.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								spec/controllers/admin/accounts_controller_spec.rb
									
									
									
									
									
										Normal file
									
								
							| @@ -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 | ||||
							
								
								
									
										15
									
								
								spec/helpers/admin/accounts_helper_spec.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								spec/helpers/admin/accounts_helper_spec.rb
									
									
									
									
									
										Normal file
									
								
							| @@ -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 | ||||
		Reference in New Issue
	
	Block a user