@asd20/ui 3.2.413 → 3.2.416

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/organisms/Asd20EventModal/index.vue +9 -12
  3. package/src/helpers/mapEventToCard.js +5 -5
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "*.scss",
6
6
  "*.vue"
7
7
  ],
8
- "version": "3.2.413",
8
+ "version": "3.2.416",
9
9
  "private": false,
10
10
  "license": "MIT",
11
11
  "repository": {
package/src/components/organisms/Asd20EventModal/index.vue CHANGED
@@ -23,13 +23,6 @@
23
23
  <h2 class="name">{{ event.summary }}</h2>
24
24
  </header>
25
25
  <Asd20List class="description">
26
- <Asd20ListItem
27
- icon="map"
28
- icon-size="lg"
29
- v-if="event.location"
30
- label="Location"
31
- :description="event.location"
32
- />
33
26
  <Asd20ListItem
34
27
  v-if="time"
35
28
  icon="hours-alt"
@@ -37,6 +30,13 @@
37
30
  label="Time"
38
31
  :description="time"
39
32
  />
33
+ <Asd20ListItem
34
+ icon="map"
35
+ icon-size="lg"
36
+ v-if="event.location"
37
+ label="Location"
38
+ :description="event.location"
39
+ />
40
40
  <Asd20ListItem
41
41
  v-if="event.description"
42
42
  label="Description"
@@ -98,12 +98,9 @@ export default {
98
98
 
99
99
  let time = `${format(parse(this.event.start), '<b>h:mm aa</b>')}`
100
100
  if (this.event.endTimeUndetermined) {
101
- time += `${format(parse(this.event.end), ', dddd, MMMM DD, YYYY')}`
101
+ time += `${format(parse(this.event.end))}`
102
102
  } else {
103
- time += ` - ${format(
104
- parse(this.event.end),
105
- '<b>h:mm aa</b>, dddd, MMMM DD, YYYY'
106
- )}`
103
+ time += ` - ${format(parse(this.event.end), '<b>h:mm aa</b>')}`
107
104
  }
108
105
  return time
109
106
  },
package/src/helpers/mapEventToCard.js CHANGED
@@ -9,12 +9,12 @@ const formattedTime = event => {
9
9
  if (event.multiDay) {
10
10
  return `${format(
11
11
  parse(event.originalStart),
12
- '<b>h:mm aa</b>, MMM.#DD,#YYYY'
12
+ '<b>h:mm aa</b>, dddd, MMMM DD, YYYY'
13
13
  )
14
14
  .replace(/#/g, '&nbsp;')
15
15
  .replace(/:00/g, '')}<br>ending ${format(
16
16
  parse(event.end),
17
- '<b>h:mm aa</b>, MMM.#DD,#YYYY'
17
+ '<b>h:mm aa</b>, dddd, MMMM DD, YYYY'
18
18
  )
19
19
  .replace(/#/g, '&nbsp;')
20
20
  .replace(/:00/g, '')}`
@@ -25,9 +25,9 @@ const formattedTime = event => {
25
25
  ''
26
26
  )}`
27
27
  if (event.endTimeUndetermined) {
28
- time += `${format(parse(event.end), ', MMM. DD, YYYY').replace(/:00/g, '')}`
28
+ time += `${format(parse(event.end)).replace(/:00/g, '')}`
29
29
  } else {
30
- time += ` - ${format(parse(event.end), '<b>h:mm aa</b>, MMM.#DD,#YYYY')
30
+ time += ` - ${format(parse(event.end), '<b>h:mm aa</b>')
31
31
  .replace(/#/g, '&nbsp;')
32
32
  .replace(/:00/g, '')}`
33
33
  }
@@ -40,7 +40,7 @@ export default function mapEventToCard(event) {
40
40
  // subtitle: 'Some subtitle goes here',
41
41
  description: event.description,
42
42
  categories: event.calendarCategories.concat([event.calendarName]),
43
- date: format(event.start, 'MMM, D YYYY'),
43
+ date: format(event.start),
44
44
  time: formattedTime(event),
45
45
  weekday: event.weekday,
46
46
  day: event.day,