From fce1f9fb072092f1986f123652679488a496fafa Mon Sep 17 00:00:00 2001
From: Marc Anguera Insa <srmarc.ai@gmail.com>
Date: Sat, 27 Mar 2021 02:02:25 +0100
Subject: [PATCH 1/5] delete ability to create orgs from public part, the
 superadmin can do it easily in the /admin section

---
 app/controllers/organizations_controller.rb   | 18 -----
 app/policies/organization_policy.rb           |  4 --
 app/views/organizations/index.html.erb        | 67 ++++++++-----------
 app/views/organizations/show.html.erb         |  8 ---
 app/views/users/manage.html.erb               |  2 +-
 config/routes.rb                              |  4 +-
 .../organizations_controller_spec.rb          | 10 ---
 7 files changed, 32 insertions(+), 81 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index ea52cbe98..cbc12109b 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -1,12 +1,6 @@
 class OrganizationsController < ApplicationController
   before_action :load_resource, only: [:show, :edit, :update, :set_current]
 
-  def new
-    @organization = Organization.new
-
-    authorize @organization
-  end
-
   def index
     @organizations = Organization.all.page(params[:page]).per(25)
   end
@@ -20,18 +14,6 @@ def show
                  per(10)
   end
 
-  def create
-    @organization = Organization.new(organization_params)
-
-    authorize @organization
-
-    if @organization.save
-      redirect_to @organization
-    else
-      render action: :new, status: :unprocessable_entity
-    end
-  end
-
   def update
     if @organization.update(organization_params)
       redirect_to @organization
diff --git a/app/policies/organization_policy.rb b/app/policies/organization_policy.rb
index 532fdda78..1081ee5ca 100644
--- a/app/policies/organization_policy.rb
+++ b/app/policies/organization_policy.rb
@@ -5,10 +5,6 @@ def index?
     true
   end
 
-  def create?
-    user&.superadmin?
-  end
-
   def update?
     user&.superadmin? || user&.admins?(organization)
   end
diff --git a/app/views/organizations/index.html.erb b/app/views/organizations/index.html.erb
index bc255c7ac..20090cac9 100644
--- a/app/views/organizations/index.html.erb
+++ b/app/views/organizations/index.html.erb
@@ -2,41 +2,32 @@
   <%= Organization.model_name.human(count: :many) %>
 </h1>
 
-<ul class="nav navbar-nav pull-right">
-  <% if superadmin? %>
-    <li>
-      <%= link_to new_organization_path do %>
-        <%= glyph :plus %>
-        <%= t 'global.add_new' %>
-      <% end %>
-    </li>
-  <% end %>
-</ul>
-
-<table class="table table-hover table-condensed">
-  <thead>
-    <tr>
-      <th><%= Organization.model_name.human(count: :one) %></th>
-      <th><%= t '.member_count' %></th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @organizations.each do |org| %>
-      <tr>
-        <td><%= link_to org.name, org %></td>
-        <td><%= org.users.count %></td>
-        <td>
-          <% if current_user&.admins?(org) %>
-            <%= link_to edit_organization_path(org), class: 'action' do %>
-              <%= glyph :pencil %>
-              <%= t 'global.edit' %>
-            <% end %>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<%= paginate @organizations %>
+<div class="panel panel-default table-responsive">
+  <div class="panel-body">
+    <table class="table table-hover table-condensed panel">
+      <thead>
+        <tr>
+          <th></th>
+          <th><%= t '.city' %></th>
+          <th><%= t '.neighborhood' %></th>
+          <th><%= t '.web' %></th>
+          <th><%= t '.member_count' %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @organizations.each do |org| %>
+          <tr>
+            <td><%= link_to(org.name, org) %></td>
+            <td><%= org.city %></td>
+            <td><%= org.neighborhood %></td>
+            <td><%= link_to(org.web, org.web) if org.web.present? %></td>
+            <td><%= org.members.count %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+    <div class="paginate-align">
+      <%= paginate @organizations %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index d5e16dce3..d14dca13d 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -84,14 +84,6 @@
   </div>
   <div class="col-sm-5">
     <ul class="nav nav-pills pull-right">
-      <% if superadmin? %>
-        <li>
-          <%= link_to organizations_path do %>
-            <%= glyph :hand_left %>
-            <%= t 'global.back' %>
-          <% end %>
-        </li>
-      <% end %>
       <% if admin? %>
         <li>
           <%= link_to edit_organization_path(@organization) do %>
