resolves conflicts

CityOfPhiladelphia · Jan 21, 2025 · 27306b2 · 27306b2
2 parents b01acee + 9ecd3bd
commit 27306b2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/components/ExpandCollapseContent.vue b/src/components/ExpandCollapseContent.vue
@@ -471,6 +471,21 @@ const transformPhone = (value) => {
           </div>
         </div>
 
+        <div
+          v-if="item.attributes.ParentSelfServiceURL"
+          class="columns is-mobile"
+        >
+          <div class="column is-11">
+            <b>{{ $t('parentSelfServiceURL') }}:</b><a
+              target="_blank"
+              :href="makeValidUrl(item.attributes.ParentSelfServiceURL)"
+            >
+              {{ item.attributes.ParentSelfServiceURL }}
+              <font-awesome-icon icon="external-link-alt" />
+            </a>
+          </div>
+        </div>
+
         <div
           v-if="item.attributes.FACEBOOK && item.attributes.FACEBOOK !== 'Lloyd Hall'"
           class="columns is-mobile website-div"

diff --git a/src/data-sources/ost.js b/src/data-sources/ost.js
@@ -13,7 +13,7 @@ export default {
         newData.features.push({
           attributes: datum,
           latlng: [ datum.latitude, datum.longitude ],
-        })
+        });
       }
       return newData;
     },