promethee 1.1.0 → 1.2.0

data/app/views/promethee/show/_component.html.erb

@@ -1 +1 @@
-<%= render "promethee/show/component/#{component[:type]}", component: component %>
+<%= render "promethee/components/#{component[:type]}/show", component: component %>

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Julien Dargelos
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -225,73 +225,71 @@ files:
 - app/assets/images/icon-promethee.svg
 - app/assets/images/logo-promethee-horizontal.svg
 - app/assets/images/logo-promethee-vertical.svg
-- app/assets/javascripts/promethee-editor.js
+- app/assets/javascripts/promethee-edit.js
 - app/assets/javascripts/promethee.js
-- app/assets/stylesheets/promethee-editor.sass
-- app/assets/stylesheets/promethee-editor/_move.sass
-- app/assets/stylesheets/promethee-editor/_preview.sass
-- app/assets/stylesheets/promethee-editor/_write.sass
+- app/assets/stylesheets/promethee-edit.sass
+- app/assets/stylesheets/promethee-edit/_move.sass
+- app/assets/stylesheets/promethee-edit/_preview.sass
+- app/assets/stylesheets/promethee-edit/_write.sass
 - app/assets/stylesheets/promethee.sass
 - app/controllers/promethee_controller.rb
 - app/views/promethee/_edit.html.erb
 - app/views/promethee/_localize.html.erb
 - app/views/promethee/_show.html.erb
+- app/views/promethee/components/column/_edit.define.html.erb
+- app/views/promethee/components/column/_edit.inspect.html.erb
+- app/views/promethee/components/column/_edit.move.html.erb
+- app/views/promethee/components/column/_edit.write.html.erb
+- app/views/promethee/components/column/_localize.html.erb
+- app/views/promethee/components/column/_show.html.erb
+- app/views/promethee/components/cover/_edit.define.html.erb
+- app/views/promethee/components/cover/_edit.inspect.html.erb
+- app/views/promethee/components/cover/_edit.move.html.erb
+- app/views/promethee/components/cover/_edit.write.html.erb
+- app/views/promethee/components/cover/_localize.html.erb
+- app/views/promethee/components/cover/_show.html.erb
+- app/views/promethee/components/details/_edit.define.html.erb
+- app/views/promethee/components/details/_edit.inspect.html.erb
+- app/views/promethee/components/details/_edit.move.html.erb
+- app/views/promethee/components/details/_edit.write.html.erb
+- app/views/promethee/components/details/_localize.html.erb
+- app/views/promethee/components/details/_show.html.erb
+- app/views/promethee/components/image/_edit.define.html.erb
+- app/views/promethee/components/image/_edit.inspect.html.erb
+- app/views/promethee/components/image/_edit.move.html.erb
+- app/views/promethee/components/image/_edit.write.html.erb
+- app/views/promethee/components/image/_localize.html.erb
+- app/views/promethee/components/image/_show.html.erb
+- app/views/promethee/components/row/_edit.define.html.erb
+- app/views/promethee/components/row/_edit.inspect.html.erb
+- app/views/promethee/components/row/_edit.move.html.erb
+- app/views/promethee/components/row/_edit.write.html.erb
+- app/views/promethee/components/row/_localize.html.erb
+- app/views/promethee/components/row/_show.html.erb
+- app/views/promethee/components/slider/_edit.define.html.erb
+- app/views/promethee/components/slider/_edit.inspect.html.erb
+- app/views/promethee/components/slider/_edit.move.html.erb
+- app/views/promethee/components/slider/_edit.write.html.erb
+- app/views/promethee/components/slider/_localize.html.erb
+- app/views/promethee/components/slider/_show.html.erb
+- app/views/promethee/components/text/_edit.define.html.erb
+- app/views/promethee/components/text/_edit.inspect.html.erb
+- app/views/promethee/components/text/_edit.move.html.erb
+- app/views/promethee/components/text/_edit.write.html.erb
+- app/views/promethee/components/text/_localize.html.erb
+- app/views/promethee/components/text/_show.html.erb
+- app/views/promethee/components/video/_edit.define.html.erb
+- app/views/promethee/components/video/_edit.inspect.html.erb
+- app/views/promethee/components/video/_edit.move.html.erb
+- app/views/promethee/components/video/_edit.write.html.erb
+- app/views/promethee/components/video/_localize.html.erb
+- app/views/promethee/components/video/_show.html.erb
 - app/views/promethee/edit/_move.html.erb
 - app/views/promethee/edit/_preview.html.erb
 - app/views/promethee/edit/_write.html.erb
