Skip to content

Commit a44cf54

Browse files
HerwalHerwal
committed
parent c33e1f8
author herwal <[email protected]> 1726071554 +0200 committer Herwal <[email protected]> 1726585905 +0200 parent c33e1f8 author herwal <[email protected]> 1726071554 +0200 committer Herwal <[email protected]> 1726585885 +0200 parent c33e1f8 author herwal <[email protected]> 1726071554 +0200 committer Herwal <[email protected]> 1726585864 +0200 parent c33e1f8 author herwal <[email protected]> 1726071554 +0200 committer Herwal <[email protected]> 1726585838 +0200 parent c33e1f8 author herwal <[email protected]> 1726071554 +0200 committer Herwal <[email protected]> 1726585621 +0200 forandret etikett for profil siden, neste steg er å kunne gå til ander sine profiler Lagt til navnet mitt på webkom siden. (#2230) 🔥 Remove boomtown (#2233) Fix weird images (#2234) change href for happening tab (#2235) added name (#2236) Ekstern link til påmelding + navn i webkom medlemsliste (#2232) Update dependency jsdom to v25 (#2202) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency @tailwindcss/forms to v0.5.9 (#2229) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency @testing-library/react to v16.0.1 (#2217) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency @sanity/icons to v3.4.0 (#2194) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency tsx to v4.19.0 (#2198) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency @types/node to v20.16.5 (#2218) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency tsx to v4.19.1 (#2242) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> added tidspunkt to csv Update dependency @types/pg to v8.11.9 (#2237) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency @tailwindcss/typography to v0.5.15 (#2216) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update pnpm to v9.10.0 (#2192) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Karo/phd (#2246) Update dependency @types/react to v18.3.5 (#2238) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency postcss to v8.4.45 (#2240) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency remove-markdown to v0.5.5 (#2241) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency tailwindcss to v3.4.11 (#2244) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency eslint-plugin-react to v7.36.1 (#2239) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency framer-motion to v11.5.4 (#2193) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency @playwright/test to v1.47.1 (#2248) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Add renovate schedule Update dependency styled-components to v6.1.13 (#2243) Update dependency eslint-plugin-jsx-a11y to v6.10.0 (#2251) Update dependency vite to ^5.4.5 (#2245) Update dependency eslint-plugin-import to v2.30.0 (#2250) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update robots 🔥 Remove boomtown (#2233) Fix weird images (#2234) change href for happening tab (#2235) added name (#2236) Ekstern link til påmelding + navn i webkom medlemsliste (#2232) Update dependency tsx to v4.19.1 (#2242) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> added tidspunkt to csv Update pnpm to v9.10.0 (#2192) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Karo/phd (#2246) Update dependency postcss to v8.4.45 (#2240) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency remove-markdown to v0.5.5 (#2241) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency tailwindcss to v3.4.11 (#2244) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency framer-motion to v11.5.4 (#2193) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update dependency @playwright/test to v1.47.1 (#2248) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Add renovate schedule Update dependency styled-components to v6.1.13 (#2243) Update dependency vite to ^5.4.5 (#2245) Update dependency eslint-plugin-import to v2.30.0 (#2250) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Update robots
1 parent c33e1f8 commit a44cf54

40 files changed

+863
-888
lines changed

‎.env.example‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ NEXTAUTH_SECRET="foobar"
3030
NEXTAUTH_URL="http://localhost:3000"
3131

3232

33-
# --- Boomtown
34-
# The hostname of the boomtown server
35-
#NEXT_PUBLIC_BOOMTOWN_HOSTNAME="localhost:8080"
36-
3733
# --- Kaffe (can be found in the nano repository)
3834
# The URL of the Kaffe server
3935
#NEXT_PUBLIC_KAFFE_URL="http://localhost:8002"

‎.github/renovate.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"labels": ["dependencies :handshake:"],
55
"commitMessageAction": "Update",
66
"rangeStrategy": "bump",
7+
"schedule": ["every weekend"],
78
"packageRules": [
89
{
910
"matchPackagePatterns": ["^@echo-webkom/", "eslint-config-custom", "tsconfig"],

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ NB: "Backenden" til Drizzle vil kjøre på [http://localhost:4983](http://localh
6767

6868
## Relaterte prosjekter
6969

70-
- [boomtown](https://github.com/echo-webkom/boomtown) - Systemet for live oppdatering av påmeldinger på arrangementer.
7170
- [nano](https://github.com/echo-webkom/nano) - Nano-services for siden.
7271

7372
## Dokumentasjon

‎apps/cms/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"dependencies": {
2323
"@echo-webkom/lib": "workspace:*",
2424
"@sanity/client": "6.21.3",
25-
"@sanity/icons": "3.3.1",
25+
"@sanity/icons": "3.4.0",
2626
"@sanity/ui": "2.8.9",
2727
"@sanity/vision": "3.56.0",
2828
"nanoid": "5.0.7",
@@ -33,12 +33,12 @@
3333
"sanity-plugin-markdown": "4.1.2",
3434
"sanity-plugin-media": "2.3.2",
3535
"slugify": "1.6.6",
36-
"styled-components": "6.1.12"
36+
"styled-components": "6.1.13"
3737
},
3838
"devDependencies": {
3939
"@echo-webkom/tsconfig": "workspace:*",
4040
"@sanity/eslint-config-studio": "4.0.0",
41-
"@types/react": "18.3.4",
41+
"@types/react": "18.3.5",
4242
"@types/styled-components": "5.1.34",
4343
"dotenv": "16.4.5",
4444
"eslint": "8.57.0",

‎apps/cms/schema.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1783,6 +1783,13 @@
17831783
},
17841784
"optional": false
17851785
},
1786+
"endDate": {
1787+
"type": "objectAttribute",
1788+
"value": {
1789+
"type": "string"
1790+
},
1791+
"optional": true
1792+
},
17861793
"registrationStartGroups": {
17871794
"type": "objectAttribute",
17881795
"value": {
@@ -1914,6 +1921,13 @@
19141921
},
19151922
"optional": true
19161923
},
1924+
"externalLink": {
1925+
"type": "objectAttribute",
1926+
"value": {
1927+
"type": "string"
1928+
},
1929+
"optional": true
1930+
},
19171931
"body": {
19181932
"type": "objectAttribute",
19191933
"value": {

‎apps/cms/schemas/happening.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,11 @@ export default defineType({
208208
}),
209209
],
210210
}),
211+
defineField({
212+
name: "externalLink",
213+
type: "url",
214+
hidden: ({ document }) => document?.happeningType !== "external",
215+
}),
211216
defineField({
212217
name: "body",
213218
title: "Brødtekst",

‎apps/cms/schemas/job-ad.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const YEARS = [
99
{ title: "3. året", value: "THIRD" },
1010
{ title: "4. året", value: "FOURTH" },
1111
{ title: "5. året", value: "FIFTH" },
12+
{ title: "PhD", value: "PHD" },
1213
];
1314

1415
export default defineType({

‎apps/cms/schemas/objects/spot-range.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ export default defineType({
1010
name: "minYear",
1111
title: "Minste trinn",
1212
type: "number",
13-
validation: (Rule) => Rule.required().min(1).max(5),
13+
validation: (Rule) => Rule.required().min(1).max(6),
1414
}),
1515
defineField({
1616
name: "maxYear",
1717
title: "Største trinn",
1818
type: "number",
19-
validation: (Rule) => Rule.required().min(Rule.valueOfField("minYear")).max(5),
19+
validation: (Rule) => Rule.required().min(Rule.valueOfField("minYear")).max(6),
2020
}),
2121
defineField({
2222
name: "spots",

‎apps/web/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"clsx": "2.1.1",
4545
"date-fns": "3.6.0",
4646
"drizzle-orm": "0.33.0",
47-
"framer-motion": "11.3.29",
47+
"framer-motion": "11.5.4",
4848
"groq": "3.56.0",
4949
"ics": "^3.7.6",
5050
"nanoid": "5.0.7",
@@ -60,31 +60,31 @@
6060
"react-markdown": "9.0.1",
6161
"react-use-websocket": "^4.8.1",
6262
"remark-gfm": "4.0.0",
63-
"remove-markdown": "0.5.2",
63+
"remove-markdown": "0.5.5",
6464
"sharp": "0.33.0",
6565
"tailwind-merge": "2.5.2",
6666
"zod": "3.23.8"
6767
},
6868
"devDependencies": {
6969
"@echo-webkom/tsconfig": "workspace:*",
70-
"@tailwindcss/forms": "0.5.8",
71-
"@tailwindcss/typography": "0.5.14",
72-
"@testing-library/react": "16.0.0",
73-
"@types/node": "20.16.1",
74-
"@types/react": "18.3.4",
70+
"@tailwindcss/forms": "0.5.9",
71+
"@tailwindcss/typography": "0.5.15",
72+
"@testing-library/react": "16.0.1",
73+
"@types/node": "20.16.5",
74+
"@types/react": "18.3.5",
7575
"@types/react-dom": "18.3.0",
7676
"@vitejs/plugin-react": "4.3.1",
7777
"autoprefixer": "10.4.20",
7878
"dotenv-cli": "7.4.2",
7979
"eslint": "8.57.0",
8080
"eslint-config-webkom": "workspace:*",
81-
"jsdom": "24.1.1",
82-
"postcss": "8.4.41",
81+
"jsdom": "25.0.0",
82+
"postcss": "8.4.45",
8383
"server-only": "^0.0.1",
84-
"tailwindcss": "3.4.10",
84+
"tailwindcss": "3.4.11",
8585
"tailwindcss-animate": "1.0.7",
8686
"typescript": "5.5.4",
87-
"vite": "^5.4.2",
87+
"vite": "^5.4.5",
8888
"vite-tsconfig-paths": "4.3.1",
8989
"vitest": "2.0.5"
9090
},

‎apps/web/src/actions/deregister.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { answers, registrations } from "@echo-webkom/db/schemas";
88
import { DeregistrationNotificationEmail } from "@echo-webkom/email";
99
import { emailClient } from "@echo-webkom/email/client";
1010

11-
import { pingBoomtown } from "@/api/boomtown";
1211
import { revalidateRegistrations } from "@/data/registrations/revalidate";
1312
import { getUser } from "@/lib/get-user";
1413
import { getContactsBySlug } from "@/sanity/utils/contacts";
@@ -73,10 +72,6 @@ export const deregister = async (id: string, payload: z.infer<typeof deregisterP
7372

7473
revalidateRegistrations(id, user.id);
7574

76-
void (async () => {
77-
await pingBoomtown(id);
78-
})();
79-
8075
return {
8176
success: true,
8277
message: "Du er nå avmeldt",

0 commit comments

Comments
 (0)