Merge pull request #217 from mnw439/add-const-vars-for-school

Add constant variables for school short, name and website

src/actions/getCalendar.ts

@@ -1,5 +1,6 @@
 "use server";
 
+import { SCHOOL_SHORT } from "@/constants/school";
 import { REVALIDATE_TIME } from "@/constants/settings";
 import { TableHour, TableLesson } from "@majusss/timetable-parser";
 import * as ics from "ics";
@@ -55,7 +56,7 @@ const createEvent = (
     .join(" ");
 
   const categories = [
-    "ZSTiO",
+    SCHOOL_SHORT,
     ...(className ? [className] : []),
     ...(groupName ? [groupName] : []),
   ];

src/app/layout.tsx

@@ -9,6 +9,7 @@ import type { Metadata, Viewport } from "next";
 import { Poppins } from "next/font/google";
 import { ReactNode } from "react";
 import "./globals.css";
+import { SCHOOL_SHORT, SCHOOL_NAME_ACCUSATIVE } from "@/constants/school";
 
 export const fetchCache = "default-cache";
 
@@ -19,11 +20,11 @@ const poppins = Poppins({
 
 export const metadata: Metadata = {
   title: {
-    template: "%s | ZSTiO - Plan lekcji",
-    default: "ZSTiO - Plan lekcji",
+    template: `%s | ${SCHOOL_SHORT} - Plan lekcji`,
+    default: `${SCHOOL_SHORT} - Plan lekcji`,
   },
   description:
-    "W prosty sposób sprawdź plan zajęć i zastępstwa dla różnych klas, nauczycieli oraz sal w Zespole Szkół Technicznych i Ogólnokształcących im. Stefana Banacha w Jarosławiu.",
+    `W prosty sposób sprawdź plan zajęć i zastępstwa dla różnych klas, nauczycieli oraz sal w ${SCHOOL_NAME_ACCUSATIVE}.`,
   metadataBase: new URL(process.env.NEXT_PUBLIC_APP_URL as string),
 
   alternates: {

src/app/manifest.ts

@@ -1,11 +1,12 @@
+import { SCHOOL_SHORT, SCHOOL_NAME_ACCUSATIVE } from "@/constants/school";
 import { MetadataRoute } from "next";
 
 export default function manifest(): MetadataRoute.Manifest {
   return {
-    name: "Plan lekcji ZSTiO",
-    short_name: "Plan lekcji ZSTiO",
+    name: `Plan lekcji ${SCHOOL_SHORT}`,
+    short_name: `Plan lekcji ${SCHOOL_SHORT}`,
     description:
-      "W prosty sposób sprawdź plan zajęć i zastępstwa dla różnych klas, nauczycieli oraz sal w Zespole Szkół Technicznych i Ogólnokształcących im. Stefana Banacha w Jarosławiu.",
+      `W prosty sposób sprawdź plan zajęć i zastępstwa dla różnych klas, nauczycieli oraz sal w ${SCHOOL_NAME_ACCUSATIVE}.`,
     start_url: "/",
     display: "standalone",
     orientation: "portrait",

src/app/substitutions/page.tsx

@@ -2,14 +2,15 @@ import { getSubstitutions } from "@/actions/getSubstitutions";
 import { BottomBar } from "@/components/common/BottomBar";
 import { Substitutions } from "@/components/substitutions/Substitutions";
 import { Topbar } from "@/components/topbar/Topbar";
+import { SCHOOL_SHORT } from "@/constants/school";
 import { redirect } from "next/navigation";
 
 export const generateMetadata = async () => {
   const substitutions = await getSubstitutions();
 
   return {
     title: substitutions.heading,
-    description: `Sprawdź zastępstwa w ZSTiO na (${substitutions.timeRange})`,
+    description: `Sprawdź zastępstwa w ${SCHOOL_SHORT} na (${substitutions.timeRange})`,
   };
 };
 

src/components/timetable/Timetable.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import logo_zstio_high from "@/assets/logo-zstio-high.png";
+import school_logo_high from "@/assets/school-logo-high.png";
 import { Button } from "@/components/ui/Button";
 import { SHORT_HOURS } from "@/constants/settings";
 import { translationDict } from "@/constants/translations";
@@ -18,6 +18,7 @@ import {
   TableHourCell,
 } from "./Cells";
 import { TableLessonCell } from "./LessonCells";
+import { SCHOOL_SHORT } from "@/constants/school";
 
 interface TimetableProps {
   timetable: OptivumTimetable;
@@ -197,8 +198,8 @@ const NotFoundTimetable: FC<NotFoundTimetableProps> = ({ id }) => {
   return (
     <div className="flex h-full flex-col items-center justify-center">
       <Image
-        src={logo_zstio_high}
-        alt="Logo szkoły ZSTiO"
+        src={school_logo_high}
+        alt={`Logo szkoły ${SCHOOL_SHORT}`}
         className="aspect-square w-24"
       />
       <div className="grid gap-1 text-center">

src/components/topbar/Topbar.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import logo_zstio from "@/assets/logo-zstio.png";
+import school_logo from "@/assets/school-logo.png";
 import { FavoriteStar } from "@/components/common/FavoriteStar";
 import { ShortLessonSwitcherCell } from "@/components/timetable/Cells";
 import { translationDict } from "@/constants/translations";
@@ -12,6 +12,7 @@ import Link from "next/link";
 import { FC, Fragment, useMemo } from "react";
 import { useIsClient } from "usehooks-ts";
 import { TopbarButtons } from "./Buttons";
+import { SCHOOL_WEBSITE, SCHOOL_SHORT } from "@/constants/school";
 
 interface TopbarProps {
   timetable?: OptivumTimetable;
@@ -81,12 +82,12 @@ export const Topbar: FC<TopbarProps> = ({ timetable, substitutions }) => {
 
 const SchoolLink: FC = () => (
   <Link
-    href="https://zstiojar.edu.pl"
+    href={SCHOOL_WEBSITE}
     className="group inline-flex w-fit items-center gap-x-4"
   >
     <Image
-      src={logo_zstio}
-      alt="Logo szkoły ZSTiO"
+      src={school_logo}
+      alt={`Logo szkoły ${SCHOOL_SHORT}`}
       className="aspect-square w-10"
     />
     <div className="inline-flex items-center gap-x-2 text-primary/70 transition-colors group-hover:text-primary/90 max-md:hidden">

src/constants/school.ts

@@ -0,0 +1,3 @@
+export const SCHOOL_SHORT = "ZSTiO";
+export const SCHOOL_NAME_ACCUSATIVE = "Zespole Szkół Technicznych i Ogólnokształcących im. Stefana Banacha w Jarosławiu";
+export const SCHOOL_WEBSITE = "https://zstiojar.edu.pl";