forandret etikett for profil siden, neste steg er å kunne gå til ande…

…r 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>
echo-webkom · Sep 17, 2024 · 6386b64 · 6386b64
1 parent c33e1f8
commit 6386b64
Show file tree

Hide file tree

Showing 31 changed files with 216 additions and 270 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/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",

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/web/package.json b/apps/web/package.json
@@ -67,18 +67,18 @@
   },
   "devDependencies": {
     "@echo-webkom/tsconfig": "workspace:*",
-    "@tailwindcss/forms": "0.5.8",
+    "@tailwindcss/forms": "0.5.9",
     "@tailwindcss/typography": "0.5.14",
-    "@testing-library/react": "16.0.0",
-    "@types/node": "20.16.1",
+    "@testing-library/react": "16.0.1",
+    "@types/node": "20.16.5",
     "@types/react": "18.3.4",
     "@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",
+    "jsdom": "25.0.0",
     "postcss": "8.4.41",
     "server-only": "^0.0.1",
     "tailwindcss": "3.4.10",

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]/_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/components/happening-sidebar.tsx b/apps/web/src/components/happening-sidebar.tsx
@@ -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>
       {/**

diff --git a/apps/web/src/components/registration-count.tsx b/apps/web/src/components/registration-count.tsx
@@ -3,51 +3,18 @@
 
 import { BiInfinite } from "react-icons/bi";
 
-import { useRegistrations } from "@/hooks/use-registrations";
-import { cn } from "@/utils/cn";
-
 type RegistrationCountProps = {
-  happeningId: string;
+  registeredCount: number;
   maxCapacity: number | null;
-  initialRegistaredCount: number;
-  initialWaitlistCount: number;
 };
 
-export const RegistrationCount = ({
-  happeningId,
-  maxCapacity,
-  initialRegistaredCount,
-  initialWaitlistCount,
-}: RegistrationCountProps) => {
-  const { registeredCount } = useRegistrations(
-    happeningId,
-    initialRegistaredCount,
-    initialWaitlistCount,
-  );
-
-  const precent = Math.round((registeredCount / (maxCapacity || 1)) * 100);
-  const hasProgressBar = Boolean(maxCapacity && precent > 0);
-
+export const RegistrationCount = ({ maxCapacity, registeredCount }: RegistrationCountProps) => {
   return (
     <div className="flex flex-col gap-2">
       <div className="flex items-center gap-1">
         {Math.min(registeredCount, maxCapacity || Number.POSITIVE_INFINITY)} /{" "}
         {maxCapacity || <BiInfinite className="h-5 w-5" />}
       </div>
-      {hasProgressBar && (
-        <div className="h-4 w-full overflow-hidden rounded-md border">
-          <div
-            style={{
-              width: `${precent}%`,
-              transition: "width 0.5s",
-            }}
-            className={cn("h-full", {
-              "bg-red-500": precent >= 100,
-              "bg-green-400": precent < 100,
-            })}
-          />
-        </div>
-      )}
     </div>
   );
 };
diff --git a/apps/web/src/components/ui/avatar.tsx b/apps/web/src/components/ui/avatar.tsx
@@ -26,7 +26,7 @@ export const AvatarImage = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <AvatarPrimitive.Image
     ref={ref}
-    className={cn("aspect-square h-full w-full", className)}
+    className={cn("aspect-square h-full w-full object-cover", className)}
     {...props}
   />
 ));

diff --git a/apps/web/src/config.ts b/apps/web/src/config.ts
@@ -4,8 +4,6 @@ export const dev = process.env.NODE_ENV !== "production";
 
 export const HTTP = dev ? "http" : "https";
 
-export const WS = dev ? "ws" : "wss";
-
 export const PORT = process.env.PORT ?? 3000;
 
 export const BASE_URL = dev
@@ -16,8 +14,6 @@ export const PROFILE_IMAGE_FUNCTION_URL = "https://echo-images.azurewebsites.net
 
 export const COOKIE_BANNER = "cookie-banner";
 
-export const BOOMTOWN_HOSTNAME = process.env.NEXT_PUBLIC_BOOMTOWN_HOSTNAME;
-
 export const NUM_HAPPENINGS = !isNaN(Number(process.env.NUM_HAPPENINGS))
   ? Number(process.env.NUM_HAPPENINGS)
   : 4;
diff --git a/apps/web/src/hooks/use-registrations.ts b/apps/web/src/hooks/use-registrations.ts
diff --git a/apps/web/src/lib/csv.ts b/apps/web/src/lib/csv.ts
@@ -42,6 +42,8 @@ export const toCsv = (happening: FullHappening, selectedHeaders: Array<string> =
         obj[question.title] = formattedAnswer;
       });
 
+      obj.Tidspunkt = r.changedAt ? stringify(r.changedAt) : stringify(r.createdAt);
+
       return obj;
     })
     .sort((a, b) => {