@asd20/ui 3.2.481 → 3.2.483

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/components/organisms/Asd20SecondaryHeader/index.vue +3 -3
  3. package/src/components/templates/Asd20ArticleDigestTemplate/index.vue +19 -11
  4. package/src/data/events/district-events.json +207 -77
  5. package/src/helpers/expandEvents.js +19 -15
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "*.scss",
6
6
  "*.vue"
7
7
  ],
8
- "version": "3.2.481",
8
+ "version": "3.2.483",
9
9
  "private": false,
10
10
  "license": "MIT",
11
11
  "repository": {
package/src/components/organisms/Asd20SecondaryHeader/index.vue CHANGED
@@ -67,7 +67,7 @@ export default {
67
67
  );
68
68
  flex-direction: column;
69
69
  width: 70vw;
70
- margin: space(0.5) auto;
70
+ margin: space(0.5) auto !important;
71
71
  color: var(--website-homepage-header__secondary-button-foreground-color);
72
72
  // background: var(--website-homepage-header__secondary-button-background-color);
73
73
  &:hover {
@@ -116,7 +116,7 @@ export default {
116
116
  }
117
117
  &::v-deep .asd20-button {
118
118
  width: 50vw;
119
- margin: space(0.5) space(0.5) 0 0;
119
+ margin: space(0.5) space(0.5) 0 0 !important;
120
120
  }
121
121
  }
122
122
  }
@@ -135,7 +135,7 @@ export default {
135
135
  );
136
136
  flex-direction: row;
137
137
  width: inherit;
138
- margin: 0 space(0.5) 0 0;
138
+ margin: 0 space(0.5) 0 0 !important;
139
139
  }
140
140
  }
141
141
  }
package/src/components/templates/Asd20ArticleDigestTemplate/index.vue CHANGED
@@ -91,7 +91,7 @@
91
91
  label="Categories"
92
92
  :taggable="false"
93
93
  :value="selectedCategories"
94
- :items="computedCategoryOptions"
94
+ :items="categoryOptions"
95
95
  @input="$emit('update:selected-categories', $event)"
96
96
  />
97
97
  </div>
