From d5d884edd0e720da156d918fd5646474bf96edcc Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Tue, 17 Aug 2021 09:00:08 +0200
Subject: [PATCH] server instead of adminserver
---
.../adminserver/application_controller.rb | 11 -----------
app/controllers/home_controller.rb | 1 +
app/controllers/server/application_controller.rb | 11 +++++++++++
.../dashboard_controller.rb | 2 +-
.../universities_controller.rb | 16 ++++++++--------
.../dashboard/index.html.erb | 2 +-
.../layouts/application.html.erb | 4 ++--
.../universities/_form.html.erb | 2 +-
.../universities/_university.json.jbuilder | 0
.../universities/edit.html.erb | 0
.../universities/index.html.erb | 6 +++---
.../universities/index.json.jbuilder | 0
.../universities/new.html.erb | 0
.../universities/show.html.erb | 2 +-
.../universities/show.json.jbuilder | 0
config/routes.rb | 2 +-
config/routes/{adminserver.rb => server.rb} | 2 +-
...server_navigation.rb => server_navigation.rb} | 4 ++--
18 files changed, 33 insertions(+), 32 deletions(-)
delete mode 100644 app/controllers/adminserver/application_controller.rb
create mode 100644 app/controllers/server/application_controller.rb
rename app/controllers/{adminserver => server}/dashboard_controller.rb (51%)
rename app/controllers/{adminserver => server}/universities_controller.rb (64%)
rename app/views/{adminserver => server}/dashboard/index.html.erb (75%)
rename app/views/{adminserver => server}/layouts/application.html.erb (91%)
rename app/views/{adminserver => server}/universities/_form.html.erb (90%)
rename app/views/{adminserver => server}/universities/_university.json.jbuilder (100%)
rename app/views/{adminserver => server}/universities/edit.html.erb (100%)
rename app/views/{adminserver => server}/universities/index.html.erb (74%)
rename app/views/{adminserver => server}/universities/index.json.jbuilder (100%)
rename app/views/{adminserver => server}/universities/new.html.erb (100%)
rename app/views/{adminserver => server}/universities/show.html.erb (83%)
rename app/views/{adminserver => server}/universities/show.json.jbuilder (100%)
rename config/routes/{adminserver.rb => server.rb} (69%)
rename config/{adminserver_navigation.rb => server_navigation.rb} (63%)
diff --git a/app/controllers/adminserver/application_controller.rb b/app/controllers/adminserver/application_controller.rb
deleted file mode 100644
index fef562c9f..000000000
--- a/app/controllers/adminserver/application_controller.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Adminserver::ApplicationController < ApplicationController
- layout 'adminserver/layouts/application'
-
- before_action :authenticate_user!
-
- protected
-
- def breadcrumb
- add_breadcrumb 'Tableau de bord', :adminserver_root_path
- end
-end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 95f29929c..a4a109b38 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,4 +1,5 @@
class HomeController < ApplicationController
def index
+ redirect_to '/admin' if is_university?
end
end
diff --git a/app/controllers/server/application_controller.rb b/app/controllers/server/application_controller.rb
new file mode 100644
index 000000000..f285d2347
--- /dev/null
+++ b/app/controllers/server/application_controller.rb
@@ -0,0 +1,11 @@
+class Server::ApplicationController < ApplicationController
+ layout 'server/layouts/application'
+
+ before_action :authenticate_user!
+
+ protected
+
+ def breadcrumb
+ add_breadcrumb 'Tableau de bord', :server_root_path
+ end
+end
diff --git a/app/controllers/adminserver/dashboard_controller.rb b/app/controllers/server/dashboard_controller.rb
similarity index 51%
rename from app/controllers/adminserver/dashboard_controller.rb
rename to app/controllers/server/dashboard_controller.rb
index b00c61c06..b25fd5c2f 100644
--- a/app/controllers/adminserver/dashboard_controller.rb
+++ b/app/controllers/server/dashboard_controller.rb
@@ -1,4 +1,4 @@
-class Adminserver::DashboardController < Adminserver::ApplicationController
+class Server::DashboardController < Server::ApplicationController
def index
@universities = University.all.ordered
breadcrumb
diff --git a/app/controllers/adminserver/universities_controller.rb b/app/controllers/server/universities_controller.rb
similarity index 64%
rename from app/controllers/adminserver/universities_controller.rb
rename to app/controllers/server/universities_controller.rb
index 6aa0491e5..196f639dc 100644
--- a/app/controllers/adminserver/universities_controller.rb
+++ b/app/controllers/server/universities_controller.rb
@@ -1,4 +1,4 @@
-class Adminserver::UniversitiesController < Adminserver::ApplicationController
+class Server::UniversitiesController < Server::ApplicationController
load_and_authorize_resource
def index
@@ -22,8 +22,8 @@ class Adminserver::UniversitiesController < Adminserver::ApplicationController
breadcrumb
respond_to do |format|
if @university.save
- format.html { redirect_to [:adminserver, @university], notice: "University was successfully created." }
- format.json { render :show, status: :created, location: [:adminserver, @university] }
+ format.html { redirect_to [:server, @university], notice: "University was successfully created." }
+ format.json { render :show, status: :created, location: [:server, @university] }
else
format.html { render :new, status: :unprocessable_entity }
format.json { render json: @university.errors, status: :unprocessable_entity }
@@ -35,8 +35,8 @@ class Adminserver::UniversitiesController < Adminserver::ApplicationController
breadcrumb
respond_to do |format|
if @university.update(university_params)
- format.html { redirect_to [:adminserver, @university], notice: "University was successfully updated." }
- format.json { render :show, status: :ok, location: [:adminserver, @university] }
+ format.html { redirect_to [:server, @university], notice: "University was successfully updated." }
+ format.json { render :show, status: :ok, location: [:server, @university] }
else
format.html { render :edit, status: :unprocessable_entity }
format.json { render json: @university.errors, status: :unprocessable_entity }
@@ -47,7 +47,7 @@ class Adminserver::UniversitiesController < Adminserver::ApplicationController
def destroy
@university.destroy
respond_to do |format|
- format.html { redirect_to adminserver_universities_url, notice: "University was successfully destroyed." }
+ format.html { redirect_to server_universities_url, notice: "University was successfully destroyed." }
format.json { head :no_content }
end
end
@@ -56,10 +56,10 @@ class Adminserver::UniversitiesController < Adminserver::ApplicationController
def breadcrumb
super
- add_breadcrumb University.model_name.human(count: 2), adminserver_universities_path
+ add_breadcrumb University.model_name.human(count: 2), server_universities_path
if @university
if @university.persisted?
- add_breadcrumb @university, [:adminserver, @university]
+ add_breadcrumb @university, [:server, @university]
else
add_breadcrumb 'Créer'
end
diff --git a/app/views/adminserver/dashboard/index.html.erb b/app/views/server/dashboard/index.html.erb
similarity index 75%
rename from app/views/adminserver/dashboard/index.html.erb
rename to app/views/server/dashboard/index.html.erb
index 94599b8fd..7972a96b8 100644
--- a/app/views/adminserver/dashboard/index.html.erb
+++ b/app/views/server/dashboard/index.html.erb
@@ -6,7 +6,7 @@
<div class="card">
<div class="card-body">
<h4><%= university %></h4>
- <%= link_to 'Voir', [:adminserver, university], class: button_classes('stretched-link') %>
+ <%= link_to 'Voir', [:server, university], class: button_classes('stretched-link') %>
</div>
</div>
</div>
diff --git a/app/views/adminserver/layouts/application.html.erb b/app/views/server/layouts/application.html.erb
similarity index 91%
rename from app/views/adminserver/layouts/application.html.erb
rename to app/views/server/layouts/application.html.erb
index 8ec6fbdc3..717e1cb71 100644
--- a/app/views/adminserver/layouts/application.html.erb
+++ b/app/views/server/layouts/application.html.erb
@@ -16,10 +16,10 @@
<div class="wrapper">
<nav id="sidebar" class="sidebar">
<div class="sidebar-content js-simplebar">
- <%= link_to admin_root_path, class: 'sidebar-brand' do %>
+ <%= link_to server_root_path, class: 'sidebar-brand' do %>
<%= image_tag 'osuny-white.svg', class: 'img-fluid' %>
<% end %>
- <%= render_navigation context: :adminserver %>
+ <%= render_navigation context: :server %>
</div>
</nav>
<div class="main">
diff --git a/app/views/adminserver/universities/_form.html.erb b/app/views/server/universities/_form.html.erb
similarity index 90%
rename from app/views/adminserver/universities/_form.html.erb
rename to app/views/server/universities/_form.html.erb
index ba8077411..37699903e 100644
--- a/app/views/adminserver/universities/_form.html.erb
+++ b/app/views/server/universities/_form.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for [:adminserver, university] do |f| %>
+<%= simple_form_for [:server, university] do |f| %>
<div class="row">
<div class="col-md-4">
<%= f.input :name %>
diff --git a/app/views/adminserver/universities/_university.json.jbuilder b/app/views/server/universities/_university.json.jbuilder
similarity index 100%
rename from app/views/adminserver/universities/_university.json.jbuilder
rename to app/views/server/universities/_university.json.jbuilder
diff --git a/app/views/adminserver/universities/edit.html.erb b/app/views/server/universities/edit.html.erb
similarity index 100%
rename from app/views/adminserver/universities/edit.html.erb
rename to app/views/server/universities/edit.html.erb
diff --git a/app/views/adminserver/universities/index.html.erb b/app/views/server/universities/index.html.erb
similarity index 74%
rename from app/views/adminserver/universities/index.html.erb
rename to app/views/server/universities/index.html.erb
index 41ae95471..3d3a19912 100644
--- a/app/views/adminserver/universities/index.html.erb
+++ b/app/views/server/universities/index.html.erb
@@ -12,11 +12,11 @@
<tbody>
<% @universities.each do |university| %>
<tr>
- <td><%= link_to university, [:adminserver, university] %></td>
+ <td><%= link_to university, [:server, university] %></td>
<td><%= link_to university.domain_url, university.domain_url, target: :_blank %></td>
<td><%= university.private ? University.human_attribute_name('private') : University.human_attribute_name('public') %></td>
<td class="text-end">
- <%= link_to t('edit'), edit_adminserver_university_path(university), class: button_classes %>
+ <%= link_to t('edit'), edit_server_university_path(university), class: button_classes %>
</td>
</tr>
<% end %>
@@ -24,5 +24,5 @@
</table>
<% content_for :buttons do %>
- <%= link_to t('create'), new_adminserver_university_path, class: button_classes %>
+ <%= link_to t('create'), new_server_university_path, class: button_classes %>
<% end %>
diff --git a/app/views/adminserver/universities/index.json.jbuilder b/app/views/server/universities/index.json.jbuilder
similarity index 100%
rename from app/views/adminserver/universities/index.json.jbuilder
rename to app/views/server/universities/index.json.jbuilder
diff --git a/app/views/adminserver/universities/new.html.erb b/app/views/server/universities/new.html.erb
similarity index 100%
rename from app/views/adminserver/universities/new.html.erb
rename to app/views/server/universities/new.html.erb
diff --git a/app/views/adminserver/universities/show.html.erb b/app/views/server/universities/show.html.erb
similarity index 83%
rename from app/views/adminserver/universities/show.html.erb
rename to app/views/server/universities/show.html.erb
index a88a02733..0cef956f8 100644
--- a/app/views/adminserver/universities/show.html.erb
+++ b/app/views/server/universities/show.html.erb
@@ -30,5 +30,5 @@
</p>
<% content_for :buttons do %>
- <%= link_to t('edit'), edit_adminserver_university_path(@university), class: button_classes %>
+ <%= link_to t('edit'), edit_server_university_path(@university), class: button_classes %>
<% end %>
diff --git a/app/views/adminserver/universities/show.json.jbuilder b/app/views/server/universities/show.json.jbuilder
similarity index 100%
rename from app/views/adminserver/universities/show.json.jbuilder
rename to app/views/server/universities/show.json.jbuilder
diff --git a/config/routes.rb b/config/routes.rb
index 5a0cea317..3cd6babd3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,8 +4,8 @@ Rails.application.routes.draw do
sessions: 'users/sessions'
}
- draw 'adminserver'
draw 'admin'
+ draw 'server'
namespace :features, path: '' do
Feature.all.each do |feature|
diff --git a/config/routes/adminserver.rb b/config/routes/server.rb
similarity index 69%
rename from config/routes/adminserver.rb
rename to config/routes/server.rb
index 9dd7d6ed3..ce69e968b 100644
--- a/config/routes/adminserver.rb
+++ b/config/routes/server.rb
@@ -1,4 +1,4 @@
-namespace :adminserver do
+namespace :server do
resources :universities
root to: 'dashboard#index'
end
diff --git a/config/adminserver_navigation.rb b/config/server_navigation.rb
similarity index 63%
rename from config/adminserver_navigation.rb
rename to config/server_navigation.rb
index fee2345b7..c94ce20eb 100644
--- a/config/adminserver_navigation.rb
+++ b/config/server_navigation.rb
@@ -4,7 +4,7 @@ SimpleNavigation::Configuration.run do |navigation|
navigation.highlight_on_subpath = true
navigation.selected_class = 'active'
navigation.items do |primary|
- primary.item :dashboard, t('dashboard'), adminserver_root_path, { icon: 'tachometer-alt', highlights_on: %r{adminserver$} }
- primary.item :universities, University.model_name.human(count: 2), adminserver_universities_path, { icon: 'university' }
+ primary.item :dashboard, t('dashboard'), server_root_path, { icon: 'tachometer-alt', highlights_on: %r{adminserver$} }
+ primary.item :universities, University.model_name.human(count: 2), server_universities_path, { icon: 'university' }
end
end
--
GitLab