billy_cms 0.0.11 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 619314e33692f6ce71b51ade84cdc51d0903c5d5
-  data.tar.gz: 2fe41171a67e95a210ba083fc5e6116087cd633f
+  metadata.gz: 1dd64aeeedb98f763d5cefcaada670b0fe5c4798
+  data.tar.gz: fe8743b1229d9ba5e3a0797c02cc612eecc36953
 SHA512:
-  metadata.gz: 0b229af480394c3be2e069c97b10de2e9b3f19c837bbb01a18d503b78d73d08b6739b27f7b4b87b5548b8e02725fd2ef36eab1aaaa9527bb44fcf8f7610abdc9
-  data.tar.gz: 732487a213014d6b4bed97e20d4184a9d7f8fc28a7ece74d4187b3f0af4db4bcd45281300bca9ec63a25bc957ffb6c8bf4049747748e6e7e9145c6be91a203e3
+  metadata.gz: 658d41360662fbcb6c027b2df5004501499b7a913a8f1131e1140459b21aa40059b2906d22b6cedec2ce6ee1a76d24f92bc78788a7c07714127b956965a239d1
+  data.tar.gz: bc75818c778befa9b4e70a67f789bd3fbb4e5e44380b37b5dd662f0cd2101c7d62d977106a324ec05ee8014266f22716ec835d30e17d7dc1b2c2f8ccd2864bfe

data/app/assets/javascripts/billy_cms/backend/app.js.erb

@@ -31,6 +31,6 @@ angular.module('BillyCmsBackend',
             .state('additional_attributes', {
                 url: '/system/attributes',
                 templateUrl: 'attributes/attributes.html',
-                controller: 'AttributesCtrl as attrs'
+                controller: 'AttributesCtrl as atctrl'
             })
     });

data/app/assets/javascripts/billy_cms/backend/controllers/attributes.controller.js

@@ -0,0 +1,27 @@
+'use strict';
+
+angular.module('BillyCmsBackend').controller('AttributesCtrl', ['$scope', '$http', 'AdditionalAttribute', function($scope, $http, AdditionalAttribute) {
+    var self = this;
+
+    this.selectedTabIndex = 0;
+
+    this.resetNewAttribute = function() {
+        this.newAttribute = new AdditionalAttribute();
+    };
+    this.resetNewAttribute();
+
+    this.createAttribute = function() {
+        $http.post('/billy_cms/api/attributes.json', this.newAttribute)
+            .then(function(result) {
+                var attribute = new AdditionalAttribute(result.data.attribute);
+                $scope.app.allAdditionalAttributes.push(attribute);
+
+                self.selectedTabIndex = 0;
+            })
+            .catch(function(err) {
+                alert(err);
+            })
+    }
+
+    return this;
+}]);

data/app/assets/javascripts/billy_cms/backend/controllers/page_types.controller.js

