formatering..

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
echo-webkom · Sep 27, 2024 · 8a118c2 · 8a118c2
1 parent cf76f82
commit 8a118c2
Show file tree

Hide file tree

Showing 41 changed files with 876 additions and 901 deletions.
diff --git a/.env.example b/.env.example
@@ -30,10 +30,6 @@ NEXTAUTH_SECRET="foobar"
 NEXTAUTH_URL="http://localhost:3000"
 
 
-# --- Boomtown
-# The hostname of the boomtown server
-#NEXT_PUBLIC_BOOMTOWN_HOSTNAME="localhost:8080"
-
 # --- Kaffe (can be found in the nano repository)
 # The URL of the Kaffe server
 #NEXT_PUBLIC_KAFFE_URL="http://localhost:8002"

diff --git a/.github/renovate.json b/.github/renovate.json
@@ -4,6 +4,7 @@
   "labels": ["dependencies :handshake:"],
   "commitMessageAction": "Update",
   "rangeStrategy": "bump",
+  "schedule": ["every weekend"],
   "packageRules": [
     {
       "matchPackagePatterns": ["^@echo-webkom/", "eslint-config-custom", "tsconfig"],

diff --git a/README.md b/README.md
@@ -67,7 +67,6 @@ NB: "Backenden" til Drizzle vil kjøre på [http://localhost:4983](http://localh
 
 ## Relaterte prosjekter
 
-- [boomtown](https://github.com/echo-webkom/boomtown) - Systemet for live oppdatering av påmeldinger på arrangementer.
 - [nano](https://github.com/echo-webkom/nano) - Nano-services for siden.
 
 ## Dokumentasjon

diff --git a/apps/cms/package.json b/apps/cms/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@echo-webkom/lib": "workspace:*",
     "@sanity/client": "6.21.3",
-    "@sanity/icons": "3.3.1",
+    "@sanity/icons": "3.4.0",
     "@sanity/ui": "2.8.9",
     "@sanity/vision": "3.56.0",
     "nanoid": "5.0.7",
@@ -33,12 +33,12 @@
     "sanity-plugin-markdown": "4.1.2",
     "sanity-plugin-media": "2.3.2",
     "slugify": "1.6.6",
-    "styled-components": "6.1.12"
+    "styled-components": "6.1.13"
   },
   "devDependencies": {
     "@echo-webkom/tsconfig": "workspace:*",
     "@sanity/eslint-config-studio": "4.0.0",
-    "@types/react": "18.3.4",
+    "@types/react": "18.3.5",
     "@types/styled-components": "5.1.34",
     "dotenv": "16.4.5",
     "eslint": "8.57.0",

diff --git a/apps/cms/schema.json b/apps/cms/schema.json
@@ -1783,6 +1783,13 @@
         },
         "optional": false
       },
+      "endDate": {
+        "type": "objectAttribute",
+        "value": {
+          "type": "string"
+        },
+        "optional": true
+      },
       "registrationStartGroups": {
         "type": "objectAttribute",
         "value": {
@@ -1914,6 +1921,13 @@
         },
         "optional": true
       },
+      "externalLink": {
+        "type": "objectAttribute",
+        "value": {
+          "type": "string"
+        },
+        "optional": true
+      },
       "body": {
         "type": "objectAttribute",
         "value": {

diff --git a/apps/cms/schemas/happening.tsx b/apps/cms/schemas/happening.tsx
@@ -208,6 +208,11 @@ export default defineType({
         }),
       ],
     }),
+    defineField({
+      name: "externalLink",
+      type: "url",
+      hidden: ({ document }) => document?.happeningType !== "external",
+    }),
     defineField({
       name: "body",
       title: "Brødtekst",

diff --git a/apps/cms/schemas/job-ad.tsx b/apps/cms/schemas/job-ad.tsx
@@ -9,6 +9,7 @@ const YEARS = [
   { title: "3. året", value: "THIRD" },
   { title: "4. året", value: "FOURTH" },
   { title: "5. året", value: "FIFTH" },
+  { title: "PhD", value: "PHD" },
 ];
 
 export default defineType({

diff --git a/apps/cms/schemas/objects/spot-range.tsx b/apps/cms/schemas/objects/spot-range.tsx
@@ -10,13 +10,13 @@ export default defineType({
       name: "minYear",
       title: "Minste trinn",
       type: "number",
-      validation: (Rule) => Rule.required().min(1).max(5),
+      validation: (Rule) => Rule.required().min(1).max(6),
     }),
     defineField({
       name: "maxYear",
       title: "Største trinn",
       type: "number",
-      validation: (Rule) => Rule.required().min(Rule.valueOfField("minYear")).max(5),
+      validation: (Rule) => Rule.required().min(Rule.valueOfField("minYear")).max(6),
     }),
     defineField({
       name: "spots",

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -44,7 +44,7 @@
     "clsx": "2.1.1",
     "date-fns": "3.6.0",
     "drizzle-orm": "0.33.0",
-    "framer-motion": "11.3.29",
+    "framer-motion": "11.5.4",
     "groq": "3.56.0",
     "ics": "^3.7.6",
     "nanoid": "5.0.7",
@@ -60,31 +60,31 @@
     "react-markdown": "9.0.1",
     "react-use-websocket": "^4.8.1",
     "remark-gfm": "4.0.0",
-    "remove-markdown": "0.5.2",
+    "remove-markdown": "0.5.5",
     "sharp": "0.33.0",
     "tailwind-merge": "2.5.2",
     "zod": "3.23.8"
   },
   "devDependencies": {
     "@echo-webkom/tsconfig": "workspace:*",
-    "@tailwindcss/forms": "0.5.8",
-    "@tailwindcss/typography": "0.5.14",
-    "@testing-library/react": "16.0.0",
-    "@types/node": "20.16.1",
-    "@types/react": "18.3.4",
+    "@tailwindcss/forms": "0.5.9",
+    "@tailwindcss/typography": "0.5.15",
+    "@testing-library/react": "16.0.1",
+    "@types/node": "20.16.5",
+    "@types/react": "18.3.5",
     "@types/react-dom": "18.3.0",
     "@vitejs/plugin-react": "4.3.1",
     "autoprefixer": "10.4.20",
     "dotenv-cli": "7.4.2",
     "eslint": "8.57.0",
     "eslint-config-webkom": "workspace:*",
-    "jsdom": "24.1.1",
-    "postcss": "8.4.41",
+    "jsdom": "25.0.0",
+    "postcss": "8.4.45",
     "server-only": "^0.0.1",
-    "tailwindcss": "3.4.10",
+    "tailwindcss": "3.4.11",
     "tailwindcss-animate": "1.0.7",
     "typescript": "5.5.4",
-    "vite": "^5.4.2",
+    "vite": "^5.4.5",
     "vite-tsconfig-paths": "4.3.1",
     "vitest": "2.0.5"
   },

diff --git a/apps/web/src/actions/deregister.ts b/apps/web/src/actions/deregister.ts
@@ -8,7 +8,6 @@ import { answers, registrations } from "@echo-webkom/db/schemas";
 import { DeregistrationNotificationEmail } from "@echo-webkom/email";
 import { emailClient } from "@echo-webkom/email/client";
 
-import { pingBoomtown } from "@/api/boomtown";
 import { revalidateRegistrations } from "@/data/registrations/revalidate";
 import { getUser } from "@/lib/get-user";
 import { getContactsBySlug } from "@/sanity/utils/contacts";
@@ -73,10 +72,6 @@ export const deregister = async (id: string, payload: z.infer<typeof deregisterP
 
     revalidateRegistrations(id, user.id);
 
-    void (async () => {
-      await pingBoomtown(id);
-    })();
-
     return {
       success: true,
       message: "Du er nå avmeldt",

diff --git a/apps/web/src/actions/register.ts b/apps/web/src/actions/register.ts
@@ -13,7 +13,6 @@ import {
   type SpotRange,
 } from "@echo-webkom/db/schemas";
 
-import { pingBoomtown } from "@/api/boomtown";
 import { revalidateRegistrations } from "@/data/registrations/revalidate";
 import { isUserBannedFromBedpres } from "@/lib/ban-info";
 import { getUser } from "@/lib/get-user";
@@ -304,10 +303,6 @@ export const register = async (id: string, payload: z.infer<typeof registrationF
       isWaitlisted,
     });
 
-    void (async () => {
-      await pingBoomtown(id);
-    })();
-
     return {
       success: true,
       message: isWaitlisted ? "Du er nå på venteliste" : "Du er nå påmeldt arrangementet",

diff --git a/apps/web/src/api/boomtown.ts b/apps/web/src/api/boomtown.ts
diff --git a/apps/web/src/app/(default)/auth/user/[id]/page.tsx b/apps/web/src/app/(default)/auth/user/[id]/page.tsx
@@ -33,8 +33,7 @@ export default async function ProfilePage({ params }: { params: { id: string } }
 
   return (
     <div className="max-w-2xl space-y-4">
-      <Heading level={2}>Din profil</Heading>
-
+      <Heading level={2}>{`${user.name?.split(" ")[0]} sin profil`}</Heading>
       <div className="flex flex-col gap-4">
         <div className="flex flex-col gap-6 md:flex-row">
           <UploadProfilePicture name={user.name ?? "Bo Bakseter"} image={user.image} />

diff --git a/apps/web/src/app/(default)/dashbord/[slug]/_components/registration-table-filters.tsx b/apps/web/src/app/(default)/dashbord/[slug]/_components/registration-table-filters.tsx
@@ -40,6 +40,7 @@ export const YearFilter = ({ yearFilter, setYearFilter }: YearFilterProps) => {
         <option value="3">3</option>
         <option value="4">4</option>
         <option value="5">5</option>
+        <option value="6">5+</option>
       </Select>
     </div>
   );

diff --git a/apps/web/src/app/(default)/dashbord/[slug]/_lib/get-columns.ts b/apps/web/src/app/(default)/dashbord/[slug]/_lib/get-columns.ts
@@ -20,6 +20,7 @@ export const getColumns = (questions: Array<Question>) => {
 
   columns.push(...questions.map((question) => question.title));
   columns.push("Status");
+  columns.push("Tidspunkt");
 
   return columns.filter((header) => header !== undefined).filter((header) => header.trim() !== "");
 };
diff --git a/apps/web/src/app/(default)/hjem/page.tsx b/apps/web/src/app/(default)/hjem/page.tsx
@@ -21,14 +21,14 @@ export default async function Home() {
         className="flex space-y-8 md:grid md:grid-cols-3 md:grid-rows-2 md:gap-8 md:space-y-0"
       >
         <ComingHappenings
-          title="Kommende arrangementer"
-          href="/for-studenter/arrangementer"
+          title="Arrangementer"
+          href="/for-studenter/arrangementer?type=event"
           types={["external", "event"]}
           n={7}
           className="col-span-1 row-span-2"
         />
         <ComingHappenings
-          title="Kommende bedpres"
+          title="Bedpresser"
           href="/for-studenter/arrangementer?type=bedpres"
           types={["bedpres"]}
           n={3}

diff --git a/apps/web/src/app/(default)/webkom/page.tsx b/apps/web/src/app/(default)/webkom/page.tsx
@@ -70,8 +70,15 @@ export default function WebkomPage() {
         </UnorderedList>
 
         {/* --- V24 --- */}
+        <UnorderedList className="list-none p-0 text-lg">
+          <ListItem>Jesper Kierulf Hammer</ListItem>
+        </UnorderedList>
 
         {/* --- H24 --- */}
+        <UnorderedList className="list-none p-0 text-lg">
+          <ListItem>Andreas Drevdal</ListItem>
+          <ListItem>Birk Monsen</ListItem>
+        </UnorderedList>
       </div>
     </Container>
   );

diff --git a/apps/web/src/app/robots.ts b/apps/web/src/app/robots.ts
@@ -2,9 +2,19 @@ import { type MetadataRoute } from "next";
 
 export default function robots(): MetadataRoute.Robots {
   return {
-    rules: {
-      userAgent: "*",
-      disallow: "/",
-    },
+    rules: [
+      {
+        userAgent: "*",
+        allow: "/",
+      },
+      {
+        userAgent: "*",
+        disallow: "/dashboard",
+      },
+      {
+        userAgent: "*",
+        disallow: "/admin",
+      },
+    ],
   };
 }
diff --git a/apps/web/src/components/happening-sidebar.tsx b/apps/web/src/components/happening-sidebar.tsx
@@ -291,11 +291,11 @@ export const HappeningSidebar = async ({ event }: EventSidebarProps) => {
                 <SidebarItemContent key={range.id}>
                   {range.spots || "Uendelig"} plasser for
                   {range.minYear === range.maxYear ? (
-                    <span> {range.minYear}. trinn</span>
+                    <span> {range.minYear === 6 ? "5+." : range.minYear + "."} trinn</span>
                   ) : (
                     <span>
                       {" "}
-                      {range.minYear} - {range.maxYear}. trinn
+                      {range.minYear} - {range.maxYear === 6 ? "5+." : range.maxYear + "."} trinn
                     </span>
                   )}
                 </SidebarItemContent>
@@ -311,12 +311,7 @@ export const HappeningSidebar = async ({ event }: EventSidebarProps) => {
             <SidebarItem>
               <SidebarItemTitle>Påmeldte:</SidebarItemTitle>
               <SidebarItemContent>
-                <RegistrationCount
-                  happeningId={event._id}
-                  maxCapacity={maxCapacity}
-                  initialRegistaredCount={registeredCount}
-                  initialWaitlistCount={waitlistCount}
-                />
+                <RegistrationCount registeredCount={registeredCount} maxCapacity={maxCapacity} />
               </SidebarItemContent>
             </SidebarItem>
           )}
@@ -463,6 +458,16 @@ export const HappeningSidebar = async ({ event }: EventSidebarProps) => {
                 <Countdown toDate={userRegistrationStart} />
               </SidebarItem>
             )}
+
+          {event.externalLink && (
+            <SidebarItem>
+              <Button asChild fullWidth>
+                <a href={event.externalLink} target="_blank" rel="noopener noreferrer">
+                  Til påmelding
+                </a>
+              </Button>
+            </SidebarItem>
+          )}
         </div>
       </Sidebar>
       {/**