Merge pull request #8 from fivejars/master

Small fixes

README.md

@@ -38,7 +38,7 @@ In order to use it you have to install Docksal.
 Follow the instruction below to get the working local environment that provides
 4 local websites (1 for each base theme and not yet installed Open Y):
 
-```text
+```shell script
 mkdir vymca
 cd vymca
 git clone --branch openy-gc-builds \
@@ -59,11 +59,35 @@ for drupal core:
 * _patches/OEmbed\_vimeo\_private\_videos.patch_
 
 
+### JSON API patch required for Drupal 8.7
+
+```json
+{
+  "extra": {
+    "patches": {
+      "drupal/core": {
+        "JSONAPI wont install (8.7-specific)": "https://www.drupal.org/files/issues/2019-05-23/jsonapi_2996114.patch"
+      }
+    }
+  }
+}
+```
+
 ### Migration notes
 If you have error:
 ```
 TypeError: Argument 6 passed to __construct() must be an instance of EntityTypeManagerInterface
 ```
-apply patch:
+apply patch to composer.json:
+```json
+{
+  "extra": {
+    "patches": {
+      "drupal/paragraphs": {
+        "3079627": "https://www.drupal.org/files/issues/2019-09-06/3079627-4.paragraphs.Argument-6-passed-to-construct.patch"
+      }
+    }
+  }
+}
+```
 
-* _patches/3079627-4.paragraphs.Argument-6-passed-to-construct.patch_

SUMMARY.md

@@ -1,4 +1,4 @@
-``# Table of contents
+# Table of contents
 
 * [Open Y Virtual Y content](README.md)
 * [modules](modules/README.md)

js/gated-content/src/components/auth/DaxkoSSO.vue

