cas-cms 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b88802ff9371e54ee620c776c90e53077379d80
-  data.tar.gz: c5df9bfa6966724c9c87fcff5d44116a60d95910
+  metadata.gz: 77cc9a619a6856b1f1d7fce2d059974c2d6dee9a
+  data.tar.gz: f198817ea04364321d99f7ae0e2bf1414367f851
 SHA512:
-  metadata.gz: e75b570c8b02a11c99a2239cdb0024107498169ff1fe1152f7c296837c72409a0453d09aaec614b52ad1934e86559af06389ae68311f084ce19a51e2102a7ed4
-  data.tar.gz: 920b28f837047f0539179e7a3bb0f0e512bae04975a9f8ac3ff69d3ec94ec0b0f48f40da9317627d9ea92396a9a876c48fc83de2dd4834343a9809175a2ce81a
+  metadata.gz: 3069cef01247f2cc378ebc1081989c8eaeb36000e63752d765e8c6e76206f7b909421e1e0105526ac69614142616b196e76f70b54a0a2a88c1580f49e4dca6bc
+  data.tar.gz: 4cbfd887da3aec99ad33c7dae6cc46edf0f12eabb7ee1e3e7c23357733c56ca9f3cdefe72a9c918872ed50ff9d205fb0a968fc95e2b9c5d16209c56483d0edb7

data/README.md

@@ -2,6 +2,7 @@
 Short description and motivation.
 
 ## Usage
+
 How to use my plugin.
 
 ## Installation

data/app/assets/javascripts/cas/application.js

