archangel 0.3.0 → 0.4.0

data/app/models/concerns/archangel/models/metatagable_concern.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Archangel
+  ##
+  # Model concerns
+  #
+  module Models
+    ##
+    # Model meta tag concern
+    #
+    module MetatagableConcern
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :metatags, as: :metatagable, dependent: :destroy
+
+        accepts_nested_attributes_for :metatags, reject_if: :all_blank,
+                                                 allow_destroy: true
+      end
+    end
+  end
+end

data/app/models/concerns/archangel/models/publishable_concern.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Archangel
+  ##
+  # Model concerns
+  #
+  module Models
+    ##
+    # Model publish concern
+    #
+    module PublishableConcern
+      extend ActiveSupport::Concern
+
+      included do
+        validates :published_at, allow_blank: true, date: true
+
+        scope :available, (lambda do
+          published.where("published_at <= ?", Time.current)
+        end)
+
+        scope :published, (lambda do
+          where.not(published_at: nil)
+        end)
+
+        scope :unpublished, (lambda do
+          where("published_at IS NULL OR published_at > ?", Time.current)
+        end)
+      end
+
+      ##
+      # Check if resource is published.
+      #
+      # Future publication date is also considered published. This will return
+      # true if there is any published date avaialable; past and future.
+      #
+      # @see resource.available?
+      #
+      # @return [Boolean] if published
+      #
+      def published?
+        published_at.present?
+      end
+
+      ##
+      # Check if resource is currently available.
+      #
+      # This will return true if there is a published date and it is in the
+      # past. Future publication date will return false.
+      #
+      # @return [Boolean] if available
+      #
+      def available?
+        published? && published_at <= Time.current
+      end
+    end
+  end
+end

data/app/{helpers/archangel/auth_helper.rb → policies/archangel/design_policy.rb}

@@ -2,8 +2,8 @@
 
 module Archangel
   ##
-  # Authentication helpers
+  # Design policy
   #
-  module AuthHelper
+  class DesignPolicy < ApplicationPolicy
   end
 end

data/app/policies/archangel/site_policy.rb

@@ -14,14 +14,5 @@ module Archangel
     def update?
       admin_user?
     end
-
-    ##
-    # Check if `#sample` action is authorized for current user.
-    #
-    # @return [Boolean] true for all roles
-    #
-    def sample?
-      true
-    end
   end
 end

data/app/services/archangel/{template_render_service.rb → design_render_service.rb}

@@ -4,7 +4,7 @@ module Archangel
   ##
   # Template Liquid render service
   #
-  class TemplateRenderService < RenderService
+  class DesignRenderService < RenderService
     ##
     # Render the Liquid content for template
     #
@@ -14,7 +14,7 @@ module Archangel
       template_content = build_template(template)
 
       liquid = ::Liquid::Template.parse(template_content)
-      liquid.send(:render, stringify_assigns, liquid_options).html_safe
+      liquid.send(:render, stringify_assigns, liquid_options)
     end
 
     protected
@@ -23,7 +23,7 @@ module Archangel
       template_content = current_template_content(template)
 
       unless /\{\{\s*content_for_layout\s*\}\}/.match?(template_content)
-        template_content += "{{ content_for_layout }}"
+        template_content << "{{ content_for_layout }}"
       end
 
       template_content

data/app/services/archangel/render_service.rb

@@ -58,7 +58,7 @@ module Archangel
     #
     def call
       liquid = ::Liquid::Template.parse(template)
-      liquid.send(:render, stringify_assigns, liquid_options).html_safe
+      liquid.send(:render, stringify_assigns, liquid_options)
     end
 
     protected

data/app/themes/default/assets/javascripts/default/auth.js

@@ -1,18 +1,15 @@
-//  Default Archangel auth theme
-//= require_self
 //
-//  Third-party assets
-//= require jquery2
-//= require bootstrap
-//= require jquery_ujs
+//// Default Archangel auth theme
 //
