push_type_admin 0.9.5 → 0.10.0.beta.3

data/app/views/push_type/admin/nodes/trash.html.haml

@@ -0,0 +1,48 @@
+- title 'Trash'
+
+- breadcrumbs.add 'Trash', push_type_admin.trash_nodes_path
+
+- if @nodes.empty?
+  .columns
+    .empty-default
+      %h2 No trash
+      = link_to ficon(:arrow_left, 'Back to content'), push_type_admin.nodes_path, class: 'button radius secondary'
+
+- else
+  .large-8.columns
+    %section.container
+      .head
+        .left.btn= link_to ficon(:previous), push_type_admin.nodes_path
+        .title Trash
+      .body
+        %ul.node-list
+          - for node in @nodes.all
+            %li.node-list-item.actionable{ data: { id: node.id } }
+              = link_to push_type_admin.edit_node_path(node) do
+                .title= node.title
+                .meta
+                  %span.label.secondary.radius= node.type.to_s.underscore.humanize
+                  %span.label.radius.alert Trashed
+                  - if node.orphan?
+                    %span.label.radius.alert Orphan
+                  %time Deleted #{ time_ago_in_words node.deleted_at } ago
+                  \-
+                  %span= pluralize node.children.count, 'child'
+              .buttons
+                - if node.orphan?
+                  %span= ficon(:loop)
+                - else
+                  = link_to ficon(:loop), push_type_admin.restore_node_path(node), method: 'put', class: 'success'
+                = link_to ficon(:x), push_type_admin.node_path(node), method: 'delete', class: 'alert', data: { confirm: { body: 'This action cannot be undone. All child content will also be permanently deleted.' } }
+
+  .large-4.columns
+    .side-panel{ :'side-panel' => true }
+      .padded
+        .pagination-centered
+          .pagination-stats
+            = pluralize @nodes.total_count, 'item'
+            - unless @nodes.total_count == 0
+              \- Page #{ @nodes.current_page } of #{ @nodes.total_pages }
+          = paginate @nodes
+      .cta.text-center
+        = link_to ficon(:trash, 'Empty trash'), push_type_admin.trash_nodes_path, method: 'delete', class: 'button radius alert', data: { confirm: true }

data/app/views/push_type/admin/taxonomies/index.html.haml.bak

@@ -0,0 +1,16 @@
+- title 'Taxonomies'
+
+.columns
+  %section
+    %ul.taxonomies-list.small-block-grid-1.medium-block-grid-2.large-block-grid-3
+      - for taxonomy in @taxonomies
+        %li
+          %article.taxonomies-list-item
+            = link_to push_type_admin.taxonomy_path(taxonomy.name.underscore) do
+              .title= taxonomy.title
+              .meta
+                - if taxonomy.exposed?
+                  %span.label.success.radius Exposed
+                - else
+                  %span.label.secondary.radius Unexposed
+                %span= pluralize taxonomy.all.count, 'term'

data/app/views/push_type/admin/taxonomies/show.html.haml.bak

