core: make entire card same border radius

snake: make game resizable by user
core: rearrange navigation and put main projects in a single row
2024-11-25 15:34:53 -06:00 · 2024-11-25 15:20:56 -06:00 · 2024-11-25 14:37:17 -06:00 · 2024-11-16 19:12:30 -06:00 · 2024-11-16 19:01:52 -06:00 · 2024-11-16 02:45:38 -06:00
7 changed files with 60 additions and 56 deletions
@@ -1,6 +1,6 @@
 FROM nginx:latest

-RUN apt-get update && apt-get install -y nodejs npm
+RUN apt-get update && apt-get install -y nodejs npm netcat-openbsd

 WORKDIR /app

@@ -14,10 +14,12 @@ RUN npm run build

 WORKDIR /usr/share/nginx/html
 COPY index.html .
+COPY default.css .

 RUN mkdir -p /usr/share/nginx/html/public
-COPY src/*.css ./public

 RUN cp /app/build/* ./public

+HEALTHCHECK CMD nc -z 127.0.0.1 80
+
 EXPOSE 80
@@ -22,6 +22,7 @@ body {
    padding: 8px;
    line-height: 21px;
    display: inline-block;
+    text-align: right;
 }

 #top {
@@ -34,9 +35,19 @@ body {
 }

 #main {
+    margin: 0px 120px;
+    display: flex;
    /*background: #1e2030;*/
 }

+.canvas {
+    width: 780px;
+    height: 600px;
+    align-items: center;
+    justify-content: center;
+    display: flex;
+}
+
 .cardStats {
    font-size: 18px;
 }