-- app/views/promethee/edit/inspector/_inspector.html.erb
-- app/views/promethee/edit/inspector/component/_column.html.erb
-- app/views/promethee/edit/inspector/component/_cover.html.erb
-- app/views/promethee/edit/inspector/component/_details.html.erb
-- app/views/promethee/edit/inspector/component/_image.html.erb
-- app/views/promethee/edit/inspector/component/_row.html.erb
-- app/views/promethee/edit/inspector/component/_slider.html.erb
-- app/views/promethee/edit/inspector/component/_text.html.erb
-- app/views/promethee/edit/inspector/component/_video.html.erb
-- app/views/promethee/edit/move/_component.html.erb
-- app/views/promethee/edit/move/_components.html.erb
-- app/views/promethee/edit/move/component/_column.html.erb
-- app/views/promethee/edit/move/component/_cover.html.erb
-- app/views/promethee/edit/move/component/_details.html.erb
-- app/views/promethee/edit/move/component/_image.html.erb
-- app/views/promethee/edit/move/component/_row.html.erb
-- app/views/promethee/edit/move/component/_slider.html.erb
-- app/views/promethee/edit/move/component/_text.html.erb
-- app/views/promethee/edit/move/component/_video.html.erb
-- app/views/promethee/edit/shared/_data.html.erb
-- app/views/promethee/edit/shared/_navbar.html.erb
-- app/views/promethee/edit/write/_add_button.html.erb
-- app/views/promethee/edit/write/_component.html.erb
-- app/views/promethee/edit/write/_components.html.erb
-- app/views/promethee/edit/write/_toolbar.html.erb
-- app/views/promethee/edit/write/component/_column.html.erb
-- app/views/promethee/edit/write/component/_cover.html.erb
-- app/views/promethee/edit/write/component/_details.html.erb
-- app/views/promethee/edit/write/component/_image.html.erb
-- app/views/promethee/edit/write/component/_row.html.erb
-- app/views/promethee/edit/write/component/_slider.html.erb
-- app/views/promethee/edit/write/component/_text.html.erb
-- app/views/promethee/edit/write/component/_video.html.erb
-- app/views/promethee/localize/_component.html.erb
-- app/views/promethee/localize/component/_column.html.erb
-- app/views/promethee/localize/component/_cover.html.erb
-- app/views/promethee/localize/component/_details.html.erb
-- app/views/promethee/localize/component/_image.html.erb
-- app/views/promethee/localize/component/_row.html.erb
-- app/views/promethee/localize/component/_slider.html.erb
-- app/views/promethee/localize/component/_text.html.erb
-- app/views/promethee/localize/component/_video.html.erb
 - app/views/promethee/preview.html.erb
 - app/views/promethee/show/_component.html.erb
 - app/views/promethee/show/_components.html.erb
-- app/views/promethee/show/component/_column.html.erb
-- app/views/promethee/show/component/_cover.html.erb
-- app/views/promethee/show/component/_details.html.erb
-- app/views/promethee/show/component/_image.html.erb
-- app/views/promethee/show/component/_row.html.erb
-- app/views/promethee/show/component/_slider.html.erb
-- app/views/promethee/show/component/_text.html.erb
-- app/views/promethee/show/component/_video.html.erb
 - config/routes.rb
 - lib/promethee.rb
 - lib/promethee/configuration.rb

data/app/views/promethee/edit/inspector/_inspector.html.erb

