dont publish if lint fails

add githooks and setup.sh
correct permission on shell script
2025-08-31 18:22:15 +02:00 · 2025-08-31 18:22:15 +02:00 · 2025-08-31 18:22:15 +02:00 · 2025-08-31 18:22:15 +02:00 · 2025-08-31 18:22:15 +02:00 · 2025-08-31 18:22:15 +02:00
23 changed files with 294 additions and 57 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,6 +18,8 @@ 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:
@@ -31,15 +33,16 @@ jobs:
      image: oven/bun
    steps:
      - uses: actions/checkout@v4
-      - 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
+      - name: Setup Biome
+        uses: biomejs/setup-biome@v2
+        with:
+          version: latest
+          token: ${{ secrets.BIOME_TOKEN }}
+      - name: Run Biome
+        run: biome ci .

-  build-and-push-docker:
-    needs: [build]
+  create-and-publish-docker-image:
+    needs: [lint]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
@@ -57,7 +60,6 @@ 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:
@@ -67,7 +69,11 @@ jobs:
          password: ${{ secrets.GARRISON_DOCKER_PASSWORD }}
          script: |
            cd monitor-im-flur
-            echo "Deploying Docker container..."
+            hyprctl dispatch exec 'pkill firefox'
+            hyprctl dispatch exec 'firefox -kiosk localhost:9123'
+            git clean -dfx
+            git reset --hard HEAD
+            git pull
            docker-compose pull
            docker-compose down
            docker-compose up -d
--- a/6
+++ b/6
@@ -1,7 +1,5 @@
-FROM nginx
-
+FROM nginx:alpine
 COPY ./dist /usr/share/nginx/html
-
+COPY nginx.conf /etc/nginx/nginx.conf
 EXPOSE 80
-
 CMD ["nginx", "-g", "daemon off;"]
--- a/biome.json
+++ b/biome.json
@@ -6,7 +6,7 @@
    },
    "files": {
        "ignoreUnknown": false,
-        "includes": ["**","!**/dist"]
+        "includes": ["**", "!**/dist"]
    },
    "formatter": {
        "enabled": true,
--- a/githooks/pre-commit
+++ b/githooks/pre-commit
@@ -0,0 +1,12 @@
+#!/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
@@ -0,0 +1,27 @@
+worker_processes 1;
+
+events { worker_connections 1024; }
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    server {
+        listen 80;
+        server_name _;
+
+        root /usr/share/nginx/html;
+        index index.html;
+
+        location / {
+            try_files $uri $uri/ /index.html /git-hash.js;
+        }
+
+        location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
+            expires 1y;
+            log_not_found off;
+        }
+    }
+}
--- a/pipeline/build-image.sh
+++ b/pipeline/build-image.sh
@@ -1 +0,0 @@
-#!/bin/bash
--- a/pipeline/create-git-hash-html.sh
+++ b/pipeline/create-git-hash-html.sh
@@ -0,0 +1,11 @@
+#!/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
@@ -0,0 +1,3 @@
+#!/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
@@ -0,0 +1,91 @@
+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 getImage = (sus: Amogus) => (sus.isImposter ? imposter : amogus);
+
+const initialCrewmates: Amogus[] = [
+    { key: "a", isImposter: true, posX: 10, posY: 20, speedX: 10, speedY: 30 },
+    {
+        key: "b",
+        isImposter: false,
+        posX: 400,
+        posY: 200,
+        speedX: 10,
+        speedY: -20,
+    },
+    {
+        key: "c",
+        isImposter: false,
+        posX: 900,
+        posY: 200,
+        speedX: -20,
+        speedY: 10,
+    },
+];
+
+const makeCrewmate = (crewmate: Amogus) => {
+    const image = getImage(crewmate);
+    return (
+        <div
+            key={crewmate.key}
+            className={style.container}
+            style={{ top: crewmate.posY, left: crewmate.posX }}
+        >
+            <img src={image} alt="Amogus" />
+        </div>
+    );
+};
+
+const stepCrewmates = (list: Amogus[]) => {
+    const { innerWidth: width, innerHeight: height } = window;
+    const newCrewmates = list.slice();
+    for (const c of newCrewmates) {
+        let newX = c.posX + c.speedX;
+        let newY = c.posY + c.speedY;
+        if (newX > width - 90) {
+            newX = width - 90;
+            c.speedX *= -1;
+        }
+        if (newX < 0) {
+            newX = 0;
+            c.speedX *= -1;
+        }
+        if (newY > height - 120) {
+            newY = height - 120;
+            c.speedY *= -1;
+        }
+        if (newY < 0) {
+            newY = 0;
+            c.speedY *= -1;
+        }
+        c.posX = newX;
+        c.posY = newY;
+    }
+    return newCrewmates;
+};
+
+export default function Amogus() {
+    const [crewmates, setCrewmates] = useState(initialCrewmates);
+
+    useEffect(() => {
+        const timer = setInterval(() => {
+            const c = crewmates;
+            setCrewmates(stepCrewmates(c));
+        }, 100);
+        return () => {
+            clearInterval(timer);
+        };
+    }, [crewmates]);
+
+    return <>{crewmates.map((c) => makeCrewmate(c))}</>;
+}
--- a/src/components/Amogus/style.module.css
+++ b/src/components/Amogus/style.module.css
@@ -0,0 +1,4 @@
+.container {
+    z-index: 100;
+    position: absolute;
+}
--- 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} isActive={active} />
-            )}
+            {header ? (
+                <CardHeader icon={icon} content={name} active={active} />
+            ) : null}
            <div className={style.cardContent}>{children}</div>
        </div>
    );
