optimacms 0.1.5 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7423961f90b9cefc9804eba62c7a24a34ab07cb5
-  data.tar.gz: c5db0f9c93e7397db548504094fbd9d038a7c1a7
+  metadata.gz: edd2451b5701cc30dff19fe4e8587ec829b713df
+  data.tar.gz: f7ca96f3f0b8250167a21af1bdac307d9a19b1cd
 SHA512:
-  metadata.gz: ae063cca5a45779f75f469eb98c16fa9f443261b066c7797b8c588b7bc128ebda303d4006cc2f5a1c4b5e70d96f0fc68d3e3ab744250b56498f864eec260b184
-  data.tar.gz: 5b36846f5bd8ba734bd139184291708f0dda10bb16200a9eb41092ef379597a876a413d49ca22dbde5e62c7a57b83682780d971dbbb5e92230be2001583eed98
+  metadata.gz: c9b95dead01c57644d03843e1c50702a0eceb6682d2d02d62b1ceac9f7a14de2f4f66607ddd1b917c4ea486c5755f7e300b67a0d4f4635cef4911329de82dfea
+  data.tar.gz: 0006fd2078b9156e88be5fa708638bb60eb9da7e0d3a6f9457407c24eff9e329a497c3cc893fb8f21f7c89b18f9bfbb0b5048dd3b547d6d1825d315db7bc634b

data/app/controllers/optimacms/admin/admin_base_controller.rb

@@ -1,6 +1,9 @@
 module Optimacms
   module Admin
     class AdminBaseController < ApplicationController
+      before_action :authenticate_cms_admin_user!
+
+
       layout 'optimacms/admin/layouts/main'
 
       add_flash_types :success
@@ -19,6 +22,16 @@ module Optimacms
       end
 
 
+      def after_sign_in_path_for(resource)
+        if resource.is_a?(CmsAdminUser)
+          dashboard_path
+        else
+          root_path
+        end
+
+      end
+
+
     end
   end
 end

data/app/controllers/optimacms/admin/templates_controller.rb

@@ -18,9 +18,13 @@ module Optimacms
 
     def index
       #
-      @parent_id = @filter.v('parent_id')
+      @parent_id = @filter.v('parent_id').to_i
       @parent = Template.find(@parent_id) rescue nil
 
+      if @parent.nil? && @parent_id>0
+        redirect_to templates_path(:parent_id=>0) and return
+      end
+
       #
       @items = model.list(@filter, @pg)
 

data/app/controllers/optimacms/dev_controller.rb

@@ -16,6 +16,17 @@ module Optimacms
 
       #FileUtils.rm(f)
     end
+
+    def addadminuser
+      row = Optimacms::CmsAdminUser.new
+      row.email = 'admin@example.com'
+      row.password = 'admin'
+
+      row.save
+    end
   end
+
+
+
 end
 

data/app/helpers/optimacms/application_helper.rb

@@ -1,7 +1,8 @@
 module Optimacms
   module ApplicationHelper
 
-    include ActionView::Helpers::ApplicationHelper
+    #include ActionView::Helpers::ApplicationHelper
+    x=0
 
     def method_missing(method, *args, &block)
       main_app.send(method, *args, &block)

data/app/models/optimacms/cms_admin_user.rb

@@ -0,0 +1,10 @@
+module Optimacms
+  class CmsAdminUser < ActiveRecord::Base
+    self.table_name = 'cms_users'
+
+    # Include default devise modules. Others available are:
+    # :confirmable, :lockable, :timeoutable and :omniauthable
+    #devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
+    devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable
+  end
+end

data/app/views/cms_admin_users/confirmations/new.html.erb

@@ -0,0 +1,16 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Resend confirmation instructions" %>
+  </div>
+<% end %>
+
+<%= render "cms_admin_users/shared/links" %>

data/app/views/cms_admin_users/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p>Welcome <%= @email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>

data/app/views/cms_admin_users/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/cms_admin_users/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>

data/app/views/cms_admin_users/passwords/edit.html.erb

