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;
+}