diff --git a/app/views/users/manage.html.erb b/app/views/users/manage.html.erb
index 186bc2759..093d13618 100644
--- a/app/views/users/manage.html.erb
+++ b/app/views/users/manage.html.erb
@@ -40,7 +40,7 @@
       </h2>
 
       <div class="table-responsive">
-        <table class="table table-hover table-condensed users panel">
+        <table class="table table-hover table-condensed panel">
           <thead>
             <tr>
               <th></th>
diff --git a/config/routes.rb b/config/routes.rb
index 91d3d73ff..9d3f2b403 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,7 +28,7 @@
     get :give_time, on: :member
   end
 
-  resources :organizations, concerns: :accountable, except: :destroy do
+  resources :organizations, except: [:new, :create], concerns: :accountable, except: :destroy do
     member do
       post :set_current
     end
@@ -41,7 +41,7 @@
     end
   end
 
-  resources :transfers, only: [:create, :new] do
+  resources :transfers, only: [:new, :create] do
     member do
       put :delete_reason
     end
diff --git a/spec/controllers/organizations_controller_spec.rb b/spec/controllers/organizations_controller_spec.rb
index d40fb8f79..e0ae5a717 100644
--- a/spec/controllers/organizations_controller_spec.rb
+++ b/spec/controllers/organizations_controller_spec.rb
@@ -31,16 +31,6 @@
     end
   end
 
-  describe 'POST #create' do
-    it 'only superdamins are authorized create to new organizations' do
-      login(member.user)
-
-      expect {
-        post :create, params: { organization: { name: 'New cool organization' } }
-      }.not_to change { Organization.count }
-    end
-  end
-
   describe 'POST #update' do
     context 'with a logged user (admins organization)' do
       let(:member) { Fabricate(:member, organization: organization, manager: true) }

From 3c66dc11bb39b9b58777b55c2e5064820c3c8a35 Mon Sep 17 00:00:00 2001
From: Marc Anguera Insa <srmarc.ai@gmail.com>
Date: Sat, 27 Mar 2021 02:03:48 +0100
Subject: [PATCH 2/5] css: fix footer position to make it always fixed on
 bottom

---
 app/assets/stylesheets/application.scss       |  8 -------
 .../stylesheets/application/footer.scss       | 23 ++++---------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 52243c47c..1e03e2958 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -232,12 +232,7 @@ html {
   overflow-x: inherit;
 }
 
-table.users {
-  padding: 10px;
-}
-
 @media screen {
-
   html {
     min-height: 100%;
     position: relative;
@@ -280,7 +275,6 @@ table.users {
 }
 
 @media print {
-
   body {
     padding-top: 0px;
   }
@@ -288,10 +282,8 @@ table.users {
   .table {
     border-collapse: collapse;
   }
-
 }
 
-
 .error {
   color: red;
 }
diff --git a/app/assets/stylesheets/application/footer.scss b/app/assets/stylesheets/application/footer.scss
index dfc4a67af..ef565181e 100644
--- a/app/assets/stylesheets/application/footer.scss
+++ b/app/assets/stylesheets/application/footer.scss
@@ -41,12 +41,10 @@
   }
 }
 
-.landing-page, .login-page, .pages, .unlocks-page, .confirmations-page, .passwords-page {
-  .footer {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-  }
+.footer {
+  position: absolute;
+  bottom: 0;
+  left: 0;
 }
 
 .language-selector {
@@ -65,23 +63,12 @@
       border: 1px solid white;
       padding: 4px 8px;
     }
-
-    &:hover {
-      background-color: transparent;
-    }
   }
 
   &.open > a.btn-default.dropdown-toggle {
     & {
       background-color: transparent;
-      color: white;
-      border-color: #ddd;
-    }
-
-    &:hover {
-      background-color: transparent;
-      color: white;
-      border-color: #ddd;
+      border: 1px solid white;
     }
   }
 }

From aa8c1b44926935475b05d4ee0f8dbe126dcaab8d Mon Sep 17 00:00:00 2001
From: Marc Anguera Insa <srmarc.ai@gmail.com>
Date: Sat, 27 Mar 2021 14:32:32 +0100
Subject: [PATCH 3/5] admin: users: allow to edit member#active

---
 app/admin/user.rb                   | 4 ++++
 config/initializers/active_admin.rb | 1 +
 config/routes.rb                    | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/admin/user.rb b/app/admin/user.rb
index 77435bdad..f4b5c26c0 100644
--- a/app/admin/user.rb
+++ b/app/admin/user.rb
@@ -41,6 +41,7 @@
     f.inputs "Members" do
       f.has_many :members do |m|
         m.input :organization, collection: Organization.order(id: :asc).pluck(:name, :id)