@@ -0,0 +1,22 @@
+<h2>Change your password</h2>
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= devise_error_messages! %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <div class="field">
+    <%= f.label :password, "New password" %><br />
+    <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password_confirmation, "Confirm new password" %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Change my password" %>
+  </div>
+<% end %>
+
+<%= render "cms_admin_users/shared/links" %>

data/app/views/cms_admin_users/passwords/new.html.erb

@@ -0,0 +1,16 @@
+<h2>Forgot your password?</h2>
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Send me reset password instructions" %>
+  </div>
+<% end %>
+
+<%= render "cms_admin_users/shared/links" %>

data/app/views/cms_admin_users/registrations/edit.html.erb

@@ -0,0 +1,39 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true %>
+  </div>
+
+  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+    <%= f.password_field :password, autocomplete: "off" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+    <%= f.password_field :current_password, autocomplete: "off" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Update" %>
+  </div>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
+
+<%= link_to "Back", :back %>

data/app/views/cms_admin_users/registrations/new.html.erb

@@ -0,0 +1,29 @@
+<h2>Sign up</h2>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password %>
+    <% if @validatable %>
+    <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <% end %><br />
+    <%= f.password_field :password, autocomplete: "off" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Sign up" %>
+  </div>
+<% end %>
+
+<%= render "cms_admin_users/shared/links" %>

data/app/views/cms_admin_users/sessions/new.html.erb

@@ -0,0 +1,26 @@
+<h2>Log in</h2>
+
+<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password %><br />
+    <%= f.password_field :password, autocomplete: "off" %>
+  </div>
+
+  <% if devise_mapping.rememberable? -%>
+    <div class="field">
+      <%= f.check_box :remember_me %>
+      <%= f.label :remember_me %>
+    </div>
+  <% end -%>
+
+  <div class="actions">
+    <%= f.submit "Log in" %>
+  </div>
+<% end %>
+
+<%= render "cms_admin_users/shared/links" %>

data/app/views/cms_admin_users/shared/_links.html.erb

@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Log in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

data/app/views/cms_admin_users/unlocks/new.html.erb

@@ -0,0 +1,16 @@
+<h2>Resend unlock instructions</h2>
+
+<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Resend unlock instructions" %>
+  </div>
+<% end %>
+
+<%= render "cms_admin_users/shared/links" %>

data/app/views/layouts/optimacms/application_logged_out.html.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Optimacms</title>
+  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+  <%= stylesheet_link_tag    "optimacms/application", media: "all" %>
+  <%= javascript_include_tag "optimacms/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/app/views/optimacms/admin/shared/_top.html.haml

@@ -9,17 +9,25 @@
       <a class="navbar-brand" href="#"><small><i class="fa fa-cube"></i> Admin</small></a>
     .navbar-buttons.pull-right(role="navigation")
       %ul.nav
+        -#%li
+          =link_to 'Login', new_user_session_path
         %li
           %a.dropdown-toggle(href="#" data-toggle="dropdown" aria-expanded="true")
             %span.user-info Admin
             %i.fa.fa-caret-down
           %ul.dropdown-menu-right.dropdown-menu
+            %li
+              %a{:href => '#'}
+                = fa_icon "user"
+                #{current_cms_admin_user.email}
             %li
               <a href="#"><i class="fa fa-cog"></i> Settings</a>
             %li
               <a href="profile.html"><i class="fa fa-user"></i> Profile</a>
             %li.divider
             %li
-              <a href="#"><i class="fa fa-power-off"></i> Logout</a>
+              =link_to destroy_cms_admin_user_session_path, :method => :delete do
+                = fa_icon "fa-power-off"
+                Logout
 
 

data/config/locales/devise.en.yml

@@ -0,0 +1,60 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"

data/config/routes.rb

@@ -1,8 +1,9 @@
 Optimacms::Engine.routes.draw do
-  resources :articles
 
   # admin
   scope '/cmsadmin', module: "admin" do
+    #devise_for :users, { class_name: "Optimacms::User", module: :devise }
+
     get '/' => 'dashboard#index', as: :dashboard
 
     resources :pages do

