@asd20/ui 3.2.845 → 3.2.846

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/molecules/Asd20Card/index.vue +1 -1
  3. package/src/components/organisms/Asd20PageHeader/index.vue +12 -6
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "*.scss",
6
6
  "*.vue"
7
7
  ],
8
- "version": "3.2.845",
8
+ "version": "3.2.846",
9
9
  "private": false,
10
10
  "license": "MIT",
11
11
  "repository": {
package/src/components/molecules/Asd20Card/index.vue CHANGED
@@ -334,7 +334,7 @@ export default {
334
334
  margin-top: space(0.5);
335
335
  margin-bottom: 0;
336
336
  .asd20-icon {
337
- --line-color: var(--website-icon__fill-color);
337
+ --line-color: var(--website-icon__line-color);
338
338
  margin-left: -0.125em;
339
339
  margin-right: space(0.25);
340
340
  }
package/src/components/organisms/Asd20PageHeader/index.vue CHANGED
@@ -242,23 +242,29 @@ export default {
242
242
  goBack() {
243
243
  if (typeof window === 'undefined') return
244
244
  const currentLocation = window.location.href
245
+ const currentURL = new URL(window.location.href)
246
+
245
247
  if (
246
248
  currentLocation.includes('schools') ||
247
249
  currentLocation.includes('8080')
248
250
  ) {
249
- const currentURL = new URL(window.location.href)
250
251
  this.returnURL = currentURL.origin
251
252
  return
252
253
  }
253
- if (document.referrer.startsWith('http' || '/')) {
254
+
255
+ if (document.referrer.includes('/auth/callback')) {
256
+ this.returnURL = currentURL.origin
257
+ return
258
+ }
259
+
260
+ if (
261
+ document.referrer.startsWith('http') ||
262
+ document.referrer.startsWith('/')
263
+ ) {
254
264
  this.returnURL = document.referrer
255
265
  } else {
256
- const currentURL = new URL(window.location.href)
257
266
  this.returnURL = currentURL.origin
258
267
  }
259
- // window.history.back()
260
- // const url = window.location.href
261
- // return url.slice(0, url.lastIndexOf('/'))
262
268
  },
263
269
  truncatedDescription(description) {
264
270
  return truncate(description, { length: 60, separator: /,? +/ })