@@ -5,6 +5,11 @@
 //= require_self
 
 $(document).ready(function() {
+  $("#select-site").on("change", function(e) {
+    let url = $(this).val();
+    window.location = url;
+  });
+
   $(".js-tags").selectize({
     plugins: ['restore_on_backspace', 'remove_button'],
     delimiter: ',',

data/app/assets/stylesheets/cas/form.sass

@@ -8,12 +8,17 @@ div.input.string, div.input.text
     border: 1px solid #ddd !important
     box-shadow: none
     border-radius: 3px
-div.input.string, div.input.text
+
+div.input.string,
+div.input.text,
+div.input.string,
+div.input.email,
+div.input.password
+  input
+    height: 24px
   input, textarea, select
     font-size: 1.0em
     padding: 3px 7px
-div.input.string input
-  height: 24px
 div.input.content_summary
   width: 90%
   textarea

data/app/assets/stylesheets/cas/layout.sass

@@ -12,8 +12,12 @@ body > section.grid
 body > header
   background: $general-background-color
   color: white
+  padding-left: 10px
 
   .top
+    .site-selector
+      padding-top: 25px
+      text-align: center
     .secondary
       text-align: right
       padding-top: 25px
@@ -27,12 +31,12 @@ body > header
       margin: 0
       padding: 0
       list-style: none
-      margin: 0 15px
+      margin: 0
       li
         display: table
         float: left
         background: white
-        margin: 0 4px
+        margin: 0 8px 0 0
         border-radius: 4px 4px 0 0
         &.secondary
           float: right

data/app/assets/stylesheets/cas/typography.sass

@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css?family=Lato')
+// @import url('https://fonts.googleapis.com/css?family=Lato')
 
 body
   margin: 0

data/app/controllers/cas/application_controller.rb

@@ -3,6 +3,8 @@ module Cas
     protect_from_forgery with: :exception
     before_action :authenticate_user!
     before_action :set_current_user
+    before_action :set_user_sites
+    before_action :set_domain
 
     private
 
@@ -10,8 +12,16 @@ module Cas
       @current_user = current_user
     end
 
+    def set_user_sites
+      @user_sites = @current_user.sites if @current_user.present?
+    end
+
     def set_domain
       @domain ||= (ENV["DOMAIN"] || request.domain)
+
+      if @domain.blank? || (ENV["DOMAIN"].blank? && @domain == "localhost")
+        @domain = ::Cas::Site.first!.domains.first
+      end
     end
   end
 end

data/app/controllers/cas/devise/sessions_controller.rb

@@ -1,6 +1,8 @@
 module Cas
   module Devise
     class SessionsController < ::Devise::SessionsController
+      private
+
       def after_sign_out_path_for(resource_or_scope)
         cas.root_path
       end

data/app/controllers/cas/sites/application_controller.rb

@@ -0,0 +1,15 @@
+class Cas::Sites::ApplicationController < ::Cas::ApplicationController
+  before_action :set_site
+
+  private
+
+  def set_site
+    if params[:site_id].present?
+      @site = ::Cas::Site.find_by!(slug: params[:site_id])
+    else
+      @site = ::Cas::Site
+        .where("cas_sites.domains::text[] && '{#{@domain}}'::text[]")
+        .first!
+    end
+  end
+end

data/app/controllers/cas/{sections → sites/sections}/application_controller.rb

@@ -1,11 +1,11 @@
 module Cas
-  class Sections::ApplicationController < ApplicationController
+  class Sites::Sections::ApplicationController < Sites::ApplicationController
     before_action :load_section
 
     private
 
     def load_section
-      @section ||= ::Cas::Section.friendly.find(params[:section_id])
+      @section ||= @site.sections.friendly.find(params[:section_id])
     end
 
     def scope_content_by_role(model_relation = ::Cas::Content)

data/app/controllers/cas/{sections → sites/sections}/categories_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "cas/application_controller"
 
 module Cas
-  class Sections::CategoriesController < Sections::ApplicationController
+  class Sites::Sections::CategoriesController < Sites::Sections::ApplicationController
     before_action :set_category, only: [:edit, :update, :destroy]
 
     def index
@@ -20,7 +20,7 @@ module Cas
       @category.section = @section
 
       if @category.save
-        redirect_to section_categories_url(@section), notice: 'Categoria salva com sucesso.'
+        redirect_to site_section_categories_url(@site, @section), notice: 'Categoria salva com sucesso.'
       else
         render :new
       end
@@ -28,7 +28,7 @@ module Cas
 
     def update
       if @category.update(category_params)
-        redirect_to section_categories_url(@section), notice: 'Categoria salva com sucesso.'
+        redirect_to site_section_categories_url(@site, @section), notice: 'Categoria salva com sucesso.'
       else
         render :edit
       end

data/app/controllers/cas/{sections → sites/sections}/contents_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "cas/application_controller"
 
 module Cas
-  class Sections::ContentsController < Sections::ApplicationController
+  class Sites::Sections::ContentsController < Sites::Sections::ApplicationController
     class FileBelongsToAnotherAttachable < StandardError; end
     before_action :set_content_type
 
@@ -33,7 +33,7 @@ module Cas
       end
 
       if success
-        redirect_to section_contents_url(@section), notice: 'Noticia salva com sucesso.'
+        redirect_to site_section_contents_url(@site, @section), notice: 'Noticia salva com sucesso.'
       else
         load_categories
         render :new
@@ -68,7 +68,7 @@ module Cas
       end
 
       if success
-        redirect_to section_contents_path
+        redirect_to site_section_contents_url(@site, @section)
       else
         load_categories
         render :edit
@@ -79,7 +79,7 @@ module Cas
       @content = scope_content_by_role.friendly.find(params[:id])
       @content.destroy
 
-      redirect_to section_contents_path
+      redirect_to site_section_contents_url(@site, @section)
     end
 
     private

data/app/controllers/cas/sites/sections_controller.rb

@@ -0,0 +1,7 @@
+module Cas
+  class Sites::SectionsController < Sites::ApplicationController
+    def index
+      @sections = @site.sections.all
+    end
+  end
+end

data/app/controllers/cas/{users_controller.rb → sites/users_controller.rb}

@@ -1,32 +1,37 @@
 require_dependency "cas/application_controller"
 
 module Cas
-  class UsersController < ApplicationController
+  class Sites::UsersController < Sites::ApplicationController
     def index
-      @users = ::Cas::User.order('name ASC')
+      @users = @site.users.order('name ASC')
     end
 
     def new
       @user = ::Cas::User.new
+      get_selected_sites
     end
 
     def create
       @user = ::Cas::User.new(user_params)
       @user.roles = user_params[:roles]
+      @user.site_ids = user_params[:site_ids]
       if @user.save
-        redirect_to users_path
+        redirect_to site_users_url(@site)
       else
+        get_selected_sites
         render :new
       end
     end
 
     def edit
       @user = ::Cas::User.find(params[:id])
+      get_selected_sites
     end
 
     def update
       @user = ::Cas::User.find(params[:id])
       success = nil
+      @user.site_ids = user_params[:site_ids]
       if user_params[:password].blank? && user_params[:password_confirmation].blank?
         without_password = user_params.except(:password, :password_confirmation)
         success = @user.update_without_password(without_password)
@@ -35,8 +40,9 @@ module Cas
       end
 
       if success
-        redirect_to users_path
+        redirect_to site_users_url(@site)
       else
+        get_selected_sites
         render 'edit'
       end
     end
@@ -44,18 +50,26 @@ module Cas
     private
 
     def user_params
+      site_ids = Array.wrap(params[:user][:site_ids]) << @site.id
       params
         .require(:user)
         .permit(
           :name,
           :email,
+          :site_ids,
           :password,
           :password_confirmation,
-          :roles
+          :roles,
         )
         .merge!(
-          roles: [params[:user][:roles]]
+          roles: [params[:user][:roles]],
+          site_ids: (site_ids).uniq.keep_if(&:present?)
         )
     end
+
+    def get_selected_sites
+      @selected_sites = @user.sites.map(&:id)
+      @selected_sites << @site.id if @user.new_record?
+    end
   end
 end

data/app/models/cas/site.rb

@@ -1,5 +1,10 @@
 module Cas
   class Site < ApplicationRecord
+    extend ::FriendlyId
+    friendly_id :name, use: :slugged
+
     has_many :sections, dependent: :destroy
+    has_many :sites_users, class_name: '::Cas::SitesUser'
+    has_many :users, through: :sites_users
   end
 end

data/app/models/cas/sites_user.rb

@@ -0,0 +1,7 @@
+module Cas
+  class SitesUser < ApplicationRecord
+    belongs_to :site
+    belongs_to :user
+    belongs_to :owner, class_name: '::Cas::User'
+  end
+end

data/app/models/cas/user.rb

@@ -2,23 +2,31 @@ module Cas
   class User < ApplicationRecord
     ROLES = %w[admin editor writer].freeze
 
-    before_save { self.email = email.to_s.downcase }
+    devise :database_authenticatable, #:recoverable,
+           :rememberable, :trackable, :validatable, request_keys: [:domain]
+
+    has_many :contents
+    has_many :files, class_name: 'Cas::MediaFile', as: :attachable
+    has_many :sites_users, class_name: 'Cas::SitesUser'
+    has_many :sites, through: :sites_users
+
     validates :name, presence: true, length: { maximum: 50 }
     validates :email, presence: true, length: { maximum: 255 },
                            uniqueness: { case_sensitive: false }
     validates :password, presence: true, length: { minimum: 6 }, on: :create, allow_blank: true
 
-    devise :database_authenticatable, #:recoverable,
-           :rememberable, :trackable, :validatable
-
-    has_many :contents
-    has_many :files, class_name: Cas::MediaFile, as: :attachable
+    before_save { self.email = email.to_s.downcase }
 
     def self.find_for_database_authentication(warden_conditions)
       conditions = warden_conditions.dup
+      domain = conditions[:domain]
+      domain = ENV["DOMAIN"] if Rails.env.development? && ENV["DOMAIN"].present?
+      domain = ::Cas::Site.first.domains.first if domain.to_s =~ /localhost/
       sql = where(["lower(login) = :value OR lower(email) = :value", {
         value: conditions[:email].downcase
       }])
+      sql = sql.joins(:sites)
+      sql = sql.where("cas_sites.domains::text[] && '{#{domain}}'::text[]")
       sql.first
     end
 

data/app/views/cas/{sections → sites/sections}/categories/_form.html.erb

@@ -1,10 +1,10 @@
-<%= simple_form_for([@section, category]) do |f| %>
-  <% if category.errors.any? %>
+<%= simple_form_for([@site, @section, @category]) do |f| %>
+  <% if @category.errors.any? %>
     <div id="error_explanation">
       <h2>Ocorreram alguns erros:</h2>
 
       <ul>
-        <% category.errors.full_messages.each do |message| %>
+        <% @category.errors.full_messages.each do |message| %>
           <li><%= message %></li>
         <% end %>
       </ul>

data/app/views/cas/{sections → sites/sections}/categories/edit.html.erb

@@ -2,4 +2,4 @@
 
 <%= render 'form', category: @category %>
 
-<%= link_to 'Voltar', section_categories_path(@section) %>
+<%= link_to 'Voltar', site_section_categories_path(@site, @section) %>

data/app/views/cas/{sections → sites/sections}/categories/index.html.erb

@@ -14,7 +14,7 @@
       <tr>
         <td>
           <%= link_to category.name,
-            cas.edit_section_category_path(@section, category),
+            cas.edit_site_section_category_path(@site, @section, category),
             id: "edit-category-#{category.id}"
           %>
         </td>
@@ -25,4 +25,4 @@
 
 <br>
 
-<%= link_to 'Nova categoria', cas.new_section_category_path(@section), id: 'new-category' %>
+<%= link_to 'Nova categoria', cas.new_site_section_category_path(@site, @section), id: 'new-category' %>

data/app/views/cas/sites/sections/categories/new.html.erb

@@ -0,0 +1,5 @@
+<h1><%= @section.name %>: nova categoria</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Voltar', site_section_categories_path(@site, @section) %>

data/app/views/cas/{sections → sites/sections}/contents/_form_for_content.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for ([@section, @content]) do |f| %>
+<%= simple_form_for ([@site, @section, @content]) do |f| %>
   <% if display_field?(:category) %>
     <p>
       <%= f.input :category_id,

data/app/views/cas/{sections → sites/sections}/contents/_form_for_survey.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for ([@section, @content]) do |f| %>
+<%= simple_form_for ([@site, @section, @content]) do |f| %>
   <p>
     <%= f.input :title, as: :string, label: 'Título:' %>
   </p>

data/app/views/cas/{sections → sites/sections}/contents/edit.html.erb

@@ -3,4 +3,4 @@
 
 <%= render "form_for_#{@content_type}" %>
 
-<%= link_to 'Voltar', section_contents_path %>
+<%= link_to 'Voltar', site_section_content_path %>

data/app/views/cas/{sections → sites/sections}/contents/index.html.erb

@@ -4,13 +4,13 @@
   </div>
   <div class="col-1-2 section-options">
     <% if Cas::SectionConfig.new(@section).form_has_field?(:category) %>
-      <%= link_to "Categorias", section_categories_path(@section), id: 'manage-categories' %>
+      <%= link_to "Categorias", site_section_categories_path(@site, @section), id: 'manage-categories' %>
     <% end %>
   </div>
 </div>
 
 <%= link_to 'Novo conteúdo',
-  new_section_content_path(@section.id),
+  new_site_section_content_path(@site, @section),
   id: 'new-content' %>
 
 <br />
@@ -47,7 +47,7 @@
 
           <% if column_no == 1 %>
             <%= link_to value,
-              edit_section_content_path(@section.id, content),
+              edit_site_section_content_path(@site, @section, content),
               id: "edit-content-#{content.id}" %>
           <% else %>
             <%= value %>
@@ -57,7 +57,7 @@
         </td>
       <% end %>
       <td>
-        <%= link_to 'Excluir', section_content_path(@section.id, content),
+        <%= link_to 'Excluir', site_section_content_path(@site, @section, content),
           method: :delete,
           data: { confirm: 'Tem certeza?' },
           id: "delete-content-#{content.id}" %>

data/app/views/cas/{sections → sites/sections}/contents/new.html.erb

@@ -2,4 +2,4 @@
 
 <%= render "form_for_#{@content_type}" %>
 
-<%= link_to 'Voltar', section_contents_path %>
+<%= link_to 'Voltar', site_section_contents_path(@site, @section) %>

data/app/views/cas/{sections → sites/sections}/index.html.erb

@@ -11,10 +11,10 @@
     <tr id="section-<%= section.id %>">
       <td><%= section.name %></td>
       <td>
-        <%= link_to 'Novo', new_section_content_path(section), id: "new-content-#{section.id}" %>
+        <%= link_to 'Novo', new_site_section_content_path(@site, section), id: "new-content-#{section.id}" %>
         &nbsp;
         &nbsp;
-        <%= link_to 'Gerenciar', section_contents_path(section), id: "manage-section-#{section.id}" %>
+        <%= link_to 'Gerenciar', site_section_contents_path(@site, section), id: "manage-section-#{section.id}" %>
       </td>
     </tr>
   <% end %>

data/app/views/cas/sites/users/_form.html.erb

@@ -0,0 +1,25 @@
+<%= simple_form_for [@site, @user] do |f| %>
+  <%= f.input :name %><br />
+  <%= f.input :email %><br />
+
+  <% if @current_user.admin? %>
+    <%= f.collection_check_boxes(
+      :site_ids,
+      @current_user.sites,
+      :id,
+      :name,
+      checked: @selected_sites
+    ) do |s| %>
+      <%= s.check_box(disabled: (s.value == @site.id), id: "site-id-#{s.value}") %>
+    <%= s.text %>
+    <% end %>
+  <% end %>
+
+  <% if current_user.admin? %>
+    <%= f.collection_select :roles, Cas::User::ROLES, :to_s, :humanize %></p>
+  <% end %>
+  <%= f.input :password, required: false %><br />
+  <%= f.input :password_confirmation %><br />
+
+  <%= f.button :submit, id: "save-form" %><br />
+<% end %>

data/app/views/cas/{users → sites/users}/index.html.erb

@@ -1,12 +1,12 @@
 <div class="grid">
   <div class="col-1-2">
-    <h1>Lista Usuários</h1>
+    <h1>Usuários</h1>
   </div>
   <div class="col-1-2 section-options">
   </div>
 </div>
 
-<%= link_to "Novo Usuário", new_user_path if current_user.admin? %>
+<%= link_to "Novo Usuário", new_site_user_path(@site) if current_user.admin? %>
 
 <br />
 <br />
@@ -24,7 +24,7 @@
         <tr id="user-<%= user.id %>">
           <td>
             <%= link_to user.name,
-              edit_user_path(user),
+              edit_site_user_path(@site, user),
               id: "edit-user-#{user.id}" %>
           </td>
           <td><%= user.roles.join(", ") %></td>

data/app/views/layouts/cas/application.html.erb

@@ -26,34 +26,53 @@
 
   <%= csrf_meta_tags %>
 </head>
-<body>
+<body class="<%= "site-#{@site.id}" if @current_user.present? %>">
 
   <header>
     <div class="grid top">
-      <div class="col-1-2">
+      <div class="mobile-col-1-1 col-1-3">
         <h1>
           Admin
         </h1>
       </div>
-      <div class="col-1-2 secondary">
-        <% if user_signed_in? %>
+
+      <% if user_signed_in? %>
+        <div class="mobile-col-1-1 col-1-3 site-selector">
+          <% if @user_sites.count <= 1 %>
+            <%= @user_sites[0].name %> (<%= @user_sites[0].domains.join(", ") %>)
+          <% else %>
+            <select id="select-site">
+              <% @user_sites.each do |site| %>
+                <% selected = site.id == @site.id %>
+                <option
+                  value="<%= site_sections_path(site) %>"
+                  <%= 'selected="selected"' if selected %>
+                >
+                  <%= site.name %>
+                  (<%= site.domains.join(", ") %>)
+                </option>
+              <% end %>
+            </select>
+          <% end %>
+        </div>
+        <div class="mobile-col-1-1 col-1-3 secondary">
           <span class="profile">
-            <%= link_to current_user.name, cas.edit_user_path(current_user), id: "edit-profile"%>
+            <%= link_to "Minha conta", cas.edit_site_user_path(@site, current_user), id: "edit-profile"%>
           </span>
           <span class="sign-out"%>
             <%= link_to "Sair", cas.destroy_user_session_path, method: :delete %>
           </span>
-        <% end %>
-      </div>
+        </div>
+      <% end %>
     </div>
 
     <nav class="grid">
       <ul>
         <% if user_signed_in? %>
-          <li><%= link_to "Conteúdo", cas.root_path %></li>
+          <li><%= link_to "Conteúdo", cas.site_sections_path(@site) %></li>
         <% end %>
         <% if user_signed_in? && current_user.admin? %>
-          <li><%= link_to "Pessoas", cas.users_path, id: "list-people" %></li>
+          <li><%= link_to "Pessoas", cas.site_users_path(@site), id: "list-people" %></li>
         <% end %>
       </ul>
     </nav>

data/config/locales/pt-BR.yml

@@ -1,6 +1,8 @@
 ---
 pt-BR:
   activerecord:
+    models:
+      cas/user: 'Usuário'
     attributes:
       cas/user:
         name: 'Nome'

data/config/routes.rb

@@ -14,11 +14,13 @@ Cas::Engine.routes.draw do
     controllers: { sessions: "cas/devise/sessions" },
     skip: :registrations
 
-  resources :users, controller: 'users'
+  resources :sites, only: [:index] do
+    resources :users, controller: 'sites/users'
 
-  resources :sections, only: [:index] do
-    resources :contents, controller: 'sections/contents'
-    resources :categories, controller: 'sections/categories'
+    resources :sections, only: [:index], controller: 'sites/sections' do
+      resources :contents, controller: 'sites/sections/contents'
+      resources :categories, controller: 'sites/sections/categories'
+    end
   end
 
   # used by tinymce editor
@@ -27,5 +29,5 @@ Cas::Engine.routes.draw do
     resources :files, only: [:create, :destroy]
   end
 
-  root 'sections#index'
+  root 'sites/sections#index'
 end

data/db/migrate/20170219172958_create_cas_sections.rb

@@ -7,6 +7,7 @@ class CreateCasSections < ActiveRecord::Migration[5.0]
 
       t.timestamps
     end
-     add_index :cas_sections, :site_id
+
+    add_index :cas_sections, :site_id
   end
 end

data/db/migrate/20171223134308_connects_users_to_sites.rb

@@ -0,0 +1,13 @@
+class ConnectsUsersToSites < ActiveRecord::Migration[5.0]
+  def change
+    create_table :cas_sites_users, id: :uuid do |t|
+      t.column :user_id, :uuid, null: false
+      t.column :site_id, :uuid, null: false
+      t.boolean :author_id, :uuid
+
+      t.timestamps
+    end
+
+    add_index :cas_sites_users, [:site_id, :user_id]
+  end
+end

data/db/migrate/20171223143551_make_site_unique.rb

@@ -0,0 +1,15 @@
+class MakeSiteUnique < ActiveRecord::Migration[5.0]
+  def up
+    remove_index :cas_sites, :slug
+    remove_index :cas_sites, :name
+    add_index :cas_sites, :name, unique: true
+    add_index :cas_sites, :slug, unique: true
+  end
+
+  def down
+    remove_index :cas_sites, :slug
+    remove_index :cas_sites, :name
+    add_index :cas_sites, :slug, unique: false
+    add_index :cas_sites, :name, unique: true
+  end
+end

data/lib/cas/cms.rb

@@ -0,0 +1 @@
+require_relative '../cas'

data/lib/cas/setup.rb

@@ -26,6 +26,23 @@ module Cas
             )
           end
         end
+
+        if superadmins_emails_or_logins = config["config"]["superadmins"]
+          updated_users = []
+          superadmins_emails_or_logins.each do |email_or_login|
+            user = ::Cas::User.where(
+              'cas_users.email = :value OR cas_users.login = :value',
+              value: email_or_login
+            ).first
+
+            if user.present?
+              unless updated_users.include?(user.id)
+                user.update!(sites: ::Cas::Site.all)
+              end
+              updated_users << user.id
+            end
+          end
+        end
       end
     end
 

data/lib/cas/version.rb

@@ -1,3 +1,3 @@
 module Cas
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cas-cms
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexandre de Oliveira
@@ -445,11 +445,12 @@ files:
 - app/controllers/cas/application_controller.rb
 - app/controllers/cas/devise/sessions_controller.rb
 - app/controllers/cas/file_uploads_controller.rb
-- app/controllers/cas/sections/application_controller.rb
-- app/controllers/cas/sections/categories_controller.rb
-- app/controllers/cas/sections/contents_controller.rb
-- app/controllers/cas/sections_controller.rb
-- app/controllers/cas/users_controller.rb
+- app/controllers/cas/sites/application_controller.rb
+- app/controllers/cas/sites/sections/application_controller.rb
+- app/controllers/cas/sites/sections/categories_controller.rb
+- app/controllers/cas/sites/sections/contents_controller.rb
+- app/controllers/cas/sites/sections_controller.rb
+- app/controllers/cas/sites/users_controller.rb
 - app/helpers/cas/application_helper.rb
 - app/helpers/cas/form_helper.rb
 - app/jobs/cas/application_job.rb
@@ -462,27 +463,28 @@ files:
 - app/models/cas/media_file.rb
 - app/models/cas/section.rb
 - app/models/cas/site.rb
+- app/models/cas/sites_user.rb
 - app/models/cas/user.rb
 - app/uploaders/file_uploader.rb
 - app/views/cas/devise/sessions/new.html.erb
-- app/views/cas/sections/categories/_form.html.erb
-- app/views/cas/sections/categories/edit.html.erb
-- app/views/cas/sections/categories/index.html.erb
-- app/views/cas/sections/categories/new.html.erb
-- app/views/cas/sections/contents/_form_attachments.html.erb
-- app/views/cas/sections/contents/_form_attachments_template.html.erb
-- app/views/cas/sections/contents/_form_for_content.html.erb
-- app/views/cas/sections/contents/_form_for_survey.html.erb
-- app/views/cas/sections/contents/_form_images.html.erb
-- app/views/cas/sections/contents/edit.html.erb
-- app/views/cas/sections/contents/index.html.erb
-- app/views/cas/sections/contents/new.html.erb
-- app/views/cas/sections/index.html.erb
 - app/views/cas/shared/_error_messages.html.erb
-- app/views/cas/users/_form.html.erb
-- app/views/cas/users/edit.html.erb
-- app/views/cas/users/index.html.erb
-- app/views/cas/users/new.html.erb
+- app/views/cas/sites/sections/categories/_form.html.erb
+- app/views/cas/sites/sections/categories/edit.html.erb
+- app/views/cas/sites/sections/categories/index.html.erb
+- app/views/cas/sites/sections/categories/new.html.erb
+- app/views/cas/sites/sections/contents/_form_attachments.html.erb
+- app/views/cas/sites/sections/contents/_form_attachments_template.html.erb
+- app/views/cas/sites/sections/contents/_form_for_content.html.erb
+- app/views/cas/sites/sections/contents/_form_for_survey.html.erb
+- app/views/cas/sites/sections/contents/_form_images.html.erb
+- app/views/cas/sites/sections/contents/edit.html.erb
+- app/views/cas/sites/sections/contents/index.html.erb
+- app/views/cas/sites/sections/contents/new.html.erb
+- app/views/cas/sites/sections/index.html.erb
+- app/views/cas/sites/users/_form.html.erb
+- app/views/cas/sites/users/edit.html.erb
+- app/views/cas/sites/users/index.html.erb
+- app/views/cas/sites/users/new.html.erb
 - app/views/layouts/cas/application.html.erb
 - config/initializers/acts_as_taggable.rb
 - config/initializers/devise.rb
@@ -522,7 +524,10 @@ files:
 - db/migrate/20170830000002_use_uuid_with_acts_as_taggable_references.rb
 - db/migrate/20170919181809_pageviews_default_to_zero.rb
 - db/migrate/20171201191059_add_domains_to_cas_site.rb
+- db/migrate/20171223134308_connects_users_to_sites.rb
+- db/migrate/20171223143551_make_site_unique.rb
 - lib/cas.rb
+- lib/cas/cms.rb
 - lib/cas/config.rb
 - lib/cas/engine.rb
 - lib/cas/form_field.rb

data/app/controllers/cas/sections_controller.rb

@@ -1,7 +0,0 @@
-module Cas
-  class SectionsController < ApplicationController
-    def index
-      @sections = Section.all
-    end
-  end
-end

data/app/views/cas/sections/categories/new.html.erb

@@ -1,5 +0,0 @@
-<h1><%= @section.name %>: nova categoria</h1>
-
-<%= render 'form', category: @category %>
-
-<%= link_to 'Voltar', section_categories_path(@section) %>

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

@@ -1,11 +0,0 @@
-<%= simple_form_for(@user) do |f| %>
-  <%= f.input :name %><br />
-  <%= f.input :email %><br />
-  <% if current_user.admin? %>
-    <%= f.collection_select :roles, Cas::User::ROLES, :to_s, :humanize %></p>
-  <% end %>
-  <%= f.input :password, required: false %><br />
-  <%= f.input :password_confirmation %><br />
-
-  <%= f.button :submit, id: "save-form" %><br />
-<% end %>