-//  Archangel helper scripts
-//= require "archangel/object"
-//= require "archangel/object/routes"
-//= require "archangel/object/routes/auth"
+//  Third-party assets (from Ruby gems)
+//= require jquery3
+//= require bootstrap
 //
-//  Third-party Archangel assets (from the vendor directory)
-//= require archangel/auth
+//  Third-party assets (from gem vendor directory)
+// none
 //
 //  Theme assets
-//= require_tree ./auth
+//= require default/common/flash
+//
+//  Third-party Archangel assets (from the application vendor directory)
+//= require archangel/auth

data/app/themes/default/assets/javascripts/default/backend.js

@@ -1,49 +1,28 @@
-//  Default Archangel backend theme
-//= require_self
 //
-//  Third-party assets (from gems)
+//// Default Archangel backend theme
+//
+//  Third-party assets (from Ruby gems)
 //= require jquery3
 //= require rails-ujs
 //= require popper
 //= require bootstrap
-//= require moment
-//= require selectize
 //= require cocoon
 //
-//  Third-party assets (from vendor)
-//= require daterangepicker/daterangepicker
+//  Third-party assets (from gem vendor directory)
+//= require flatpickr/flatpickr
+//= require jodit/jodit
+//= require select2/select2
 //= require sortable/sortable
-//= require trumbowyg/trumbowyg
-//= require trumbowyg/plugins/allowtagsfrompaste/trumbowyg.allowtagsfrompaste
-//= require trumbowyg/plugins/base64/trumbowyg.base64
-//= require trumbowyg/plugins/cleanpaste/trumbowyg.cleanpaste
-//= require trumbowyg/plugins/colors/trumbowyg.colors
-//= require trumbowyg/plugins/noembed/trumbowyg.noembed
-//= require trumbowyg/plugins/upload/trumbowyg.upload
-//
-//  Archangel helper scripts
-//= require "archangel/object"
-//= require "archangel/object/flash"
-//= require "archangel/object/routes"
-//= require "archangel/object/routes/backend"
-//= require "archangel/object/translate"
-//= require "archangel/object/translate/datetimepicker"
-//= require "archangel/object/translate/sortable"
-//= require "archangel/object/url"
-//= require "archangel/input/datetimepicker"
-//= require "archangel/input/meta_keywords"
-//= require "archangel/input/wysiwyg"
-//= require "archangel/input/parent/collection"
-//= require "archangel/input/parent/field"
-//= require "archangel/input/parent/page"
-//= require "archangel/sortable"
-//
-//  Third-party Archangel assets (from the vendor directory)
-//= require archangel/backend
 //
 //  Theme assets
-//= require default/common/cards
+//= require archangel/object
+//= require archangel/object/flash
+//= require archangel/input/datetimepicker
+//= require archangel/input/wysiwyg
 //= require default/common/flash
+//= require default/backend/entries/sorting
+//= require default/backend/misc/metatags
+//= require default/backend/archangel
 //
-//= require default/backend/core
-//= require default/backend/templates
+//  Third-party Archangel assets (from the application vendor directory)
+//= require archangel/backend

data/app/themes/default/assets/javascripts/default/backend/archangel.js

@@ -0,0 +1,25 @@
+$(document).ready(function () {
+
+  $(window).bind('resize', function () {
+    $('body').toggleClass('body-small', ($(window).width() <= 768));
+  }).trigger('resize');
+
+  $(document).on('scroll', function() {
+    var scrollDistance = $(this).scrollTop();
+
+    if (scrollDistance > 100) {
+      $('.scroll-to-top').fadeIn();
+    } else {
+      $('.scroll-to-top').fadeOut();
+    }
+  });
+
+  $('a.scroll-to-top').click(function(e) {
+    $('html, body').scrollTop(0);
+
+    e.preventDefault();
+  });
+
+  $('[data-toggle=popover]').popover();
+
+});

data/app/themes/default/assets/javascripts/default/backend/entries/sorting.js

