@asd20/ui 3.2.957 → 3.2.959
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.
- package/package.json +1 -1
- package/src/components/organisms/Asd20Calendar/index.vue +1 -0
- package/src/components/organisms/Asd20PageFooter/index.vue +29 -9
- package/src/components/templates/Asd20ArticleDigestCompactTemplate/index.vue +1 -0
- package/src/components/templates/Asd20ArticleDigestTemplate/index.vue +1 -0
- package/src/components/templates/Asd20ArticleListTemplate/index.vue +1 -0
- package/src/components/templates/Asd20ArticleTemplate/index.vue +1 -0
- package/src/components/templates/Asd20BasePageTemplate/index.vue +1 -0
- package/src/components/templates/Asd20CampusDetailTemplate/index.vue +1 -0
- package/src/components/templates/Asd20CampusTemplate/index.vue +15 -0
- package/src/components/templates/Asd20ClubsTemplate/index.vue +1 -0
- package/src/components/templates/Asd20DetailAlternateTemplate/index.vue +1 -0
- package/src/components/templates/Asd20DetailImageFullTemplate/index.vue +1 -0
- package/src/components/templates/Asd20DetailImageTemplate/index.vue +1 -0
- package/src/components/templates/Asd20DetailTemplate/index.vue +1 -0
- package/src/components/templates/Asd20FileListPageTemplate/index.vue +1 -0
- package/src/components/templates/Asd20GroupFeatureTemplate/index.vue +1 -0
- package/src/components/templates/Asd20LoginsTemplate/index.vue +1 -0
- package/src/components/templates/Asd20PeopleFeatureTemplate/index.vue +1 -0
- package/src/components/templates/Asd20ProfileTemplate/index.vue +1 -0
- package/src/components/templates/Asd20SalaryCalculatorTemplate/index.vue +1 -0
- package/src/components/templates/Asd20SchoolHomeTemplate/index.vue +15 -0
- package/src/components/templates/Asd20SchoolHomeVideoTemplate/index.vue +15 -1
- package/src/components/templates/Asd20WayfindingAlternateTemplate/index.vue +1 -0
- package/src/components/templates/Asd20WayfindingImageTemplate/index.vue +1 -0
- package/src/components/templates/Asd20WayfindingTemplate/index.vue +1 -0
- package/src/data/page-queries/school-home-page-query-result.json +10 -0
- package/src/helpers/mapPageQueryResultToPageTemplateProps.js +18 -0
- package/src/mixins/pageTemplateMixin.js +1 -0
package/package.json
CHANGED
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"
|
|
29
29
|
tagline
|
|
30
30
|
/>
|
|
31
|
-
<div class="
|
|
31
|
+
<div class="footer-optional-logo">
|
|
32
32
|
<a
|
|
33
33
|
v-if="websiteLogoProps"
|
|
34
34
|
:href="websiteLogoProps.logoLink ? websiteLogoProps.logoLink : ''"
|
|
@@ -40,6 +40,17 @@
|
|
|
40
40
|
:alt="websiteLogoProps.logoAlt ? websiteLogoProps.logoAlt : ''"
|
|
41
41
|
/>
|
|
42
42
|
</a>
|
|
43
|
+
<a
|
|
44
|
+
v-if="websiteLogoProps2"
|
|
45
|
+
:href="websiteLogoProps2.logoLink ? websiteLogoProps2.logoLink : ''"
|
|
46
|
+
>
|
|
47
|
+
<img
|
|
48
|
+
:src="
|
|
49
|
+
websiteLogoProps2.logoImageUrl ? websiteLogoProps2.logoImageUrl : ''
|
|
50
|
+
"
|
|
51
|
+
:alt="websiteLogoProps2.logoAlt ? websiteLogoProps2.logoAlt : ''"
|
|
52
|
+
/>
|
|
53
|
+
</a>
|
|
43
54
|
</div>
|
|
44
55
|
</div>
|
|
45
56
|
|
|
@@ -172,6 +183,7 @@ export default {
|
|
|
172
183
|
}),
|
|
173
184
|
},
|
|
174
185
|
websiteLogoProps: { type: Object, default: null },
|
|
186
|
+
websiteLogoProps2: { type: Object, default: null },
|
|
175
187
|
},
|
|
176
188
|
computed: {
|
|
177
189
|
collapsed() {
|
|
@@ -252,9 +264,14 @@ export default {
|
|
|
252
264
|
img {
|
|
253
265
|
max-width: 6rem;
|
|
254
266
|
}
|
|
255
|
-
.
|
|
256
|
-
display:
|
|
257
|
-
|
|
267
|
+
.footer-optional-logo {
|
|
268
|
+
display: flex !important;
|
|
269
|
+
flex-direction: column;
|
|
270
|
+
text-align: right !important;
|
|
271
|
+
a {
|
|
272
|
+
display: block;
|
|
273
|
+
height: max-content;
|
|
274
|
+
}
|
|
258
275
|
}
|
|
259
276
|
}
|
|
260
277
|
|
|
@@ -377,9 +394,13 @@ export default {
|
|
|
377
394
|
display: flex;
|
|
378
395
|
justify-content: space-between;
|
|
379
396
|
padding-bottom: space(2);
|
|
380
|
-
.
|
|
381
|
-
display:
|
|
382
|
-
|
|
397
|
+
.footer-optional-logo {
|
|
398
|
+
display:flex;
|
|
399
|
+
flex-direction: row;
|
|
400
|
+
a {
|
|
401
|
+
display: block;
|
|
402
|
+
height: max-content;
|
|
403
|
+
}
|
|
383
404
|
}
|
|
384
405
|
img {
|
|
385
406
|
// margin-top: space(-1);
|
|
@@ -450,5 +471,4 @@ export default {
|
|
|
450
471
|
}
|
|
451
472
|
}
|
|
452
473
|
}
|
|
453
|
-
</style>
|
|
454
|
-
|
|
474
|
+
</style>
|
|
@@ -42,6 +42,20 @@
|
|
|
42
42
|
:alt="websiteLogoProps.logoAlt ? websiteLogoProps.logoAlt : ''"
|
|
43
43
|
/>
|
|
44
44
|
</a>
|
|
45
|
+
<a
|
|
46
|
+
v-if="websiteLogoProps2"
|
|
47
|
+
:href="websiteLogoProps2.logoLink ? websiteLogoProps2.logoLink : ''"
|
|
48
|
+
>
|
|
49
|
+
<img
|
|
50
|
+
class="optionalLogo"
|
|
51
|
+
:src="
|
|
52
|
+
websiteLogoProps2.logoImageUrl
|
|
53
|
+
? websiteLogoProps2.logoImageUrl
|
|
54
|
+
: ''
|
|
55
|
+
"
|
|
56
|
+
:alt="websiteLogoProps2.logoAlt ? websiteLogoProps2.logoAlt : ''"
|
|
57
|
+
/>
|
|
58
|
+
</a>
|
|
45
59
|
</div>
|
|
46
60
|
</client-only>
|
|
47
61
|
</template>
|
|
@@ -139,6 +153,7 @@
|
|
|
139
153
|
:socialLinks="socialLinks"
|
|
140
154
|
:disclosureLinks="disclosureLinks"
|
|
141
155
|
:websiteLogoProps="websiteLogoProps"
|
|
156
|
+
:websiteLogoProps2="websiteLogoProps2"
|
|
142
157
|
>
|
|
143
158
|
<slot name="page-footer" />
|
|
144
159
|
</asd20-page-footer>
|
|
@@ -59,6 +59,20 @@
|
|
|
59
59
|
"
|
|
60
60
|
/>
|
|
61
61
|
</a>
|
|
62
|
+
<a
|
|
63
|
+
v-if="websiteLogoProps2 && showLogo"
|
|
64
|
+
:href="websiteLogoProps2.logoLink ? websiteLogoProps2.logoLink : ''"
|
|
65
|
+
>
|
|
66
|
+
<img
|
|
67
|
+
class="optionalLogo"
|
|
68
|
+
:src="
|
|
69
|
+
websiteLogoProps2.logoImageUrl
|
|
70
|
+
? websiteLogoProps2.logoImageUrl
|
|
71
|
+
: ''
|
|
72
|
+
"
|
|
73
|
+
:alt="websiteLogoProps2.logoAlt ? websiteLogoProps2.logoAlt : ''"
|
|
74
|
+
/>
|
|
75
|
+
</a>
|
|
62
76
|
</div>
|
|
63
77
|
</client-only>
|
|
64
78
|
</template>
|
|
@@ -133,6 +147,7 @@
|
|
|
133
147
|
:socialLinks="socialLinks"
|
|
134
148
|
:disclosureLinks="disclosureLinks"
|
|
135
149
|
:websiteLogoProps="websiteLogoProps"
|
|
150
|
+
:websiteLogoProps2="websiteLogoProps2"
|
|
136
151
|
>
|
|
137
152
|
<slot name="page-footer" />
|
|
138
153
|
</asd20-page-footer>
|
|
@@ -56,6 +56,20 @@
|
|
|
56
56
|
:alt="websiteLogoProps.logoAlt ? websiteLogoProps.logoAlt : ''"
|
|
57
57
|
/>
|
|
58
58
|
</a>
|
|
59
|
+
<a
|
|
60
|
+
v-if="websiteLogoProps2"
|
|
61
|
+
:href="websiteLogoProps2.logoLink ? websiteLogoProps2.logoLink : ''"
|
|
62
|
+
>
|
|
63
|
+
<img
|
|
64
|
+
class="optionalLogo"
|
|
65
|
+
:src="
|
|
66
|
+
websiteLogoProps2.logoImageUrl
|
|
67
|
+
? websiteLogoProps2.logoImageUrl
|
|
68
|
+
: ''
|
|
69
|
+
"
|
|
70
|
+
:alt="websiteLogoProps2.logoAlt ? websiteLogoProps2.logoAlt : ''"
|
|
71
|
+
/>
|
|
72
|
+
</a>
|
|
59
73
|
</div>
|
|
60
74
|
</client-only>
|
|
61
75
|
</template>
|
|
@@ -131,6 +145,7 @@
|
|
|
131
145
|
:socialLinks="socialLinks"
|
|
132
146
|
:disclosureLinks="disclosureLinks"
|
|
133
147
|
:websiteLogoProps="websiteLogoProps"
|
|
148
|
+
:websiteLogoProps2="websiteLogoProps2"
|
|
134
149
|
>
|
|
135
150
|
<slot name="page-footer" />
|
|
136
151
|
</asd20-page-footer>
|
|
@@ -329,7 +344,6 @@ export default {
|
|
|
329
344
|
.optionalLogo {
|
|
330
345
|
max-width: 12rem;
|
|
331
346
|
max-height: 6rem;
|
|
332
|
-
margin-left: space(1);
|
|
333
347
|
}
|
|
334
348
|
}
|
|
335
349
|
.notification-translation-container {
|
|
@@ -1655,6 +1655,16 @@
|
|
|
1655
1655
|
"validationPattern": null,
|
|
1656
1656
|
"required": false
|
|
1657
1657
|
},
|
|
1658
|
+
{
|
|
1659
|
+
"name": "websiteLogo2",
|
|
1660
|
+
"category": "websiteLogo",
|
|
1661
|
+
"id": "abf845b5-1d4b-4864-a0f1-c8c37b1b4faz",
|
|
1662
|
+
"title": "Website Logo 2",
|
|
1663
|
+
"type": "text",
|
|
1664
|
+
"value": "[{\"logoImageUrl\":\"https://asd20websitestorage.blob.core.windows.net/asd20-images/school-logos/ibWorldSchool.png\", \"logoLink\":\"/academics\",\"logoAlt\":\"The IB logo.\"}]",
|
|
1665
|
+
"validationPattern": null,
|
|
1666
|
+
"required": false
|
|
1667
|
+
},
|
|
1658
1668
|
{
|
|
1659
1669
|
"name": "backgroundColor",
|
|
1660
1670
|
"category": "websiteFooter",
|
|
@@ -162,6 +162,14 @@ export default function mapPageQueryResultToPageTemplateProps(queryResult) {
|
|
|
162
162
|
defaultValue: [],
|
|
163
163
|
})[0] || null
|
|
164
164
|
|
|
165
|
+
const secondWebsiteLogoConfiguration =
|
|
166
|
+
getConfigurationValueOrDefault({
|
|
167
|
+
configurations: inheritedConfigurations,
|
|
168
|
+
category: 'websiteLogo',
|
|
169
|
+
name: 'websiteLogo2',
|
|
170
|
+
defaultValue: []
|
|
171
|
+
})[0] || null
|
|
172
|
+
|
|
165
173
|
// Extract logo component props from configuration
|
|
166
174
|
let websiteLogoProps = null
|
|
167
175
|
if (firstWebsiteLogoConfiguration) {
|
|
@@ -172,6 +180,15 @@ export default function mapPageQueryResultToPageTemplateProps(queryResult) {
|
|
|
172
180
|
}
|
|
173
181
|
}
|
|
174
182
|
|
|
183
|
+
let websiteLogoProps2 = null
|
|
184
|
+
if (secondWebsiteLogoConfiguration) {
|
|
185
|
+
websiteLogoProps2 = {
|
|
186
|
+
logoImageUrl: secondWebsiteLogoConfiguration.logoImageUrl || '',
|
|
187
|
+
logoLink: secondWebsiteLogoConfiguration.logoLink || '/',
|
|
188
|
+
logoAlt: secondWebsiteLogoConfiguration.logoAlt || ''
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
|
|
175
192
|
// Output page props
|
|
176
193
|
let pageProps = {}
|
|
177
194
|
try {
|
|
@@ -289,6 +306,7 @@ export default function mapPageQueryResultToPageTemplateProps(queryResult) {
|
|
|
289
306
|
filesFeedProps,
|
|
290
307
|
peopleFeedProps,
|
|
291
308
|
websiteLogoProps,
|
|
309
|
+
websiteLogoProps2,
|
|
292
310
|
}
|
|
293
311
|
} catch (error) {
|
|
294
312
|
console.error('An error occured while mapping pageQuery to props', error)
|
|
@@ -28,6 +28,7 @@ export default {
|
|
|
28
28
|
primaryMessageLimit: { type: Number, default: 12 },
|
|
29
29
|
// factoids: { type: Array, default: () => [] },
|
|
30
30
|
websiteLogoProps: { type: Object, default: null },
|
|
31
|
+
websiteLogoProps2: { type: Object, default: null },
|
|
31
32
|
|
|
32
33
|
// Page state
|
|
33
34
|
menuOpen: { type: Boolean, default: false },
|