@@ -1,11 +0,0 @@
-<div class="promethee-editor__inspector" ng-show="promethee.inspected">
-  <div class="promethee-editor__inspector-header">
-    <div class="pull-right">
-      <span ng-click="promethee.inspected = null"><%= fa_icon :times %></span>
-    </div>
-    <h5>{{promethee.inspected.type}}</h5>
-  </div>
-  <div class="promethee-editor__inspector-content">
-    <ng-include ng-if="promethee.inspected" src="'promethee/inspector/component/' + promethee.inspected.type"></ng-include>
-  </div>
-</div>

data/app/views/promethee/edit/inspector/component/_row.html.erb

@@ -1,3 +0,0 @@
-<script type="text/ng-template" id="promethee/inspector/component/row">
-  No option for row.
-</script>

data/app/views/promethee/edit/inspector/component/_slider.html.erb

@@ -1,3 +0,0 @@
-<script type="text/ng-template" id="promethee/inspector/component/slider">
-  No option for slider.
-</script>

data/app/views/promethee/edit/move/_component.html.erb

@@ -1,5 +0,0 @@
-<script type="text/ng-template" id="promethee/move/component">
-  <div class="promethee-editor__move__component">
-    <ng-include src="'promethee/move/component/' + component.type"></ng-include>
-  </div>
-</script>

data/app/views/promethee/edit/move/_components.html.erb

@@ -1,26 +0,0 @@
-<script type="text/ng-template" id="promethee/move/components">
-  <div ng-init="type = component.type; components = component.children">
-    <div 
-      class="promethee-editor__move__droppable promethee-editor__move__droppable--{{type}} promethee-editor__move__droppable--{{type}}--first"
-      droppable
-      data-index="0"
-      >
-    </div>
-    <div
-      ng-repeat="component in components"
-      class="promethee-editor__move__draggable promethee-editor__move__draggable--{{type}}"
-      draggable
-      data-index="{{$index}}"
-      data-type="{{component.type}}"
-      >
-      <ng-include src="'promethee/move/component'"></ng-include>
-      <div
-        class="promethee-editor__move__droppable promethee-editor__move__droppable--{{type}}"
-        droppable
-        data-index="{{$index+1}}"
-        data-type="{{type}}"
-        >
-      </div>
-    </div>
-  </div>
-</script>

data/app/views/promethee/edit/move/component/_cover.html.erb

@@ -1,8 +0,0 @@
-<script type="text/ng-template" id="promethee/move/component/cover">
-    <div
-      class="promethee-editor__wrapper promethee-editor__cover-content"
-      ng-bind-html="component.attributes.body | htmlSafe"
-      style="background-image: url('{{component.attributes.src}}')"
-      ></div>
-  </div>
-</script>

data/app/views/promethee/edit/shared/_data.html.erb

@@ -1 +0,0 @@
-<input type="hidden" name="page[data]" id="page_data" value="{{data}}" />

data/app/views/promethee/edit/shared/_navbar.html.erb

@@ -1,25 +0,0 @@
-<nav class="navbar navbar-default promethee-editor__navbar" ng-class="{'navbar-fixed-top': fullscreen }">
-  <div class="container-fluid">
-    <div class="navbar-header promethee-editor__icon">
-      <div class="navbar-brand"><%= File.read(__dir__ + '/../../../../assets/images/icon-promethee.svg').html_safe %></div>
-    </div>
-    <div id="navbar">
-      <ul class="nav navbar-nav navbar-right">
-        <li ng-click="mode = 'write'" ng-class="{active: mode == 'write'}"><a><%= fa_icon :pencil %></a></li>
-        <li ng-click="mode = 'move'" ng-class="{active: mode == 'move'}"><a><%= fa_icon :arrows %></a></li>
-        <li ng-click="enablePreview()" ng-class="{active: mode == 'preview'}">
-          <a data-toggle="dropdown"><%= fa_icon :eye %></a>
-          <ul class="dropdown-menu" ng-show="mode == 'preview'">
-            <li ng-click="preview = 'desktop'" ng-class="{active: preview == 'desktop'}"><a><i class="fa fa-desktop"></i></a></li>
-            <li ng-click="preview = 'tablet'" ng-class="{active: preview == 'tablet'}"><a><i class="fa fa-tablet"></i></a></li>
-            <li ng-click="preview = 'mobile'" ng-class="{active: preview == 'mobile'}"><a><i class="fa fa-mobile"></i></a></li>
-          </ul>
-        </li>
-        <li ng-click="fullscreen = !fullscreen">
-          <a ng-show="fullscreen"><%= fa_icon :expand %></a>
-          <a ng-hide="fullscreen"><%= fa_icon :compress %></a>
-        </li>
-      </ul>
-    </div>
-  </div>
-</nav>