@@ -0,0 +1,37 @@
+(function() {
+  'use strict';
+
+  var sortable_entry_element = document.getElementById('sortable');
+
+  if (sortable_entry_element != null)
+  {
+    Sortable.create(sortable_entry_element, {
+      handle: '.sortable-handle',
+      animation: 150,
+      onSort: function (evt) {
+        if (evt.type != 'sort') { return; }
+
+        return $.ajax({
+          url: evt.to.dataset.sortableUrl,
+          method: 'POST',
+          dataType: 'json',
+          data: {
+            collection_entry: {
+              sort: {
+                id: evt.item.dataset.sortableItemId,
+                position: evt.newIndex
+              }
+            }
+          }
+        })
+          .done(function() {
+            Archangel.flash.flashMessage('info', 'Sort order has been updated');
+          })
+          .fail(function() {
+            Archangel.flash.flashMessage('error', 'There was a problem updating position');
+          });
+      }
+    });
+  }
+
+})();

data/app/themes/default/assets/javascripts/default/backend/misc/metatags.js

@@ -0,0 +1,16 @@
+$(function() {
+  'use strict';
+
+  var metatag_selects = 'select[name^="page[metatags_attributes]"], select[name^="site[metatags_attributes]"]';
+
+  $(metatag_selects).select2({
+    tags: true
+  });
+
+  $('.form-inputs').on('cocoon:after-insert', function(_e, insertedItem) {
+    insertedItem.find(metatag_selects).select2({
+      tags: true
+    });
+  });
+
+});

data/app/themes/default/assets/javascripts/default/common/flash.js

@@ -1,48 +1,9 @@
 (function () {
   'use strict';
 
-  document.addEventListener('DOMContentLoaded', function() {
-    var messagesContainer = document.querySelector('#alert-messages'),
-        alertItems = messagesContainer.querySelectorAll('.alert'),
-        alertItemCount = alertItems.length;
+  // Fade out flash messages
+  setTimeout(function(){
+    $('.alert').alert('close');
+  }, 5000);
 
-    function setOpacity(element, opacity, filterOpacity) {
-      element.style.opacity = opacity;
-      element.style.filter = 'alpha(opacity = ' + filterOpacity + ')';
-    }
-
-    function fadeOutFlash(element, startLevel, endLevel, duration, callback) {
-      var fadeInternal,
-          level = startLevel;
-
-      fadeInternal = setInterval(function() {
-        if (level <= endLevel) {
-          setOpacity(element, endLevel, endLevel);
-
-          clearInterval(fadeInternal);
-
-          if (typeof callback === 'function') { callback(true); }
-        }
-
-        else {
-          level -= 0.1;
-
-          setOpacity(element, level, (level * 100));
-        }
-      }, duration);
-    }
-
-    ////
-    // Fade flash messages out
-    //
-    for (var i = 0; i < alertItemCount; i += 1) {
-      var item = alertItems[i];
-
-      setTimeout(function() {
-        fadeOutFlash(item, 1, 0, 50, function() {
-          item.parentNode.removeChild(item);
-        });
-      }, 3000);
-    }
-  });
 }());

data/app/themes/default/assets/javascripts/default/frontend.js

@@ -1,18 +1,16 @@
-//  Default Archangel frontend theme
-//= require_self
 //
-//  Third-party assets
-//= require jquery2
-//= require bootstrap
-//= require jquery_ujs
+//// Default Archangel frontend theme
 //
-//  Archangel helper scripts
-//= require "archangel/object"
-//= require "archangel/object/routes"
-//= require "archangel/object/routes/frontend"
+//  Third-party assets (from Ruby gems)
+//= require jquery3
+//= require popper
+//= require bootstrap
 //
-//  Third-party Archangel assets (from the vendor directory)
-//= require archangel/frontend
+//  Third-party assets (from gem vendor directory)
+// none
 //
 //  Theme assets