@@ -0,0 +1,55 @@
+- title "Manage #{ @taxonomy.title.downcase }"
+- breadcrumbs.add @taxonomy.title, push_type_admin.taxonomy_path(@taxonomy.name.underscore)
+
+%div{ ng: { controller: 'TaxonomyTermsCtrl', init: "param='#{ @taxonomy.name.underscore }'; baseSlug='#{ @taxonomy.base_slug }'; terms=#{ @terms.to_json }" } }
+  .large-8.columns
+    .container
+      .head
+        .left.btn= link_to ficon(:previous), push_type_admin.taxonomies_path
+        .title= yield :title
+      .body{ :'ui-tree' => 'treeFuncs' }
+        .empty-default{ ng: { hide: 'termCount() > 0' } }
+          %h2 No #{ @taxonomy.title.downcase }
+          %p Organise content through taxonomies. Get started by creating your first #{ @taxonomy.title.downcase.singularize }.
+        %ul.taxonomy-term-list{ :'ui-tree-nodes' => true, ng: { model: 'terms' } }
+          %li.taxonomy-term-item{ :'ui-tree-node' => true, ng: { repeat: 'term in terms', include: "'taxonomy.html'" } }
+
+  .large-4.columns
+    .side-panel{ :'side-panel' => true }
+      .cta.text-center
+        %a.button.success.radius{ ng: { click: 'newTerm()' } }
+          = ficon :plus, "Add #{ @taxonomy.title.downcase.singularize }"
+
+
+= content_tag :script, type: 'text/ng-template', id: 'taxonomy.html' do
+  %div{ ng: { controller: 'TaxonomyTermCtrl' } }
+    %div.show{ ng: { hide: 'isEditing()' } }
+      .title {{ term.title }}
+      .meta
+        %span {{ termPermalink() }}
+      .edit
+        %a{ ng: { click: 'edit()' } }
+          .icon= ficon(:pencil)
+          .meta Edit
+      .handle{ :'ui-tree-handle' => true }
+    %form{ name: 'termForm', ng: { show: 'isEditing()' } }
+      .columns
+        .row.collapse
+          .small-1.columns{ ng: { class: 'errorClass("title")' } }
+            %label.prefix Title
+          .small-11.columns{ ng: { class: 'errorClass("title")' } }
+            %input{ type: 'text', name: 'title', ng: { model: 'term.title', keyup: 'setSlug()' } }
+            %small.error{ ng: { show: 'errors.title' } } {{ errors.title }}
+        .row.collapse
+          .small-1.columns{ ng: { class: 'errorClass("slug")' } }
+            %label.prefix Slug
+          .small-5.columns{ ng: { class: 'errorClass("slug")' } }
+            %input{ type: 'text', name: 'slug', ng: { model: 'term.slug' } }
+            %small.error{ ng: { show: 'errors.slug' } } {{ errors.slug }}
+          .small-6.columns.text-right
+            %button.tiny.radius.success{ ng: { click: 'save()' } } Save
+            %button.tiny.radius.alert{ :'pt-confirm-reveal' => 'delete()', ng: { hide: 'isNewTerm()' }, data: { body: "This action cannot be undone. All child #{ @taxonomy.title.downcase } will also be permanently deleted."} } Delete
+            %button.tiny.radius.secondary{ ng: { click: 'reset()' } } Cancel
+      %input{ type: 'hidden', value: '{{ term.id }}', ng: { if: 'term.id' } }
+    %ul.nested-taxonomy-term-list{ :'ui-tree-nodes' => true, ng: { init: 'terms = term.children', model: 'terms' } }<
+      %li.taxonomy-term-item{ :'ui-tree-node' => true, ng: { repeat: 'term in terms', include: "'taxonomy.html'" } }

data/app/views/push_type/admin/users/_form.html.haml

@@ -0,0 +1,36 @@
+= form_for @user, url: url do |f|
+  .large-8.columns
+    .container
+      .head
+        .left.btn= link_to ficon(:previous), push_type_admin.users_path
+        .title= yield :title
+      .body.padded
+        .row.title
+          .columns
+            = f.label :name
+            = f.text_field :name
+        .row.email
+          .columns
+            = f.label :email
+            = f.email_field :email
+
+        .row.custom-fields
+          - @user.fields.each do |key, field|
+            %div{ class: field_classes(field) }
+              = f.label field.name, field.label
+              = render_field field, f
+
+  .large-4.columns
+    .side-panel{ :'side-panel' => true }
+      .padded
+        .meta-table= render 'meta_table'
+      .submit.text-center
+        - if @user.new_record?
+          %button.button.success.radius= ficon :check, 'Create user'
+        - else
+          %button.button.radius= ficon :check, 'Update user'
+          - unless @user == push_type_user
+            .text-button.alert
+              = link_to 'Delete user', push_type_admin.user_path(@user), method: 'delete', data: { confirm: true }
+            
+            

data/app/views/push_type/admin/users/_user.html.haml

@@ -0,0 +1,7 @@
+%article.user-list-item
+  = link_to push_type_admin.edit_user_path(user) do
+    .avatar= user.initials
+    .title= user.name
+    .meta
+      %span.label.secondary.radius User
+      %time= last_logged_in user