data/app/views/promethee/edit/write/_add_button.html.erb

@@ -1,66 +0,0 @@
-<script type="text/ng-template" id="promethee/write/add_button">
-  <a ng-click="addComponentTo(component.children)" class="promethee-editor__adder__button"><%= fa_icon 'plus-circle', class: "fa-3x" %></a>
-</script>
-
-<div class="promethee-editor__adder" ng-controller="AdderController">
-  <div class="modal fade in" tabindex="-1" role="dialog" style="display: {{adding ? 'block' : 'none'}}">
-    <div class="modal-dialog modal-lg" role="document">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" ng-click="close()"><span aria-hidden="true">&times;</span></button>
-          <h4 class="modal-title">Select component</h4>
-        </div>
-        <div class="modal-body">
-          <div class="row">
-            <div
-              ng-repeat="definition in definitions"
-              ng-click="pushComponent(definition)"
-              class="col-md-3"
-            >
-              <div class="thumbnail">
-                <img ng-src="{{definition.thumb}}" class="img-responsive">
-                <h4>{{definition.name}}</h4>
-                <p>{{definition.description}}</p>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-<script type="text/javascript">
-  promethee.controller('AdderController', ['$scope', '$rootScope', 'definitions', function($scope, $rootScope, definitions) {
-
-    $scope.adding = false;
-    $scope.childrenToAddTo = null;
-    $scope.definitions = definitions;
-
-    $scope.close = function() {
-      $scope.adding = false;
-      $scope.addingToChildren = null;
-    };
-
-    $scope.pushComponent = function(definition) {
-      var definition = angular.copy(definition.data);
-      definition.id = $scope.createIdentifier();
-      $scope.childrenToAddTo.push(definition);
-      $scope.close();
-    };
-
-    $rootScope.addComponentTo = function(components) {
-      $scope.adding = true;
-      $scope.childrenToAddTo = components;
-    };
-
-    // https://gist.github.com/gordonbrander/2230317
-    $scope.createIdentifier = function () {
-      // Math.random should be unique because of its seeding algorithm.
-      // Convert it to base 36 (numbers + letters), and grab the first 9 characters
-      // after the decimal.
-      return '' + Math.random().toString(36).substr(2, 9);
-    };
-
-  }]);
-</script>

data/app/views/promethee/edit/write/_component.html.erb

@@ -1,3 +0,0 @@
-<script type="text/ng-template" id="promethee/write/component">
-  <ng-include src="'promethee/write/component/' + component.type"></ng-include>
-</script>

data/app/views/promethee/edit/write/_components.html.erb

@@ -1,7 +0,0 @@
-<script type="text/ng-template" id="promethee/write/components">
-  <div ng-init="components = component.children">
-    <div ng-repeat="component in components">
-      <ng-include src="'promethee/write/component'"></ng-include>
-    </div>
-  </div>
-</script>

data/app/views/promethee/edit/write/_toolbar.html.erb

@@ -1,5 +0,0 @@
-<script type="text/ng-template" id="promethee/write/toolbar">
-  <div class="pull-right">
-    <span ng-click="remove(component, components)" class="promethee-editor__button"><%= fa_icon :times %></span>
-  </div>
-</script>

data/app/views/promethee/edit/write/component/_column.html.erb