data/db/migrate/20150503213839_devise_create_optimacms_cms_users.rb

@@ -0,0 +1,42 @@
+class DeviseCreateOptimacmsCmsUsers < ActiveRecord::Migration
+  def change
+    create_table(:optimacms_cms_users) do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+
+      t.timestamps
+    end
+
+    add_index :optimacms_cms_users, :email,                unique: true
+    add_index :optimacms_cms_users, :reset_password_token, unique: true
+    # add_index :optimacms_cms_users, :confirmation_token,   unique: true
+    # add_index :optimacms_cms_users, :unlock_token,         unique: true
+  end
+end

data/lib/optimacms/devise.rb

@@ -0,0 +1,88 @@
+
+require 'devise'
+
+module Optimacms
+  module Devise
+
+    def self.config
+      {
+          class_name: "Optimacms::CmsAdminUser",
+          path: '/cmsadmin',
+          #path: ActiveAdmin.application.default_namespace || "/",
+          controllers: Optimacms::Devise.controllers,
+          path_names: { sign_in: 'login', sign_out: "logout" },
+          #sign_out_via: [*::Devise.sign_out_via, ActiveAdmin.application.logout_link_method].uniq
+      }
+    end
+
+    def self.controllers
+      {
+        sessions: "optimacms/devise/sessions",
+        passwords: "optimacms/devise/passwords",
+        unlocks: "optimacms/devise/unlocks",
+        registrations: "optimacms/devise/registrations",
+        confirmations: "optimacms/devise/confirmations"
+      }
+    end
+
+
+    # got from activeadmin
+
+    module Controller
+      extend ::ActiveSupport::Concern
+
+      included do
+        layout 'optimacms/application_logged_out'
+        #helper ::Optimacms::ViewHelpers
+      end
+
+      # Redirect to the default namespace on logout
+      def root_path
+        return '/'
+        #namespace = Optimacms.application.default_namespace.presence
+        namespace = nil
+        root_path_method = [namespace, :root_path].compact.join('_')
+
+        path = if Helpers::Routes.respond_to? root_path_method
+                 Helpers::Routes.send root_path_method
+               else
+                 # Guess a root_path when url_helpers not helpful
+                 "/#{namespace}"
+               end
+
+        # NOTE: `relative_url_root` is deprecated by rails.
+        #       Remove prefix here if it is removed completely.
+        #prefix = Rails.configuration.action_controller[:relative_url_root] || ''
+        prefix = ''
+        prefix + path
+      end
+    end
+
+
+
+    class SessionsController < ::Devise::SessionsController
+      include ::Optimacms::Devise::Controller
+    end
+
+    class PasswordsController < ::Devise::PasswordsController
+      include ::Optimacms::Devise::Controller
+    end
+
+    class UnlocksController < ::Devise::UnlocksController
+      include ::Optimacms::Devise::Controller
+    end
+
+    class RegistrationsController < ::Devise::RegistrationsController
+       include ::Optimacms::Devise::Controller
+    end
+
+    class ConfirmationsController < ::Devise::ConfirmationsController
+       include ::Optimacms::Devise::Controller
+    end
+
+    def self.controllers_for_filters
+      [SessionsController, PasswordsController, UnlocksController, RegistrationsController, ConfirmationsController
+      ]
+    end
+  end
+end

data/lib/optimacms/engine.rb

@@ -1,3 +1,4 @@
+
 module Optimacms
   class Engine < ::Rails::Engine
     isolate_namespace Optimacms

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.5"
+  VERSION = "0.1.14"
 end

data/lib/optimacms.rb

@@ -1,3 +1,4 @@
+require 'devise'
 require "optimacms/engine"
 
 module Optimacms

data/test/dummy/app/models/user.rb

@@ -0,0 +1,6 @@
+class User < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+end

data/test/dummy/app/views/home/index.html.haml

@@ -2,6 +2,10 @@
 %ul
   %li= link_to '/cmsadmin', '/cmsadmin'
 
+%h2 Users
+%ul
+  %li= link_to 'Login', new_user_session_path
+
 %h2 Pages
 
 %ul