data/app/views/push_type/admin/users/edit.html.haml

@@ -0,0 +1,4 @@
+- title 'Edit user'
+- breadcrumbs.add @user.name, push_type_admin.edit_user_path(@user)
+
+= render 'form', url: push_type_admin.user_path(@user)

data/app/views/push_type/admin/users/index.html.haml

@@ -0,0 +1,21 @@
+- title 'Users'
+
+.large-8.columns
+  - if @users.empty?
+    .empty-default
+      %h2 No users
+      %p This is weird. How are you even seeing this?
+  - else
+    %section
+      %ul.user-list.small-block-grid-1.medium-block-grid-2
+        - for user in @users.all
+          %li= render 'user', user: user
+
+.large-4.columns
+  .side-panel{ :'side-panel' => true }
+    .padded
+      .pagination-centered
+        .pagination-stats #{ pluralize @users.total_count, 'user' } - Page #{ @users.current_page } of #{ @users.total_pages }
+        = paginate @users
+    .cta.text-center
+      = link_to ficon(:plus, 'New user'), push_type_admin.new_user_path, class: 'button radius success'

data/app/views/push_type/admin/users/new.html.haml

@@ -0,0 +1,4 @@
+- title 'New user'
+- breadcrumbs.add yield(:title), push_type_admin.new_user_path
+
+= render 'form', url: push_type_admin.users_path

data/app/views/push_type/fields/_asset.html.haml

@@ -21,7 +21,7 @@
       %a.button.success.small.radius{ :'v-bind:data-reveal-id' => 'uid' } Pick media
 
     .reveal-modal{ :'v-bind:id' => 'uid', data: { reveal: true } }
-      %asset-modal{ :'index-path' => push_type.assets_path, :'upload-path' => push_type.upload_assets_path, :':reveal-id' => 'uid' }
+      %asset-modal{ :':reveal-id' => 'uid' }
 
 - if f.object.errors[field.name].present?
   %small.error= f.object.errors[field.name].join(', ')

data/app/views/push_type/fields/_wysiwyg.html.haml

@@ -1,7 +1,7 @@
 %wysiwyg-field{ :'inline-template' => true }
   .wysiwyg-field
-    = f.text_area field.name, field.html_options.merge(:'upload-path' => push_type.upload_assets_path)
+    = f.text_area field.name, field.html_options
 
     .reveal-modal{ :'v-bind:id' => 'uid', data: { reveal: true } }
-      %asset-modal{ :'index-path' => push_type.assets_path, :'upload-path' => push_type.upload_assets_path, :':reveal-id' => 'uid' }
+      %asset-modal{ :':reveal-id' => 'uid' }
 

data/app/webpack/javascripts/admin.es6