--- a/src/components/CardContainers/style.module.css
+++ b/src/components/CardContainers/style.module.css
@@ -5,7 +5,6 @@
    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,17 +1,14 @@
-import classNames from "classnames/bind";
+import classNames from "classnames";

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

-const styles = {
-    container: style.container,
-    active: style.active,
-};
-
-const cx = classNames.bind(styles);
-
-export default function CardHeader({ icon, content, isActive = false }) {
+export default function CardHeader({ icon, content, active = false }) {
    return (
-        <div className={cx("container", { active: isActive })}>
+        <div
+            className={classNames(style.container, {
+                [`${style.active}`]: active,
+            })}
+        >
            <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,5 +1,7 @@
+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,
@@ -42,29 +44,43 @@ export default function Dashboard() {

    return (
        <div className={`${style.dashboard} ${scheme}`}>
-            <CardColumn>
-                <Card icon="🚊" name="Timetable">
-                    <Timetable />
-                </Card>
-
-                <CardRow>
-                    <Card icon="🕐" name="Clock">
-                        <Datetime />
+            <Amogus />
+            <div className={style.body}>
+                <CardColumn>
+                    <Card icon="🚊" name="Timetable">
+                        <Timetable />
                    </Card>

-                    <Card icon="🌤" name="Weather">
-                        <Weather />
+                    <CardRow>
+                        <Card icon="🕐" name="Clock">
+                            <Datetime />
+                        </Card>
+
+                        <Card icon="🌤" name="Weather">
+                            <Weather />
+                        </Card>
+
+                        <div
+                            className={classNames(
+                                style.bouncingWindow,
+                                style.hidden,
+                            )}
+                        >
+                            <Card icon="🍁" name="420">
+                                <FourTwenty />
+                            </Card>
+                        </div>
+                    </CardRow>
+
+                    <Card icon="🔔" name="Terminal" active={true}>
+                        <Terminal />
                    </Card>
-                </CardRow>

-                <Card icon="🔔" name="Terminal" active={true}>
-                    <Terminal />
-                </Card>
-
-                <Card icon="🧹" name="Flatastic">
-                    <Flatastic />
-                </Card>
-            </CardColumn>
+                    <Card icon="🧹" name="Flatastic">
+                        <Flatastic />
+                    </Card>
+                </CardColumn>
+            </div>

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

+.body {
+    height: 100%;
+    padding: 30px;
+    overflow: scroll;
+}
+
 /* 7 to 16  */
 .day {
    background-color: #007c7d;
@@ -19,3 +25,30 @@
 .night {
    background-color: #2a3f55;
 }
+
+.amogus {
+    z-index: 100;
+    position: absolute;
+    scale: 60%;
+    animation:
+        x 10s linear infinite alternate,
+        y 7s linear infinite alternate;
+}
+
+@keyframes x {
+    from {
+        left: 0;
+    }
+    to {
+        left: calc(100vw - 70px);
+    }
+}
+
+@keyframes y {
+    from {
+        top: 0;
+    }
+    to {
+        top: calc(100vh - 90px);
+    }
+}
--- 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,5 @@
-import style from "./style.module.css";
-
 import weedImage from "/img/weed.png";
+import style from "./style.module.css";

 export default function Footer() {
    return (
--- a/src/components/FourTwenty/FourTwenty.tsx
+++ b/src/components/FourTwenty/FourTwenty.tsx
@@ -0,0 +1,37 @@
+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
@@ -0,0 +1,5 @@
+.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	2c805ab513	dont publish if lint fails All checks were successful CI / build (push) Successful in 13s Details CI / lint (push) Successful in 9s Details CI / create-and-publish-docker-image (push) Successful in 11s Details CI / build (pull_request) Successful in 12s Details CI / lint (pull_request) Successful in 9s Details CI / create-and-publish-docker-image (pull_request) Successful in 12s Details	2025-08-31 18:22:15 +02:00
Arif Hasanic	2b21310dfb	add githooks and setup.sh	2025-08-31 18:22:15 +02:00
Arif Hasanic	756e709181	correct permission on shell script	2025-08-31 18:22:15 +02:00
Arif Hasanic	9872b64fbd	create git hash html	2025-08-31 18:22:15 +02:00
Arif Hasanic	b6c9c51ec3	docker image now uses dist folder from build step for deploy	2025-08-31 18:22:15 +02:00
Arif Hasanic	83f872577b	ensure git-hash.js is in dist folder	2025-08-31 18:22:15 +02:00
Arif Hasanic	2b489e83ba	write git sha env variable into docker container	2025-08-31 18:22:15 +02:00
Darius Schefer	6189b80ff1	Bouncing Amogus All checks were successful CI / build (push) Successful in 12s Details CI / lint (push) Successful in 11s Details CI / create-and-publish-docker-image (push) Successful in 19s Details	2025-08-31 18:21:01 +02:00
Arif Hasanic	df2999516d	auto restart firefox after publish; write git hash into file for server All checks were successful CI / build (push) Successful in 13s Details CI / lint (push) Successful in 10s Details CI / create-and-publish-docker-image (push) Successful in 18s Details	2025-08-31 16:48:10 +02:00
Arif Hasanic	24f0aa75d5	code style fix 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 18s Details	2025-08-31 16:02:49 +02:00
Arif Hasanic	8f9b2c6abe	uncomment (the most) important code Some checks failed CI / build (push) Successful in 13s Details CI / lint (push) Failing after 9s Details CI / build-and-push-docker (push) Successful in 19s Details	2025-08-31 16:01:43 +02:00
Arif Hasanic	6595a7f8bb	fix code style issues All checks were successful CI / build (push) Successful in 13s Details CI / lint (push) Successful in 9s Details CI / build-and-push-docker (push) Successful in 18s Details	2025-08-31 15:59:22 +02:00
Arif Hasanic	c95c9de320	fix code style issues	2025-08-31 15:58:58 +02:00
Arif Hasanic	f7de45e47c	add small 420 widget	2025-08-31 15:58:31 +02:00
Darius Schefer	7556d0496a	Amogus	2025-08-31 01:10:19 +02:00
Arif Hasanic	7d68cce351	fix code style	2025-08-30 23:51:26 +02:00
Arif Hasanic	e051a1aa4f	add token for biome	2025-08-30 23:51:26 +02:00
Arif Hasanic	e9ef31e7ee	use biome giithub action	2025-08-30 23:51:26 +02:00
Arif Hasanic	bba4960276	use bunx to run biome	2025-08-30 23:51:26 +02:00
Arif Hasanic	b1d639f618	run bun install before lint	2025-08-30 23:51:26 +02:00
Arif Hasanic	1702e0c408	run multiple lint commands in one sub step	2025-08-30 23:51:26 +02:00
Darius Schefer	f87d3da269	Add missing semicolon	2025-08-30 23:33:55 +02:00
Darius Schefer	bbee38af9b	Change margin to padding becaue I am dumb	2025-08-30 23:29:46 +02:00
Arif Hasanic	55d86dbcaf	fix ci 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 18s Details	2025-08-30 23:24:51 +02:00
Arif Hasanic	e366379a57	fix typo in docker-compose file	2025-08-30 23:24:51 +02:00
Arif Hasanic	19aa35195f	add nginx file to docker container	2025-08-30 23:24:51 +02:00
Darius Schefer	4926c3b388	Fix header and make content scroll on overflow	2025-08-30 23:17:10 +02:00