Merge pull request #74 from simonyiszk/feature/improvements

Isti01 · web-flow · commit f74fd8dddb84 · 2025-04-16T23:06:12.000+02:00
Improvements
diff --git a/.env.example b/.env.example
@@ -7,3 +7,4 @@ CONTENTFUL_PREVIEW_ACCESS_TOKEN=""
 CONTENTFUL_PREVIEW_SECRET=""
 CONTENTFUL_REVALIDATE_SECRET=""
 NEXT_REVALIDATION_SECRET=""
+NEXT_PUBLIC_PLAUSIBLE_SCRIPT=""
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+*.ts text eol=lf
+*.tsx text eol=lf
+*.js text eol=lf
+*.jsx text eol=lf
diff --git a/messages/en.json b/messages/en.json
@@ -29,7 +29,8 @@
       "bmeAlt": "Budapest University of Technology and Economics (BME)",
       "vikAlt": "Faculty of Electrical Engineering and Informatics (VIK)",
       "schonherzAlt": "Schönherz",
-      "simonyikonf": "Simonyi Conference"
+      "simonyikonf": "Simonyi Conference",
+      "tanverseny": "High School Academic Competition"
     },
     "subpages": {
       "header": {
diff --git a/messages/hu.json b/messages/hu.json
@@ -29,7 +29,8 @@
       "bmeAlt": "Budapesti Műszaki és Gazdaságtudományi Egyetem (BME)",
       "vikAlt": "Villamosmérnöki és Informatikai Kar (VIK)",
       "schonherzAlt": "Schönherz",
-      "simonyikonf": "Simonyi Konferencia"
+      "simonyikonf": "Simonyi Konferencia",
+      "tanverseny": "Középiskolai Tanulmányi Verseny"
     },
     "subpages": {
       "header": {
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
@@ -79,6 +79,7 @@ export default function LocaleLayout({ children, params: { locale } }: { childre
       className={`${spaceGrotesk.variable} ${archivo.variable}`}
     >
       <body className="bg-dark text-white text-opacity-text selection:bg-primary-200 selection:text-primary-950">
+        <script defer src={process.env.NEXT_PUBLIC_PLAUSIBLE_SCRIPT} data-domain="simonyi.bme.hu"/>
         <div className="flex min-h-safe_screen flex-col justify-between">
           <NextIntlClientProvider messages={messages}>
             {children}
diff --git a/src/components/app/home/home-about.tsx b/src/components/app/home/home-about.tsx
@@ -7,7 +7,7 @@ export default function HomeAbout({ about, images }: { about: AboutType; images:
   return (
     <div className="flex flex-col">
       {about.title && <Typography as="h1" variant="h1" className="mb-8">{about.title}</Typography>}
-      <div className="grid grid-cols-1 gap-16 whitespace-pre-wrap lg:grid-cols-2">
+      <div className="grid grid-cols-1 gap-16 whitespace-pre-wrap text-justify lg:grid-cols-2">
         {contentfulDocumentToReactComponents(about.description)}
         <HomeAboutImageBrowser lightboxImages={images} />
       </div>
diff --git a/src/components/app/home/home-greeting.tsx b/src/components/app/home/home-greeting.tsx
@@ -36,17 +36,17 @@ export default function HomeGreeting({
           </div>
           <div className="flex justify-center">
             <a
-              href="https://konferencia.simonyi.bme.hu/"
-              title="konferencia.simonyi.bme.hu"
+              href="https://skktv.simonyi.bme.hu/?utm_source=simonyi.bme.hu"
+              title="skktv.simonyi.bme.hu"
               target="_blank"
               rel="noreferrer"
             >
-              <Button className="w-full">{t("simonyikonf")}</Button>
+              <Button className="w-full">{t("tanverseny")}</Button>
             </a>
           </div>
           <div className="flex flex-row flex-wrap justify-evenly gap-8">
             <a
-              href="https://tanfolyam.simonyi.bme.hu/"
+              href="https://tanfolyam.simonyi.bme.hu/?utm_source=simonyi.bme.hu"
               title="tanfolyam.simonyi.bme.hu"
               target="_blank"
               rel="noreferrer"
diff --git a/src/components/student-group/student-group.component.tsx b/src/components/student-group/student-group.component.tsx
@@ -16,7 +16,7 @@ function StudentGroup({ name, logo, description, socials = [], isDense = false }
   };
 
   return (
-    <div className="flex max-w-full flex-col items-center justify-between gap-8 rounded-2xl bg-darkmode_regular p-5 md:max-w-[45%] lg:max-w-[31%]">
+    <div className="flex max-w-full flex-col items-center justify-between gap-8 rounded-2xl bg-darkmode_regular p-8 md:max-w-[45%] lg:max-w-[31%]">
       <div className="flex w-full flex-col items-center gap-8">
         <div
           className="flex w-full flex-row items-center justify-between gap-8 hover:cursor-pointer md:hover:cursor-auto"
@@ -33,7 +33,7 @@ function StudentGroup({ name, logo, description, socials = [], isDense = false }
           <div className={`${isOpen ? "block" : "hidden md:block"} relative h-[100px] w-full max-w-[250px]`}>
             <Image src={logo.url} alt={logo.alt} fill />
           </div>
-          <div className={`${isOpen ? "block" : "hidden md:block"}`}>
+          <div className={`text-justify ${isOpen ? "block" : "hidden md:block"}`}>
             <Typography>{description}</Typography>
           </div>
         </>

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ export default function LocaleLayout({ children, params: { locale } }: { childre`
`79`	`79`	className={`${spaceGrotesk.variable} ${archivo.variable}`}
`80`	`80`	`>`
`81`	`81`	`<body className="bg-dark text-white text-opacity-text selection:bg-primary-200 selection:text-primary-950">`
	`82`	`+ <script defer src={process.env.NEXT_PUBLIC_PLAUSIBLE_SCRIPT} data-domain="simonyi.bme.hu"/>`
`82`	`83`	`<div className="flex min-h-safe_screen flex-col justify-between">`
`83`	`84`	`<NextIntlClientProvider messages={messages}>`
`84`	`85`	`{children}`