@@ -1,21 +0,0 @@
-<script type="text/ng-template" id="promethee/write/component/column">
-  <div
-    ng-click="inspect(component, $event)"
-    class="
-      col
-      col-md-{{component.attributes.size}}
-      col-md-offset-{{component.attributes.offset}}
-      promethee-editor__component
-      promethee-editor__component--column
-    "
-    >
-    <div class="promethee-editor__component-selected" ng-class="{'promethee-editor__component-selected--visible': promethee.inspected === component}">
-      <div class="promethee-editor__toolbar">
-        Column
-        <ng-include src="'promethee/write/toolbar'"></ng-include>
-      </div>
-      <ng-include src="'promethee/write/components'"></ng-include>
-      <ng-include src="'promethee/write/add_button'"></ng-include>
-    </div>
-  </div>
-</script>

data/app/views/promethee/edit/write/component/_cover.html.erb

@@ -1,55 +0,0 @@
-<script type="text/ng-template" id="promethee/write/component/cover">
-  <div
-    ng-controller="CoverController"
-    ng-click="inspect(component, $event)"
-    class="promethee-editor__component promethee-editor__component--cover"
-  >
-    <div class="promethee-editor__component-selected" ng-class="{'promethee-editor__component-selected--visible': promethee.inspected === component}">
-      <div class="promethee-editor__toolbar">
-        Cover
-        <ng-include src="'promethee/write/toolbar'"></ng-include>
-      </div>
-
-      <div
-        ng-hide="editing"
-        class="promethee-editor__wrapper promethee-editor__cover-content"
-        ng-bind-html="component.attributes.body | htmlSafe"
-        ng-click="edit()"
-        style="background-image: url('{{component.attributes.src}}')"
-      ></div>
-
-      <div
-        ng-show="editing"
-        class="promethee-editor__wrapper promethee-editor__cover-content"
-        style="background-image: url('{{component.attributes.src}}')"
-      >
-        <summernote config="options" ng-model="component.attributes.body"></summernote>
-      </div>
-    </div>
-  </div>
-</script>
-
-<script>
-  angular.injector(['ng', 'Promethee']).get('definitions').push({
-    name: 'Cover',
-    thumb: 'http://via.placeholder.com/300x200',
-    data: {
-      type: 'cover',
-      attributes: {
-        src: 'https://picsum.photos/1920/1080/?random',
-        body: ''
-      }
-    }
-  });
-
-  promethee.controller('CoverController', ['$scope', function($scopen) {
-    $scope.options = {
-      toolbar: [
-        ['headline', ['style']],
-        ['style', ['bold', 'italic']],
-        ['alignment', ['ul', 'ol', 'paragraph']],
-        ['code', ['codeview']]
-      ]
-    };
-  }]);
-</script>

data/app/views/promethee/edit/write/component/_details.html.erb

@@ -1,52 +0,0 @@
-<script type="text/ng-template" id="promethee/write/component/details">
-  <div
-    ng-controller="DetailsController"
-    ng-click="inspect(component, $event)"
-    class="promethee-editor__component promethee-editor__component--details"
-  >
-    <div class="promethee-editor__component-selected" ng-class="{'promethee-editor__component-selected--visible': promethee.inspected === component}">
-      <div class="promethee-editor__toolbar">
-        Details
-        <ng-include src="'promethee/write/toolbar'"></ng-include>
-      </div>
-
-      <details>
-        <summary>{{component.attributes.summary}}</summary>
-        <ng-include src="'promethee/write/components'"></ng-include>
-
-        <span
-          type="button"
-          class="btn btn-default btn-block"
-          ng-click="addComponentTo(component.children)"
-        >
-          Add component
-        </span>
-      </details>
-    </div>
-  </div>
-</script>
-
-<script>
-  angular.injector(['ng', 'Promethee']).get('definitions').push({
-    name: 'Details',
-    thumb: 'http://via.placeholder.com/300x200',
-    data: {
-      type: 'details',
-      children: [],
-      attributes: {
-        summary: 'Edit me'
-      }
-    }
-  });
-
-  promethee.controller('DetailsController', ['$scope', function($scope) {
-    $scope.options = {
-      toolbar: [
-        ['headline', ['style']],
-        ['style', ['bold', 'italic']],
-        ['alignment', ['ul', 'ol', 'paragraph']],
-        ['code', ['codeview']]
-      ]
-    };
-  }]);
-</script>