Skip to content

Commit bea74d7

Browse files
tonjrotonjro
authored
Merge branch 'master' into dependabot/npm_and_yarn/qs-6.5.3
2 parents fecdef7 + 69801fb commit bea74d7

File tree

8 files changed

+169
-36
lines changed

8 files changed

+169
-36
lines changed

‎.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"editor.codeActionsOnSave": {
3-
"source.fixAll": true
3+
"source.fixAll": "explicit"
44
},
55
"[typescript]": {
66
"editor.formatOnSave": true

‎sanity/schemas/simple-event.js

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ export default {
99
initialValue: {
1010
official: true,
1111
signLanguageInterpreted: false,
12+
simultaneousTexting: false,
13+
inductionLoop: false,
1214
wheelchairFriendly: false,
13-
liveStream: false
15+
liveStream: false,
16+
english: false
1417
},
1518
fieldsets: [
1619
{
@@ -125,10 +128,15 @@ export default {
125128
{ title: "Debate", value: "debate" },
126129
{ title: "Talk", value: "talk" },
127130
{ title: "Lecture", value: "lecture" },
131+
{ title: "Litteratur", value: "literature" },
132+
{ title: "Workshop", value: "workshop" },
128133
{ title: "Party", value: "party" },
129134
{ title: "Dans", value: "dans" },
135+
{ title: "Performance", value: "performance" },
130136
{ title: "Teater", value: "teater" },
137+
{ title: "Kino", value: "cinema" },
131138
{ title: "Drag", value: "drag" },
139+
{ title: "Activity for children", value: "children" },
132140
{ title: "Other", value: "other" }
133141
]
134142
},
@@ -143,9 +151,11 @@ export default {
143151
{ title: "Pride House", value: "house" },
144152
{ title: "Pride Parade", value: "parade" },
145153
{ title: "Mini Pride", value: "minipride" },
146-
{ title: "Pride square", value: "square" },
154+
{ title: "Salt", value: "salt" },
147155
{ title: "External", value: "external" },
148-
{ title: "Other", value: "other" }
156+
{ title: "Other", value: "other" },
157+
{ title: "Pride square", value: "square" },
158+
{ title: "Skeive Scener", value: "scener" }
149159
]
150160
},
151161
fieldset: "location",
@@ -157,8 +167,13 @@ export default {
157167
options: {
158168
list: [
159169
{ title: "Hovedscenen", value: "stage1" },
160-
{ title: "BamseScenen", value: "stage2" },
161-
{ title: "Kulturhuset", value: "kultur" },
170+
{ title: "Bamsescenen", value: "stage2" },
171+
{ title: "Kulturscenen", value: "kultur" },
172+
{ title: "Eyr", value: "eyr" },
173+
{ title: "Hippokrates", value: "hippo" },
174+
{ title: "Bjerget", value: "bjerget" },
175+
{ title: "Isachsen", value: "isachsen" },
176+
{ title: "Schjelderup", value: "schjelderup" },
162177
{ title: "Mini Pride", value: "minipride" },
163178
{ title: "Pride Box", value: "box" },
164179
{ title: "Loud ‘n’ Proud", value: "loudproud" },
@@ -179,6 +194,18 @@ export default {
179194
fieldset: "accessibility",
180195
validation: Rule => Rule.required()
181196
},
197+
{
198+
name: "simultaneousTexting",
199+
type: "boolean",
200+
fieldset: "accessibility",
201+
validation: Rule => Rule.required()
202+
},
203+
{
204+
name: "inductionLoop",
205+
type: "boolean",
206+
fieldset: "accessibility",
207+
validation: Rule => Rule.required()
208+
},
182209
{
183210
name: "wheelchairFriendly",
184211
type: "boolean",
@@ -193,6 +220,12 @@ export default {
193220
fieldset: "accessibility",
194221
validation: Rule => Rule.required()
195222
},
223+
{
224+
name: "english",
225+
type: "boolean",
226+
fieldset: "accessibility",
227+
validation: Rule => Rule.required()
228+
},
196229
{
197230
name: "alcoholFree",
198231
type: "boolean",

‎web/src/components/event-card.tsx

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,19 @@ import { MdLocationPin } from "react-icons/md";
88

99
const EVENT_CATEGORIES = {
1010
concert: "Konsert",
11+
debate: "Debatt",
1112
talk: "Samtale",
1213
lecture: "Foredrag",
13-
debate: "Debatt",
14+
literature: "Litteratur",
15+
workshop: "Workshop",
1416
party: "Fest",
1517
dans: "Dans",
16-
drag: "Drag",
18+
performance: "Performance",
1719
teater: "Teater",
18-
other: "Annen"
20+
cinema: "Kino",
21+
drag: "Drag",
22+
children: "Aktivitet for barn/unge",
23+
other: "Annet"
1924
};
2025

2126
const getArenaName = (arena: SanitySimpleEvent["arena"]) => {
@@ -26,6 +31,10 @@ const getArenaName = (arena: SanitySimpleEvent["arena"]) => {
2631
return "Pride House";
2732
case "parade":
2833
return "Pride Parade";
34+
case "salt":
35+
return "Salt";
36+
case "minipride":
37+
return "Mini Pride";
2938
default:
3039
return undefined;
3140
}

‎web/src/components/footer/index.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,13 @@ const Footer: React.FC<Props> = () => {
8080
</ul>
8181
)}
8282
</S.Image>
83-
<a href="https://www.tilgjengelighetsmerket.no/">
83+
<a href="https://www.oslopride.no/p/tilgjengelighet">
8484
<img src={`${Tilgjengelighet}`} alt="Tilgjengelighetsmerket" />
8585
</a>
8686
</div>
8787

8888
<S.Info>
89-
<h3>Oslo Pride as</h3>
90-
<p>c/o Foreningen FRI,</p>
91-
<p>Mariboes gate 13, 0183 OSLO</p>
89+
<h3>Oslo Pride AS</h3>
9290
<p>
9391
Org.nr:{" "}
9492
<a href="https://w2.brreg.no/enhet/sok/detalj.jsp?orgnr=986625860">

‎web/src/pages/event-overview.tsx

Lines changed: 59 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,20 @@ const arenaFilters: Filter[] = [
215215
predicate: event => event.arena === "parade"
216216
},
217217
{
218-
value: "square",
219-
label: "Pride Square",
220-
predicate: event => event.arena === "square"
218+
value: "salt",
219+
label: "Salt",
220+
predicate: event => event.arena === "salt"
221221
},
222222
{
223223
value: "minipride",
224224
label: "Mini Pride",
225225
predicate: event => event.arena === "minipride"
226226
},
227+
{
228+
value: "scener",
229+
label: "Skeive Scener",
230+
predicate: event => event.arena === "scener"
231+
},
227232
{
228233
value: "external",
229234
label: "Ekstern",
@@ -237,6 +242,11 @@ const categoryFilters: Filter[] = [
237242
label: "Konsert",
238243
predicate: event => event.category === "concert"
239244
},
245+
{
246+
value: "debate",
247+
label: "Debatt",
248+
predicate: event => event.category === "debate"
249+
},
240250
{
241251
value: "talk",
242252
label: "Samtale",
@@ -248,9 +258,14 @@ const categoryFilters: Filter[] = [
248258
predicate: event => event.category === "lecture"
249259
},
250260
{
251-
value: "debate",
252-
label: "Debatt",
253-
predicate: event => event.category === "debate"
261+
value: "literature",
262+
label: "Litteratur",
263+
predicate: event => event.category === "literature"
264+
},
265+
{
266+
value: "workshop",
267+
label: "Workshop",
268+
predicate: event => event.category === "workshop"
254269
},
255270
{
256271
value: "party",
@@ -263,14 +278,34 @@ const categoryFilters: Filter[] = [
263278
predicate: event => event.category === "dans"
264279
},
265280
{
266-
value: "drag",
267-
label: "Drag",
268-
predicate: event => event.category === "drag"
281+
value: "performance",
282+
label: "Performance",
283+
predicate: event => event.category === "performance"
269284
},
270285
{
271286
value: "teater",
272287
label: "Teater",
273288
predicate: event => event.category === "teater"
289+
},
290+
{
291+
value: "cinema",
292+
label: "Kino",
293+
predicate: event => event.category === "cinema"
294+
},
295+
{
296+
value: "drag",
297+
label: "Drag",
298+
predicate: event => event.category === "drag"
299+
},
300+
{
301+
value: "children",
302+
label: "Aktivitet for barn/unge",
303+
predicate: event => event.category === "children"
304+
},
305+
{
306+
value: "other",
307+
label: "Annet",
308+
predicate: event => event.category === "other"
274309
}
275310
];
276311

@@ -290,10 +325,25 @@ const accessibilityFilters: Filter[] = [
290325
label: "Tegnspråktolket",
291326
predicate: event => event.signLanguageInterpreted
292327
},
328+
{
329+
value: "simultaneousTexting",
330+
label: "Simultanteksting",
331+
predicate: event => event.simultaneousTexting
332+
},
333+
{
334+
value: "inductionLoop",
335+
label: "Teleslynge",
336+
predicate: event => event.inductionLoop
337+
},
293338
{
294339
value: "alcoholFree",
295340
label: "Rusfritt",
296341
predicate: event => event.alcoholFree
342+
},
343+
{
344+
value: "english",
345+
label: "In English",
346+
predicate: event => event.english
297347
}
298348
];
299349

‎web/src/pages/event.tsx

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,16 @@ const getArenaName = (arena: SanitySimpleEvent["arena"]) => {
115115
return "Pride House";
116116
case "parade":
117117
return "Pride Parade";
118+
case "salt":
119+
return "Salt";
118120
case "square":
119121
return "Pride Square";
120122
case "external":
121123
return "Eksternt arrangement";
124+
case "minipride":
125+
return "Mini Pride";
126+
case "scener":
127+
return "Skeive Scener";
122128
default:
123129
return "Annet";
124130
}
@@ -129,9 +135,19 @@ const getVenueName = (venue: SanitySimpleEvent["venue"]) => {
129135
case "stage1":
130136
return "Hovedscenen";
131137
case "stage2":
132-
return "BamseScenen";
138+
return "Bamsescenen";
133139
case "kultur":
134-
return "Kulturhuset";
140+
return "Kulturscenen";
141+
case "eyr":
142+
return "Eyr";
143+
case "hippo":
144+
return "Hippokrates";
145+
case "bjerget":
146+
return "Bjerget";
147+
case "isachsen":
148+
return "Isachsen";
149+
case "schjelderup":
150+
return "Schjelderup";
135151
case "loudproud":
136152
return "Loud ‘n’ Proud";
137153
case "box":
@@ -243,6 +259,14 @@ const Event: React.FC<Props> = props => {
243259
<span>Tegnspråktolket</span>
244260
<span>{event.signLanguageInterpreted ? "Ja" : "Nei"}</span>
245261
</li>
262+
<li>
263+
<span>Simultanteksting</span>
264+
<span>{event.simultaneousTexting ? "Ja" : "Nei"}</span>
265+
</li>
266+
<li>
267+
<span>Teleslynge</span>
268+
<span>{event.inductionLoop ? "Ja" : "Nei"}</span>
269+
</li>
246270
<li>
247271
<span>Rusfritt</span>
248272
<span>{event.alcoholFree ? "Ja" : "Nei"}</span>
@@ -251,6 +275,10 @@ const Event: React.FC<Props> = props => {
251275
<span>Strømmes</span>
252276
<span>{event.liveStream ? "Ja" : "Nei"}</span>
253277
</li>
278+
<li>
279+
<span>In English</span>
280+
<span>{event.english ? "Ja" : "Nei"}</span>
281+
</li>
254282
{event.eventLink && (
255283
<li>
256284
<span>Arrangement-lenke</span>

‎web/src/sanity/models.ts

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,32 +178,47 @@ export type SanitySimpleEvent = SanityDocument<
178178
| "debate"
179179
| "talk"
180180
| "lecture"
181+
| "literature"
182+
| "workshop"
181183
| "party"
182-
| "drag"
183-
| "teater"
184184
| "dans"
185+
| "performance"
186+
| "teater"
187+
| "cinema"
188+
| "drag"
189+
| "children"
185190
| "other";
186191
arena:
187192
| "park"
188193
| "house"
189194
| "parade"
190195
| "external"
196+
| "salt"
191197
| "square"
192198
| "other"
193-
| "minipride";
199+
| "minipride"
200+
| "scener";
194201
venue?:
195202
| "stage1"
196203
| "stage2"
197204
| "loudproud"
198205
| "box"
199206
| "kultur"
207+
| "eyr"
208+
| "hippo"
209+
| "bjerget"
210+
| "isachsen"
211+
| "schjelderup"
200212
| "minipride"
201213
| "online"
202214
| "youngs";
203215
address?: string;
204216
signLanguageInterpreted: boolean;
217+
simultaneousTexting: boolean;
218+
inductionLoop: boolean;
205219
wheelchairFriendly: boolean;
206220
liveStream: boolean;
221+
english: boolean;
207222
alcoholFree: boolean;
208223
eventLink?: string;
209224
organizer: string;

0 commit comments

Comments
 (0)