@@ -20,14 +20,20 @@ export default {
   data() {
     return {
       error: '',
-      loading: true,
     };
   },
+  created() {
+    this.$store.commit('setLoading', true);
+  },
+  computed: {
+    loading() {
+      return this.$store.state.authDaxkoSSO.loading;
+    },
+  },
   async mounted() {
     await this.$store
       .dispatch('daxkossoAuthorize')
       .then(() => {
-        this.loading = false;
         this.$router.push({ name: 'Home' }).catch(() => {});
       })
       .catch((error) => {

js/gated-content/src/components/auth/DummyAuth.vue

@@ -4,8 +4,7 @@
       <Spinner></Spinner>
     </div>
     <template v-else>
-      <button @click.prevent="dummyLogin">Login!</button>
-      <pre>config: {{ config }}</pre>
+      <button class="gc-button" @click.prevent="dummyLogin">Enter Virtual YMCA</button>
     </template>
   </div>
 </template>

js/gated-content/src/components/blog/BlogListing.vue

@@ -119,7 +119,7 @@ export default {
       if (this.featuredLocal) {
         params.filter.field_gc_video_featured = 1;
       }
-
+      params.filter.status = 1;
       if (this.limit !== 0) {
         params.page = {
           limit: this.limit,

js/gated-content/src/components/event/EventListing.vue

@@ -206,6 +206,7 @@ export default {
         params.filter.field_ls_featured = 1;
       }
 
+      params.filter.status = 1;
       params.sort = {
         sortByDate: {
           path: 'date.value',

js/gated-content/src/components/video/VideoListing.vue

@@ -129,7 +129,7 @@ export default {
       if (this.featuredLocal) {
         params.filter.field_gc_video_featured = 1;
       }
-
+      params.filter.status = 1;
       if (this.limit !== 0) {
         params.page = {
           limit: this.limit,

js/gated-content/src/scss/global.scss

@@ -5,6 +5,7 @@
 
 @import "variables";
 @import "widgets/video-level";
+@import "widgets/button";
 @import "components/video-listing";
 @import "components/video-teaser";
 @import "components/event-teaser";

js/gated-content/src/scss/widgets/button.scss

@@ -0,0 +1,12 @@
+.gc-button {
+  display: block;
+  border: none;
+  background-color: $dark-blue;
+  color: $white;
+  text-transform: uppercase;
+  padding: 10px 20px;
+  border-radius: 5px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 20px;
+}

js/gated-content/src/store/modules/auth/daxkosso.js

@@ -3,6 +3,7 @@ import client from '@/client';
 export default {
   state: {
     config: null,
+    loading: false,
   },
   actions: {
     async daxkossoAuthorize(context) {
@@ -18,6 +19,7 @@ export default {
               context.dispatch('authorize', result.data.user);
             }
           });
+          context.commit('setLoading', false);
         } else {
           // Redirect user if session is not started and there are no token in get.
           window.location = context.getters.getDaxkoSSOConfig.login_url;
@@ -36,6 +38,9 @@ export default {
     setDaxkoSSOConfig(state, config) {
       state.config = config;
     },
+    setLoading(state, value) {
+      state.loading = value;
+    },
   },
   getters: {
     getDaxkoSSOConfig: (state) => state.config,

modules/openy_gc_demo/migrations/migrate_plus.migration.virtual_y_node_landing.yml

@@ -20,6 +20,8 @@ source:
         -
           header_content_id: virtual_y_banner_top
       content:
+        -
+          content_id: wherever_you_go_y_is_there
         -
           content_id: virtual_y_landing_page_login_app
       bottom_content:
@@ -107,12 +109,14 @@ process:
       target_id:
         plugin: migration
         migration:
+          - virtual_y_paragraph_simple_content
           - virtual_y_paragraph_gated_content
           - virtual_y_paragraph_gated_content_login
         source: content_id
       target_revision_id:
         plugin: migration
         migration:
+          - virtual_y_paragraph_simple_content
           - virtual_y_paragraph_gated_content
           - virtual_y_paragraph_gated_content_login
         source: content_id
@@ -141,4 +145,5 @@ migration_dependencies:
     - virtual_y_paragraph_small_banner
     - virtual_y_paragraph_gated_content
     - virtual_y_paragraph_gated_content_login
+    - virtual_y_paragraph_simple_content
   optional: {  }

modules/openy_gc_demo/migrations/migrate_plus.migration.virtual_y_paragraph_simple_content.yml

@@ -0,0 +1,34 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - openy_gc_demo
+id: virtual_y_paragraph_simple_content
+migration_tags: {  }
+migration_group: virtual_y
+label: 'Create simple content paragraph(s) for Virtual Y'
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      id: wherever_you_go_y_is_there
+      field_prgf_description_value: |
+        <p class="text-align-center">&nbsp;</p>
+        <h1 class="text-align-center">Access from anywhere, anytime</h1>
+        <p class="text-align-center"><strong>Enter your email address below
+        to access exclusive content made for you.</strong></p>
+        <p class="text-align-center"><strong>Not a member? Join today to
+        start experiencing the power of Virtual YMCA.</strong></p>
+        <p class="text-align-center">&nbsp;</p>
+  ids:
+    id:
+      type: string
+process:
+  field_prgf_description/value: field_prgf_description_value
+  field_prgf_description/format:
+    plugin: default_value
+    default_value: full_html
+destination:
+  plugin: 'entity:paragraph'
+  default_bundle: simple_content

modules/openy_gc_demo/openy_gc_demo.info.yml

@@ -6,6 +6,7 @@ version: 0.1
 core: 8.x
 dependencies:
   - drupal:migrate
+  - drupal:openy_migrate
   - migrate_plus:migrate_plus
   - migrate_tools:migrate_tools
   - drupal:openy_demo_tcolor

src/Controller/CategoriesController.php

@@ -44,7 +44,9 @@ public static function create(ContainerInterface $container) {
   public function list() {
     $query = $this->database->select('node__field_gc_video_category', 'n');
     $query->leftJoin('taxonomy_term_data', 't', 't.tid = n.field_gc_video_category_target_id');
+    $query->leftJoin('taxonomy_term_field_data', 'tf', 't.tid = tf.tid');
     $query->condition('t.vid', 'gc_category');
+    $query->condition('tf.status', 1);
     $query->fields('t', ['uuid']);
     $query->distinct(TRUE);
     $result = $query->execute()->fetchCol();