Skip to content

Commit

Permalink
refactor: 🚨 apply safe linting and formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
phibkro committed Feb 18, 2025
1 parent de9b1bb commit 8d2d013
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 51 deletions.
3 changes: 1 addition & 2 deletions src/api/Assistenter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ export interface ForAssistenterContent {
export default (): ForAssistenterContent => {
return {
title: "Assistenter",
ingress:
`Vektorassistent er et frivillig verv der du reiser til en ungdomsskole
ingress: `Vektorassistent er et frivillig verv der du reiser til en ungdomsskole
én dag i uka for å hjelpe til som lærerassistent i matematikk.
En stilling som vektorassistent varer i 4 eller 8 uker, og du kan selv velge
hvilken ukedag som passer best for deg.`,
Expand Down
2 changes: 1 addition & 1 deletion src/api/ForForeldre.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ export default (): ForForeldreContent => {
bottomText:
"Påmeldingsskjemaet er under konstruksjon! Ta kontakt med skolekoordineringsteamet for påmelding til eventuelle foreldrekurs.",
};
};
};
7 changes: 3 additions & 4 deletions src/api/OmOss.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ export interface OmOssContent {
bottomImage: {
url: URL;
alt: string;
};
};
cards: Array<TextPictureParagraphAPIProps>;
}
export default (): OmOssContent => {
return {
title: "Om Vektorprogrammet",
ingress:
`Vektorprogrammet arbeider for å øke interessen for matematikk
ingress: `Vektorprogrammet arbeider for å øke interessen for matematikk
og realfag blant elever i grunnskolen. Vi er en nasjonal studentorganisasjon
som sender studenter med god realfagskompetanse til skoler
for å hjelpe elevene i matematikktimene. Disse
Expand Down Expand Up @@ -67,4 +66,4 @@ export default (): OmOssContent => {
},
],
};
};
};
4 changes: 2 additions & 2 deletions src/components/Divider.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Logo from "/images/vektor-logo-circle.svg";

export function Divider () {
export function Divider() {
return (
<div className="w-full flex md:hidden lg:hidden flex-col items-center opacity-30 h-24 mt-5 mb-5">
<img
Expand All @@ -11,4 +11,4 @@ export function Divider () {
<div className="w-10/12 h-1 rounded-full bg-vektor-blue" />
</div>
);
};
}
13 changes: 6 additions & 7 deletions src/components/TextPictureParagraph.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ interface TextPictureParagraphProps {
image: {
url: URL;
alt: string;
};
}
};
}
export interface TextPictureParagraphAPIProps {
title: string;
text: string;
Expand All @@ -22,17 +22,16 @@ export const TextPictureParagraph = ({
title,
text,
pictureOnLeft = true,
image
image,
}: TextPictureParagraphProps) => {

return (
<div
className={`flex ${pictureOnLeft ? "md:flex-row-reverse" : ""} justify-center md:justify-between items-center gap-5 md:gap-14 flex-wrap md:flex-nowrap`}
>
<img
src={image.url.toString()}
alt={image.alt}
className="flex max-h-96 rounded-lg sm:w-auto md:max-w-96 md:h-fit"
src={image.url.toString()}
alt={image.alt}
className="flex max-h-96 rounded-lg sm:w-auto md:max-w-96 md:h-fit"
/>
<div className="flex flex-col max-w-6xl gap-3 md:gap-5">
<h1 className="text-center text-xl md:text-3xl font-bold text-vektor-DARKblue dark:text-text-dark">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/foreldre.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import getContent from "@/api/ForForeldre";
import { Divider } from "@/components/Divider";
import { TextPictureParagraph } from "@/components/TextPictureParagraph";
import getContent from "@/api/ForForeldre";

// biome-ignore lint/style/noDefaultExport: Route Modules require default export https://reactrouter.com/start/framework/route-module
export default function ForForeldre() {
Expand Down
14 changes: 7 additions & 7 deletions src/pages/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { NavLink, Outlet, useLocation } from "react-router";
import { useRef, useState } from "react";
import { navRoutes } from "~/routes";
import getSponsors, { type Sponsor } from "@/api/Sponsor";
import { FolderOpen, Mail, MapPin } from "lucide-react";
import { SiFacebook } from "@icons-pack/react-simple-icons";
import { FolderOpen, Mail, MapPin } from "lucide-react";
import { useRef, useState } from "react";
import { NavLink, Outlet, useLocation } from "react-router";
import { Link } from "react-router";
import { navRoutes } from "~/routes";
import "./layout.css";
import {
Drawer,
DrawerTrigger,
DrawerClose,
DrawerContent,
DrawerHeader,
DrawerDescription,
DrawerFooter,
DrawerClose,
DrawerHeader,
DrawerTrigger,
} from "~/components/ui/drawer";

// biome-ignore lint/style/noDefaultExport: Route Modules require default export https://reactrouter.com/start/framework/route-module
Expand Down
13 changes: 6 additions & 7 deletions src/pages/public/OmOss/components/OmOss.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TextPictureParagraph } from "@/components/TextPictureParagraph";
import { Divider } from "@/components/Divider";
import getContent from "@/api/OmOss";
import { Divider } from "@/components/Divider";
import { TextPictureParagraph } from "@/components/TextPictureParagraph";
import {
Accordion,
AccordionContent,
Expand Down Expand Up @@ -86,7 +86,8 @@ const teamAccordions: AccordionType[] = [
];

const OmOss = () => {
const { title, ingress, bottomText, bottomHeader, bottomImage, cards} = getContent();
const { title, ingress, bottomText, bottomHeader, bottomImage, cards } =
getContent();
const accordionSection = (
<div className="flex flex-col items-center w-full">
<h2 className="text-2xl text-vektor-DARKblue dark:text-gray-200">
Expand Down Expand Up @@ -143,11 +144,9 @@ const OmOss = () => {
))}
<div className="flex flex-col w-full gap-3 md:gap-5">
<h1 className="text-vektor-DARKblue text-2xl md:text-4xl text-center font-bold dark:text-text-dark">
{bottomHeader}
{bottomHeader}
</h1>
<p className="text-md md:text-lg">
{bottomText}
</p>
<p className="text-md md:text-lg">{bottomText}</p>
<img
className="mt-0"
alt={bottomImage.alt}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const serverURL = "https://staging.vektorprogrammet.no/api/servers";
const diskUsageURL = "https://staging.vektorprogrammet.no/api/disk-space";
const serverUrl = "https://staging.vektorprogrammet.no/api/servers";
const diskUsageUrl = "https://staging.vektorprogrammet.no/api/disk-space";

export async function fetchServers(): Promise<[StagingServerAPIResponse]> {
const response = await fetch(serverURL);
const response = await fetch(serverUrl);
const body = await response.json();
return body;
}

export async function fetchDiskUsage(): Promise<any> {
const response = await fetch(diskUsageURL);
const response = await fetch(diskUsageUrl);
const body = await response.json();
return body;
}
Expand Down
9 changes: 1 addition & 8 deletions src/pages/public/Team/components/TeamCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@ interface Props {
alt: string;
}

const TeamCard = ({
title,
text1,
text2,
text3,
alt,
imgPath,
}: Props) => {
const TeamCard = ({ title, text1, text2, text3, alt, imgPath }: Props) => {
return (
<div className="flex w-full mx-auto justify-around flex-wrap">
<div className="max-w-6xl mt-5 flex flex-col">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/public/User/components/Utlegg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ const Utlegg: React.FC = () => {
<button
type="button"
className={`text-xl hover:font-semibold mb-4 ${
!showWindow ? "text-green-600" : "text-blue-600"
showWindow ? "text-blue-600" : "text-green-600"
}`}
onClick={handleClick}
>
Expand Down
9 changes: 4 additions & 5 deletions src/pages/public/mainPage.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import react from "react";
import CountUp from "react-countup";
import { Link } from "react-router";
import VisibilitySensor from "react-visibility-sensor";

import Abelprisen from "/images/mainPage/sponsor/Abelprisen.png";
import KSBergen from "/images/mainPage/sponsor/KSBergen.png";
import ksBergen from "/images/mainPage/sponsor/KSBergen.png";
import Matematikksenteret from "/images/mainPage/sponsor/Matematikksenteret.png";
import NTNUIE from "/images/mainPage/sponsor/NTNUIE.png";
import NTNUIV from "/images/mainPage/sponsor/NTNUIV.png";
import Samarbeidsforum from "/images/mainPage/sponsor/SamarbeidsForum.png";
import SparebankstiftelsenDNB from "/images/mainPage/sponsor/SparebankstiftelsenDNB.png";
import sparebankstiftelsenDnb from "/images/mainPage/sponsor/SparebankstiftelsenDNB.png";
import Tekna from "/images/mainPage/sponsor/Tekna.png";
import UiB from "/images/mainPage/sponsor/UIB.png";
import VisionTech from "/images/mainPage/sponsor/VisionTech.png";
Expand All @@ -23,7 +22,7 @@ const hovedsponsor = [
},
{
name: "Sparebankstiftelsen DNB",
image: SparebankstiftelsenDNB,
image: sparebankstiftelsenDnb,
},
];

Expand Down Expand Up @@ -58,7 +57,7 @@ const sponsorer = [
},
{
name: "Kulturstyret Bergen",
image: KSBergen,
image: ksBergen,
},
];
interface MainPageProps {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/skoler.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Divider } from "@/components/Divider";

// biome-ignore lint/style/noDefaultExport: Route Modules require default export https://reactrouter.com/start/framework/route-module
export default function ForSkoler () {
export default function ForSkoler() {
const goToContact = (url: string) => () => {
window.location.href = url;
};
Expand Down Expand Up @@ -137,4 +137,4 @@ export default function ForSkoler () {
</div>
</div>
);
};
}

0 comments on commit 8d2d013

Please sign in to comment.