Merge pull request #16 from CityOfPhiladelphia/main

moves APPLY NOW button to prod
CityOfPhiladelphia · Jan 29, 2025 · 979364c · 979364c
2 parents 39e9022 + de363cd
commit 979364c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/.github/workflows/testing_cache_and_push.yml b/.github/workflows/testing_cache_and_push.yml
@@ -3,7 +3,7 @@ name: Testing caching with npm and push
 on:
   push:
     branches:
-      - vue3-pinboard
+      - testing
 
 jobs:
   build:

diff --git a/src/components/ExpandCollapseContent.vue b/src/components/ExpandCollapseContent.vue
@@ -17,6 +17,18 @@ const props = defineProps({
 });
 
 // computed
+const registrationOpen = computed(() => {
+  if (props.item.properties.RegistrationPeriodStartDate && props.item.properties.RegistrationPeriodEndDate) {
+    if (new Date(props.item.properties.RegistrationPeriodStartDate) <= new Date() && new Date(props.item.properties.RegistrationPeriodEndDate) >= new Date()) {
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+    return false;
+  }
+});
+
 const hasFocusAreas = computed(() => {
   return props.item.properties.isArt || props.item.properties.isHealth || props.item.properties.isCharacterDevelopment || props.item.properties.isCommunityService || props.item.properties.isSTEM || props.item.properties.isCareerConnected;
 });
@@ -456,21 +468,6 @@ const transformPhone = (value) => {
           </div>
         </div>
 
-        <!-- <div
-          v-if="item.properties.ParentSelfServiceURL"
-          class="columns is-mobile"
-        >
-          <div class="column is-11">
-            <b>{{ $t('parentSelfServiceURL') }}:</b><a
-              target="_blank"
-              :href="makeValidUrl(item.properties.ParentSelfServiceURL)"
-            >
-              {{ item.properties.ParentSelfServiceURL }}
-              <font-awesome-icon icon="external-link-alt" />
-            </a>
-          </div>
-        </div> -->
-
         <div
           v-if="item.properties.FACEBOOK && item.properties.FACEBOOK !== 'Lloyd Hall'"
           class="columns is-mobile website-div"
@@ -561,6 +558,21 @@ const transformPhone = (value) => {
           </div>
         </div>
 
+        <div
+          v-if="registrationOpen && item.properties.ParentSelfServiceURL"
+          class="columns is-mobile"
+        >
+          <div class="column is-11">
+            <a
+              :href="makeValidUrl(item.properties.ParentSelfServiceURL)"
+              target="_blank"
+              class="button is-primary"
+            >
+              Apply Now
+            </a>
+          </div>
+        </div>
+
         <div
           class="columns is-mobile"
         >
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Testing caching with npm and push @@
     on:
       push:
         branches:
-          - vue3-pinboard
+          - testing
     jobs:
       build:
@@ Expand Down @@