pages_cms 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa19f12b78afe65d3b7ff8f12f9c4594ba1e427
-  data.tar.gz: b242191a957d83594fde8f779faebf756c25b572
+  metadata.gz: 6b2fdec95d63995bd3a28b460526b59b6d132a42
+  data.tar.gz: 6740a1864cd89118ff1c1c9cef05ccc692cb629f
 SHA512:
-  metadata.gz: a17e7ab969ba94a6ffac9ffebaf6f612be14323bb3c09c6393a921d6da64e3648aa237158a31a69b83aa03702e1f0b186fe68743dab9b0e4eec94f5b7af19989
-  data.tar.gz: 96cb8aa6417d20209c6671f3522b1f95c78895f1b6253bffc80a21b07d3eb847930f6a10d86fea40bd2dffda62d01314655812b86ce01c6c6ba5d380d01a6432
+  metadata.gz: 2d5085eee1098f2c88a5d36a69206af473411825ee3d03f4ec4d83d12307860ca2890daff0e48a2946d8ceddfbe1a03ad839750d736e0271505cda6e26a7f969
+  data.tar.gz: 12191edbb30905acc60a4465e9a6a433d81c71d45d8b89cd7dff99fc8e32182604ba23df3b084bba504288802048b3b188122015143e9a8ea09c0dffa77be8fa

data/README.md

@@ -24,7 +24,7 @@ These content types can be interpreted by a designer to create a unique look and
 
 ## Installation
 
-1. 	Add: `gem 'pages_cms', '~> 1.0.3'` to your `Gemfile`
+1. 	Add: `gem 'pages_cms', '~> 1.1.0'` to your `Gemfile`
 2. 	Run: `$ rails generate pages_cms:install`
 3.	Add: `//= require cocoon` to your `application.js` file
 

data/app/assets/stylesheets/pages_cms/pages_cms.scss

@@ -5,15 +5,14 @@
 .indent-2 { margin-left: 3.5em; }
 .small-text-area { width: 400px; }
 .big { font-size: 3em; height: auto !important; }
-.container-fluid { max-width: 1100px; }
+.container-fluid { max-width: 1150px; }
 .navbar { height: 50px; margin: 0; }
 .gallery { height: 300px !important; width: auto; overflow: hidden;}
 .center { text-align: center;}
