Merge branch 'develop'

Author: toastercup

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,13 @@
-**Purpose:**
+## Purpose:
 
 
-**JIRA:**
+## JIRA:
 
 
-**Changes:**
+## Steps to Take On Prod
+
+
+## Changes:
 * Changes to setup
   *
 
@@ -13,23 +16,23 @@
 
 * Migrations
   *
-  
+
 * Library changes
   *
 
 * Side effects
   *
 
-**Screenshots**
+## Screenshots
 * Before
 
 * After
 
 
-**QA Links:**
+## QA Links:
 
 
-**How to Verify These Changes**
+## How to Verify These Changes
 * Specific pages to visit
   *
 
@@ -40,7 +43,7 @@
   *
 
 
-**Relevant PRs/Dependencies:**
+## Relevant PRs/Dependencies:
 
 
-**Additional Information**
+## Additional Information

Gemfile

@@ -12,7 +12,7 @@ gem 'rails', '~> 5.0.1'
 
 # Cortex-specific
 gem 'cortex-exceptions', '= 0.0.4'
-gem 'cortex-plugins-core', '= 0.11.1'
+gem 'cortex-plugins-core', '= 0.11.2'
 
 # API
 gem 'grape', '~> 0.17'

Gemfile.lock

@@ -137,7 +137,7 @@ GEM
     concurrent-ruby (1.0.4)
     connection_pool (2.2.1)
     cortex-exceptions (0.0.4)
-    cortex-plugins-core (0.11.1)
+    cortex-plugins-core (0.11.2)
       cells (~> 4.1)
       cells-haml (~> 0.0.10)
       cells-rails (~> 0.0.6)
@@ -435,8 +435,8 @@ GEM
     json_spec (1.1.4)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jsonb_accessor (1.0.0.beta.2)
-      activerecord (>= 5.0.0)
+    jsonb_accessor (1.0.0.beta.3)
+      activerecord (>= 5.0)
       pg (>= 0.18.1)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
@@ -725,7 +725,7 @@ DEPENDENCIES
   cells-rails (~> 0.0.7)
   codeclimate-test-reporter (~> 0.6)
   cortex-exceptions (= 0.0.4)
-  cortex-plugins-core (= 0.11.1)
+  cortex-plugins-core (= 0.11.2)
   database_cleaner (~> 1.5)
   deep_cloneable (~> 2.2.2)
   devise (~> 4.2.0)

app/api/v1/resources/posts.rb

@@ -46,6 +46,16 @@ class Posts < Grape::API
           posts_page
         end
 
+        desc 'Show all published posts', { entity: ::V1::Entities::Post, nickname: "allPostFeed" }
+        paginate per_page: 10000
+        get 'feed/all_posts' do
+          require_scope! 'view:posts'
+          authorize! :view, ::Post
+
+          posts = ::GetPosts.call(params: declared(clean_params(params), include_missing: false), tenant: current_tenant, published: true).posts
+          posts_page = ::V1::Entities::Post.represent posts.to_a
+        end
+
         desc 'Show published post authors'
         get 'feed/authors' do
           present Author.published.distinct, with: ::V1::Entities::Author

app/assets/javascripts/authentication.js

@@ -5,5 +5,6 @@
 //= require material
 
 //= require base
+//= require authentication/login
 
 // require turbolinks # temporarily disabled

app/assets/javascripts/authentication/login.js

