@asd20/ui 3.2.845 → 3.2.847

package/package.json

@@ -5,7 +5,7 @@
     "*.scss",
     "*.vue"
   ],
-  "version": "3.2.845",
+  "version": "3.2.847",
   "private": false,
   "license": "MIT",
   "repository": {

package/src/components/molecules/Asd20Card/index.vue

@@ -334,7 +334,7 @@ export default {
     margin-top: space(0.5);
     margin-bottom: 0;
     .asd20-icon {
-      --line-color: var(--website-icon__fill-color);
+      --line-color: var(--website-icon__line-color);
       margin-left: -0.125em;
       margin-right: space(0.25);
     }

package/src/components/organisms/Asd20PageHeader/index.vue

@@ -242,23 +242,29 @@ export default {
     goBack() {
       if (typeof window === 'undefined') return
       const currentLocation = window.location.href
+      const currentURL = new URL(window.location.href)
+
       if (
         currentLocation.includes('schools') ||
         currentLocation.includes('8080')
       ) {
-        const currentURL = new URL(window.location.href)
         this.returnURL = currentURL.origin
         return
       }
-      if (document.referrer.startsWith('http' || '/')) {
+
+      if (document.referrer.includes('/auth/callback')) {
+        this.returnURL = currentURL.origin
+        return
+      }
+
+      if (
+        document.referrer.startsWith('http') ||
+        document.referrer.startsWith('/')
+      ) {
         this.returnURL = document.referrer
       } else {
-        const currentURL = new URL(window.location.href)
         this.returnURL = currentURL.origin
       }
-      // window.history.back()
-      // const url = window.location.href
-      // return url.slice(0, url.lastIndexOf('/'))
     },
     truncatedDescription(description) {
       return truncate(description, { length: 60, separator: /,? +/ })

package/src/components/templates/Asd20ClubsTemplate/index.vue

@@ -327,7 +327,7 @@ export default {
             date: '',
             time: '',
             // description: '',
-            // image: '',
+            image: '',
             pinned: false,
           })
         )

package/src/data/messages/stories.json

@@ -759,7 +759,7 @@
       "channels": ["News & Stories"],
       "audiences": [],
       "ownerOrganizationId": "26eaf390-d8ab-11e9-a3a8-5de5bba4f125",
-      "images": "[]",
+      "images": "[{\"files\":[{\"url\":\"https://asd20websitestorage.blob.core.windows.net/website-files/message-images//thumbnail-md/Screen Shot 2020-06-29 at 8.08.34 AM_250x250.jpg\",\"name\":\"thumbnail-md\",\"width\":250,\"height\":250,\"filename\":\"Screen Shot 2020-06-29 at 8.08.34 AM_250x250.jpg\",\"filepath\":\"message-images//thumbnail-md/Screen Shot 2020-06-29 at 8.08.34 AM_250x250.jpg\",\"filesize\":18750},{\"url\":\"https://asd20websitestorage.blob.core.windows.net/website-files/message-images//thumbnail-sm/Screen Shot 2020-06-29 at 8.08.34 AM_100x100.jpg\",\"name\":\"thumbnail-sm\",\"width\":100,\"height\":100,\"filename\":\"Screen Shot 2020-06-29 at 8.08.34 AM_100x100.jpg\",\"filepath\":\"message-images//thumbnail-sm/Screen Shot 2020-06-29 at 8.08.34 AM_100x100.jpg\",\"filesize\":4884},{\"url\":\"https://asd20websitestorage.blob.core.windows.net/website-files/message-images//thumbnail-xs/Screen Shot 2020-06-29 at 8.08.34 AM_50x50.jpg\",\"name\":\"thumbnail-xs\",\"width\":50,\"height\":50,\"filename\":\"Screen Shot 2020-06-29 at 8.08.34 AM_50x50.jpg\",\"filepath\":\"message-images//thumbnail-xs/Screen Shot 2020-06-29 at 8.08.34 AM_50x50.jpg\",\"filesize\":1840},{\"url\":\"https://asd20websitestorage.blob.core.windows.net/website-files/message-images//banner/Screen Shot 2020-06-29 at 8.08.34 AM_800x300.jpg\",\"name\":\"banner\",\"width\":800,\"height\":300,\"filename\":\"Screen Shot 2020-06-29 at 8.08.34 AM_800x300.jpg\",\"filepath\":\"message-images//banner/Screen Shot 2020-06-29 at 8.08.34 AM_800x300.jpg\",\"filesize\":54628},{\"url\":\"https://asd20websitestorage.blob.core.windows.net/website-files/message-images//full/Screen Shot 2020-06-29 at 8.08.34 AM_1200x800.jpg\",\"name\":\"full\",\"width\":1200,\"height\":800,\"filename\":\"Screen Shot 2020-06-29 at 8.08.34 AM_1200x800.jpg\",\"filepath\":\"message-images//full/Screen Shot 2020-06-29 at 8.08.34 AM_1200x800.jpg\",\"filesize\":142032}],\"isCover\":true,\"metadata\":{\"alt\":\"A Pine Creek High School Graduate looking very self-assured.\"}}]",
       "videos": "[{\"id\":\"0ol7e2ASbIk\",\"embedUrl\":\"https://www.youtube.com/embed/0ol7e2ASbIk\",\"watchUrl\":\"https://www.youtube.com/watch?v=0ol7e2ASbIk\",\"coverImageUrl\":\"https://img.youtube.com/vi/0ol7e2ASbIk/0.jpg\"}]",
       "translations": "null",
       "callsToAction": "null",

package/src/mixins/userProfileMixin.js

@@ -0,0 +1,29 @@
+import globalpropmixinfactory from '.'
+
+// Create a mixin to access user profile
+const userProfileMixin = globalpropmixinfactory('userProfile', {
+  type: Object,
+  default: () => ({}),
+})
+
+// In your component
+export default {
+  mixins: [userProfileMixin],
+  computed: {
+    userDisplayName() {
+      return this._userProfile.displayName || ''
+    },
+    userGivenName() {
+      return this._userProfile.givenName || ''
+    },
+    userJobTitle() {
+      return this._userProfile.jobTitle || ''
+    },
+    userOfficeLocation() {
+      return this._userProfile.officeLocation || ''
+    },
+  },
+//   mounted() {
+//     console.log('User Profile:', this._userProfile)
+//   },
+}