-.content { width: 700px; margin: auto;}
-.block { border: #ededed thin solid; background-color: #f7f7f7; padding: 1em; margin-top: 1em; border-radius: 10px; position: relative; }
+.content { max-width: 700px; margin: auto;}
+.block {  padding: 1em; margin-top: 1em; border-radius: 10px; position: relative; }
 .med { font-size: 2em !important; height: auto !important; }
 .right { width: auto; position: absolute; bottom: 1em; right: 1em; }
-.sortable-placeholder {  border: 1px dashed #CCC;  background: none; height: 2em; }
 .wysihtml5-command-active { background-color: #eee !important; border: thin solid #bbb; }
 .toolbar-wrap { a { padding: 0.5em !important; } }
 .float-left { float: left !important; margin: 1em !important;}
@@ -28,4 +27,17 @@
 .contact-mes { max-width: 600px; max-height: 80px !important; overflow: scroll !important }
 .image-box { position: relative; width: 50%; float: left !important; overflow: hidden; transition: all 0.3s; h3 { position: absolute; top: 50%; text-align: center; width: 100%; } }
 .image-box:hover { opacity: 0.5; }
-//.form-control { border: none !important; outline: none !important; box-shadow: none !important }
+.admin-list { background-color: #2E2F30; margin: 0; color: #90d9ff !important; a { color: #ffffff !important; padding: 5px; } a:hover { color: black !important; background-color: #fff !important;} }
+.list-table { list-style-type: none; .drop-link { color: inherit; } li {margin: 1.5em; position: relative; padding-top: 0.5em;} .items {position: relative; padding-top: 0.5em;} .links { position: absolute; right: 25% !important; top: 0; }  }
+.form-control { border-left: none !important; border-right: none !important; border-top: none !important; outline: none !important; box-shadow: none !important; border-radius: 0 !important; }
+.sortable-dragging {  border: 1px dashed #CCC;  background: none; height: 2em; }
+.sortable-placeholder {  border: 1px dashed #CCC;  background: none; height: 2em; }
+.mess { max-height: 40px; overflow: hidden; }
+.page-height-1 { height: 80vh !important; overflow: scroll; }
+.page-height-2 { height: 70vh !important; overflow: scroll; }
+.message{ position: fixed; width: 200px; top: 0; left: 0; right: 0; margin: auto !important;  }
+.relative { position: relative; }
+.hard-right { position: absolute; right: 0; top: 0; }
+
+.td-left { width: 40% }
+.td-right { width: 60% !important }

data/app/controllers/pages_cms/admin/accounts_controller.rb

@@ -2,6 +2,11 @@ require_dependency "pages_cms/application_controller"
 
 module PagesCms
   class Admin::AccountsController < ApplicationController
+    before_action :logged_in_admin
+
+    def index
+      @accounts = Account.all
+    end
 
     def new
       @account = Account.new
@@ -10,11 +15,14 @@ module PagesCms
     def create
       @account = Account.new(account_params)
       if @account.save
+        @account.pages.create!(title: 'Home')
+        Rails.application.reload_routes!
+        session[:current_account] = @account.id
         flash[:success] = 'Account created'
-        redirect_to root_path
+        redirect_to admin_accounts_path
       else
         flash[:danger] = "Failed to create: #{@account.errors.full_messages.to_sentence}"
-        redirect_to '/admin/account/'
+        redirect_to admin_accounts_path
       end
     end
 
@@ -26,16 +34,40 @@ module PagesCms
       @account = Account.find(params[:id])
       if @account.update(account_params)
         flash[:success] = 'Account updated'
-        redirect_to root_path
+        redirect_to admin_accounts_path
       else
         flash[:danger] = "Failed to update: #{@account.errors.full_messages.to_sentence}"
-        redirect_to '/admin/account/'
+        redirect_to admin_accounts_path
+      end
+    end
+
+    def site
+      if Account.exists?(params[:account])
+        session[:current_account] = params[:account]
+        current_account = PagesCms::Account.find(params[:account])
+        flash[:success] = "Site changed to #{current_account.site_name}"
+        redirect_to admin_accounts_path
+      else
+        flash[:danger] = 'Site does not exist!'
+        redirect_to admin_accounts_path
+      end
+    end
+
+    def destroy
+      account = Account.find(params[:id])
+      if session[:current_account] == account.id
+        session[:current_account] = nil
       end
+      account.destroy
+      flash[:success] = 'Account destroyed'
+      redirect_to admin_accounts_path
     end
 
     private
       def account_params
-        params.require(:account).permit(:name, :email, :site_name)
+        params.require(:account).permit(
+          :name, :email, :site_name, :mount_location, :web_address, :meta_tags, :meta_description
+        )
       end
 
   end

data/app/controllers/pages_cms/admin/articles_controller.rb

@@ -3,20 +3,30 @@ require_dependency "pages_cms/application_controller"
 module PagesCms
   class Admin::ArticlesController < ApplicationController
     before_action :logged_in_admin
+    before_action :selected_account
 
     def index
-      @articles = Article.all
+      @articles = current_account.articles.all
       filter_params(params).each do |search, result|
         @articles = @articles.public_send(search, result) if result.present?
       end
+      if params[:edit].present? && Article.exists?(params[:edit])
+        @article = Article.find(params[:edit])
+        @edit = true
+      elsif params[:new] == 'true'
+        @article = Article.new
+        @new = true
+      else
+        @article = false
+      end
     end
 
     def new
-      @article = Article.new
+      @article = current_account.articles.build
     end
 
     def create
-      @article = Article.new(article_params)
+      @article = current_account.articles.build(article_params)
       if @article.save
         flash[:success] = 'Successfully updated'
         redirect_to admin_articles_path

data/app/controllers/pages_cms/admin/contacts_controller.rb

@@ -2,9 +2,11 @@ require_dependency "pages_cms/application_controller"
 
 module PagesCms
   class Admin::ContactsController < ApplicationController
+    before_action :logged_in_admin
+    before_action :selected_account
 
     def index
-      @contacts = Contact.all
+      @contacts = current_account.contacts
     end
 
     def destroy

data/app/controllers/pages_cms/admin/images_controller.rb

@@ -3,15 +3,16 @@ require_dependency "pages_cms/application_controller"
 module PagesCms
   class Admin::ImagesController < ApplicationController
     before_action :logged_in_admin
+    before_action :selected_account
 
     def index
-      @images = Image.all
-      @image  = Image.new
+      @images = current_account.images
+      @image  = current_account.images.build
     end
 
     def create
       if params[:image][:is_url]
-        image = Image.new(image_params)
+        image = current_account.images.build(image_params)
         if image.save
           flash[:success] = 'Successfully uploaded file.'
           redirect_to admin_images_path
@@ -26,7 +27,7 @@ module PagesCms
           uploaded_io = params[:image][:file]
           extension = uploaded_io.original_filename.split('.')[1]
           name = "#{Time.now.to_i}_#{user_named}.#{extension}"
-          @image = Image.new(file: "/images/#{name}", name: user_named)
+          @image = current_account.images.build(file: "/images/#{name}", name: user_named)
           if @image.save
             File.open(Rails.root.join('public', 'images', name), 'wb') do |file|
               file.write(uploaded_io.read)

data/app/controllers/pages_cms/admin/pages_controller.rb

@@ -3,14 +3,16 @@ require_dependency "pages_cms/application_controller"
 module PagesCms
   class Admin::PagesController < ApplicationController
     before_action :logged_in_admin
+    before_action :selected_account
 
     def index
-      @pages = Page.where(parent_id: nil).includes(:children)
+      @pages = current_account.pages.where(parent_id: nil).includes(:children).order(:order)
     end
 
     def create
-      @page = Page.new(page_params)
+      @page = current_account.pages.build(page_params)
       if @page.save
+        Rails.application.reload_routes!
         flash[:success] = 'Page created'
         redirect_to edit_admin_page_path(@page.id)
       else
@@ -39,6 +41,17 @@ module PagesCms
       end
     end
 
+    def order
+      order_list = params[:order][:data]
+      logger.debug(order_list)
+      order_list.each do |position|
+        Page.find(position).update(order: order_list.index(position) )
+      end
+      respond_to do |format|
+        format.json { head :ok }
+      end
+    end
+
     def destroy
       Page.find(params[:id]).destroy
       flash[:success] = 'Page deleted'

data/app/controllers/pages_cms/application_controller.rb

@@ -1,2 +1,14 @@
 class PagesCms::ApplicationController < ApplicationController
+
+  def selected_account
+    if session[:current_account].nil? || PagesCms::Account.exists?(session[:current_account]) == false
+      flash[:danger] = 'Select a site to edit'
+      redirect_to admin_accounts_path
+    end
+  end
+
+  def current_account
+    PagesCms::Account.find(session[:current_account])
+  end
+
 end

data/app/controllers/pages_cms/contacts_controller.rb

@@ -2,9 +2,10 @@ require_dependency "pages_cms/application_controller"
 
 module PagesCms
   class ContactsController < ApplicationController
+    include ApplicationHelper
 
     def create
-      contact = Contact.new(contact_params)
+      contact = current_site.contacts.build(contact_params)
       if contact.save
         flash[:success] = 'Successfully contacted us. We will respond shortly!'
         ContactMailer.new_contact(contact).deliver_now

data/app/controllers/pages_cms/pages_controller.rb

@@ -4,12 +4,14 @@ module PagesCms
   class PagesController < ApplicationController
 
     def show
-      page = Page.find_by_slug(params[:slug])
+      @site = current_site
+      page  = @site.pages.find_by_slug(params[:slug])
       page_setup(page)
     end
 
     def home
-      page = Page.find_by_title('Home')
+      @site = current_site
+      page  = @site.pages.find_by_slug('home')
       page_setup(page)
     end
 
@@ -17,19 +19,22 @@ module PagesCms
       def page_setup(page)
         if page != nil
           @page = page
-          @articles = Article.published
+          @articles = current_site.articles.published
           filter_params(params).each do |search, result|
             @articles = @articles.public_send(search, result) if result.present?
           end
-          if @page.sidebar && @page.sidebar.show && @page.sidebar.use_instead.nil?
-            @sidebar = @page.sidebar
-          elsif @page.sidebar && !@page.sidebar.show
+
+          sidebar = @page.sidebar
+          if sidebar && sidebar.show && sidebar.use_instead.nil?
+            @sidebar = sidebar
+          elsif sidebar && !sidebar.show
             @sidebar = false
-          elsif @page.sidebar && !@page.sidebar.use_instead.nil?
-            @sidebar = Sidebar.find(@page.sidebar.use_instead)
+          elsif sidebar && !sidebar.use_instead.nil?
+            @sidebar = Sidebar.find(sidebar.use_instead)
           else
             @sidebar = false
           end
+
           if @page.sliders && @page.sliders.any?
             @sliders = @page.sliders.order(:order)
           else
@@ -37,7 +42,8 @@ module PagesCms
           end
           render template: 'pages_cms/pages/show'
         else
-          redirect_to '/'
+          # flash[:danger] = 'could not find page'
+          # redirect_to '/'
         end
       end
 
@@ -45,6 +51,10 @@ module PagesCms
         params.slice(:search)
       end
 
+      def current_site
+        Account.find(params[:account])
+      end
+
   end
 
 end

data/app/helpers/pages_cms/application_helper.rb

@@ -10,5 +10,54 @@ module PagesCms
       end
     end
 
+    def current_account
+      if Account.exists?(session[:current_account])
+        Account.find(session[:current_account])
+      else
+        false
+      end
+    end
+
+    # added by PagesCMS. Use this helper to link to user created pages.
+    def slugged_path(page)
+      if page.class == String
+        "/#{page}"
+      else
+        mount = page.account.mount_location
+        if page.parent.nil?
+          "#{'/' unless mount == '/'}#{mount unless mount == '/'}/#{page.slug}"
+        else
+          "#{'/' unless mount == '/'}#{mount unless mount == '/'}/#{page.parent.slug}/#{page.slug}"
+        end
+      end
+    end
+
+    # redirects to the blog with a search
+    def blog_path(page, search = '')
+      "#{slugged_path(page)}?=#{search}"
+    end
+
+    def insert_html_breaks(string)
+      string.gsub(/\n/, '<br />')
+    end
+
+    def meta_tags
+
+    end
+
+    def meta_description
+
+    end
+
+    def current_site
+      if params[:account]
+        Account.where(id: params[:account]).first
+      elsif session[:current_account]
+        Account.where(id: session[:current_account]).first
+      else
+        Account.all
+      end
+    end
+
   end
 end

data/app/models/pages_cms/account.rb

@@ -1,12 +1,14 @@
 module PagesCms
   class Account < ActiveRecord::Base
-    validate :only_one_account
+    has_many :pages,      dependent: :destroy
+    has_many :articles,   dependent: :destroy
+    has_many :images,     dependent: :destroy
+    has_many :contacts,   dependent: :destroy
 
-    private
-      def only_one_account
-        if Account.count >= 1
-          errors.add(:base, 'Only one account allowed!')
-        end
-      end
+    VALID_MOUNT = /[a-zA-Z]+[\/]/
+    validates :mount_location, presence: true, uniqueness: true,  format: { with: VALID_MOUNT }
+
+    VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
+    validates :email,   presence: true, format: { with: VALID_EMAIL_REGEX }
   end
 end

data/app/models/pages_cms/article.rb

@@ -1,6 +1,6 @@
 module PagesCms
   class Article < ActiveRecord::Base
-
+    belongs_to :account
     belongs_to :image
 
     validates :title,   presence: true

data/app/models/pages_cms/contact.rb

@@ -1,5 +1,6 @@
 module PagesCms
   class Contact < ActiveRecord::Base
+    belongs_to :account
     VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
     validates :email,   presence: true, format: { with: VALID_EMAIL_REGEX }
     validates :name,    presence: true

data/app/models/pages_cms/image.rb

@@ -1,6 +1,6 @@
 module PagesCms
   class Image < ActiveRecord::Base
-
+    belongs_to :account
     has_many :thumbnails, dependent: :destroy
 
     validates :file, presence: true