@@ -0,0 +1,15 @@
+var login_tab_change = function() {
+  $('.login_tab').on('click', function(ev) {
+    var value = this.text;
+    $('#user_email').focus();
+
+    if (value === 'Legacy') {
+      $('.legacy_value').val(1)
+    } else {
+      $('.legacy_value').val(0)
+    }
+  }
+}
+
+$(document).ready(login_tab_change);
+$(document).on('page:load', login_tab_change);

app/assets/stylesheets/application.scss

@@ -24,6 +24,7 @@
 @import 'components/flash';
 @import 'components/form';
 @import 'components/header';
+@import 'components/index';
 @import 'components/jumbo-button';
 @import 'components/notes';
 @import 'components/sidebar';

app/assets/stylesheets/components/content.scss

@@ -1,3 +1,7 @@
+.mdl-data-table {
+  white-space: normal;
+}
+
 .mdl-data-table th {
   @extend .text-style-4;
 }

app/assets/stylesheets/components/dialog.scss

@@ -1,6 +1,8 @@
 .mdl-dialog {
   width: 80%;
   max-height: 80%;
+  padding: 0;
+  overflow-x: hidden;
   overflow-y: auto;
 }
 
@@ -10,6 +12,12 @@
   font-size: 1.17rem;
 }
 