@@ -121,9 +132,7 @@ a.button {
 .card {
    background: #363a4f;
    text-align: center;
-    border-radius: 6px;
-    border-top-left-radius: 18px;
-    border-top-right-radius: 18px;
+    border-radius: 18px;
    animation: card 3s linear infinite;
    width: 800px;
    height: 800px;
@@ -3,24 +3,26 @@
 <head>
  <meta charset="utf-8"/>
  <title>Trianta</title>
-  <link rel="stylesheet" href="public/home.css" />
+  <link rel="stylesheet" href="default.css" />
 </head>
 <body>
    <div id="navigation">
+        <p class="navItem" style="text-align: left; flex-grow: 1;">Trianta</p>
        <a class="navItem" href="https://www.github.com/trimutex">GitHub</a>
        <a class="navItem" href="https://lab.trianta.dev/Trianta">Projects</a>
-        <p class="navItem" style="text-align: right; flex-grow: 1;">Trianta</p>
    </div>
    <div id="main">
        <div class="card">
            <h2 class="cardTop">Pong</h2>
-            <canvas width="750" height="585" id="pong"></canvas>
-            <script src="public/pong.js"></script>
-            <div id="gameover" hidden="true">
-                <h1>Game Over</h1>      
-            </div>
-            <div id="restart" hidden="true">
-                <button class="button" type="button" onclick = "restartGame()">Restart Game</a>
+            <div class="canvas">
+                <canvas width="750" height="585" id="pong"></canvas>
+                <script src="public/pong.js"></script>
+                <div id="gameover" hidden="true">
+                    <h1>Game Over</h1>      
+                </div>
+                <div id="restart" hidden="true">
+                    <button class="button" type="button" onclick = "restartGame()">Restart Game</a>
+                </div>
            </div>
            <p class="cardStats">Left Paddle Height: <span id="leftPaddle"></span></p>
            <p class="cardStats">Right Paddle Height: <span id="rightPaddle"></span></p>
@@ -28,8 +30,16 @@
        </div>
        <div class="card">
            <h2 class="cardTop">Snake</h2>
-            <canvas width="625" height="375" id="snake"></canvas>
-            <script src="public/snake.js"></script>
+            <div class="canvas">
+                <canvas width="625" height="375" id="snake"></canvas>
+                <script src="public/snake.js"></script>
+            </div>
+            <p class="cardStats">
+                Adjust game size -- Width: 
+                <input class="cardStats" id="snakeWidth" type="number" min="2" max="31" value="25">
+                Height: 
+                <input class="cardStats" id="snakeHeight" type="number" min="2" max="24" value="15">
+            </p>
            <p class="cardStats">Snake Head Location: <span id="snakeHead"></span></p>
            <p class="cardStats">Food Location: <span id="snakeFood"></span></p>
            <a class="navItem" href="https://lab.trianta.dev/Trianta/trianta.dev/src/branch/main/src/snake.ts">View Code</a>
@@ -1,21 +1,21 @@
 {
  "name": "trianta.dev",
-  "version": "0.1.0",
+  "version": "0.2.2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "trianta.dev",
-      "version": "0.1.0",
+      "version": "0.2.2",
      "license": "MIT",
      "dependencies": {
        "typescript": "^5.5.4"
      }
    },
    "node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
      "license": "Apache-2.0",
      "bin": {
        "tsc": "bin/tsc",
@@ -1,6 +1,6 @@
 {
  "name": "trianta.dev",
-  "version": "0.1.0",
+  "version": "0.2.2",
  "description": "My personal website",
  "main": "index.html",
  "scripts": {
@@ -1,23 +0,0 @@
-html, body {
-    height: 100%;
-    margin: 0;
-}
-
-body {
-    background: black;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.button {
-    background: blue;
-    color: white;
-    padding: 15px 20px;
-    font-size: 32px;
-    font-family: Arial, Helvetica, sans-serif;
-    text-transform: uppercase;
-    cursor: pointer;
-    position: relative;
-}
-
@@ -60,11 +60,10 @@ class SnakeCore {
    foodAte: boolean;

    constructor() {
-        // TODO: Add CSS stuff for page
        this.canvas = document.getElementById('snake') as HTMLCanvasElement;
        this.context = this.canvas.getContext('2d') as CanvasRenderingContext2D;
        this.grid = 25; // size of grid squares
-        this.timeout = 20; // speed in ms
+        this.timeout = 32; // speed in ms
        this.width = 25;
        this.height = 15;
        this.board = [];
@@ -170,6 +169,21 @@ class SnakeCore {
        document.getElementById("snakeHead").innerHTML = "x: " + this.body[this.body.length - 1].x + " y: " + this.body[this.body.length - 1].y;
        document.getElementById("snakeFood").innerHTML = "x: " + this.food.x + " y: " + this.food.y ;
    }
+
+    // Update width and height from page to match game
+    getPageNumbers() {
+        let specifiedWidth = parseInt((document.getElementById("snakeWidth") as HTMLInputElement).value);
+        let specifiedHeight = parseInt((document.getElementById("snakeHeight") as HTMLInputElement).value);
+        if (this.width == specifiedWidth && this.height == specifiedHeight)
+            return false;
+        this.width = specifiedWidth;
+        this.height = specifiedHeight;
+        while (this.height > this.board.length)
+            this.board.push(new Array(this.width));
+        this.canvas.setAttribute("width", String(specifiedWidth * this.grid));
+        this.canvas.setAttribute("height", String(specifiedHeight * this.grid));
+        return true;
+    }
 }

 class Bot {
@@ -213,7 +227,6 @@ class Bot {
        }
    }
    
-    // TODO: Fix trim function
    trim() {
        let reachedSnake = false;
        this.path.push(this.pathUntrimmed.pop() as Point); // Push food location
@@ -240,13 +253,6 @@ class Bot {
        }
    }

-    /*
-        values:
-        0 = left
-        1 = up
-        2 = right
-        4 = down
-    */
    nextMove() {
        // Get new path to food
        if (this.path.length === 0)
@@ -279,7 +285,7 @@ const g_snakebot: Bot = new Bot();
 // game loop
 function snakeloop() {
    // Reset of needed
-    if (g_snake.gameover)
+    if (g_snake.gameover || g_snake.getPageNumbers())
        g_snake.reset();

    // Simulate movement of snake
Author	SHA1	Message	Date
Trianta	f1346a628c	core: make entire card same border radius	2024-11-25 15:34:53 -06:00
Trianta	343af77bd1	snake: make game resizable by user	2024-11-25 15:20:56 -06:00
Trianta	47fd5c7458	core: rearrange navigation and put main projects in a single row	2024-11-25 14:37:17 -06:00
trianta	a754319374	Merge pull request 'core: reorganize some pieces for the future' (#10 ) from reorganize into main Reviewed-on: Trianta/trianta.dev#10	2024-11-16 19:12:30 -06:00
Trianta	4aeed537d7	core: update package to v0.2.2	2024-11-16 19:01:52 -06:00
Trianta	f725b4e922	core: propagate changes throughout files	2024-11-16 02:45:38 -06:00
Trianta	8252f38bb7	core: move home page css to root and rename	2024-11-16 02:38:15 -06:00
Trianta	e4d9afdd68	pong: remove unused css file	2024-11-16 02:32:58 -06:00
Trianta	90c868d9e9	docker: add healthcheck	2024-11-09 04:37:30 -06:00
Trianta	452c35c1b0	snake: slightly increase speed	2024-11-09 03:18:42 -06:00
Trianta	9dea6014fe	snake: remove dealt with comments	2024-11-09 02:57:12 -06:00
Trianta	e37d737d3a	snake: decrease speed again	2024-11-09 02:50:24 -06:00
Trianta	65c7b930e3	meta: update package.json	2024-11-09 02:38:08 -06:00
Trianta	082176d75e	snake: revert speed back	2024-11-09 02:32:14 -06:00
Trianta	18673c95c4	snake: decrease speed slightly more	2024-11-09 02:25:16 -06:00
Trianta	cb52bd1561	snake: slightly decrease game speed	2024-11-09 02:09:06 -06:00