-//= require_tree ./frontend
+//= require default/common/flash
+//
+//  Third-party Archangel assets (from the application vendor directory)
+//= require archangel/frontend

data/app/themes/default/assets/stylesheets/default/_theme.scss

@@ -0,0 +1,13 @@
+$web-font-path: 'https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700' !default;
+@import url($web-font-path);
+
+// mixins
+@import 'common/mixins';
+// bootstrap overrides
+@import 'common/navbar';
+@import 'common/cards';
+@import 'common/forms';
+// bootstrap extensions
+@import 'common/borders';
+// theme
+@import 'common/global';

data/app/themes/default/assets/stylesheets/default/_variables.scss

@@ -0,0 +1,113 @@
+//
+// Color system
+//
+
+$white:    #fff !default;
+$gray-100: #f8f9fa !default;
+$gray-200: #eee !default;
+$gray-300: #dee2e6 !default;
+$gray-400: #ccc !default;
+$gray-500: #adb5bd !default;
+$gray-600: #888 !default;
+$gray-700: #495057 !default;
+$gray-800: #333 !default;
+$gray-900: #222 !default;
+$black:    #000 !default;
+
+$blue:    #2d7ebf !default;
+$indigo:  #6610f2 !default;
+$purple:  #6f42c1 !default;
+$pink:    #e83e8c !default;
+$red:     #f04124 !default;
+$orange:  #fd7e14 !default;
+$yellow:  #e99002 !default;
+$green:   #43ac6a !default;
+$teal:    #20c997 !default;
+$cyan:    #5bc0de !default;
+
+$primary:       $blue !default;
+$secondary:     $gray-200 !default;
+$success:       $green !default;
+$info:          $cyan !default;
+$warning:       $yellow !default;
+$danger:        $red !default;
+$light:         $gray-200 !default;
+$dark:          $gray-900 !default;
+
+$yiq-contrasted-threshold: 200 !default;
+
+// Settings
+
+$enable-validation-icons:     false !default;
+
+// Body
+
+$body-bg:                     $gray-100 !default;
+
+// Fonts
+
+$font-family-sans-serif:      'Open Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol' !default;
+
+$font-size-base:              .9375rem !default;
+
+$headings-font-weight:        300 !default;
+
+// Dropdowns
+
+$dropdown-border-color:             rgba($black, .1) !default;
+$dropdown-divider-bg:               rgba($black, .1) !default;
+
+// Navs
+
+$nav-link-disabled-color:           $gray-400 !default;
+
+$nav-tabs-border-color:             $dropdown-border-color !default;
+$nav-tabs-link-hover-border-color:  $nav-tabs-border-color !default;
+$nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
+
+// Navbar
+
+$navbar-dark-color:                 rgba($white, .7) !default;
+$navbar-dark-hover-color:           $white !default;
+
+// Pagination
+
+$pagination-color:                  $gray-600 !default;
+$pagination-border-color:           $nav-tabs-border-color !default;
+
+$pagination-active-border-color:    darken($primary, 5%) !default;
+
+$pagination-disabled-color:         $gray-200 !default;
+
+// Badges
+
+$badge-font-weight:                 300 !default;
+$badge-padding-x:                   1rem !default;
+
+// Progress bars
+
+$progress-bg:                       $gray-400 !default;
+$progress-bar-color:                $white !default;
+
+// List group
+
+$list-group-disabled-bg:            $gray-200 !default;
+
+// Close
+
+$close-color:                       $gray-600 !default;
+$close-text-shadow:                 none !default;
+
+// Spacing Variables
+//
+// Change below variable if the height of the navbar changes
+$navbar-base-height: 56px;
+
+// Change below variable to change the width of the sidenav
+$sidebar-base-width: 225px;
+
+// Change below variable to change the width of the sidenav when collapsed
+$sidebar-collapsed-width: 90px;
+
+// Change below variable to change the height of the sticky footer
+$sticky-footer-height: 5rem;