udongo 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c5f900d7751fde5b3875bd0efe6ee7f56bf5488
-  data.tar.gz: 347e24cfe05e569e89178a2b3f4fae33325c933f
+  metadata.gz: 03ec6deb38ed000dbcd57727c0f667c3badc1532
+  data.tar.gz: f4570b7da82b646770b7c28b95dafdd0267385aa
 SHA512:
-  metadata.gz: 849fbe000dd4bd06f352fed26e8ff1f2a5931f19a97ef08b0933ed11171d337c7bde6302ecc012e8863441b547a81a62c539f5ee579cc9044043862dd968a4c3
-  data.tar.gz: a73bbcad8f96b51c87a36788cb97b7e432d60be6e26924ed4d5389064a3676050be52b6c795786f55f229f7f61634ab4919b4254f6862a7369ae2c69296e856b
+  metadata.gz: 0978896a59861c96ccb94c1da31bfbc340e3110101afaab52059f5b57d675b40bebf675d3ecbe7e346eb197a98cf24eb4aeed44ed4991682691b0d049be52104
+  data.tar.gz: d87798eba170892b8cc7c1c5f538ab93a4497c4f6dce964fe6fe7caaf2a5b11df251bdb8953f9fbf8108ed75589d8466b5691a53bbbfd697d466fb12ae15305d

data/app/controllers/backend/users/base_controller.rb

@@ -0,0 +1,11 @@
+class Backend::Users::BaseController < Backend::BaseController
+  before_action :find_user
+  before_action do
+    breadcrumb.add t('b.users'), backend_users_path
+    breadcrumb.add @user.full_name
+  end
+
+  def find_user
+    @user = User.find params[:user_id]
+  end
+end

data/app/controllers/backend/users_controller.rb

@@ -0,0 +1,51 @@
+class Backend::UsersController < Backend::BaseController
+  before_action :find_user, only: [:show, :edit, :update, :destroy]
+  before_action -> { breadcrumb.add t('b.users'), backend_users_path }
+
+  def index
+    @users = User.all
+  end
+
+  def show
+    redirect_to edit_backend_user_path(@user)
+  end
+
+  def new
+    @user = User.new
+  end
+
+  def create
+    @user = User.new allowed_params
+
+    if @user.save
+      redirect_to backend_users_path, notice: translate_notice(:added, :user)
+    else
+      render :new
+    end
+  end
+
+  def update
+    if @user.update_attributes allowed_params
+      redirect_to backend_users_path, notice: translate_notice(:changes_saved)
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @user.destroy
+    redirect_to backend_users_path, notice: translate_notice(:deleted, :user)
+  end
+
+  private
+
+  def find_user
+    @user = User.find params[:id]
+  end
+
+  def allowed_params
+    params[:user].permit(
+      :first_name, :last_name, :email, :password, :password_confirmation
+    )
+  end
+end

data/app/models/user.rb

@@ -0,0 +1,10 @@
+class User < ActiveRecord::Base
+  include Concerns::Person
+  has_secure_password
+
+  validates :first_name, :last_name, presence: true
+  validates :email,
+            presence: true,
+            email: true,
+            uniqueness: { case_sensitive: false }
+end

data/app/views/backend/admins/index.html.erb

@@ -20,8 +20,8 @@
           <td><%= a.full_name %></td>
           <td><%= mail_to a.email %></td>
           <td class="text-xs-right">
-            <%= link_to icon(:pencil_square_o), edit_backend_admin_path(a) %>
-            <%= link_to icon(:trash), backend_admin_path(a), method: :delete, data: { confirm: t('b.msg.confirm') }%>
+            <%= link_to_edit [:backend, a] %>
+            <%= link_to_delete [:backend, a] %>
           </td>
         </tr>
       <% end %>

data/app/views/backend/redirects/index.html.erb

@@ -28,8 +28,8 @@
           <td><%= t r.enabled?.to_s %></td>
           <td><%= r.times_used.to_i %></td>
           <td class="text-xs-right">
-            <%= link_to icon(:pencil_square_o), edit_backend_redirect_path(r) %>
-            <%= link_to icon(:trash), backend_redirect_path(r), method: 'delete', data: { confirm: t('b.msg.confirm') } %>
+            <%= link_to_edit [:backend, r] %>
+            <%= link_to_delete [:backend, r] %>
           </td>
         </tr>
       <% end %>

data/app/views/backend/search_synonyms/index.html.erb

@@ -22,8 +22,8 @@
           <td><%= s.term %></td>
           <td><%= s.synonyms %></td>
           <td class="text-xs-right">
-            <%= link_to icon(:pencil_square_o), edit_backend_search_synonym_path(s) %>
-            <%= link_to icon(:trash), backend_search_synonym_path(s), method: 'delete', data: { confirm: t('b.msg.confirm') } %>
+            <%= link_to_edit [:backend, s] %>
+            <%= link_to_delete [:backend, s] %>
           </td>
         </tr>
       <% end %>