@@ -1,3 +1,5 @@
+'use strict';
+
 window.angular.module('BillyCmsBackend').controller('PageTypesCtrl', ['$scope', function($scope) {
     var self = this;
     $scope.$watch(
@@ -16,4 +18,37 @@ window.angular.module('BillyCmsBackend').controller('PageTypesCtrl', ['$scope',
     if ($scope.app.allPageTypes && $scope.app.allPageTypes.length > 0) {
         this.selectPageType($scope.app.allPageTypes[0]);
     }
+
+    this.addAtributeToSelectedPageType = function() {
+        var attributeId = this.attributeIdToAdd;
+        var pageType = this.selectedPageType;
+        if (!pageType) {
+            return console.error('No Page Type selected.');
+        }
+        return pageType
+            .addAdditionalAttribute(attributeId)
+            .then(function() {
+                self.attributeIdToAdd = null;
+            })
+            .catch(function(error) {
+                alert(error);
+            });
+    };
+
+    this.removeAttribute = function(attribute) {
+        return this.selectedPageType.removeAdditionalAttribute(attribute).catch(function(err) {
+            alert(err);
+        });
+    }
+
+    this.attributesAddableToSelectedPageType = function() {
+        if (!self.selectedPageType) {
+            return [];
+        }
+        return ($scope.app.allAdditionalAttributes || []).filter(function(attribute) {
+            return self.selectedPageType.additional_attributes
+                .map(function(attr) { return attr.id; })
+                .indexOf(attribute.id) < 0;
+        });
+    }
 }]);

data/app/assets/javascripts/billy_cms/backend/factories/{additional_attribute.js → additional_attribute.factory.js}

@@ -2,6 +2,7 @@
 
 angular.module('BillyCmsBackend').factory('AdditionalAttribute', [function() {
     var AdditionalAttribute = function(options) {
+        if (!options) { options = {} }
         this.id = options.id || null;
         this.name = options.name || null;
         this.title = options.title || '';

data/app/assets/javascripts/billy_cms/backend/factories/page_type.js

@@ -1,17 +1,62 @@
 'use strict';
 
-angular.module('BillyCmsBackend').factory('PageType', ['AdditionalAttribute', function(AdditionalAttribute) {
+angular.module('BillyCmsBackend').factory('PageType', ['AdditionalAttribute', '$http', function(AdditionalAttribute, $http) {
     var PageType = function(options) {
-      this.id = options.id || null;
-      this.name = options.name || null;
-      this.title = options.title || '';
-
-      this.additional_attributes = (options.additional_attributes || []).map(function(attributeOptions) {
-          return new AdditionalAttribute(attributeOptions);
-      })
+        this.applyOptions(options);
     };
 
+    PageType.prototype.applyOptions = function(options) {
+        this.id = options.id || null;
+        this.name = options.name || null;
+        this.title = options.title || '';
+
+        this.additional_attributes = (options.additional_attributes || []).map(function(attributeOptions) {
+            return new AdditionalAttribute(attributeOptions);
+        })
+    }
+
+    PageType.prototype.addAdditionalAttribute = function(attributeOrAttributeId) {
+        var attributeId;
+        var self = this;
+        if (!this.id) {
+            throw new Error('PageType is not valid.');
+        }
+        if (typeof attributeOrAttributeId === 'number' || typeof attributeOrAttributeId === 'string') {
+            attributeId = parseInt(attributeOrAttributeId, 10);
+        } else {
+            attributeId = attributeOrAttributeId.id;
+        }
+        if (!attributeId) {
+            throw new Error('Please pass a valid attribute or attribute id.');
+        }
+        return $http.post('/billy_cms/api/page_types/' + String(this.id) + '/attributes.json', {
+            attribute: {
+                id: attributeId
+            }
+        }).then(function(result) {
+            self.applyOptions(result.data.page_type)
+        });
+    }
 
+    PageType.prototype.removeAdditionalAttribute = function(attributeOrAttributeId) {
+        var self = this;
+        var attributeId;
+        if (!this.id) {
+            throw new Error('PageType is not valid.');
+        }
+        if (typeof attributeOrAttributeId === 'number' || typeof attributeOrAttributeId === 'string') {
+            attributeId = parseInt(attributeOrAttributeId, 10);
+        } else {
+            attributeId = attributeOrAttributeId.id;
+        }
+        if (!attributeId) {
+            throw new Error('Please pass a valid attribute or attribute id.');
+        }
+        return $http.delete('/billy_cms/api/page_types/' + String(this.id) + '/attributes/' + String(attributeId))
+            .then(function(result) {
+                self.applyOptions(result.data.page_type)
+            });
+    }
 
     return PageType;
 

data/app/assets/stylesheets/billy_cms/backend/index.scss

@@ -18,4 +18,17 @@ i.jstree-icon.binary-type {
 
 md-list-item.selected {
 	border-left: 5px mediumslateblue ridge;
+}
+
+span.delete-link {
+	color: #730E15;
+	::before {
+		content: '[';
+	}
+	::after {
+		content: ']';
+	}
+	&:hover {
+		color: #ff1e2e;
+	}
 }

data/app/controllers/api/attributes_controller.rb

@@ -11,7 +11,7 @@ module Api
         def update
             render nothing: true, status: 400 unless params[:attribute]
             attribute = BillyCms::AdditionalAttribute.find params[:id]
-            if attribute.update_attributes attribute_params
+            if attribute.update_attributes attributes_params
                 render json: {
                     success: true,
                     attribute: attribute
@@ -26,7 +26,7 @@ module Api
 
         def create
             render nothing: true, status: 400 unless params[:attribute]
-            attribute = BillyCms::AdditionalAttribute.new attribute_params
+            attribute = BillyCms::AdditionalAttribute.new attributes_params
             if attribute.save
                 render json: {
                     success: true,
@@ -57,7 +57,7 @@ module Api
         private
 
         def attributes_params
-            params.require(:attribute).permit(:title, :attribute, :attribute_type) if current_user.admin?
+            params.require(:attribute).permit(:title, :name, :attribute_type) if current_user.admin?
         end
     end
 end

data/app/controllers/api/page_type_attributes_controller.rb

@@ -0,0 +1,59 @@
+module Api
+  class PageTypeAttributesController < ApiController
+    before_filter :set_page_type
+    before_filter :set_additional_attribute, only: [:create]
+    before_filter :ensure_user_is_admin
+
+    def index
+      render json: @page_type.additional_attributes
+    end
+
+    def show
+      render json: @page_type.additional_attributes.find(params.fetch(:id))
+    end
+
+    def create
+      if @page_type && @additional_attribute
+        if @page_type.additional_attributes.include? @additional_attribute
+          render json: { success: false, error: 'Attribute already exists.' }, status: 400
+        else
+          @page_type.additional_attributes.push @additional_attribute
+          render json: { success: true, page_type: BillyCms::PageTypeSerializer.new(@page_type) }
+        end
+      end
+    end
+
+    def destroy
+      additional_attribute_id = params[:id]
+      @additional_attribute = BillyCms::AdditionalAttribute.find(additional_attribute_id)
+      if @page_type && @additional_attribute
+        unless @page_type.additional_attributes.include? @additional_attribute
+          render json: { success: false, error: "Attribute does not exist on pages of type '#{@page_type.name}'." }, status: 400
+        else
+          @page_type.additional_attributes.delete(additional_attribute_id)
+          render json: { success: true, page_type: BillyCms::PageTypeSerializer.new(@page_type) }
+        end
+      end
+    end
+
+    private
+
+    def set_page_type
+      @page_type = BillyCms::PageType.find(params.fetch(:page_type_id))
+    end
+
+    def set_additional_attribute
+      if id = attribute_params[:id]
+        begin
+          @additional_attribute = BillyCms::AdditionalAttribute.find id
+        rescue ActiveRecord::RecordNotFound
+          @additional_attribute = nil
+        end
+      end
+    end
+
+    def attribute_params
+      params.require(:attribute).permit(:id)
+    end
+  end
+end

data/app/helpers/billy_cms/content_helper.rb

@@ -3,7 +3,14 @@ module BillyCms
 
     def page_field(page, field, options = {})
       tag_name = options[:tag] || :div
-      content_tag tag_name, page.send(field).to_s.html_safe, class: "page-#{field.to_s}", 'billycms-attribute' => field.to_s, 'billycms-page' => page[:id], contenteditable: false
+      html_options = {
+          :'billycms-attribute' => field.to_s,
+          :'billycms-page' => page[:id],
+          :contenteditable => false,
+          :class => ''
+      }.merge(options[:html] || {})
+      html_options[:class] += " page-#{field.to_s}"
+      content_tag tag_name, page.send(field).to_s.html_safe, html_options
     end
 
     def cms_image(obj, options = {})

data/app/views/billy_cms/backend/_attributes.html.erb

@@ -1,12 +1,39 @@
 <md-content>
-  <h2>Attribute</h2>
+  <md-tabs md-dynamic-height md-border-bottom md-selected="atctrl.selectedTabIndex">
+    <md-tab label="Alle Attribute">
+      <md-list>
+        <md-list-item class="md-2-line" ng-repeat="attribute in app.allAdditionalAttributes">
+          <div class="md-list-item-text" layout="column">
+            <h3>{{ attribute.title }}</h3>
+            <p>{{ attribute.name }} &bull; {{attribute.attribute_type}}</p>
+          </div>
+        </md-list-item>
+      </md-list>
+    </md-tab>
+    <md-tab label="Neues Attribut hinzufügen">
+      <form ng-submit="atctrl.createAttribute()">
+        <md-input-container class="md-block">
+          <label>Titel:</label>
+          <input type="text" ng-model="atctrl.newAttribute.title" />
+        </md-input-container>
+        <md-input-container class="md-block">
+          <label>Name:</label>
+          <input type="text" ng-model="atctrl.newAttribute.name" />
+        </md-input-container>
+        <md-input-container class="md-block">
+          <label>Typ:</label>
+          <md-select ng-model="atctrl.newAttribute.attribute_type">
+            <md-option value="string">Text</md-option>
+            <md-option value="integer">Zahl</md-option>
+            <md-option value="email">Email</md-option>
+            <md-option value="url">URL</md-option>
+          </md-select>
+        </md-input-container>
 
-  <md-list>
-      <md-list-item class="md-2-line" ng-repeat="attribute in attrs.possibleAttributes">
-        <div class="md-list-item-text" layout="column">
-          <h3>{{ attribute.title }}</h3>
-          <p>{{ attribute.name }} &bull; {{attribute.attribute_type}}</p>
+        <div layout="row">
+          <input type="submit" value="speichern" class="md-button md-primary md-raised" />
         </div>
-      </md-list-item>
-  </md-list>
+      </form>
+    </md-tab>
+  </md-tabs>
 </md-content>

data/app/views/billy_cms/backend/_page_types.html.erb

@@ -34,14 +34,16 @@
       Zusätzliche Eigenschaften
     </h2>
     <md-input-container>
-      <label>Hinzufügen:</label>
-      <md-select ng-model="ptctrl.attributeToAdd">
-        <md-option ng-repeat="attribute in app.allAdditionalAttributes" value="{{attribute}}">{{attribute.title}}</md-option>
+      <label>Mögliche zusätzliche Eigenschaft hinzufügen:</label>
+      <md-select ng-model="ptctrl.attributeIdToAdd" ng-change="ptctrl.addAtributeToSelectedPageType()">
+        <md-option ng-repeat="attribute in ptctrl.attributesAddableToSelectedPageType() track by $index" value="{{attribute.id}}">
+          {{attribute.title}} ({{attribute.name}})
+        </md-option>
       </md-select>
     </md-input-container>
     <ul>
       <li ng-repeat="attribute in ptctrl.selectedPageType.additional_attributes">
-        {{attribute.title}}
+        {{attribute.title}} &nbsp; <span class="delete-link" ng-click="ptctrl.removeAttribute(attribute)">entfernen</span>
       </li>
     </ul>
   </form>

data/config/routes.rb

@@ -3,6 +3,8 @@ BillyCms::Engine.routes.draw do
   namespace :api do
     resources :pages
     resources :attributes
-    resources :page_types
+    resources :page_types do
+      resources :attributes, controller: :page_type_attributes, only: [:index, :show, :create, :destroy]
+    end
   end
 end

data/lib/billy_cms/version.rb

@@ -1,3 +1,3 @@
 module BillyCms
-  VERSION = "0.0.11"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billy_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.14
 platform: ruby
 authors:
 - unsdrei GbR
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,12 +126,12 @@ files:
 - app/assets/javascripts/billy_cms.js
 - app/assets/javascripts/billy_cms/backend.js
 - app/assets/javascripts/billy_cms/backend/app.js.erb
-- app/assets/javascripts/billy_cms/backend/attributes.js
 - app/assets/javascripts/billy_cms/backend/controllers/application.controller.js.erb
+- app/assets/javascripts/billy_cms/backend/controllers/attributes.controller.js
 - app/assets/javascripts/billy_cms/backend/controllers/page_types.controller.js
 - app/assets/javascripts/billy_cms/backend/directives/header.directive.js
 - app/assets/javascripts/billy_cms/backend/directives/ng-jstree.js
-- app/assets/javascripts/billy_cms/backend/factories/additional_attribute.js
+- app/assets/javascripts/billy_cms/backend/factories/additional_attribute.factory.js
 - app/assets/javascripts/billy_cms/backend/factories/billy_object.js
 - app/assets/javascripts/billy_cms/backend/factories/page_type.js
 - app/assets/javascripts/billy_cms/backend/jstree.js
@@ -149,6 +149,7 @@ files:
 - app/assets/stylesheets/billy_cms/jstree.scss
 - app/controllers/api/api_controller.rb
 - app/controllers/api/attributes_controller.rb
+- app/controllers/api/page_type_attributes_controller.rb
 - app/controllers/api/page_types_controller.rb
 - app/controllers/api/pages_controller.rb
 - app/controllers/billy_cms/backend_controller.rb

data/app/assets/javascripts/billy_cms/backend/attributes.js

@@ -1,33 +0,0 @@
-'use strict';
-
-angular.module('BillyCmsBackend').controller('AttributesCtrl', function($http, Attribute) {
-    var vm = this;
-
-    vm.possibleAttributes = [];
-    vm.loadAttributes = function() {
-      $http.get('/billy_cms/api/attributes')
-        .then(function(response) {
-          var data = response.data;
-          console.log(data);
-          vm.possibleAttributes = data.attributes.map(function(attr) {
-              return new Attribute(attr);
-          })
-        }, function(err) {
-          alert('Fehler: ', err);
-        });
-    };
-    vm.loadAttributes();
-
-    return vm;
-});
-
-angular.module('BillyCmsBackend').factory('Attribute', function() {
-    var Attribute = function(options) {
-        this.title = options.title || '';
-        this.name = options.name || null;
-        this.id = options.id || null;
-        this.attribute_type = options.attribute_type || 'string';
-    };
-
-    return Attribute;
-});