Amogus cleanup

Bad collision
restart firefox after pull
2025-09-01 20:24:19 +02:00 · 2025-09-01 20:24:19 +02:00 · 2025-09-01 20:24:19 +02:00 · 2025-09-01 20:24:19 +02:00 · 2025-08-31 23:55:45 +02:00 · 2025-08-31 21:04:52 +02:00
12 changed files with 180 additions and 48 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,8 +18,8 @@ jobs:
        run: bun install
      - name: Build
        run: bun run build
-      - name: Write git hash into dist
-        run: echo "export const GIT_HASH = '$(git rev-parse HEAD)';" > dist/git-hash.js 
+      - name: Write Git-Hash into html
+        run: ./pipeline/create-git-hash-html.sh
      - name: Create Build Artifact
        uses: christopherhx/gitea-upload-artifact@v4
        with:
@@ -42,7 +42,7 @@ jobs:
        run: biome ci .

  create-and-publish-docker-image:
-    needs: [build]
+    needs: [lint]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
@@ -60,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:
@@ -70,13 +69,13 @@ jobs:
          password: ${{ secrets.GARRISON_DOCKER_PASSWORD }}
          script: |
            cd monitor-im-flur
-            echo "Deploying Docker container..."
-            $HYPRLAND_INSTANCE_SIGNATURE
-            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
+            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,11 +1,5 @@
-FROM oven/bun as builder
-WORKDIR /app
-COPY . .
-RUN bun install
-RUN bun run build
-
 FROM nginx:alpine
-COPY --from=builder /app/dist /usr/share/nginx/html
+COPY ./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
@@ -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
@@ -16,7 +16,7 @@ http {
        index index.html;

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

        location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
--- 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/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/components/Amogus/Amogus.tsx
+++ b/src/components/Amogus/Amogus.tsx
@@ -0,0 +1,132 @@
+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
@@ -0,0 +1,8 @@
+.container {
+    z-index: 100;
+    position: absolute;
+    scale: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
--- 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,
@@ -11,7 +13,7 @@ import Footer from "@/components/Footer/Footer";
 import Terminal from "@/components/Terminal/Terminal";
 import Timetable from "@/components/Timetable/Timetable";
 import Weather from "@/components/Weather/Weather";
-import amogus from "/img/amogus.png";
+
 import style from "./style.module.css";

 export default function Dashboard() {
@@ -42,9 +44,7 @@ export default function Dashboard() {

    return (
        <div className={`${style.dashboard} ${scheme}`}>
-            <div className={style.amogus}>
-                <img src={amogus} alt="Amogus" />
-            </div>
+            <Amogus />
            <div className={style.body}>
                <CardColumn>
                    <Card icon="🚊" name="Timetable">
@@ -59,6 +59,7 @@ export default function Dashboard() {
                        <Card icon="🌤" name="Weather">
                            <Weather />
                        </Card>
+
                        <Card icon="🍁" name="420">
                            <FourTwenty />
                        </Card>
--- a/src/components/Dashboard/style.module.css
+++ b/src/components/Dashboard/style.module.css
@@ -25,30 +25,3 @@
 .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);
-    }
-}
Author	SHA1	Message	Date
Darius Schefer	cb4ce4188e	Amogus cleanup All checks were successful CI / build (pull_request) Successful in 12s Details CI / lint (pull_request) Successful in 10s Details CI / create-and-publish-docker-image (pull_request) Successful in 14s Details CI / build (push) Successful in 12s Details CI / lint (push) Successful in 9s Details CI / create-and-publish-docker-image (push) Successful in 12s Details	2025-09-01 20:24:19 +02:00
Darius Schefer	53db7e795c	Bad collision	2025-09-01 20:24:19 +02:00
Arif Hasanic	3606f9b043	restart firefox after pull	2025-09-01 20:24:19 +02:00
Darius Schefer	5da900c1c3	Enhance Amogus	2025-09-01 20:24:19 +02:00
Arif Hasanic	8653365af1	rename github folder 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 14s Details	2025-08-31 23:55:45 +02:00
Arif Hasanic	d914f47640	Merge branch 'better-deploy' Some checks failed CI / build (push) Successful in 15s Details CI / lint (push) Successful in 13s Details CI / create-and-publish-docker-image (push) Has been cancelled Details	2025-08-31 21:04:52 +02:00
Arif Hasanic	668d260fd6	fix typo in ci All checks were successful CI / build (push) Successful in 15s Details CI / lint (push) Successful in 10s Details CI / create-and-publish-docker-image (push) Successful in 18s Details	2025-08-31 18:36:41 +02:00
Arif Hasanic	03dc0984f3	quic commit Some checks failed CI / build (push) Successful in 13s Details CI / lint (push) Successful in 9s Details CI / create-and-publish-docker-image (push) Failing after 16s Details	2025-08-31 18:26:33 +02:00
Arif Hasanic	0d94904c50	set HYPRLAND_INSTANCE_SIGNATURE Some checks failed CI / build (push) Successful in 13s Details CI / create-and-publish-docker-image (push) Failing after 7s Details CI / lint (push) Successful in 8s Details	2025-08-31 18:25:32 +02:00
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