data/app/views/backend/users/_form.html.erb

@@ -0,0 +1,34 @@
+<%= render 'backend/general_form_error', object: @user %>
+
+<%= simple_form_for [:backend, @user] do |f| %>
+  <div class="row">
+    <div class="col-md-6">
+      <div class="card">
+        <div class="card-header">
+          <%= t 'b.msg.users.personal_details' %>
+        </div>
+
+        <div class="card-block">
+          <%= f.input :first_name %>
+          <%= f.input :last_name %>
+          <%= f.input :email, required: true %>
+        </div>
+      </div>
+    </div>
+
+    <div class="col-md-6">
+      <div class="card">
+        <div class="card-header">
+          <%= t 'b.msg.users.account_details' %>
+        </div>
+
+        <div class="card-block">
+          <%= f.input :password, required: @user.new_record? %>
+          <%= f.input :password_confirmation, required: @user.new_record? %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <%= render 'backend/form_actions', cancel_url: backend_users_path %>
+<% end %>

data/app/views/backend/users/_tabs.html.erb

@@ -0,0 +1,22 @@
+<div class="row subnav">
+  <div class="col-md-12">
+    <ul class="nav nav-pills">
+      <li class="nav-item">
+        <% klass = %w(nav-link) %>
+        <% klass << 'active' if active == :general %>
+
+        <%= link_to t('b.general'), edit_backend_user_path(@user), class: klass %>
+      </li>
+
+      <!-- Add extra subnav links here -->
+      <!--
+      <li class="nav-item">
+        <% klass = %w(nav-link) %>
+        <% klass << 'active' if active == :foo %>
+
+        <%= link_to t('b.general'), '#', class: klass %>
+      </li>
+      -->
+    </ul>
+  </div>
+</div>

data/app/views/backend/users/edit.html.erb

@@ -0,0 +1,5 @@
+<% breadcrumb.add @user.full_name, backend_user_path(@user) %>
+<% breadcrumb.add t('b.edit') %>
+<%= render 'backend/breadcrumbs' %>
+<%= render 'backend/users/tabs', active: :general %>
+<%= render 'backend/users/form' %>

data/app/views/backend/users/index.html.erb

@@ -0,0 +1,33 @@
+<%= render 'backend/breadcrumbs' %>
+
+<p class="text-xs-right">
+  <%= link_to icon(:plus, t('b.add')), new_backend_user_path, class: 'btn btn-primary btn-sm' %>
+</p>
+
+<% if @users.any? %>
+  <table class="table table-hover table-striped">
+    <thead class="thead-inverse">
+      <tr>
+        <th><%= t 'b.name' %></th>
+        <th><%= t 'b.email' %></th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @users.each do |a| %>
+        <tr>
+          <td><%= a.full_name %></td>
+          <td><%= mail_to a.email %></td>
+          <td class="text-xs-right">
+            <%= link_to icon(:pencil_square_o), edit_backend_user_path(a) %>
+            <%= link_to icon(:trash), backend_user_path(a), method: :delete, data: { confirm: t('b.msg.confirm') }%>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+<% else %>
+  <p><%= t 'b.msg.no_items' %></p>
+<% end %>

data/app/views/backend/users/new.html.erb

@@ -0,0 +1,4 @@
+<% breadcrumb.add t('b.add') %>
+<%= render 'backend/breadcrumbs' %>
+
+<%= render 'form' %>

data/app/views/layouts/backend/_top_navigation.html.erb

@@ -12,6 +12,7 @@
     <div class="dropdown-menu">
       <%= link_to t('b.navigation'), backend_navigations_path, class: 'dropdown-item' %>
       <%= link_to t('b.admins'), backend_admins_path, class: 'dropdown-item' %>
+      <%= link_to t('b.users'), backend_users_path, class: 'dropdown-item' %>
       <%= link_to t('b.redirects'), backend_redirects_path, class: 'dropdown-item' %>
       <div class="dropdown-divider"></div>
       <%= link_to t('b.emails'), backend_emails_path, class: 'dropdown-item' %>

data/changelog.md

@@ -1,3 +1,8 @@
+5.0.0 - 2017-02-12
+--
+* Added a general ```User``` model which you can extend in your own app.
+
+
 4.0.0 - 2017-02-12
 --
 * Added Concerns::Searchable. This lets model instances automatically save 

data/config/locales/en_backend.yml

@@ -67,6 +67,8 @@ en:
     to: To
     up: Up
     used: Used
+    user: User
+    users: Users
     variables: Variables
     view: View
 
@@ -99,9 +101,14 @@ en:
       navigation:
         custom: Custom
       no_items: There are no items.
+      pages:
+        invisible: Deze pagina is niet zichtbaar op de website.
       saved: '%s was saved.'
       seo: SEO
       status_codes:
         '301': 301 (Moved Permanently)
         '303': 303 (See Other)
         '307': 307 (Temporary Redirect)
+      users:
+        account_details: Account details
+        personal_details: Personal details

data/config/locales/nl_backend.yml

