Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit 8988a14

Browse files
authored
Merge pull request #295 from CoderDojo/feature/covid-banner
Add covid banner to find dojo page
2 parents e1ab244 + 216dd38 commit 8988a14

File tree

4 files changed

+35
-5
lines changed

4 files changed

+35
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"dependencies": {
2525
"@coderdojo/cd-common": "1.1.11",
2626
"bootstrap": "^3.4.1",
27-
"cp-translations": "1.0.140",
27+
"cp-translations": "^1.0.142",
2828
"font-awesome": "^4.7.0",
2929
"handlebars": "^4.1.0",
3030
"js-cookie": "^2.1.4",

src/common/cd-covid-banner.vue

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<template>
2+
<div class="cd-banner">
3+
<p>{{ $t('Thank you for your interest in joining the CoderDojo community!') }}</p>
4+
<p>{{ $t('Due to the coronavirus pandemic, we have paused the Dojo verification process.') }}</p>
5+
<p>{{ $t('In the meantime, we’re providing exciting opportunities for young people, parents, volunteers, and educators to get creative with tech through') }}
6+
<a class="cd-banner-link" href="https://www.raspberrypi.org/at-home/">{{ $t('Digital Making at Home') }}</a> {{ $t('from the Raspberry Pi Foundation.') }}
7+
</p>
8+
</div>
9+
</template>
10+
11+
<script>
12+
</script>
13+
14+
<style scoped lang="less">
15+
.cd-banner {
16+
background-color: #63257D;
17+
color: #fff;
18+
margin: 0 -16px;
19+
padding: 24px 32px 14px;
20+
}
21+
22+
.cd-banner-link {
23+
color: #fff;
24+
text-decoration: underline;
25+
font-weight: bold;
26+
}
27+
</style>

src/dojos/cd-find-dojo.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<template>
22
<div v-title="title" class="cd-find-dojo">
3+
<cd-covid-banner></cd-covid-banner>
34
<div class="cd-find-dojo__panel" :class="{ 'cd-find-dojo__panel--reduced': searchExecuted }">
45
<form class="cd-find-dojo__panel-form" :class="{ 'cd-find-dojo__panel-form--reduced': searchExecuted }" @submit.prevent="$router.push({ query: { q: searchCriteria, p: 1 } });">
56
<h1 v-if="!searchExecuted" class="cd-find-dojo__panel-form-header">{{ $t('Find a Dojo to attend') }}</h1>
@@ -78,6 +79,7 @@
7879
import Vue from 'vue';
7980
import DojoList from '@/dojos/cd-dojo-list';
8081
import DojoMap from '@/dojos/cd-dojo-map';
82+
import cdCovidBanner from '@/common/cd-covid-banner';
8183
import GeolocationService from '@/geolocation/service';
8284
import translationComponentGenerator from '@/common/cd-translation-component-generator';
8385
import DojosService from './service';
@@ -184,6 +186,7 @@
184186
DojoMap,
185187
NoResultsDesktop,
186188
NoResultsMobile,
189+
cdCovidBanner,
187190
},
188191
watch: {
189192
$route(newRoute) {

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2386,10 +2386,10 @@ cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
23862386
parse-json "^2.2.0"
23872387
require-from-string "^1.1.0"
23882388

2389-
2390-
version "1.0.140"
2391-
resolved "https://registry.yarnpkg.com/cp-translations/-/cp-translations-1.0.140.tgz#ee8b175748d224a89558abe1228e3b2049767b61"
2392-
integrity sha512-Fpd561fXRfzhKy3aOE2p4A7KFBLJOJjiZ8liZLPseSHv4xSK//MnqFnoE6HJMd5AqibFqDmShGPxXY5glFIdtw==
2389+
cp-translations@^1.0.142:
2390+
version "1.0.142"
2391+
resolved "https://registry.yarnpkg.com/cp-translations/-/cp-translations-1.0.142.tgz#239cb85d190279094e384101a47618201b924b8a"
2392+
integrity sha512-+kayUqvZWM/qfdLYd88CF3qw0pYiTX7aHRvH4SmgP/Ir1uSMoAC0m+LE1RLw1r5gL2SZTzWr0KqheHm/iftckg==
23932393

23942394
crc32-stream@^2.0.0:
23952395
version "2.0.0"

0 commit comments

Comments
 (0)