+        m.input :active
         m.input :manager
       end
     end
@@ -59,6 +60,9 @@
         panel "Memberships" do
           table_for user.members do
             column :organization
+            column :active do |member|
+              "✔" if member.active
+            end
             column :manager do |member|
               "✔" if member.manager
             end
diff --git a/config/initializers/active_admin.rb b/config/initializers/active_admin.rb
index f7b99c3bc..3193df533 100644
--- a/config/initializers/active_admin.rb
+++ b/config/initializers/active_admin.rb
@@ -1,6 +1,7 @@
 ActiveAdmin.setup do |config|
   config.site_title = "TimeOverflow"
   config.site_title_link = "/"
+  config.footer = "TimeOverflow Admin | www.timeoverflow.org"
   config.authentication_method = :authenticate_superuser!
   config.current_user_method = :current_user
   config.logout_link_path = :destroy_user_session_path
diff --git a/config/routes.rb b/config/routes.rb
index 9d3f2b403..cc8fd4c7e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,7 +28,7 @@
     get :give_time, on: :member
   end
 
-  resources :organizations, except: [:new, :create], concerns: :accountable, except: :destroy do
+  resources :organizations, except: [:new, :create, :destroy], concerns: :accountable do
     member do
       post :set_current
     end

From 34bd8c681063c737d2b65cb8fbf20c207f5e82f8 Mon Sep 17 00:00:00 2001
From: Marc Anguera Insa <srmarc.ai@gmail.com>
Date: Sat, 27 Mar 2021 14:38:42 +0100
Subject: [PATCH 4/5] delete deprecated view organizations#new

---
 app/controllers/organizations_controller.rb | 2 --
 app/views/organizations/new.html.erb        | 4 ----
 2 files changed, 6 deletions(-)
 delete mode 100644 app/views/organizations/new.html.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index cbc12109b..0c747804a 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -22,8 +22,6 @@ def update
     end
   end
 
-  # POST /organizations/:organization_id/set_current
-  #
   def set_current
     if current_user
       session[:current_organization_id] = @organization.id
diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb
deleted file mode 100644
index bb6907b0f..000000000
--- a/app/views/organizations/new.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1>
-  <%= t '.new' %>
-</h1>
-<%= render 'form' %>

From 4f9aa02b21ada11ceef3d4d8f32e1d5653056d55 Mon Sep 17 00:00:00 2001
From: Marc Anguera Insa <srmarc.ai@gmail.com>
Date: Tue, 30 Mar 2021 00:30:21 +0200
Subject: [PATCH 5/5] :art: more consistent page titles in both members pages

---
 app/views/users/index.html.erb  | 14 ++++----------
 app/views/users/manage.html.erb | 11 +++++------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 3d901a9dd..b2e84ee80 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,7 +1,10 @@
 <div class="container-fluid">
   <div class="row">
     <div class="col-md-12">
-      <h1><%= t(".members") %></h1>
+      <h1>
+        <%= link_to current_organization.name, current_organization %>
+        <%= t(".members") %>
+      </h1>
     </div>
   </div>
 </div>
@@ -22,15 +25,6 @@
 </div>
 
 <div class="container-fluid">
-  <div class="row">
-    <div class="col-md-12">
-      <h2>
-        <%= link_to current_organization.name,
-                    organization_path(current_organization) %>
-      </h2>
-    </div>
-  </div>
-
   <div class="row to-member-cards">
     <%= render partial: 'member_card', collection: @member_view_models, as: :member %>
   </div>
diff --git a/app/views/users/manage.html.erb b/app/views/users/manage.html.erb
index 093d13618..ef715a5a9 100644
--- a/app/views/users/manage.html.erb
+++ b/app/views/users/manage.html.erb
@@ -1,7 +1,10 @@
 <div class="container-fluid">
   <div class="row">
     <div class="col-md-12">
-      <h1><%= t(".members") %></h1>
+      <h1>
+        <%= link_to current_organization.name, current_organization %>
+        <%= t("users.index.members") %>
+      </h1>
     </div>
   </div>
 </div>
@@ -30,15 +33,11 @@
     </div>
   </div>
 </div>
+<br>
 
 <div class="container-fluid">
   <div class="row">
     <div class="col-md-12">
-      <h2>
-        <%= link_to current_organization.name,
-                    organization_path(current_organization) %>
-      </h2>
-
       <div class="table-responsive">
         <table class="table table-hover table-condensed panel">
           <thead>