@@ -52,7 +52,7 @@ $(document).on('ready page:load turbolinks:load', function() {
     handle: '.handle',
     forcePlaceholderSize: true
   }).on('sortupdate', function(e, ui) {
-    $.post(`/push_type/nodes/${ ui.item.data('id') }/position`, {
+    $.post(`${ PushType.Routes.adminPath }/nodes/${ ui.item.data('id') }/position`, {
       prev: ui.item.prev().data('id'),
       next: ui.item.next().data('id')
     }, 'json');

data/app/webpack/javascripts/components/asset-form.es6

@@ -5,18 +5,24 @@ export default Vue.component('asset-form', {
   props: {
     asset: {
       coerce: (val) => JSON.parse(val)
-    },
-    createPath: true,
-    updatePath: true
+    }
   },
 
   computed: {
+    createPath: function() {
+      return `${ PushType.Routes.adminPath }/media`;
+    },
+
+    updatePath: function() {
+      return `${ PushType.Routes.adminPath }/media/${ this.asset.id }`;
+    },
+
     saveMethod: function() {
       return this.asset['new_record?'] ? 'post' : 'patch';
     },
 
     saveUrl: function() {
-      return this.asset['new_record?'] ? this.createPath : this.updatePath.replace(/~id$/, this.asset.id);
+      return this.asset['new_record?'] ? this.createPath : this.updatePath;
     },
 
     saveButtonText: function() {

data/app/webpack/javascripts/components/asset-index.es6

@@ -5,13 +5,12 @@ export default Vue.component('asset-index', {
   props: {
     assets: {
       coerce: (val) => JSON.parse(val)
-    },
-    editPath: true
+    }
   },
 
   methods: {
     editUrl: function(asset) {
-      return this.editPath.replace(/~id/, asset.id);
+      return `${ PushType.Routes.adminPath }/media/${ asset.id }/edit`;
     },
     afterUpload: function(asset) {
       this.assets.unshift(asset);

data/app/webpack/javascripts/components/asset-modal.vue

@@ -26,7 +26,7 @@
       </div>
       <div id="upload" class="content">
         <div class="asset-upload">
-          <div class="dropzone" v-asset-upload v-bind:upload-path="uploadPath" maxfiles="10">
+          <div class="dropzone" v-asset-upload maxfiles="10">
             <div class="prompt">Drag files to quickly upload them&hellip;</div>
             <div class="icon"><i class="fi-upload-cloud"></i></div>
           </div>
@@ -40,7 +40,7 @@
 import $ from 'jquery';
 
 export default {
-  props: ['indexPath', 'uploadPath', 'revealId'],
+  props: ['revealId'],
 
   data: function() {
     return {
@@ -54,6 +54,10 @@ export default {
   },
 
   computed: {
+    indexPath: function() {
+      return `${ PushType.Routes.adminPath }/media`;
+    },
+
     $modal: function() {
       return $(`#${ this.revealId }`);
     }
@@ -65,7 +69,9 @@ export default {
     },
 
     loadAssets: function(page) {
-      let config = page ? { page: page } : null;
+      let config = {
+        params: { page: page || 1 }
+      };
       this.$http.get(this.indexPath, config).then(function(r) {
         this.assets = r.data.assets;
         this.meta = r.data.meta;

data/app/webpack/javascripts/components/node-form.es6

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import moment from 'moment';
+import slug from 'slug';
 
 export default Vue.component('node-form', {
 
@@ -56,17 +57,7 @@ export default Vue.component('node-form', {
   methods: {
     setSlug: function() {
       if (this.node['new_record?']) {
-        this.node.slug = this.node.title.toLowerCase()
-                          .replace(/[àáâãäå]/g,"a")
-                          .replace(/[éèêëęėē]/g,"e")
-                          .replace(/[ýÿ]/g,"y")
-                          .replace(/[úûüùū]/g,"u")
-                          .replace(/[íîïìįī]/g,"i")
-                          .replace(/[óöôòõøō]/g,"o")
-                          .replace(/[ð]/g,"d")
-                          .replace(/[æ]/g,"ae")
-                          .replace(/[þ]/g,"th")
-                          .replace(/[\s\_]/g, '-').replace(/[^\w\-]/g, '');
+        this.node.slug = slug(this.node.title, { lower: true });
       }
     }
   }

data/app/webpack/javascripts/directives/asset-upload.es6

@@ -2,7 +2,7 @@ import Vue from 'vue';
 import $ from 'jquery';
 
 export default Vue.directive('asset-upload', {
-  params: ['upload-path', 'fallback-id', 'maxfiles'],
+  params: ['fallback-id', 'maxfiles'],
   bind: function() {
     let self = this,
         $el = $(self.el);
@@ -13,7 +13,7 @@ export default Vue.directive('asset-upload', {
       }
       $el.filedrop({
         fallback_id:  self.params.fallbackId,
-        url:          self.params.uploadPath,
+        url:          `${ PushType.Routes.adminPath }/media/upload`,
         paramname:    'asset[file]',
         maxfiles:     ( self.params.maxfiles || 1 ),
         maxfilesize:  10,

data/app/webpack/javascripts/directives/froala.es6

@@ -38,7 +38,7 @@ const opts = {
 }
 
 export default Vue.directive('froala', {
-  params: ['upload-path', 'froala-toolbar'],
+  params: ['froala-toolbar'],
 
   bind: function() {
     let $el = $(this.el);
@@ -47,10 +47,12 @@ export default Vue.directive('froala', {
     $el.on('froalaEditor.blur',         (e, editor) => editor.$box.removeClass('focus') );
     $el.on('froalaEditor.image.error',  (e, editor, error) => alert(error.message) );
 
+    let uploadPath = `${ PushType.Routes.adminPath }/media/upload`;
+
     let options = {};
     _.extend(options, defaults, opts[this.params.froalaToolbar], {
-      fileUploadURL: this.params.uploadPath,
-      imageUploadURL: this.params.uploadPath
+      fileUploadURL:  uploadPath,
+      imageUploadURL: uploadPath
     })
 
     setTimeout(() => { $el.froalaEditor(options) }, 200);

data/config/routes.rb

@@ -1,32 +1,35 @@
-PushType::Core::Engine.routes.draw do
+PushType::Admin::Engine.routes.draw do
 
-  resources :nodes, except: :show do
-    collection do
-      get 'trash'
-      delete 'trash' => 'nodes#empty'
-    end
-    member do
-      post 'position'
-      put 'restore'
-    end
-    resources :nodes, only: [:index, :new, :create]
-  end
+  scope module: 'admin' do
 
-  resources :assets, except: :show, path: 'media' do
-    collection do
-      post 'upload'
-      get 'trash'
-      delete 'trash' => 'assets#empty'
+    resources :nodes, except: :show do
+      collection do
+        get 'trash'
+        delete 'trash' => 'nodes#empty'
+      end
+      member do
+        post 'position'
+        put 'restore'
+      end
+      resources :nodes, only: [:index, :new, :create]
     end
-    member do
-      put 'restore'
+
+    resources :assets, except: :show, path: 'media' do
+      collection do
+        post 'upload'
+        get 'trash'
+        delete 'trash' => 'assets#empty'
+      end
+      member do
+        put 'restore'
+      end
     end
-  end
 
-  resources :users, except: :show
+    resources :users, except: :show
 
-  get 'info' => 'admin#info', as: 'info'
+  end
 
+  get 'info' => 'admin#info', as: 'info'
   root to: redirect('nodes')
     
 end

data/config/webpack.config.js

@@ -23,5 +23,9 @@ module.exports = {
       { test: /\.es6$/, loader: 'babel', query: { presets: ['es2015'] } },
       { test: /\.vue$/, loader: 'vue' }
     ]
-  }
+  },
+
+  plugins: [
+    new webpack.IgnorePlugin(/unicode\/category\/So$/)
+  ]
 };

data/lib/push_type/admin/engine.rb

@@ -23,16 +23,16 @@ module PushType
           html_options class: 'left'
 
           item :content do
-            link    { push_type.nodes_path }
-            active  { request.fullpath.match %r{^#{ push_type.nodes_path }} }
+            link    { push_type_admin.nodes_path }
+            active  { request.fullpath.match %r{^#{ push_type_admin.nodes_path }} }
           end
           item :media do
-            link    { push_type.assets_path }
-            active  { request.fullpath.match %r{^#{ push_type.assets_path }} }
+            link    { push_type_admin.assets_path }
+            active  { request.fullpath.match %r{^#{ push_type_admin.assets_path }} }
           end
           item :users do
-            link    { push_type.users_path }
-            active  { request.fullpath.match %r{^#{ push_type.users_path }} }
+            link    { push_type_admin.users_path }
+            active  { request.fullpath.match %r{^#{ push_type_admin.users_path }} }
           end
         end
 
@@ -42,7 +42,7 @@ module PushType
 
           item :info do
             text    { ficon(:info) }
-            link    { push_type.info_path }
+            link    { push_type_admin.info_path }
             link_options data: { :'reveal-id' => 'reveal-ajax', :'reveal-ajax' => true }
           end
         end

data/lib/push_type/admin.rb

@@ -1,4 +1,5 @@
 require 'push_type_core'
+require 'push_type_api'
 
 require 'coffee-rails'
 require 'sass-rails'
@@ -24,7 +25,7 @@ module PushType
   end
 
   module Admin
-    ActiveSupport.run_load_hooks(:push_type_admin, PushType)
+    PushType.register_engine self, mount: 'admin'
   end
   
 end

data/test/controllers/push_type/admin/assets_controller_test.rb

@@ -0,0 +1,118 @@
+require 'test_helper'
+
+module PushType
+  class Admin::AssetsControllerTest < ActionController::TestCase
+
+    let(:asset_attrs) { FactoryGirl.attributes_for(:asset) }
+    let(:asset) { FactoryGirl.create :asset }
+    
+    describe 'GET #index' do
+      before do
+        5.times { FactoryGirl.create :asset }
+        get :index
+      end
+      it { response.must_render_template 'index' }
+      it { assigns[:assets].size.must_equal 5 }
+    end
+
+    describe 'GET #trash' do
+      before do
+        2.times { FactoryGirl.create :asset }
+        3.times { FactoryGirl.create :asset, deleted_at: Time.zone.now }
+        get :trash
+      end
+      it { response.must_render_template 'trash' }
+      it { assigns[:assets].size.must_equal 3 }
+    end
+
+    describe 'GET #new' do
+      before { get :new }
+      it { response.must_render_template 'new' }
+      it { assigns[:asset].must_be :new_record? }
+      it { assigns[:asset].must_be_instance_of Asset }
+    end
+
+    describe 'POST #create' do
+      let(:action!) { post :create, params: { asset: asset_attrs } }
+      describe 'with valid asset' do
+        before { action! }
+        it { response.must_respond_with :redirect }
+        it { flash[:notice].must_be :present? }
+      end
+      describe 'asset count' do
+        it { proc { action! }.must_change 'Asset.count', 1 }
+      end
+      describe 'with in-valid asset' do
+        let(:asset_attrs) { {} }
+        before { action! }
+        it { response.must_render_template 'new' }
+        it { assigns[:asset].errors.must_be :present? }
+      end
+    end
+
+    describe 'POST #upload' do
+      let(:json_response) { JSON.parse(response.body) }
+      let(:action!) { post :upload, format: :json, params: { asset: asset_attrs } }
+      describe 'with valid asset' do
+        before { action! }
+        it { response.must_respond_with :success }
+        it { json_response['asset'].must_be :present? }
+        it { json_response['errors'].wont_be :present? }
+      end
+      describe 'asset count' do
+        it { proc { action! }.must_change 'Asset.count', 1 }
+      end
+      describe 'with in-valid asset' do
+        let(:asset_attrs) { {} }
+        before { action! }
+        it { response.must_respond_with :unprocessable_entity }
+        it { json_response['asset'].wont_be :present? }
+        it { json_response['errors'].must_be :present? }
+      end
+    end
+
+    describe 'GET #edit' do
+      before { get :edit, params: { id: asset.id } }
+      it { response.must_render_template 'edit' }
+      it { assigns[:asset].must_equal asset }
+    end
+
+    describe 'PUT #update' do
+      before { put :update, params: { id: asset.id, asset: { description: new_description } } }
+      describe 'with valid asset' do
+        let(:new_description) { 'Foo bar baz' }
+        it { response.must_respond_with :redirect }
+        it { flash[:notice].must_be :present? }
+        it { asset.reload.description.must_equal new_description }
+      end
+    end
+
+    describe 'DELETE #destroy' do
+      before { delete :destroy, params: { id: asset.id } }
+      it { response.must_respond_with :redirect }
+      it { flash[:notice].must_be :present? }
+      it { asset.reload.must_be :trashed? }
+    end
+
+    describe 'PUT #restore' do
+      before do
+        asset.trash!
+        put :restore, params: { id: asset.id }
+      end
+      it { response.must_respond_with :redirect }
+      it { flash[:notice].must_be :present? }
+      it { asset.reload.wont_be :trashed? }
+    end
+
+    describe 'DELETE #empty' do
+      before do
+        3.times { FactoryGirl.create :asset, deleted_at: Time.zone.now }
+        delete :empty
+      end
+      it { response.must_respond_with :redirect }
+      it { flash[:notice].must_be :present? }
+      it { PushType::Asset.trashed.must_be :empty? }
+    end
+
+  end
+end