+.mdl-dialog__content {
+  box-sizing: border-box;
+  padding: 0;
+  width: 100%;
+}
+
 .content-item-button {
   display: flex;
   justify-content: center;

app/assets/stylesheets/components/form.scss

@@ -7,6 +7,21 @@ footer .mdl-button {
 .mdl-textfield {
   width: auto;
   display: block;
+
+  .tooltip-icon {
+    position: absolute;
+    right: 0;
+    top: 8%;
+  }
+}
+
+.mdl-textfield__label {
+  font-size: $base-font-size !important;
+}
+
+.mdl-textfield--floating-label.is-dirty .mdl-textfield__label,
+.mdl-textfield--floating-label.is-focused .mdl-textfield__label {
+  color: $color-black !important;
 }
 
 form {
@@ -24,9 +39,13 @@ form {
 }
 
 // Tags
-
-div.bootstrap-tagsinput input {
-  width: 100% !important;
+.bootstrap-tagsinput {
+  width: 100%;
+  border-radius: 0 !important;
+  border-top: none;
+  border-right: none;
+  border-left: none;
+  border-bottom: 1px solid $color-grey-light;
 }
 .cortex-bootstrap .label {
   border-radius: 0.75em;
@@ -42,3 +61,7 @@ div.bootstrap-tagsinput input {
 }
 
 // Extras
+.tooltip-icon {
+  color: $color-grey;
+  font-size: $base-font-size * 1.25;
+}

app/assets/stylesheets/components/index.scss

@@ -0,0 +1,23 @@
+.content_item-link {
+  cursor: pointer;
+
+  a {
+    text-decoration: none;
+    color: inherit;
+    display: inline-table;
+    height: 100%;
+    width: 100%;
+
+    &:hover,
+    &:active,
+    &:focus {
+      color: inherit;
+      text-decoration: none;
+    }
+
+    span.circular {
+      line-height: 50px;
+      vertical-align: middle;
+    }
+  }
+}

app/assets/stylesheets/variables/_colors.scss

@@ -24,6 +24,7 @@ $color-grey-extralight: #F4F4F4; // Wizard Instruction Panel background color
 $color-red: #d85252;
 
 $color-white: white; // Header
+$color-black: #000000;
 
 
 // Color Semantics

app/cells/field_cell.rb

@@ -23,6 +23,10 @@ def render_label
     @options[:form].label :data, field.name
   end
 
+  def render_tooltip
+    cell(Plugins::Core::TooltipCell, nil, tooltip: @options[:tooltip], id: SecureRandom.base64(4))
+  end
+
   def render_field_id
     @options[:form].hidden_field :field_id, value: field.id
   end

app/cells/index/table_body.haml

@@ -2,15 +2,10 @@
   - context[:content_items].each do |content_item|
     %tr
       - @options[:data][:columns].each do |column|
-        %td{ class: 'mdl-data-table__cell--non-numeric' }
-          = cell('index/content_item', nil, { cells: column[:cells], content_item: content_item }).(:column)
-      - if context[:popup]
-        %td{ class: 'mdl-data-table__cell--non-numeric' }
-          %a{ href: "#", data: { id: content_item.id, title: content_item_title(content_item), thumb: content_item_thumb_url(content_item), url: content_item_asset_url(content_item), alt: content_item_asset_alt_text(content_item), asset_type: content_item_asset_type(content_item) }, class: "media-select--#{context[:popup]} mdl-button mdl-js-button mdl-button--icon" }
-            %i{ class: 'material-icons' }
-              add
-      - else
-        %td{ class: 'mdl-data-table__cell--non-numeric' }
-          = link_to edit_content_type_content_item_path(context[:content_type].id, content_item.id), class: 'mdl-button mdl-js-button mdl-button--icon' do
-            %i{ class: 'material-icons' }
-              create
+        %td.mdl-data-table__cell--non-numeric.content_item-link
+          - if context[:popup]
+            = link_to  '#', data: { id: content_item.id, title: content_item_title(content_item), thumb: content_item_thumb_url(content_item), url: content_item_asset_url(content_item), alt: content_item_asset_alt_text(content_item), asset_type: content_item_asset_type(content_item) }, class: "media-select--#{context[:popup]}"  do
+              = cell('index/content_item', nil, { cells: column[:cells], content_item: content_item }).(:column)
+          - else
+            = link_to edit_content_type_content_item_path(context[:content_type].id, content_item.id) do
+              = cell('index/content_item', nil, { cells: column[:cells], content_item: content_item }).(:column)

app/cells/index/table_headers.haml

@@ -3,9 +3,3 @@
     - @options[:data][:columns].each do |column|
       %th{ class: 'mdl-data-table__cell--non-numeric' }
         = render_table_header(column)
-    - if context[:popup]
-      %th{ class: 'mdl-data-table__cell--non-numeric' }
-        Select
-    - else
-      %th{ class: 'mdl-data-table__cell--non-numeric' }
-        Edit

app/cells/wizard/column/show.haml

@@ -1,4 +1,6 @@
 %div{class: ['mdl-cell', grid_class]}
+  %p
+    = description
   - elements.each do |element|
     - if element.keys.include?("id")
       = cell(Wizard::FieldCell, element).()

app/cells/wizard/column_cell.rb

@@ -4,6 +4,7 @@ class ColumnCell < Cell::ViewModel
     property :grid_width
     property :display
     property :elements
+    property :description
 
     def show
       render

app/cells/wizard/field/show.haml

@@ -1,30 +1,30 @@
 = context[:form].fields_for 'field_items', field_item do |field_item_form|
   - if field_item.field.field_type_instance.class == TextFieldType
     - if render_method
-      = cell(Plugins::Core::TextCell, field_item, form: field_item_form, input_options: input, label_options: label).(render_method)
+      = cell(Plugins::Core::TextCell, field_item, form: field_item_form, input_options: input, label_options: label, tooltip: tooltip).(render_method)
     - else
-      = cell(Plugins::Core::TextCell, field_item, form: field_item_form, input_options: input, label_options: label).(:input)
+      = cell(Plugins::Core::TextCell, field_item, form: field_item_form, input_options: input, label_options: label, tooltip: tooltip).(:input)
 
   - if field_item.field.field_type_instance.class == BooleanFieldType
-    = cell(Plugins::Core::BooleanCell, field_item, form: field_item_form, field_name: field_item.field.name, default_value: false, input_options: input, label_options: label).(:checkbox)
+    = cell(Plugins::Core::BooleanCell, field_item, form: field_item_form, field_name: field_item.field.name, default_value: false, input_options: input, label_options: label, tooltip: tooltip).(:checkbox)
 
   - if field_item.field.field_type_instance.class == TreeFieldType
-    = cell(Plugins::Core::TreeCell, field_item, form: field_item_form, metadata: field_item.field.metadata["allowed_values"], field: field, input_options: input, label_options: label).(render_method)
+    = cell(Plugins::Core::TreeCell, field_item, form: field_item_form, metadata: field_item.field.metadata["allowed_values"], field: field, input_options: input, label_options: label, tooltip: tooltip).(render_method)
 
   - if field_item.field.field_type_instance.class == DateTimeFieldType
-    = cell(Plugins::Core::DateTimeCell, field_item, form: field_item_form, default_value: '', input_options: input, label_options: label).(:datepicker)
+    = cell(Plugins::Core::DateTimeCell, field_item, form: field_item_form, default_value: '', input_options: input, label_options: label, tooltip: tooltip).(:datepicker)
 
   - if field_item.field.field_type_instance.class == TagFieldType
-    = cell(Plugins::Core::TagCell, field_item, form: field_item_form, default_value: [], input_options: input, label_options: label).(:tag_picker)
+    = cell(Plugins::Core::TagCell, field_item, form: field_item_form, default_value: [], input_options: input, label_options: label, tooltip: tooltip).(:tag_picker)
 
   - if field_item.field.field_type_instance.class == UserFieldType
-    = cell(Plugins::Core::UserCell, field_item, form: field_item_form, user_data: User.all, input_options: input, label_options: label).(:dropdown)
+    = cell(Plugins::Core::UserCell, field_item, form: field_item_form, user_data: User.all, input_options: input, label_options: label, tooltip: tooltip).(:dropdown)
 
   - if field_item.field.field_type_instance.class == AssetFieldType
-    = cell(Plugins::Core::AssetCell, field_item, form: field_item_form, input_options: input, label_options: label).(:input)
+    = cell(Plugins::Core::AssetCell, field_item, form: field_item_form, input_options: input, label_options: label, tooltip: tooltip).(:input)
 
   - if field_item.field.field_type_instance.class == ContentItemFieldType
-    = cell(Plugins::Core::ContentItemCell, field_item, form: field_item_form).(:popup)
+    = cell(Plugins::Core::ContentItemCell, field_item, form: field_item_form, tooltip: tooltip).(:popup)
 
   - if field_item.field.field_type_instance.class == AuthorFieldType
-    = cell(Plugins::Core::AuthorCell, field_item, form: field_item_form).(:input)
+    = cell(Plugins::Core::AuthorCell, field_item, form: field_item_form, tooltip: tooltip).(:input)

app/cells/wizard/field_cell.rb

@@ -4,6 +4,7 @@ class FieldCell < Cell::ViewModel
     property :label
     property :input
     property :render_method
+    property :tooltip
 
     def show
       render

app/models/content_item.rb

@@ -42,12 +42,8 @@ def self.taggable_fields
     Field.select { |field| field.field_type_instance.is_a?(TagFieldType) }.map { |field_item| field_item.name.parameterize('_') }
   end
 
-  # The following method (#author_image) is currently faked
-  # author_image is faked pending being able to reference the specific User object (ex:
-  # content_item.author.user_image)
-
-  def author_image
-    "<img src='#{creator.gravatar}' height='50px' />".html_safe
+  def author_email
+    creator.email
   end
 
   def publish_state
@@ -64,11 +60,14 @@ def rss_url(base_url, slug_field_id)
     "#{base_url}#{slug}"
   end
 
-  def user_email(user_field_id)
-    user_id = field_items.find_by_field_id(user_field_id).data.values.join
-    user_email = User.find_by_id(user_id).try(:email)
-    user_fullname = User.find_by_id(user_id).try(:fullname)
-    "#{user_email} (#{user_fullname})"
+  def rss_date(date_field_id)
+    date = field_items.find_by_field_id(date_field_id).data["timestamp"]
+    Date.parse(date).rfc2822
+  end
+
+  def rss_author(field_id)
+    author = field_items.find_by_field_id(field_id).data["author_name"]
+    "[email protected] (#{author})"
   end
 
   # The Method self.taggable_fields must always be above the acts_as_taggable_on inclusion for it.