@@ -67,6 +67,8 @@ nl:
     to: Naar
     up: Omhoog
     used: Gebruikt
+    user: Gebruiker
+    users: Gebruikers
     variables: Variabelen
     view: Bekijk
 
@@ -107,3 +109,6 @@ nl:
         '301': 301 (Moved Permanently)
         '303': 303 (See Other)
         '307': 307 (Temporary Redirect)
+      users:
+        account_details: Accountgegevens
+        personal_details: Persoonlijke gegevens

data/config/routes.rb

@@ -16,9 +16,11 @@ Rails.application.routes.draw do
     get '/' => 'dashboard#show'
     get 'search' => 'search#query'
 
-
     resources :sessions, only: [:new, :create, :destroy]
     resources :admins
+    resources :users
+    resources :redirects, except: :show
+    resources :search_synonyms, except: :show
 
     resources :pages, except: [:show] do
       concerns :translatable
@@ -57,10 +59,6 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :redirects, except: :show
-
-    resources :search_synonyms, except: :show
-
     namespace :content do
       resources :rows, only: [:index, :new, :destroy] do
         concerns :positionable

data/db/migrate/20161201102429_create_users.rb

@@ -0,0 +1,11 @@
+class CreateUsers < ActiveRecord::Migration[5.0]
+  def change
+    create_table :users do |t|
+      t.string :email, index: true
+      t.string :password
+      t.string :password_digest
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20161201104929_add_first_last_and_display_name_to_users.rb

@@ -0,0 +1,7 @@
+class AddFirstLastAndDisplayNameToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :users, :first_name, :string
+    add_column :users, :last_name, :string
+    add_column :users, :display_name, :string
+  end
+end

data/db/migrate/20170212150903_cleanup_user_model.rb

@@ -0,0 +1,20 @@
+class CleanupUserModel < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :users, :password
+    remove_column :users, :display_name
+
+    change_column :users, :first_name, :string, after: 'id'
+    change_column :users, :last_name, :string, after: 'first_name'
+    change_column :users, :email, :string, after: 'last_name'
+
+    add_column :users, :login_count, :integer, after: 'email'
+    add_column :users, :current_login_ip, :string, after: 'login_count'
+    add_column :users, :last_login_ip, :string, after: 'current_login_ip'
+    add_column :users, :current_login_at, :datetime, after: 'last_login_ip'
+    add_column :users, :last_login_at, :datetime, after: 'current_login_at'
+    add_column :users, :reset_password_token, :string, after: 'last_login_at'
+    add_column :users, :reset_password_sent_at, :datetime, after: 'reset_password_token'
+
+    add_index :users, :reset_password_token
+  end
+end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '4.0.0'
+  VERSION = '5.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -468,6 +468,8 @@ files:
 - app/controllers/backend/sessions_controller.rb
 - app/controllers/backend/snippets_controller.rb
 - app/controllers/backend/tagbox_controller.rb
+- app/controllers/backend/users/base_controller.rb
+- app/controllers/backend/users_controller.rb
 - app/controllers/catch_all_controller.rb
 - app/controllers/concerns/backend/content_type_controller.rb
 - app/controllers/concerns/backend/positionable_controller.rb
@@ -552,6 +554,7 @@ files:
 - app/models/store_with_file.rb
 - app/models/tag.rb
 - app/models/tagged_item.rb
+- app/models/user.rb
 - app/uploaders/ckeditor_attachment_file_uploader.rb
 - app/uploaders/ckeditor_picture_uploader.rb
 - app/uploaders/content_image_uploader.rb
@@ -614,6 +617,11 @@ files:
 - app/views/backend/snippets/edit_translation.html.erb
 - app/views/backend/snippets/index.html.erb
 - app/views/backend/snippets/new.html.erb
+- app/views/backend/users/_form.html.erb
+- app/views/backend/users/_tabs.html.erb
+- app/views/backend/users/edit.html.erb
+- app/views/backend/users/index.html.erb
+- app/views/backend/users/new.html.erb
 - app/views/layouts/backend/_top_navigation.html.erb
 - app/views/layouts/backend/application.html.erb
 - app/views/layouts/backend/lightbox.html.erb
@@ -702,11 +710,14 @@ files:
 - db/migrate/20161029124558_add_locale_to_admin.rb
 - db/migrate/20161029130557_add_bcc_and_cc_to_email_templates.rb
 - db/migrate/20161029171056_add_ccc_and_bcc_to_email.rb
+- db/migrate/20161201102429_create_users.rb
+- db/migrate/20161201104929_add_first_last_and_display_name_to_users.rb
 - db/migrate/20170112151235_create_search_indices.rb
 - db/migrate/20170117143805_add_indices_to_search_indices.rb
 - db/migrate/20170118130428_create_search_synonyms.rb
 - db/migrate/20170118153840_create_search_modules.rb
 - db/migrate/20170202170310_rename_key_to_name_for_search_indices.rb
+- db/migrate/20170212150903_cleanup_user_model.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb