fix ci

fix typo in docker-compose file
add nginx file to docker container
2025-08-30 23:21:52 +02:00 · 2025-08-30 23:12:22 +02:00 · 2025-08-30 23:04:01 +02:00
23 changed files with 61 additions and 277 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,8 +18,6 @@ jobs:
        run: bun install
      - name: Build
        run: bun run build
-      - name: Write Git-Hash into html
-        run: ./pipeline/create-git-hash-html.sh
      - name: Create Build Artifact
        uses: christopherhx/gitea-upload-artifact@v4
        with:
@@ -33,16 +31,15 @@ jobs:
      image: oven/bun
    steps:
      - uses: actions/checkout@v4
-      - name: Setup Biome
-        uses: biomejs/setup-biome@v2
-        with:
-          version: latest
-          token: ${{ secrets.BIOME_TOKEN }}
-      - name: Run Biome
-        run: biome ci .
+      - name: Install Biome
+        run: bun install -g biome
+      - name: Run Biome lint
+        run: biome lint --write
+      - name: Run Biome format check
+        run: biome format --write

-  create-and-publish-docker-image:
-    needs: [lint]
+  build-and-push-docker:
+    needs: [build]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
@@ -60,6 +57,7 @@ jobs:
        run: docker build -t git.rivercry.com/wg/monitor-im-flur .
      - name: Push Docker image
        run: docker push git.rivercry.com/wg/monitor-im-flur
+      
      - name: Deploy via SSH
        uses: appleboy/ssh-action@v0.1.10
        with:
@@ -69,13 +67,10 @@ jobs:
          password: ${{ secrets.GARRISON_DOCKER_PASSWORD }}
          script: |
            cd monitor-im-flur
+            echo "Deploying Docker container..."
            git clean -dfx
            git reset --hard HEAD
            git pull
            docker-compose pull
            docker-compose down
            docker-compose up -d
-            export HYPRLAND_INSTANCE_SIGNATURE=$(hyprctl instances -j | jq '.[0].instance' | tr -d "'\"")
-            hyprctl dispatch exec 'pkill firefox'
-            hyprctl dispatch exec 'firefox -kiosk localhost:9123'
-            
--- a/8
+++ b/8
@@ -1,5 +1,11 @@
+FROM oven/bun as builder
+WORKDIR /app
+COPY . .
+RUN bun install
+RUN bun run build
+
 FROM nginx:alpine
-COPY ./dist /usr/share/nginx/html
+COPY --from=builder /app/dist /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/nginx.conf
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]
--- a/githooks/pre-commit
+++ b/githooks/pre-commit
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-echo "Running pre-commit hooks..."
-
-biome check --write
-biome lint --write
-
-if git diff --quiet; then
-  exit 0
-else
-  git add -u
-fi
--- a/nginx.conf
+++ b/nginx.conf
@@ -16,7 +16,7 @@ http {
        index index.html;

        location / {
-            try_files $uri $uri/ /index.html /git-hash.js;
+            try_files $uri $uri/ /index.html;
        }

        location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
--- a/pipeline/build-image.sh
+++ b/pipeline/build-image.sh
@@ -0,0 +1 @@
+#!/bin/bash
--- a/pipeline/create-git-hash-html.sh
+++ b/pipeline/create-git-hash-html.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-echo "<!DOCTYPE html>
-<html>
-<head>
-    <title>Git Hash</title>
-</head>
-<body>
-    <pre>GITHUB_SHA = '$GITHUB_SHA';</pre>
-</body>
-</html>" > dist/git-hash.html
--- a/public/img/amogus.png
+++ b/public/img/amogus.png
--- a/public/img/imposter.png
+++ b/public/img/imposter.png
--- a/setup.sh
+++ b/setup.sh
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-git config --local core.hooksPath githooks
--- a/src/api/homeAssistant.ts
+++ b/src/api/homeAssistant.ts
@@ -1,8 +1,8 @@
-const token =
-    "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI3N2JmOTk1ODI3MzA0ZWIzOWYwNThjMzQ4YTY3ZDJkYyIsImlhdCI6MTc1NjQ3NTM4OSwiZXhwIjoyMDcxODM1Mzg5fQ.TZZ4SUGlERuIVrhzC_wfCN-qS1wSAKNN9uMMDjkqOgA";
+const token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI3N2JmOTk1ODI3MzA0ZWIzOWYwNThjMzQ4YTY3ZDJkYyIsImlhdCI6MTc1NjQ3NTM4OSwiZXhwIjoyMDcxODM1Mzg5fQ.TZZ4SUGlERuIVrhzC_wfCN-qS1wSAKNN9uMMDjkqOgA";

 async function fetchTentHumidity() {
-    const url = `https://home.rivercry.com/api/states/sensor.third_reality_inc_3rths0224z_luftfeuchtigkeit_2`;
+    const url =
+        `https://home.rivercry.com/api/states/sensor.third_reality_inc_3rths0224z_luftfeuchtigkeit_2`;
    const response = await fetch(url, {
        method: "GET",
        headers: {
--- a/src/components/Amogus/Amogus.tsx
+++ b/src/components/Amogus/Amogus.tsx
@@ -1,132 +0,0 @@
-import { useEffect, useState } from "react";
-import amogus from "/img/amogus.png";
-import imposter from "/img/imposter.png";
-import style from "./style.module.css";
-
-type Amogus = {
-    isImposter: boolean;
-    posX: number;
-    posY: number;
-    speedX: number;
-    speedY: number;
-};
-
-const amogusWidth = 70;
-const amogusHeight = 70;
-
-const { innerWidth: width, innerHeight: height } = window;
-
-const getImage = (sus: Amogus) => (sus.isImposter ? imposter : amogus);
-
-const makeInitialCrewmates = (): Amogus[] => {
-    return [
-        makeCrewmate(true),
-        makeCrewmate(false),
-        makeCrewmate(false),
-        makeCrewmate(false),
-        makeCrewmate(false),
-        makeCrewmate(false),
-        makeCrewmate(false),
-        makeCrewmate(false),
-        makeCrewmate(false),
-    ];
-};
-
-const randNum = (min: number, max: number): number =>
-    Math.random() * (max - min) + min;
-
-const makeCrewmate = (imposter: boolean): Amogus => ({
-    isImposter: imposter,
-    posX: randNum(0, width - amogusWidth),
-    posY: randNum(0, height - amogusHeight),
-    speedX: Math.random() > 0.5 ? randNum(3, 10) : randNum(-3, -10),
-    speedY: Math.random() > 0.5 ? randNum(3, 10) : randNum(-3, -10),
-});
-
-const intersect = (c1: Amogus, c2: Amogus): boolean =>
-    Math.abs(c1.posX - c2.posX) < amogusWidth - 20 &&
-    Math.abs(c1.posY - c2.posY) < amogusHeight - 20;
-
-const doMove = (crewmates: Amogus[]) =>
-    crewmates.map((c) => ({
-        ...c,
-        posX: c.posX + c.speedX,
-        posY: c.posY + c.speedY,
-    }));
-
-const doCollisionWalls = (crewmates: Amogus[]) =>
-    crewmates.map((c) => {
-        if (c.posX > width - amogusWidth) {
-            return {
-                ...c,
-                posX: width - amogusWidth,
-                speedX: c.speedX * -1,
-            };
-        } else if (c.posX < -20) {
-            return { ...c, posX: -20, speedX: c.speedX * -1 };
-        } else if (c.posY > height - amogusHeight) {
-            return {
-                ...c,
-                posY: height - amogusHeight,
-                speedY: c.speedY * -1,
-            };
-        } else if (c.posY < -20) {
-            return { ...c, posY: -20, speedY: c.speedY * -1 };
-        } else return c;
-    });
-
-// TODO: This is ugly
-const doCollisionOthers = (crewmates: Amogus[]) =>
-    crewmates.map((c) => {
-        const intersections = crewmates
-            .filter((o) => o !== c) // don't collide with yourself pls
-            .filter((o) => intersect(c, o));
-
-        if (intersections.some((o) => Math.abs(o.posX - c.posX) < 50)) {
-            return { ...c, speedX: c.speedX * -1 };
-        }
-        if (intersections.some((o) => Math.abs(o.posY - c.posY) < 50)) {
-            return { ...c, speedY: c.speedY * -1 };
-        }
-        return c;
-    });
-
-const doKills = (crewmates: Amogus[]) => {
-    const imposters = crewmates.filter((c) => c.isImposter);
-    const alive = crewmates
-        .filter((c) => !c.isImposter)
-        .filter((c) => imposters.every((i) => !intersect(i, c)));
-    return imposters.concat(alive);
-};
-
-const checkReset = (crewmates: Amogus[]) =>
-    crewmates.every((c) => c.isImposter) ? makeInitialCrewmates() : crewmates;
-
-const renderCrewmate = (crewmate: Amogus, key: number) => (
-    <div
-        key={key}
-        className={style.container}
-        style={{ top: crewmate.posY, left: crewmate.posX }}
-    >
-        <img src={getImage(crewmate)} alt="Amogus" />
-    </div>
-);
-
-export default function Amogus() {
-    const [crewmates, setCrewmates] = useState(() => makeInitialCrewmates());
-
-    useEffect(() => {
-        const timer = setInterval(() => {
-            setCrewmates((c) => doMove(c));
-            setCrewmates((c) => doCollisionWalls(c));
-            setCrewmates((c) => doCollisionOthers(c));
-            setCrewmates((c) => doKills(c));
-            setCrewmates((c) => checkReset(c));
-        }, 50);
-        return () => {
-            clearInterval(timer);
-        };
-    }, []);
-
-    return <>{crewmates.map((c, index) => renderCrewmate(c, index))}</>;
-}
--- a/src/components/Amogus/style.module.css
+++ b/src/components/Amogus/style.module.css
@@ -1,8 +0,0 @@
-.container {
-    z-index: 100;
-    position: absolute;
-    scale: 50%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
--- a/src/components/Card/Card.tsx
+++ b/src/components/Card/Card.tsx
@@ -17,9 +17,9 @@ export default function Card({
 }) {
    return (
        <div className={style.card}>
-            {header ? (
-                <CardHeader icon={icon} content={name} active={active} />
-            ) : null}
+            {header && (
+                <CardHeader icon={icon} content={name} isActive={active} />
+            )}
            <div className={style.cardContent}>{children}</div>
        </div>
    );
--- a/src/components/CardContainers/style.module.css
+++ b/src/components/CardContainers/style.module.css
@@ -5,6 +5,7 @@
    justify-content: flex-start;
    align-items: stretch;
    gap: 30px;
+    margin: 30px;
 }

 .cardRow {
--- a/src/components/CardHeader/CardHeader.tsx
+++ b/src/components/CardHeader/CardHeader.tsx
@@ -1,14 +1,17 @@
-import classNames from "classnames";
+import classNames from "classnames/bind";

 import style from "./style.module.css";

-export default function CardHeader({ icon, content, active = false }) {
+const styles = {
+    container: style.container,
+    active: style.active,
+};
+
+const cx = classNames.bind(styles);
+
+export default function CardHeader({ icon, content, isActive = false }) {
    return (
-        <div
-            className={classNames(style.container, {
-                [`${style.active}`]: active,
-            })}
-        >
+        <div className={cx("container", { active: isActive })}>
            <div className={style.title}>
                <div className={style.icon}>{icon}</div>
                <div className={style.content}>{content}</div>
--- a/src/components/Dashboard/Dashboard.tsx
+++ b/src/components/Dashboard/Dashboard.tsx
@@ -1,7 +1,5 @@
-import FourTwenty from "@components/FourTwenty/FourTwenty";
-import classNames from "classnames";
 import { useEffect, useState } from "react";
-import Amogus from "@/components/Amogus/Amogus";
+
 import Card from "@/components/Card/Card";
 import {
    CardColumn,
@@ -44,8 +42,6 @@ export default function Dashboard() {

    return (
        <div className={`${style.dashboard} ${scheme}`}>
-            <Amogus />
-            <div className={style.body}>
            <CardColumn>
                <Card icon="🚊" name="Timetable">
                    <Timetable />
@@ -59,10 +55,6 @@ export default function Dashboard() {
                    <Card icon="🌤" name="Weather">
                        <Weather />
                    </Card>
-
-                        <Card icon="🍁" name="420">
-                            <FourTwenty />
-                        </Card>
                </CardRow>

                <Card icon="🔔" name="Terminal" active={true}>
@@ -73,7 +65,6 @@ export default function Dashboard() {
                    <Flatastic />
                </Card>
            </CardColumn>
-            </div>

            <Footer />
        </div>
--- a/src/components/Dashboard/style.module.css
+++ b/src/components/Dashboard/style.module.css
@@ -5,12 +5,6 @@
    transition: 0.5s;
 }

-.body {
-    height: 100%;
-    padding: 30px;
-    overflow: scroll;
-}
-
 /* 7 to 16  */
 .day {
    background-color: #007c7d;
--- a/src/components/Datetime/Datetime.tsx
+++ b/src/components/Datetime/Datetime.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";

-import clockImage from "/img/clock.png";
+import clockImage from "/img/clock.png"

 import style from "./style.module.css";

--- a/src/components/Footer/Footer.tsx
+++ b/src/components/Footer/Footer.tsx
@@ -1,6 +1,7 @@
-import weedImage from "/img/weed.png";
 import style from "./style.module.css";

+import weedImage from "/img/weed.png";
+
 export default function Footer() {
    return (
        <div className={style.container}>
--- a/src/components/FourTwenty/FourTwenty.tsx
+++ b/src/components/FourTwenty/FourTwenty.tsx
@@ -1,37 +0,0 @@
-import style from "./style.module.css";
-
-// function Timer({ hours, minutes }: { hours: number; minutes: number }) {
-//     const x = hours > 0 ? `${hours}h ` : "";
-//     const y = minutes > 0 ? `${minutes % 60}m` : "";
-
-//     return (
-//         <div>
-//             <p>
-//                 {x}
-//                 {y}
-//             </p>
-//         </div>
-//     );
-// }
-
-// function FourTwentyLoading() {}
-
-function FourTwentySmoking() {
-    return (
-        <div className={style.container}>
-            <img
-                className={style.image}
-                src="https://media4.giphy.com/media/v1.Y2lkPTc5MGI3NjExMjFlYnhzYzJnc3ZzejBnOGZzcHFpNGpxOHNrN2dwcnZ3NmZ2eWJ0dyZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9Zw/5xaOcLRnsWIB0CkfE3u/giphy.gif"
-                alt="Smoking"
-            />
-        </div>
-    );
-}
-
-export default function FourTwenty() {
-    return (
-        <div>
-            <FourTwentySmoking />
-        </div>
-    );
-}
--- a/src/components/FourTwenty/style.module.css
+++ b/src/components/FourTwenty/style.module.css
@@ -1,5 +0,0 @@
-.container img {
-    all: unset;
-    object-fit: contain;
-    width: 200px;
-}
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,7 +1,7 @@
 import path from "node:path";
 import react from "@vitejs/plugin-react-swc";
 import { defineConfig } from "vite";
-import mkcert from "vite-plugin-mkcert";
+import mkcert from 'vite-plugin-mkcert'

 export default defineConfig({
    plugins: [react(), mkcert()],
Author	SHA1	Message	Date
Arif Hasanic	930a844749	fix ci All checks were successful CI / build (push) Successful in 12s Details CI / lint (push) Successful in 6s Details CI / build-and-push-docker (push) Successful in 19s Details	2025-08-30 23:21:52 +02:00
Arif Hasanic	6631101d3d	fix typo in docker-compose file All checks were successful CI / build (push) Successful in 12s Details CI / lint (push) Successful in 9s Details CI / build-and-push-docker (push) Successful in 17s Details	2025-08-30 23:12:22 +02:00
Arif Hasanic	01a8f18bae	add nginx file to docker container All checks were successful CI / build (push) Successful in 13s Details CI / lint (push) Successful in 8s Details CI / build-and-push-docker (push) Successful in 20s Details	2025-08-30 23:04:01 +02:00