@explorer-1/vue 0.2.83 → 0.2.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorer-1/vue",
-  "version": "0.2.83",
+  "version": "0.2.85",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/components/BaseLink/BaseLink.vue

@@ -186,40 +186,42 @@ export default defineComponent({
     },
     addTrailingSlash(path: string) {
       let filteredPath = path
-      const isFilePath = () => {
-        const afterLastSlash = path.split('/').pop()
-        if (afterLastSlash && afterLastSlash.includes('.')) {
-          return true
-        }
-        return false
-      }
-      const isQueryPath = path.includes('?')
-      const isAnchorPath = path.includes('#')
-      if (
-        !isQueryPath &&
-        !isAnchorPath &&
-        !isFilePath() &&
-        path !== '/' &&
-        !path.endsWith('/') &&
-        !path.startsWith('/preview')
-      ) {
-        // add a trailing slash if there isn't one
-        filteredPath += '/'
-      } else if (isQueryPath) {
-        if (!path.includes('/?')) {
-          // also add a trailing slash to paths with query params
-          const urlParts = filteredPath.split('?')
-          const pathWithSlash = `${urlParts[0]}/`
-          const queryParams = urlParts[1]
-          filteredPath = pathWithSlash + '?' + queryParams
+      if (path && typeof path === 'string') {
+        const isFilePath = () => {
+          const afterLastSlash = path.split('/').pop()
+          if (afterLastSlash && afterLastSlash.includes('.')) {
+            return true
+          }
+          return false
         }
-      } else if (isAnchorPath) {
-        if (!path.includes('/#')) {
-          // also add a trailing slash to paths with anchors
-          const urlParts = filteredPath.split('#')
-          const pathWithSlash = `${urlParts[0]}/`
-          const anchor = urlParts[1]
-          filteredPath = pathWithSlash + '#' + anchor
+        const isQueryPath = path.includes('?')
+        const isAnchorPath = path.includes('#')
+        if (
+          !isQueryPath &&
+          !isAnchorPath &&
+          !isFilePath() &&
+          path !== '/' &&
+          !path.endsWith('/') &&
+          !path.startsWith('/preview')
+        ) {
+          // add a trailing slash if there isn't one
+          filteredPath += '/'
+        } else if (isQueryPath) {
+          if (!path.includes('/?')) {
+            // also add a trailing slash to paths with query params
+            const urlParts = filteredPath.split('?')
+            const pathWithSlash = `${urlParts[0]}/`
+            const queryParams = urlParts[1]
+            filteredPath = pathWithSlash + '?' + queryParams
+          }
+        } else if (isAnchorPath) {
+          if (!path.includes('/#')) {
+            // also add a trailing slash to paths with anchors
+            const urlParts = filteredPath.split('#')
+            const pathWithSlash = `${urlParts[0]}/`
+            const anchor = urlParts[1]
+            filteredPath = pathWithSlash + '#' + anchor
+          }
         }
       }
       return filteredPath

package/src/components/NavMobile/NavMobile.vue

@@ -41,7 +41,13 @@
               v-if="themeStore.theme === 'ThemeEdu'"
               class="-ml-1 pl-2 border-l border-white border-opacity-30 z-20 print:border-black"
             >
-              <span class="text-white font-bold text-xl pl-px">Education</span>
+              <BaseLink
+                class="text-white font-bold text-xl pl-px"
+                to="/edubeta/"
+                variant="none"
+              >
+                Education</BaseLink
+              >
             </div>
           </div>
           <button

package/src/components/NavSecondary/NavSecondary.vue

@@ -189,6 +189,7 @@ export default defineComponent({
 .NavSecondary {
   top: -1px; // for intersection observer to work
   @apply sticky z-40 w-full bg-white border-b border-gray-mid border-opacity-0 transition-border-opacity duration-150 edu:duration-300 ease-in;
+  @apply hidden;
   @screen lg {
     @apply block;
   }

package/src/components/PastEventsCarousel/PastEventsCarousel.vue

@@ -3,14 +3,7 @@
     v-if="hasContent"
     heading="Past Events"
     variant="cards"
-    :link="{
-      // path: 'events',
-      query: {
-        event_status: 'Past events',
-        sortBy: 'eventStartDateLatest',
-        page: '1'
-      }
-    }"
+    link="/events/?page=1&event_status=Past+events&sortBy=eventStartDateLatest"
     link-title="View all past events"
     indent="col-1"
     v-bind="$attrs"

package/src/templates/edu/PageEduLesson/PageEduLessonSection.vue

@@ -123,55 +123,58 @@ const { heading, blocks, image, procedures, text } = reactive(props)
   // Assumes font-size for body element is a constant 16px
   @return math.div($pxValue, 16) * 1rem;
 }
-.PageEduProcedureSection {
-  .PageEduProcedureSectionSteps {
-    counter-reset: step;
-  }
-  .PageEduProcedureSectionSingleStep {
-    li:not(:last-of-type) .BlockStreamfield {
-      @apply -mb-5;
+.PageEduLessonSection {
+  @apply overflow-x-hidden;
+  .PageEduProcedureSection {
+    .PageEduProcedureSectionSteps {
+      counter-reset: step;
     }
-  }
-  ol.PageEduProcedureSectionSingleStep {
-    @apply list-none;
-    > li {
-      @apply relative w-full;
-      counter-increment: step;
-      &::before {
-        @apply relative block w-[45rem] mx-auto h-0 pl-1;
-        content: counter(step) '. ';
-        // mimicking .text-body-lg
-        font-size: pxToRem(18);
-        line-height: 1.6667;
+    .PageEduProcedureSectionSingleStep {
+      li:not(:last-of-type) .BlockStreamfield {
+        @apply -mb-5;
       }
-
-      @screen sm {
+    }
+    ol.PageEduProcedureSectionSingleStep {
+      @apply list-none;
+      > li {
+        @apply relative w-full;
+        counter-increment: step;
         &::before {
-          @apply w-[47rem];
-          font-size: pxToRem(19);
+          @apply relative block w-[45rem] mx-auto h-0 pl-1;
+          content: counter(step) '. ';
+          // mimicking .text-body-lg
+          font-size: pxToRem(18);
+          line-height: 1.6667;
         }
-      }
-      @screen md {
-        &::before {
-          @apply w-[51.5rem];
-          font-size: pxToRem(20);
+
+        @screen sm {
+          &::before {
+            @apply w-[47rem];
+            font-size: pxToRem(19);
+          }
         }
-      }
-      @screen lg {
-        &::before {
-          @apply w-[46rem] pl-0;
-          font-size: pxToRem(21);
+        @screen md {
+          &::before {
+            @apply w-[51.5rem];
+            font-size: pxToRem(20);
+          }
         }
-      }
-      @screen xl {
-        &::before {
-          @apply w-[59rem];
-          font-size: pxToRem(22);
+        @screen lg {
+          &::before {
+            @apply w-[46rem] pl-0;
+            font-size: pxToRem(21);
+          }
         }
-      }
-      @screen 2xl {
-        &::before {
-          // @apply w-[58.5rem];
+        @screen xl {
+          &::before {
+            @apply w-[59rem];
+            font-size: pxToRem(22);
+          }
+        }
+        @screen 2xl {
+          &::before {
+            // @apply w-[58.5rem];
+          }
         }
       }
     }

package/src/templates/edu/PageEduStudentProject/PageEduStudentProjectSection.vue

@@ -172,52 +172,55 @@ const { heading, blocks, image, steps, stepsNumbering, text } = reactive(props)
   // Assumes font-size for body element is a constant 16px
   @return math.div($pxValue, 16) * 1rem;
 }
-.PageEduStudentProjectStep {
-  &:target {
-    @apply scroll-mt-14;
-  }
-  .BlockStreamfield {
-    div:last-child {
-      @apply mb-0 #{!important};
+.PageEduStudentProjectSection {
+  @apply overflow-x-hidden;
+  .PageEduStudentProjectStep {
+    &:target {
+      @apply scroll-mt-14;
     }
-  }
-  .caption-area {
-    @apply px-0;
-  }
-  .steps-numbering {
-    // intentionally overriding correction that occurs within ThemeVariantGray
-    @apply text-jpl-red;
-  }
-  .LayoutHelper > div > .BlockText {
-    .richtext-image {
-      &.right,
-      &.left {
-        @apply lg:max-w-md;
-      }
-      &.right {
-        @apply mr-0;
-      }
-      &.left {
-        @apply ml-0;
+    .BlockStreamfield {
+      div:last-child {
+        @apply mb-0 #{!important};
       }
     }
-  }
-
-  .PageEduStudentProjectStep__fullWidth {
+    .caption-area {
+      @apply px-0;
+    }
+    .steps-numbering {
+      // intentionally overriding correction that occurs within ThemeVariantGray
+      @apply text-jpl-red;
+    }
     .LayoutHelper > div > .BlockText {
-      p,
-      li {
-        @screen lg {
-          @apply pr-[9rem];
+      .richtext-image {
+        &.right,
+        &.left {
+          @apply lg:max-w-md;
+        }
+        &.right {
+          @apply mr-0;
         }
-        @screen xl {
-          @apply pr-[13rem];
+        &.left {
+          @apply ml-0;
         }
       }
-      table {
+    }
+
+    .PageEduStudentProjectStep__fullWidth {
+      .LayoutHelper > div > .BlockText {
         p,
         li {
-          @apply pr-0;
+          @screen lg {
+            @apply pr-[9rem];
+          }
+          @screen xl {
+            @apply pr-[13rem];
+          }
+        }
+        table {
+          p,
+          li {
+            @apply pr-0;
+          }
         }
       }
     }