Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/img/events/ais_hackathon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/events/modal_aw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ export default function Navbar() {
//{ href: "/karta", text: t.map }, 2026
{ href: "/event", text: t.event }, //2026
{ href: "/logos", text: t.logos },
{ href: "/kontaktsamtal", text: t.meetings },
//{ href: "/kontaktsamtal", text: t.meetings },
//{ href: "/sok", text: t.sok }, 2026
]}
/>
Expand Down
7 changes: 4 additions & 3 deletions src/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ export default {
},
ddagenXericssonNight: {
header: "D-Dagen X Ericsson Night",
text: "Time: 17:XX \nPlace: META",
text: "Time: 17:17 \nPlace: META",
eventText: "Event Page"
},
innovationPitchCompetition: {
Expand All @@ -1220,8 +1220,8 @@ export default {
eventText: "Event Page"
},
ais: {
header: "Event with AI Society",
text: "Time: TBD \nPlace: TBD",
header: "AI Society Hackathon",
text: "",
eventText: "Event Page"
},
},
Expand All @@ -1238,6 +1238,7 @@ export default {
text1988: "The Computer Science Chapter's 5-year anniversary organized a small industry fair and sparked interest in the concept, which is evident in dBuggen (the Computer Science Chapter's venerable chapter magazine).",
header1983: "1983",
text1983: "The beginning: The Computer Science Chapter was founded on October 7, 1983.",
text2026: "Didzis & Oliver are organizing the fair in 2026!",
text2025: "25th anniversary!",
text2024: "William & Toshihide organized D-Dagen with the most visitors ever!",
text2023: "Axel & Johan organized D-Dagen with the most companies ever!",
Expand Down
9 changes: 5 additions & 4 deletions src/locales/sv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1199,12 +1199,12 @@ export default {
banquetSignupText: "biljetter går att köpa efter detta så länge det finns platser kvar.",
modalAW: {
header: "Modal AW",
text: "Tid: 16:00 \nPlats: Modals kontor på Sveavägen 17",
text: "Tid: 17:30 \nPlats: Modals kontor på Sveavägen 17",
eventText: "Eventsida"
},
ddagenXericssonNight: {
header: "D-Dagen X Ericsson Night",
text: "Tid: 17:XX \nPlats: META",
text: "Tid: 17:17 \nPlats: META",
eventText: "Eventsida"
},
innovationPitchCompetition: {
Expand All @@ -1214,8 +1214,8 @@ export default {
eventText: "Eventsida"
},
ais: {
header: "Event med AI Society",
text: "Tid: TBD \nPlats: TBD",
header: "AI Society Hackathon",
text: "",
eventText: "Eventsida"
},
},
Expand All @@ -1232,6 +1232,7 @@ export default {
text1988: "Datasektionens 5-års jubileum anordnade en liten branschdag och väckte intresse för konceptet, vilket syns i dBuggen (Datasektionens anrika sektionstidning).",
header1983: "1983",
text1983: "Begynnelsen, Datasektionen grundas den 7:e oktober 1983.",
text2026: "Didzis & Oliver anordnar mässan 2026!",
text2025: "JUBILEUMSÅRET!",
text2024: "William & Toshihide anordnade D-Dagen mässan med flest besökare någonsin!",
text2023: "Axel & Johan anordnade D-Dagen mässan med flest företag någonsin!",
Expand Down
32 changes: 25 additions & 7 deletions src/pages/event.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useState, useRef, useEffect } from "react";

type EventItem = {
date: string;
eventDate?: string;
companyName: string;
image: string;
fullImage?: boolean;
Expand All @@ -31,6 +32,7 @@ function SingleEvent({
eventLinkSecondaryText,
eventLinkSecondaryUrl,
eventHash,
eventDate,
}: {
color: string;
toReverse: boolean;
Expand All @@ -44,11 +46,20 @@ function SingleEvent({
eventLinkSecondaryText?: string;
eventLinkSecondaryUrl?: string;
eventHash?: string;
eventDate?: string;
}) {
const t = useLocale();
const router = useRouter();
const [modalState, setModal] = useState(false);
const modalRef = useRef<HTMLDivElement>(null);
const stockholmDateParts = new Intl.DateTimeFormat("en-US", {
timeZone: "Europe/Stockholm",
year: "numeric",
month: "2-digit",
day: "2-digit",
}).formatToParts(new Date());
const stockholmToday = `${stockholmDateParts.find((part) => part.type === "year")?.value}-${stockholmDateParts.find((part) => part.type === "month")?.value}-${stockholmDateParts.find((part) => part.type === "day")?.value}`;
const isPast = eventDate ? eventDate < stockholmToday : false;

const openModal = () => {
setModal(true);
Expand Down Expand Up @@ -92,7 +103,7 @@ function SingleEvent({
<button
type="button"
aria-label={`${t.event.description}: ${eventInfo[1]}`}
className={`group flex w-full max-w-[420px] flex-col items-start gap-3 rounded-xl border-2 border-cerise bg-black/10 p-3 text-left shadow-[0_6px_0_rgba(238,47,123,0.35)] transition duration-200 hover:-translate-y-1 hover:bg-black/20 hover:shadow-[0_10px_0_rgba(238,47,123,0.45)] focus:outline-none focus:ring-4 focus:ring-cerise/40 active:translate-y-0 active:shadow-[0_3px_0_rgba(238,47,123,0.35)] ${toReverse ? "sm:items-start" : "sm:items-end"}`}
className={`group flex w-full max-w-[420px] flex-col items-start gap-3 rounded-xl border-2 ${isPast ? "border-slate-500" : "border-cerise"} bg-black/10 p-3 text-left shadow-[0_6px_0_rgba(238,47,123,0.35)] transition duration-200 hover:-translate-y-1 hover:bg-black/20 hover:shadow-[0_10px_0_rgba(238,47,123,0.45)] focus:outline-none focus:ring-4 focus:ring-cerise/40 active:translate-y-0 active:shadow-[0_3px_0_rgba(238,47,123,0.35)] ${toReverse ? "sm:items-start" : "sm:items-end"}`}
onClick={openModal}
>
<h2 className="text-left text-white sm:text-center md:text-xl lg:text-3xl">{eventInfo[1]}</h2>
Expand All @@ -108,7 +119,7 @@ function SingleEvent({
</div>
<div className="flex h-full w-16 shrink-0 justify-center sm:basis-[124px]">
<div className={`relative flex min-h-[360px] w-1 self-stretch justify-center ${color} sm:min-h-[420px]`}>
{showDate && <div className={`absolute flex h-14 w-14 items-center justify-center rounded-full ${color} text-center text-xs text-white sm:h-16 sm:w-16 sm:text-lg`}>
{showDate && <div className={`absolute flex h-14 w-14 items-center justify-center rounded-full ${isPast ? "bg-slate-500 ring-2 ring-cerise/60" : color} text-center text-xs text-white sm:h-16 sm:w-16 sm:text-lg`}>
{eventInfo[3]}
</div>}
</div>
Expand Down Expand Up @@ -182,6 +193,7 @@ export default function Events() {
const events: EventItem[] = [
{
date: "16/9",
eventDate: "2026-09-16",
companyName: "EECS event",
image: "/img/ddagen2024/rekrytPub.jpg",
fullImage: true,
Expand All @@ -190,6 +202,7 @@ export default function Events() {
},
{
date: "30/9",
eventDate: "2026-09-30",
companyName: "Ericsson",
companyUrl: "https://www.ericsson.com/",
image: "/img/exhibitors/ericsson.png",
Expand All @@ -201,6 +214,7 @@ export default function Events() {
},
{
date: "1/10",
eventDate: "2026-10-01",
companyName: "KTH Innovation",
companyUrl: "https://www.kth.se/innovation",
image: "/img/events/pitch-comp.png",
Expand All @@ -214,26 +228,27 @@ export default function Events() {
eventHash: "pitch"
},
{
date: "TBD",
date: "28/9 - 9/10",
companyName: "AI Society",
companyUrl: "https://kthais.com/",
image: "/img/exhibitors/ais.png",
image: "/img/events/ais_hackathon.png",
fullImage: true,
header: t.event.ais.header,
text: t.event.ais.text,
eventLinkText: t.event.ais.eventText,
eventLinkUrl: "https://lu.ma/"
eventLinkUrl: "https://luma.com/kthais-d6jh"
},
{
date: "5/10",
eventDate: "2026-10-05",
companyName: "Modal",
companyUrl: "https://modal.com/",
image: "/img/events/modal_aw.png",
fullImage: true,
header: t.event.modalAW.header,
text: t.event.modalAW.text,
eventLinkText: t.event.modalAW.eventText,
eventLinkUrl: "https://lu.ma/"
eventLinkUrl: "https://luma.com/2ammix32"
},
/*
{
Expand Down Expand Up @@ -314,7 +329,8 @@ export default function Events() {
image: "/img/ddagen2024/banquette-dinner.jpg",
fullImage: true,
header: t.event.banquet,
text: ""
text: "",
eventLinkUrl: "https://dsekt.se/ddagensittning"
},
]

Expand Down Expand Up @@ -399,6 +415,7 @@ export default function Events() {
eventLinkSecondaryText={event?.eventLinkSecondaryText}
eventLinkSecondaryUrl={event?.eventLinkSecondaryUrl}
eventHash={event?.eventHash}
eventDate={event?.eventDate}
/>
))
}
Expand Down Expand Up @@ -431,6 +448,7 @@ export default function Events() {
eventLinkUrl={event?.eventLinkUrl}
eventLinkSecondaryText={event?.eventLinkSecondaryText}
eventLinkSecondaryUrl={event?.eventLinkSecondaryUrl}
eventDate={event?.eventDate}
/>
))
}
Expand Down
3 changes: 2 additions & 1 deletion src/pages/f%C3%B6rstudenter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default function ForStudents() {
</button>}
</ImageTextSection>

{/* Section of D-Dagen Info */}
{/* Section of D-Dagen Info
<ImageTextSection
t={t}
leftSideImage={true}
Expand All @@ -130,6 +130,7 @@ export default function ForStudents() {
</a>
</button>
</ImageTextSection>
*/}

<ImageTextSection
t={t}
Expand Down
8 changes: 8 additions & 0 deletions src/pages/historia.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,14 @@ export default function Years() {
const t = useLocale();

const years = [
{
year: 2026,
pgImage: "/img/historia/pg2026.jpg",
nrOfCompanies: "???",
nrOfVisitors: "????",
dda: "Didzis Urtans & Oliver Zhou",
text: t.history.text2026
},
{
year: 2025,
pgImage: "/img/historia/pg2025.jpg",
Expand Down
14 changes: 14 additions & 0 deletions src/server/api/routers/exhibitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1285,6 +1285,20 @@ export const exhibitorRouter = createTRPCRouter({
} catch (error) {
console.error("Failed to notify salesperson about extra order request", error);
}

// TO REQUEST
try {
await sendEmail(
"requests@ddagen.se",
`Extra order request from ${exhibitor.name}`,
`<p>${exhibitor.name} (${userEmail}) has requested an extra order:</p>` +
`<ul><li>Type: ${input.type}</li><li>Amount: ${input.amount}</li>` +
`<li>Price per unit: ${input.price_per_unit}</li></ul>` +
`<p>Salesperson: ${salespersonEmail}</p>`
);
} catch (error) {
console.error("Failed to notify requests at ddagen about extra order request", error);
}
}

console.log(Object.keys(ctx));
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.tsbuildinfo

Large diffs are not rendered by default.

Loading