css: unify colors and swap bg/fg

Reviewed-on: Trianta/trianta.dev#12

Dockerfile

@@ -15,6 +15,7 @@ RUN npm run build
 WORKDIR /usr/share/nginx/html
 COPY index.html .
 COPY default.css .
+COPY pages/ .
 
 RUN mkdir -p /usr/share/nginx/html/public
 

Jenkinsfile

@@ -1,22 +1,53 @@
 pipeline {
-    agent any
+    agent none
     stages {
         stage('Checkout') {
+            agent { label 'agent-12' }
+            when { expression { return env.GIT_BRANCH == 'origin/main' } }
             steps {
                 checkout scm
             }
         }
         stage('Build') {
+            agent { label 'agent-12' }
+            when { expression { return env.GIT_BRANCH == 'origin/main' } }
+            steps {
+                script {
+                    docker.build('trianta.dev:latest')
+                }
+            }
+        }
+        stage('Deploy') {
+            agent { label 'agent-12' }
+            when { expression { return env.GIT_BRANCH == 'origin/main' } }
+            steps {
+                sh 'docker stop trianta.dev && docker rm trianta.dev || exit 0'
+                sh 'docker run -d -e USER=scv -e USER_UID=1001 -e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name trianta.dev trianta.dev:latest'
+            }
+        }
+        stage('Test Checkout') {
+            agent { label 'agent-13' }
+            when { expression { return env.GIT_BRANCH != 'origin/main' } }
+            steps {
+                sh 'echo $GIT_BRANCH'
+                checkout scm
+            }
+        }
+        stage('Test Build') {
+            agent { label 'agent-13' }
+            when { expression { return env.GIT_BRANCH != 'origin/main' } }
             steps {
                 script {
                     docker.build('test.trianta.dev:latest')
                 }
             }
         }
-        stage('Deploy') {
+        stage('Test Deploy') {
+            agent { label 'agent-13' }
+            when { expression { return env.GIT_BRANCH != 'origin/main' } }
             steps {
-                sh 'docker stop test && docker rm test || exit 0'
-                sh 'docker run -d -p 3466:80 --name test test.trianta.dev:latest'
+                sh 'docker stop test.trianta.dev && docker rm test.trianta.dev || exit 0'
+                sh 'docker run -d -e USER=scv -e USER_UID=1001 -e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name test.trianta.dev test.trianta.dev:latest'
             }
         }
     }

default.css

@@ -1,116 +1,132 @@
+/*
+ * text / border: #8c7862
+ * foreground: #89bea6
+ * background: #61937c 
+ */
+
+
 body {
-    font-family: Arial, sans-serif;
-    font-size: 14px;
-    color: #4c4f69;
+    font-family: "Departure Mono", sans-serif;
+    font-optical-sizing: auto;
+    font-weight: 400;
+    color: #8c7862;
+    background: #61937c;
     line-height: 1.5;
-    max-width: 1920px;
     margin-inline: auto;
-    background: #eff1f5;
-    margin: 0px auto;
+    margin: 0 auto;
 }
 
-#navigation {
-    display: flex;
+.inside {
+    max-width: 60rem;
+    margin: 0 auto;
+    padding: 2rem 1.5rem;
+    background: #89bea6;
+    border: 4px solid #8c7862;
 }
 
-.navItem {
-    margin: 6px;
-    margin-top: 0px;
-    padding: 8px;
-    line-height: 21px;
-    display: inline-block;
-    text-align: right;
+nav {
+    padding: 1rem;
+    text-align: center;
+    width: 6rem;
 }
 
-#top {
-    margin-bottom: 6px;
-    border-radius: 16px;
-    border-top-left-radius: 0px;
-    margin: 4px auto;
-    margin-top: 0px;
-    height: 55px;
+nav ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
 }
 
-#main {
-    margin: 0px 120px;
-    display: flex;
+.gap {
+    width: 4rem;
+}
+
+.content {
+    width: 48rem;
+    text-align: left;
+}
+
+@media screen and (max-width: 600px) {
+    .column {
+        width: 100%;
+    }
+    .gap {
+        visibility: hidden;
+    }
+}
+
+.trianta {
+    font-size: 2.5rem !important;
+    min-width: 12rem;
 }
 
 .canvas {
-    width: 780px;
-    height: 600px;
-    align-items: center;
-    justify-content: center;
-    display: flex;
+    margin: auto;
+    display: inline-block;
+    width: 60rem;
+    vertical-align: bottom;
+    border: solid 4px #8c7862;
 }
 
-.cardStats {
+.stats {
     font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
 }
 
 h1 {
-    width: 130px;
-    text-align: center;
-    display: inline-block;
-    font-size: 1.8rem;
-    margin: 0px;
-    padding: 8px;
-    border-top-left-radius: 18px;
-    border-top-right-radius: 18px;
+    max-width: 650px;
+    text-align: left;
+    padding: 8px 1.5rem;
 }
 
 h2 {
-    color: #6c6f85;
-    font-size: 1.8rem;
+    border: solid 2px #8c7862;
+    margin: auto;
+    padding: 8px;
     text-align: center;
-    margin-top: 0;
-    margin-bottom: 0.5rem;
+    width: 400px;
 }
 
 h3 {
-    color: #dc8a78;
-    font-size: 1.3rem;
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-h4 {
-    color: #8c8fa1;
-    font-size: 1.1rem;
+    text-align: center;
     margin-top: 0;
     margin-bottom: 0.5rem;
 }
 
 p {
-    margin: 0px;
+    margin: 1rem;
 }
 
 a {
-    text-decoration: none;
+    border: solid 2px #8c7862;
+    border-radius: 12px;
+    display: inline-block;
+    margin: 6px;
+    margin-top: 0px;
+    max-width: 8rem;
     padding: 8px;
-    color: #8aadf4;
+    text-align: center;
+    text-decoration: none;
+    width: 100%;
 }
 
 a:hover, a:active {
-    border-radius: 9px;
     text-decoration: underline;
-    text-shadow: 1px 1px 1px #333;
-    animation: hover 3s linear infinite;
 }
 
 a.button {
     margin: 14px 10%;
     padding: 4px 12px;
-    border: 1px outset #bcc0cc;
-    border-radius: 9px;
-    color: #1e66f5;
     display: inline-block;
-    background-color: #ccd0da;
     text-decoration: none;
     width: 80px;
     text-align: center;
 }
 
+a:visited {
+    color: #8c7862;
+}
+
 @keyframes hover {
     0% { box-shadow: 0 0 8px 4px #eff1f5; }
     15% { box-shadow: 0 0 8px 4px #bcc0cc; }
@@ -121,30 +137,22 @@ a.button {
 
 @keyframes card {
     0% { box-shadow: 0 0 8px 4px #eff1f5; }
-    50% { box-shadow: 0 0 8px 4px #df8e1d; }
+    50% { box-shadow: 0 0 8px 4px #fe640b; }
     100% { box-shadow: 0 0 8px 4px #eff1f5; }
 }
 
 .card {
-    background: #ccd0da;
     text-align: center;
-    border-radius: 18px;
-    animation: card 3s linear infinite;
-    width: 800px;
-    height: 800px;
     margin: 0px auto;
     margin-top: 25px;
     margin-bottom: 25px;
 }
 
-.cardTop {
-    background: #e6e9ef;
-    border-top-left-radius: 18px;
-    border-top-right-radius: 18px;
+.reserve {
+    max-height: 800px;
 }
 
 #pong {
     margin: 6px;
-    border-radius: 9px;
-    background: #494d64;
+    background: #61937c;
 }

index.html

@@ -3,46 +3,26 @@
 <head>
     <meta charset="utf-8"/>
     <title>Trianta</title>
-  <link rel="stylesheet" href="default.css" />
+    <link rel="stylesheet" href="/default.css">
+    <link rel="stylesheet" href="https://www.nerdfonts.com/assets/css/webfont.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>
-    </div>
-    <div id="main">
-        <div class="card">
-            <h2 class="cardTop">Pong</h2>
-            <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 class="inside">
+        <div style="display: flex;">
+            <a href="/" class="trianta">TRIANTA</a>
+            <div class="column">
+                <a href="https://www.github.com/trimutex" alt="GitHub"><i class="nf nf-dev-github"></i></a>
+                <a href="https://lab.trianta.dev/Trianta" alt="Personal Projects"><i class="nf nf-linux-gitea"></i></a>
+                <a href="/completed" alt="Completed"><i class="nf nf-dev-javascript"></i></a>
+                <a href="/current" alt="Current"><i class="nf nf-dev-git_branch"></i></a>
+                <a href="/other" alt="Other"><i class="nf nf-dev-git_merge"></i></a>
+                <a href="/contact" alt="Contact"><i class="nf nf-oct-feed_person"></i></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>
-            <a class="navItem" href="https://lab.trianta.dev/Trianta/trianta.dev/src/branch/main/src/pong.js">View Code</a>
-        </div>
-        <div class="card">
-            <h2 class="cardTop">Snake</h2>
-            <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>
+        <p>Function over form by design</p>
+        <div style="display: flex;">
+            <div class="column gap"></div>
+            <div class="column content"></div>
         </div>
     </div>
 </body>

package-lock.json

@@ -13,9 +13,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
-      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",

pages/completed/.htaccess

@@ -0,0 +1 @@
+DirectoryIndex index.html

pages/completed/index.html

@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>Trianta</title>
+    <link rel="stylesheet" href="/default.css" />
+</head>
+<body>
+    <div class="inside">
+        <div>
+            <a href="/" class="trianta">TRIANTA</a>
+            <p>Function over form by design</p>
+        </div>
+        <div style="display: flex;">
+            <nav class="column">
+                <ul>
+                    <li><a href="https://www.github.com/trimutex">GitHub</a></li>
+                    <li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
+                    <li><a href="/completed">Completed</a></li>
+                    <li><a href="/current">Current</a></li>
+                    <li><a href="/other">Other</a></li>
+                    <li><a href="/contact">Contact</a></li>
+                </ul>
+            </nav>
+            <div class="column gap"></div>
+            <div class="column content">
+                <h2>Completed Projects</h2>
+                <div class="card reserve">
+                    <div class="canvas">
+                        <canvas width="750" height="585" id="pong"></canvas>
+                        <script src="/public/pong.js"></script>
+                        <div id="gameover" hidden="true">
+                            <h3>Game Over</h3>      
+                        </div>
+                        <div id="restart" hidden="true">
+                            <button class="button" type="button" onclick = "restartGame()">Restart Game</a>
+                        </div>
+                    </div>
+                    <div class="stats">
+                        <p style="font-size: 22px;">Pong</p>
+                        <p>Left Paddle Height: <span id="leftPaddle"></span></p>
+                        <p>Right Paddle Height: <span id="rightPaddle"></span></p>
+                        <a href="https://lab.trianta.dev/Trianta/trianta.dev/src/branch/main/src/pong.js">View Code</a>
+                    </div>
+                </div>
+                <div class="card reserve">
+                    <div class="canvas">
+                        <canvas width="625" height="375" id="snake"></canvas>
+                        <script src="/public/snake.js"></script>
+                    </div>
+                    <div class="stats">
+                        <p style="font-size: 22px;">Snake</p>
+                        <p>
+                            Adjust game size -- Width: 
+                            <input id="snakeWidth" type="number" min="2" max="31" value="31">
+                            Height: 
+                            <input id="snakeHeight" type="number" min="2" max="24" value="24">
+                        </p>
+                        <p>Snake Head Location: <span id="snakeHead"></span></p>
+                        <p>Food Location: <span id="snakeFood"></span></p>
+                        <a href="https://lab.trianta.dev/Trianta/trianta.dev/src/branch/main/src/snake.ts">View Code</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

pages/contact/.htaccess

@@ -0,0 +1 @@
+DirectoryIndex index.html

pages/contact/index.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>Trianta</title>
+    <link rel="stylesheet" href="/default.css" />
+</head>
+<body>
+    <div class="inside">
+        <div>
+            <a href="/" class="trianta">TRIANTA</a>
+            <p>Function over form by design</p>
+        </div>
+        <div style="display: flex;">
+            <nav class="column">
+                <ul>
+                    <li><a href="https://www.github.com/trimutex">GitHub</a></li>
+                    <li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
+                    <li><a href="/completed">Completed</a></li>
+                    <li><a href="/current">Current</a></li>
+                    <li><a href="/other">Other</a></li>
+                    <li><a href="/contact">Contact</a></li>
+                </ul>
+            </nav>
+            <div class="column gap"></div>
+            <div class="column content">
+                <h2>Contact Methods</h2>
+                <p>E-mail:  gregcraw2001@gmail.com</p>
+                <p>Discord: trianta</p>
+                <p>Matrix:  @trimutex:matrix.org</p>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

pages/current/.htaccess

@@ -0,0 +1 @@
+DirectoryIndex index.html

pages/current/index.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>Trianta</title>
+    <link rel="stylesheet" href="/default.css" />
+</head>
+<body>
+    <div class="inside">
+        <div>
+            <a href="/" class="trianta">TRIANTA</a>
+            <p>Function over form by design</p>
+        </div>
+        <div style="display: flex;">
+            <nav class="column">
+                <ul>
+                    <li><a href="https://www.github.com/trimutex">GitHub</a></li>
+                    <li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
+                    <li><a href="/completed">Completed</a></li>
+                    <li><a href="/current">Current</a></li>
+                    <li><a href="/other">Other</a></li>
+                    <li><a href="/contact">Contact</a></li>
+                </ul>
+            </nav>
+            <div class="column gap"></div>
+            <div class="column content">
+                <h2>Current Personal Projects</h2>
+                <div class="card">
+                    <h3>Wrench</h3>
+                    <p>Description: A simple application to handle all of your Linux configuration needs.</p>
+                    <p>Language: C++26</p>
+                    <p>Tools: CMake</p>
+                    <p>Frameworks: Qt6</p>
+                    <a href="https://github.com/Trimutex/wrench">View Repository</a>
+                </div>
+                <div class="card">
+                    <h3>Synopsis</h3>
+                    <p>Description: A markdown repository containing details and changes of servers I maintain.</p>
+                    <a href="https://github.com/Trimutex/synopsis">View Repository</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

pages/other/.htaccess

@@ -0,0 +1 @@
+DirectoryIndex index.html

pages/other/index.html

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>Trianta</title>
+    <link rel="stylesheet" href="/default.css" />
+</head>
+<body>
+    <div class="inside">
+        <div>
+            <a href="/" class="trianta">TRIANTA</a>
+            <p>Function over form by design</p>
+        </div>
+        <div style="display: flex;">
+            <nav class="column">
+                <ul>
+                    <li><a href="https://www.github.com/trimutex">GitHub</a></li>
+                    <li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
+                    <li><a href="/completed">Completed</a></li>
+                    <li><a href="/current">Current</a></li>
+                    <li><a href="/other">Other</a></li>
+                    <li><a href="/contact">Contact</a></li>
+                </ul>
+            </nav>
+            <div class="column gap"></div>
+            <div class="column content">
+                <h2>Other Projects</h2>
+                <div class="card">
+                    <h3>Hyprland</h3>
+                    <p>Description: An independent, highly customizable, dynamic tiling Wayland compositor that doesn't sacrifice on its looks. </p>
+                    <a href="https://github.com/hyprwm/Hyprland">View Repository</a>
+                    <p>Language: C++26</p>
+                    <p>Tools: CMake</p>
+                    <p>and various libraries.</p>
+                    <p>Contributions (newest first)</p>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/8323">hyprwm/Hyprland#8323</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/8044">hyprwm/Hyprland#8044</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7959">hyprwm/Hyprland#7959</a>
+                    <br>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7755">hyprwm/Hyprland#7755</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7683">hyprwm/Hyprland#7683</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7633">hyprwm/Hyprland#7633</a>
+                    <br>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7575">hyprwm/Hyprland#7575</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7458">hyprwm/Hyprland#7458</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/6652">hyprwm/Hyprland#6652</a>
+                </div>
+                <div class="card">
+                    <h3>Proxy</h3>
+                    <p>Description: A program written in C++ to act as a proxy for another server.</p>
+                    <a href="https://lab.trianta.dev/Trianta/proxy-network">View Repository</a>
+                    <p>Language: C++11</p>
+                    <p>Tools: CMake</p>
+                    <p>Testing Frameworks: <a href="https://github.com/ThrowTheSwitch/Unity">Unity Test (ThrowTheSwitch)</a></p>
+                </div>
+                <div class="card">
+                    <h3>Cloudcare</h3>
+                    <p>Description: A sample repository that uses downloaded .bed files to train a model on DNA using PyTorch.</p>
+                    <a href="https://github.com/Trimutex/cloudcare">View Repository</a>
+                    <p>Languages: Python, Bash</p>
+                    <p>Libraries: PyTorch</p>
+                    <p>Tools: Conda</p>
+                </div>
+                <div class="card">
+                    <h3>N-Queens</h3>
+                    <p>Description: The N-Queens problem recreated in C++ which gets solved using a Genetic Algorithm.</p>
+                    <a href="https://lab.trianta.dev/Trianta/n-queens">View Repository</a>
+                    <p>Language: C++11</p>
+                    <p>Tools: CMake</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

src/snake.ts

@@ -158,7 +158,7 @@ class SnakeCore {
                 else if (isBitSet(g_snake.board[i][j], BoardState.FOOD))
                     g_snake.context.fillStyle = "red";
                 else
-                    g_snake.context.fillStyle = "black";
+                    continue;
                 g_snake.context.fillRect(j * g_snake.grid, i * g_snake.grid, g_snake.grid, g_snake.grid);
             }
         }