jenkins: finally fix pipeline

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

@@ -4,11 +4,56 @@
  * background: #03001C
  */
 
+
+/* colors
+@define-color fg    #504945;
+@define-color bg    #fbf1c7;
+@define-color imp   #d79921;
+
+@define-color fg            #3c3836;
+@define-color fg0           #282828;
+@define-color fg1           #3c3836;
+@define-color fg2           #504945;
+@define-color fg3           #665c54;
+@define-color fg4           #7c6f64;
+
+@define-color bg            #fbf1c7;
+@define-color bg0           #fbf1c7;
+@define-color bg0_h         #f9f5d7;
+@define-color bg0_s         #f2e5bc;
+@define-color bg1           #ebdbb2;
+@define-color bg2           #d5c4a1;
+@define-color bg3           #bdae93;
+@define-color bg4           #a89984;
+
+@define-color gray          #7c6f64;
+@define-color red           #cc241d;
+@define-color green         #98971a;
+@define-color yellow        #d79921;
+@define-color blue          #458588;
+@define-color purple        #b16286;
+@define-color aqua          #689d6a;
+@define-color orange        #d65d0e;
+@define-color peach         #fe640b;
+
+@define-color alt_gray      #928374;
+@define-color alt_red       #9d0006;
+@define-color alt_green     #79740e;
+@define-color alt_yellow    #b57614;
+@define-color alt_blue      #076678;
+@define-color alt_purple    #8f3f71;
+@define-color alt_aqua      #427b58;
+@define-color alt_orange    #af3a03;
+*/
+
+
+
 body {
-    font-family: Arial, sans-serif;
-    font-weight: 800;
-    color: #06CDFF;
-    background: #03001C;
+    font-family: "Noto Sans Symbols", sans-serif;
+    font-optical-sizing: auto;
+    font-weight: 400;
+    color: #504945;
+    background: #fbf1c7;
     line-height: 1.5;
     margin-inline: auto;
     margin: 0 auto;
@@ -51,11 +96,9 @@ nav ul {
 }
 
 .trianta {
-    border: none !important;
-    color: #06CDFF !important;
+    color: #d79921 !important;
     font-size: 2.5rem !important;
     min-width: 12rem;
-    margin: -1rem;
 }
 
 .canvas {
@@ -63,13 +106,12 @@ nav ul {
     display: inline-block;
     width: 60rem;
     vertical-align: bottom;
-    border: solid 4px #06CDFF;
+    border: solid 4px #d79921;
 }
 
 .stats {
     font-size: 18px;
     display: inline-block;
-    width: 12rem;
     vertical-align: middle;
 }
 
@@ -80,7 +122,7 @@ h1 {
 }
 
 h2 {
-    border: solid 2px #06CDFF;
+    border: solid 2px #d79921;
     margin: auto;
     padding: 8px;
     text-align: center;
@@ -94,14 +136,12 @@ h3 {
 }
 
 p {
-    margin: 0px;
+    margin: 1rem;
 }
 
 a {
-    background-color: #03001C;
-    border: solid 2px #06CDFF;
+    border: solid 2px #d79921;
     border-radius: 12px;
-    color: #06CDFF;
     display: inline-block;
     margin: 6px;
     margin-top: 0px;
@@ -126,8 +166,7 @@ a.button {
 }
 
 a:visited {
-    border: solid 2px #8200FF;
-    color: #8200FF;
+    border: solid 2px #d79921;
 }
 
 @keyframes hover {

index.html

@@ -4,24 +4,25 @@
     <meta charset="utf-8"/>
     <title>Trianta</title>
     <link rel="stylesheet" href="/default.css" />
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Noto+Sans+Symbols:wght@100..900&display=swap');
+    </style>
 </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>
+            <a href="/" class="trianta">TRIANTA</a>
+            <div class="column">
+                <a href="https://www.github.com/trimutex" alt="GitHub"></a>
+                <a href="https://lab.trianta.dev/Trianta" alt="Personal Projects"></a>
+                <a href="/completed" alt="Completed"></a>
+                <a href="/current" alt="Current"></a>
+                <a href="/other" alt="Other"></a>
+                <a href="/contact" alt="Contact">󰀄</a>
+            </div>
+        </div>
+        <p>Function over form by design</p>
+        <div style="display: flex;">
             <div class="column gap"></div>
             <div class="column content"></div>
         </div>

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/contact/index.html

@@ -27,6 +27,7 @@
                 <h2>Contact Methods</h2>
                 <p>E-mail:  gregcraw2001@gmail.com</p>
                 <p>Discord: trianta</p>
+                <p>Matrix:  @trimutex:matrix.org</p>
             </div>
         </div>
     </div>