@@ -298,7 +298,7 @@ export default {
298
298
  props: {
299
299
  keywords: { type: String, default: '' },
300
300
  selectedCategories: { type: Array, default: () => [] },
301
- categoryOptions: { type: Array, default: () => [] },
301
+ // categoryOptions: { type: Array, default: () => [] },
302
302
  },
303
303
  data: function() {
304
304
  return {
@@ -323,17 +323,25 @@ export default {
323
323
  // link: c.link.replace('/stories', '/announcements'),
324
324
  // }))
325
325
  },
326
- computedCategoryOptions() {
326
+ categoryOptions() {
327
327
  // get a unique array of categories with duplicates removed
328
- if (this.categoryOptions.length === 0) {
329
- return [
330
- ...new Set(
331
- this.cards.reduce((a, c) => a.concat(c.categories || []), []).sort()
332
- ),
333
- ]
334
- }
335
- return this.categoryOptions
328
+ return [
329
+ ...new Set(
330
+ this.cards.reduce((a, c) => a.concat(c.categories || []), []).sort()
331
+ ),
332
+ ]
336
333
  },
334
+ // computedCategoryOptions() {
335
+ // // get a unique array of categories with duplicates removed
336
+ // if (this.categoryOptions.length === 0) {
337
+ // return [
338
+ // ...new Set(
339
+ // this.cards.reduce((a, c) => a.concat(c.categories || []), []).sort()
340
+ // ),
341
+ // ]
342
+ // }
343
+ // return this.categoryOptions
344
+ // },
337
345
  },
338
346
  watch: {
339
347
  selectedCategories: function(newVal, oldVal) {
package/src/data/events/district-events.json CHANGED
@@ -2,164 +2,294 @@
2
2
  "@odata.context": "https://asd20-website-search.search.windows.net/indexes('events-index')/$metadata#docs(*)",
3
3
  "@odata.count": 18,
4
4
  "@search.facets": {
5
- "calendarLocation": [{ "count": 18, "value": "District Wide" }],
5
+ "calendarLocation": [
6
+ {
7
+ "count": 18,
8
+ "value": "District Wide"
9
+ }
10
+ ],
6
11
  "calendarCategories": [],
7
12
  "calendarId": [
8
- { "count": 12, "value": "2002ca04-bd3b-dd84-1e4e-576d878dd497" },
9
- { "count": 6, "value": "00a67c71-942d-8ba3-4202-179a23732170" }
13
+ {
14
+ "count": 12,
15
+ "value": "2002ca04-bd3b-dd84-1e4e-576d878dd497"
16
+ },
17
+ {
18
+ "count": 6,
19
+ "value": "00a67c71-942d-8ba3-4202-179a23732170"
20
+ }
10
21
  ]
11
22
  },
12
23
  "value": [
13
-
14
24
  {
15
- "@search.score": 1.0,
25
+ "@search.score": 1,
16
26
  "id": null,
17
- "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMDUwM0Q5OTdDQkI1QUQ2MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDAzNEUyMDAyRTgzRDc2N22zQ2OEYwQjcyRUEwMEYxM0VFRg=1",
27
+ "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMDc3N0RBQjVFNzBCMkQ4MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDA4Q0IxNTUwMjk4QzVDNzQ2ODZDNDg3NTI2NTFCMEI5Qg==",
18
28
  "type": "event",
19
- "summary": "BOE Meeting: Quam Ornare Pellentesque Magna Tristique - Quam Ornare Pellentesque Magna Tristique",
20
- "description": "Maecenas sed diam eget risus varius blandit sit amet non magna. Maecenas faucibus mollis interdum. Cras mattis consectetur purus sit amet fermentum. Curabitur blandit tempus porttitor. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Lorem ipsum dolor sit amet, consectetur adipiscing elit. <a href='www.asd20.org'>asd20.org<a>",
21
- "location": "Location Name",
22
- "start": "2020-10-04T00:00:00Z",
23
- "end": "2020-10-04T03:00:00Z",
24
- "dtstamp": "2020-10-04T00:00:00Z",
29
+ "summary": "Winter Break - No School",
30
+ "description": "No School",
31
+ "location": "AAHS",
32
+ "start": "2022-12-19T07:00:00Z",
33
+ "end": "2023-01-05T07:00:00Z",
34
+ "dtstamp": "2022-12-19T07:00:00Z",
25
35
  "class": "",
26
36
  "priority": "",
27
37
  "transparency": "",
28
38
  "status": "",
29
39
  "sequence": "",
30
- "calendarId": "00a67c71-942d-8ba3-4202-179a23732170",
31
- "calendarName": "Board of Education",
32
- "calendarLocation": "District Wide",
40
+ "url": null,
41
+ "calendarId": "da74e260-04f3-11ec-a052-79c69b6cfc2b",
42
+ "calendarName": "School Wide",
43
+ "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
44
+ "calendarOrganizationTitle": "Air Academy High School",
33
45
  "calendarCategories": [],
34
46
  "calendarKeywords": [],
35
- "calendarUrl": "https://outlook.office365.com/owa/calendar/80c1b2bdfa664001bf60281506110722@asd20.org/4db82407960c48f38c7fed5f1b04c10614905392209255665596/calendar.ics",
47
+ "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/1ff6c80db4dd42c5be39096fdf50a4ee10284553908289904160/calendar.ics",
36
48
  "calendarFormat": "ical",
37
- "calendarColor": "#0D2C6C"
49
+ "calendarColor": "#213f94"
38
50
  },
39
51
  {
40
- "@search.score": 1.0,
52
+ "@search.score": 1,
41
53
  "id": null,
42
- "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwM2DRDNkY1MTc2MzlGM0Q1MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDA3NUNDNDlGQjFCRkQ0QzRGQUMxNkZBQzlEMUY4MjFBNQ=4",
54
+ "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMDYwMzFGM0FERjUwQkQ5MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDA1NjA4MzhGNkIzMkU3OTQ1ODk2OUU1RUJDRENBM0U4Rg==",
43
55
  "type": "event",
44
- "summary": "Semester Begins",
45
- "description": "\n",
56
+ "summary": "First day of second semester",
57
+ "description": "",
58
+ "location": "AAHS",
59
+ "start": "2023-01-05T07:00:00Z",
60
+ "end": "2023-01-06T07:00:00Z",
61
+ "dtstamp": "2023-01-05T07:00:00Z",
62
+ "class": "",
63
+ "priority": "",
64
+ "transparency": "",
65
+ "status": "",
66
+ "sequence": "",
67
+ "url": null,
68
+ "calendarId": "da74e260-04f3-11ec-a052-79c69b6cfc2b",
69
+ "calendarName": "School Wide",
70
+ "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
71
+ "calendarOrganizationTitle": "Air Academy High School",
72
+ "calendarCategories": [],
73
+ "calendarKeywords": [],
74
+ "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/1ff6c80db4dd42c5be39096fdf50a4ee10284553908289904160/calendar.ics",
75
+ "calendarFormat": "ical",
76
+ "calendarColor": "#213f94"
77
+ },
78
+ {
79
+ "@search.score": 1,
80
+ "id": null,
81
+ "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMEVGRDJDOEZCQ0RFN0Q4MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDBDMUEwRTM5NTYwQTRGMjQzOEQyN0MzRjAxQzdGRkQ4QQ==",
82
+ "type": "event",
83
+ "summary": "Parent Council - College Info Meeting",
84
+ "description": "Admissions officers from several local and regional colleges/universities will be in attendance sharing information about their schools.",
85
+ "location": "AAHS Media Center",
86
+ "start": "2023-01-19T20:20:00Z",
87
+ "end": "2023-01-19T21:50:00Z",
88
+ "dtstamp": "2023-01-19T20:20:00Z",
89
+ "class": "",
90
+ "priority": "",
91
+ "transparency": "",
92
+ "status": "",
93
+ "sequence": "",
94
+ "url": null,
95
+ "calendarId": "da74e260-04f3-11ec-a052-79c69b6cfc2b",
96
+ "calendarName": "School Wide",
97
+ "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
98
+ "calendarOrganizationTitle": "Air Academy High School",
99
+ "calendarCategories": [],
100
+ "calendarKeywords": [],
101
+ "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/1ff6c80db4dd42c5be39096fdf50a4ee10284553908289904160/calendar.ics",
102
+ "calendarFormat": "ical",
103
+ "calendarColor": "#213f94"
104
+ },
105
+ {
106
+ "@search.score": 1,
107
+ "id": null,
108
+ "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMEUzNDIwRENBRjUwQkQ5MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDBCRDE0QjFENjA2ODMxODQyOUU4NDEwMTY1MTM4Mzc4Mg==",
109
+ "type": "event",
110
+ "summary": "Choice Night",
111
+ "description": "",
112
+ "location": "AAHS Media Center",
113
+ "start": "2023-01-20T01:00:00Z",
114
+ "end": "2023-01-20T03:00:00Z",
115
+ "dtstamp": "2023-01-20T01:00:00Z",
116
+ "class": "",
117
+ "priority": "",
118
+ "transparency": "",
119
+ "status": "",
120
+ "sequence": "",
121
+ "url": null,
122
+ "calendarId": "da74e260-04f3-11ec-a052-79c69b6cfc2b",
123
+ "calendarName": "School Wide",
124
+ "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
125
+ "calendarOrganizationTitle": "Air Academy High School",
126
+ "calendarCategories": [],
127
+ "calendarKeywords": [],
128
+ "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/1ff6c80db4dd42c5be39096fdf50a4ee10284553908289904160/calendar.ics",
129
+ "calendarFormat": "ical",
130
+ "calendarColor": "#213f94"
131
+ },
132
+ {
133
+ "@search.score": 1,
134
+ "id": null,
135
+ "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMDQyQzAzMUUwRjUwQkQ5MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDA3NENFNTM4MjdERTEwMzRDQjAwNzNGNjU5MUFFRjM1OQ==",
136
+ "type": "event",
137
+ "summary": "8th Grade Information Night",
138
+ "description": "",
139
+ "location": "AAHS Gyms",
140
+ "start": "2023-02-10T01:00:00Z",
141
+ "end": "2023-02-10T03:00:00Z",
142
+ "dtstamp": "2023-02-10T01:00:00Z",
143
+ "class": "",
144
+ "priority": "",
145
+ "transparency": "",
146
+ "status": "",
147
+ "sequence": "",
148
+ "url": null,
149
+ "calendarId": "da74e260-04f3-11ec-a052-79c69b6cfc2b",
150
+ "calendarName": "School Wide",
151
+ "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
152
+ "calendarOrganizationTitle": "Air Academy High School",
153
+ "calendarCategories": [],
154
+ "calendarKeywords": [],
155
+ "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/1ff6c80db4dd42c5be39096fdf50a4ee10284553908289904160/calendar.ics",
156
+ "calendarFormat": "ical",
157
+ "calendarColor": "#213f94"
158
+ },
159
+ {
160
+ "@search.score": 1,
161
+ "id": null,
162
+ "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMEJBRTREM0ZDRjUwQkQ5MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDAyRUM1ODhDQUJDNzcxNjRDQjI4QjhENjVGNUYyM0I1Mw==",
163
+ "type": "event",
164
+ "summary": "Parent-teacher Conferences",
165
+ "description": "",
46
166
  "location": "",
47
- "start": "2020-10-24T06:00:00Z",
48
- "end": "2020-10-25T06:00:00Z",
49
- "dtstamp": "2020-10-24T06:00:00Z",
167
+ "start": "2023-03-22T21:30:00Z",
168
+ "end": "2023-03-23T01:30:00Z",
169
+ "dtstamp": "2023-03-22T21:30:00Z",
50
170
  "class": "",
51
171
  "priority": "",
52
172
  "transparency": "",
53
173
  "status": "",
54
174
  "sequence": "",
55
- "calendarId": "2002ca04-bd3b-dd84-1e4e-576d878dd497",
56
- "calendarName": "District Schedules",
57
- "calendarLocation": "District Wide",
175
+ "url": null,
176
+ "calendarId": "da74e260-04f3-11ec-a052-79c69b6cfc2b",
177
+ "calendarName": "School Wide",
178
+ "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
179
+ "calendarOrganizationTitle": "Air Academy High School",
58
180
  "calendarCategories": [],
59
181
  "calendarKeywords": [],
60
- "calendarUrl": "https://outlook.office365.com/owa/calendar/80c1b2bdfa664001bf60281506110722@asd20.org/8dbefd84a53446aaa364ee0f7d2a977c13651128840375967179/calendar.ics",
182
+ "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/1ff6c80db4dd42c5be39096fdf50a4ee10284553908289904160/calendar.ics",
61
183
  "calendarFormat": "ical",
62
- "calendarColor": "#0D2C6C"
184
+ "calendarColor": "#213f94"
63
185
  },
64
186
  {
65
- "@search.score": 1.0,
187
+ "@search.score": 1,
66
188
  "id": null,
67
- "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMDJBRUQ24QUIyMTU2MkQ2MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDBCNURBMkY1MkNCMzg1OTRFODEwNjQyNDYwRTZDNDA2QQ=6",
189
+ "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMEEwQUMwRTBFRjYwQkQ5MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDAzMkEyMEY2N0Y3N0I2MjQ2QTMyNTNFNjlEQTlFNUNDMA==",
68
190
  "type": "event",
69
- "summary": "First Day of School for Students",
70
- "description": "\n",
191
+ "summary": "Parent-Teacher Conferences",
192
+ "description": "",
71
193
  "location": "",
72
- "start": "2020-09-24T06:00:00Z",
73
- "end": "2020-09-25T06:00:00Z",
74
- "dtstamp": "2020-09-24T06:00:00Z",
194
+ "start": "2023-03-23T22:00:00Z",
195
+ "end": "2023-03-24T01:00:00Z",
196
+ "dtstamp": "2023-03-23T22:00:00Z",
75
197
  "class": "",
76
198
  "priority": "",
77
199
  "transparency": "",
78
200
  "status": "",
79
201
  "sequence": "",
80
- "calendarId": "2002ca04-bd3b-dd84-1e4e-576d878dd497",
81
- "calendarName": "District Schedules",
82
- "calendarLocation": "District Wide",
202
+ "url": null,
203
+ "calendarId": "da74e260-04f3-11ec-a052-79c69b6cfc2b",
204
+ "calendarName": "School Wide",
205
+ "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
206
+ "calendarOrganizationTitle": "Air Academy High School",
83
207
  "calendarCategories": [],
84
208
  "calendarKeywords": [],
85
- "calendarUrl": "https://outlook.office365.com/owa/calendar/80c1b2bdfa664001bf60281506110722@asd20.org/8dbefd84a53446aaa364ee0f7d2a977c13651128840375967179/calendar.ics",
209
+ "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/1ff6c80db4dd42c5be39096fdf50a4ee10284553908289904160/calendar.ics",
86
210
  "calendarFormat": "ical",
87
- "calendarColor": "#0D2C6C"
211
+ "calendarColor": "#213f94"
88
212
  },
89
213
  {
90
- "@search.score": 1.0,
214
+ "@search.score": 1,
91
215
  "id": null,
92
- "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDg2wMDAwMDAwMDkwREMzNzZEQkI12QUQ2MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDA0OTZFN0QzQkY2RDAxMTQwQkM5REM4NEY2RkQ3RTMwNA=7",
216
+ "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMDE1QkJENDBFRjYwQkQ5MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDA3NTYwODEwREYwNjdBMDQzQTdEOEI0NTY3RjlBRTdCNg==",
93
217
  "type": "event",
94
- "summary": "BOE Meeting",
218
+ "summary": "No school",
95
219
  "description": "",
96
220
  "location": "",
97
- "start": "2020-10-07T00:00:00Z",
98
- "end": "2020-10-07T03:00:00Z",
99
- "dtstamp": "2020-10-07T00:00:00Z",
221
+ "start": "2023-03-24T06:00:00Z",
222
+ "end": "2023-03-25T06:00:00Z",
223
+ "dtstamp": "2023-03-24T06:00:00Z",
100
224
  "class": "",
101
225
  "priority": "",
102
226
  "transparency": "",
103
227
  "status": "",
104
228
  "sequence": "",
105
- "calendarId": "00a67c71-942d-8ba3-4202-179a23732170",
106
- "calendarName": "Board of Education",
107
- "calendarLocation": "District Wide",
229
+ "url": null,
230
+ "calendarId": "da74e260-04f3-11ec-a052-79c69b6cfc2b",
231
+ "calendarName": "School Wide",
232
+ "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
233
+ "calendarOrganizationTitle": "Air Academy High School",
108
234
  "calendarCategories": [],
109
235
  "calendarKeywords": [],
110
- "calendarUrl": "https://outlook.office365.com/owa/calendar/80c1b2bdfa664001bf60281506110722@asd20.org/4db82407960c48f38c7fed5f1b04c10614905392209255665596/calendar.ics",
236
+ "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/1ff6c80db4dd42c5be39096fdf50a4ee10284553908289904160/calendar.ics",
111
237
  "calendarFormat": "ical",
112
- "calendarColor": "#0D2C6C"
238
+ "calendarColor": "#213f94"
113
239
  },
114
240
  {
115
- "@search.score": 1.0,
241
+ "@search.score": 1,
116
242
  "id": null,
117
- "uid": "MDQwMDAwMDA4MjAwRTAwMDc20QzVCNzEwMUE4MkUwMDgwMDAwMDAwMEMxNTRDQjVDMzlGM0Q1MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDAwNTExNzA2QTYxNjYwODQ1ODZDNjk1NTBCRjk5NEU2RQ=8",
243
+ "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMDE2MTM4NjE2RjYwQkQ5MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDBBMjBCN0QxMzU4RTUyMjQyODdFRkQ0QThDQjQ0NkY5Ng==",
118
244
  "type": "event",
119
- "summary": "Teacher Work Day",
120
- "description": "\n",
245
+ "summary": "No school - Spring Break",
246
+ "description": "",
121
247
  "location": "",
122
- "start": "2020-10-14T06:00:00Z",
123
- "end": "2020-10-15T06:00:00Z",
124
- "dtstamp": "2020-10-14T06:00:00Z",
248
+ "start": "2023-03-27T06:00:00Z",
249
+ "end": "2023-03-28T06:00:00Z",
250
+ "dtstamp": "2023-03-27T06:00:00Z",
125
251
  "class": "",
126
252
  "priority": "",
127
253
  "transparency": "",
128
254
  "status": "",
129
255
  "sequence": "",
130
- "calendarId": "2002ca04-bd3b-dd84-1e4e-576d878dd497",
131
- "calendarName": "District Schedules",
132
- "calendarLocation": "District Wide",
256
+ "url": null,
257
+ "calendarId": "da74e260-04f3-11ec-a052-79c69b6cfc2b",
258
+ "calendarName": "School Wide",
259
+ "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
260
+ "calendarOrganizationTitle": "Air Academy High School",
133
261
  "calendarCategories": [],
134
262
  "calendarKeywords": [],
135
- "calendarUrl": "https://outlook.office365.com/owa/calendar/80c1b2bdfa664001bf60281506110722@asd20.org/8dbefd84a53446aaa364ee0f7d2a977c13651128840375967179/calendar.ics",
263
+ "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/1ff6c80db4dd42c5be39096fdf50a4ee10284553908289904160/calendar.ics",
136
264
  "calendarFormat": "ical",
137
- "calendarColor": "#0D2C6C"
265
+ "calendarColor": "#213f94"
138
266
  },
139
267
  {
140
- "@search.score": 1.0,
268
+ "@search.score": 1,
141
269
  "id": null,
142
- "uid": "MDQwMD2AwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMEQwMkExQjc0QkI1QUQ2MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDAxNzdDRjM3MzVDQjVCRTQ4ODY2OTAzQjgyNDQ4REU1Ng=9",
270
+ "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMDIyQzE3RTIwRjYwQkQ5MDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDAzRjdENDg0MzUyQjdEQTQ1ODc1QjQwRDE2MEQ2NkEwOA==",
143
271
  "type": "event",
144
- "summary": "BOE Meeting (in-person)",
145
- "description": "The Aug. 20, 2020, board meeting will be in-person, at the EAC, 1110 Chapel Hills Drive. Those who cannot attend can watch the livestream<https://bit.ly/3g8wV0k> at 6 p.m., and a recording of the meeting will be available by the end on the day on Monday, Aug. 24, 2020.\n\nSpace will be limited as social distancing will be enforced, as will facial covering/mask wearing.\n\nThose who wish to address the board should attend in person. As always, in lieu of addressing the board in person, written comments may be submitted to Katrina Adad, board secretary, who will ensure that board members and Tom Gregory, superintendent, receive a copy of all comments. Comments submitted in writing will not be read publicly at the board meeting, but they will continue to be acknowledged in writing by the board president following the meeting.\n",
272
+ "summary": "No school - Spring Break",
273
+ "description": "",
146
274
  "location": "",
147
- "start": "2020-09-21T00:00:00Z",
148
- "end": "2020-09-21T03:00:00Z",
149
- "dtstamp": "2020-09-21T00:00:00Z",
275
+ "start": "2023-03-28T06:00:00Z",
276
+ "end": "2023-03-29T06:00:00Z",
277
+ "dtstamp": "2023-03-28T06:00:00Z",
150
278
  "class": "",
151
279
  "priority": "",
152
280
  "transparency": "",
153
281
  "status": "",
154
282
  "sequence": "",
155
- "calendarId": "00a67c71-942d-8ba3-4202-179a23732170",
156
- "calendarName": "Board of Education",
157
- "calendarLocation": "District Wide",
283
+ "url": null,
284
+ "calendarId": "da74e260-04f3-11ec-a052-79c69b6cfc2b",
285
+ "calendarName": "School Wide",
286
+ "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
287
+ "calendarOrganizationTitle": "Air Academy High School",
158
288
  "calendarCategories": [],
159
289
  "calendarKeywords": [],
160
- "calendarUrl": "https://outlook.office365.com/owa/calendar/80c1b2bdfa664001bf60281506110722@asd20.org/4db82407960c48f38c7fed5f1b04c10614905392209255665596/calendar.ics",
290
+ "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/1ff6c80db4dd42c5be39096fdf50a4ee10284553908289904160/calendar.ics",
161
291
  "calendarFormat": "ical",
162
- "calendarColor": "#0D2C6C"
292
+ "calendarColor": "#213f94"
163
293
  }
164
294
  ]
165
- }
295
+ }
package/src/helpers/expandEvents.js CHANGED
@@ -26,22 +26,26 @@ export default function expandEvents(events) {
26
26
 
27
27
  if (multiDay && !allDay) {
28
28
  for (let d = 0; d < diffDays; d++) {
29
+ const today = new Date()
30
+ today.setDate(today.getDate() - 1)
29
31
  const newStart = addDays(event.start, d)
30
- a.push(
31
- Object.assign({}, event, {
32
- start: newStart,
33
- end: event.end ? event.end : null,
34
- originalStart: event.start,
35
- allDay: parse(event.start).getHours() === 0,
36
- endTimeUndetermined,
37
- multiDay,
38
- weekday: format(parse(newStart), 'dddd'),
39
- day: format(parse(newStart), 'DD'),
40
- number: format(parse(newStart), 'D'),
41
- month: format(parse(newStart), 'MMMM'),
42
- year: format(parse(newStart), 'YYYY'),
43
- })
44
- )
32
+ if (newStart > today) {
33
+ a.push(
34
+ Object.assign({}, event, {
35
+ start: newStart,
36
+ end: event.end ? event.end : null,
37
+ originalStart: event.start,
38
+ allDay: parse(event.start).getHours() === 0,
39
+ endTimeUndetermined,
40
+ multiDay,
41
+ weekday: format(parse(newStart), 'dddd'),
42
+ day: format(parse(newStart), 'DD'),
43
+ number: format(parse(newStart), 'D'),
44
+ month: format(parse(newStart), 'MMMM'),
45
+ year: format(parse(newStart), 'YYYY'),
46
+ })
47
+ )
48
+ }
45
49
  }
46
50
  } else {
47
51
  a.push(