Compare commits
216 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 41c01fcf55 | |||
| ea61606f68 | |||
| e350bba979 | |||
| 6dc13a5c1e | |||
| a20db4d400 | |||
| de6b32b21e | |||
| f3725f605d | |||
| 7c7cc7130e | |||
| e57719d4f6 | |||
| ff6f212c83 | |||
| 122e341c89 | |||
| 39b848b126 | |||
| 0b367bba27 | |||
| f02b11b418 | |||
| d23375e28b | |||
| dcf2cfb35d | |||
| dd0b5f63fe | |||
| eb0b249d6a | |||
| 8cbaef9afe | |||
| 995eb69937 | |||
| 193dcb2b2b | |||
| d42c59c317 | |||
| 2b5b791399 | |||
| f99105c222 | |||
| ca716de215 | |||
| 7f93e1c58a | |||
| 0f12fd3742 | |||
| 91cefa9033 | |||
| 2f86d84e19 | |||
| dc461f6af0 | |||
| 8b2d332d8b | |||
| 00804e0a30 | |||
| 4b8cac97ad | |||
| 8af19f442c | |||
| 62212f1c7c | |||
| 8751d5aa86 | |||
| 5edb887eec | |||
| dea09e2f50 | |||
| 785266d0e4 | |||
| 4d01c794c0 | |||
| 262246e8f0 | |||
| d3f77572e9 | |||
| 8ca2fa1dc0 | |||
| 56ea11654b | |||
| a732bc46d9 | |||
| e9b0b6131c | |||
| edf95f7873 | |||
| 84947a2ff0 | |||
| be6e110335 | |||
| 4c21ed0fdf | |||
| 6b50321421 | |||
| 27f090907b | |||
| 87c2b8addd | |||
| e281a8fb53 | |||
| c6ade68281 | |||
| 6057267dfa | |||
| 9640c4089d | |||
| f84d79db22 | |||
| 0b0d8e4d8d | |||
| 4bcfe43827 | |||
| e22751a9a1 | |||
| c4cd3ce557 | |||
| 944e698126 | |||
| e90c952f44 | |||
| 476cd8fdb8 | |||
| dcb21f5125 | |||
| 14b599ce10 | |||
| 0cf7fc9f18 | |||
| 7da8c9dc67 | |||
| 96e19e9cef | |||
| a33166ca0e | |||
| d574883963 | |||
| a751832a5c | |||
| 2a5dcb5ed7 | |||
| e399b6ed8e | |||
| e1b559d226 | |||
| 103cd033de | |||
| 1224943b47 | |||
| 697c2dd500 | |||
| 50f1462738 | |||
| 158239726c | |||
| ac770bc509 | |||
| a83b18c30d | |||
| 18881b07cc | |||
| 6964cf3957 | |||
| 6f2461ad5b | |||
| c49a4081f5 | |||
| ccd9b38129 | |||
| 96d0f8ea5b | |||
| 72a640c0a3 | |||
| 09376c4820 | |||
| 8de385132a | |||
| 68e386fade | |||
| cb669ae425 | |||
| db5681df08 | |||
| 2b29ad9671 | |||
| 0ff9ab2acf | |||
| 18503526e1 | |||
| 7403db87d5 | |||
| 712100e68e | |||
| 697c2a2992 | |||
| 0fc9a025d7 | |||
| 1f4ad4ebd3 | |||
| 2008e7ba63 | |||
| 6cc3907ff4 | |||
| 501ef4f2b8 | |||
| e220f9c213 | |||
| b114b117e5 | |||
| 278241eca6 | |||
| 13428ff28b | |||
| 536c8dd473 | |||
| 8c049aa0f7 | |||
| 226cfd3b75 | |||
| 55f39569f3 | |||
| e05506e2ac | |||
| d0c91dafe4 | |||
| 4186f3d319 | |||
| 2ea10b1227 | |||
| f479617192 | |||
| e45f348e47 | |||
| 4442393049 | |||
| 07a1e245f6 | |||
| ecda9ea210 | |||
| 3b666182a3 | |||
| a6ffab5181 | |||
| fa7fc16fd2 | |||
| b87d481826 | |||
| d2ba977656 | |||
| c77b691279 | |||
| 526a0f1952 | |||
| 38f216c2af | |||
| 64b04cc031 | |||
| ddfc99cd9d | |||
| 2d9acc6df7 | |||
| b048216da2 | |||
| 6a7be4362d | |||
| bb119f34c0 | |||
| a0972d19cf | |||
| 6068c2b4fa | |||
| 901faf6d4e | |||
| ed18ddfa59 | |||
| 833cbdbe07 | |||
| f58effc904 | |||
| 84643c765a | |||
| f00bc01ad7 | |||
| 688a31cff9 | |||
| c0f669d419 | |||
| 8e839e4efd | |||
| ad7d7e1c85 | |||
| 794a1c23d0 | |||
| 68b7d66f2d | |||
| c856505bb4 | |||
| e330c9ab08 | |||
| c10676064d | |||
| 95bba8bde1 | |||
| 028ef8df27 | |||
| 9c3539ebef | |||
| 97f832de22 | |||
| b4ef84bc04 | |||
| f3a5359a84 | |||
| c27b5c0ea9 | |||
| f1346a628c | |||
| 343af77bd1 | |||
| 47fd5c7458 | |||
| a754319374 | |||
| 4aeed537d7 | |||
| f725b4e922 | |||
| 8252f38bb7 | |||
| e4d9afdd68 | |||
| 90c868d9e9 | |||
| 452c35c1b0 | |||
| 9dea6014fe | |||
| e37d737d3a | |||
| 65c7b930e3 | |||
| 082176d75e | |||
| 18673c95c4 | |||
| cb52bd1561 | |||
| 0c196e690f | |||
| 532d8a480c | |||
| 92cfd954c1 | |||
| 3bbc9701c5 | |||
| 3699ed465b | |||
| b6fe678367 | |||
| f59e7cf747 | |||
| 33d5c491c2 | |||
| de80157f2e | |||
| 86ef363d3b | |||
| 727e13a1c9 | |||
| acc1e2b042 | |||
| 2916b4e127 | |||
| 61f59208a0 | |||
| 7f23f4a40c | |||
| 457c7a22fa | |||
| 6667a2f79b | |||
| de5f4c5eaf | |||
| 2967663a82 | |||
| 477ce1461e | |||
| 3641cfd836 | |||
| bda79f51a6 | |||
| 98149cae07 | |||
| e0c09898ae | |||
| 0e34226b43 | |||
| 4f6fbc4196 | |||
| b8198afd25 | |||
| 08645727a8 | |||
| c317e7ab08 | |||
| 4f41b247ba | |||
| 10db37262c | |||
| ceeb1f552b | |||
| 8e626448a2 | |||
| f975b0a045 | |||
| 06b7aa8c6f | |||
| 53af784952 | |||
| eb6c023578 | |||
| 0cbdb1f7fc | |||
| 50942522fe |
+11
@@ -0,0 +1,11 @@
|
||||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
||||
|
||||
# dependencies
|
||||
/node_modules
|
||||
|
||||
# production
|
||||
/build
|
||||
|
||||
# typescript
|
||||
*.tsbuildinfo
|
||||
next-env.d.ts
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
FROM nginx:latest
|
||||
|
||||
RUN apt-get update && apt-get install -y nodejs npm netcat-openbsd
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY package*.json ./
|
||||
|
||||
RUN npm install
|
||||
|
||||
COPY . .
|
||||
|
||||
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
|
||||
|
||||
RUN cp /app/build/* ./public
|
||||
|
||||
HEALTHCHECK CMD nc -z 127.0.0.1 80
|
||||
|
||||
EXPOSE 80
|
||||
Vendored
+54
@@ -0,0 +1,54 @@
|
||||
pipeline {
|
||||
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('Test Deploy') {
|
||||
agent { label 'agent-13' }
|
||||
when { expression { return env.GIT_BRANCH != 'origin/main' } }
|
||||
steps {
|
||||
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'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
-142
@@ -1,142 +0,0 @@
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
font-size: 14px;
|
||||
color: #cad3f5;
|
||||
line-height: 1.5;
|
||||
max-width: 1920px;
|
||||
margin-inline: auto;
|
||||
background: #24273a;
|
||||
margin: 0px auto;
|
||||
}
|
||||
|
||||
#navigation {
|
||||
background: #181926;
|
||||
display: flex;
|
||||
border-bottom-left-radius: 18px;
|
||||
border-bottom-right-radius: 18px;
|
||||
}
|
||||
|
||||
.navItem {
|
||||
margin: 6px;
|
||||
margin-top: 0px;
|
||||
padding: 8px;
|
||||
line-height: 21px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
#top {
|
||||
margin-bottom: 6px;
|
||||
border-radius: 16px;
|
||||
border-top-left-radius: 0px;
|
||||
margin: 4px auto;
|
||||
margin-top: 0px;
|
||||
height: 55px;
|
||||
}
|
||||
|
||||
#main {
|
||||
/*background: #1e2030;*/
|
||||
}
|
||||
|
||||
.cardStats {
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
h2 {
|
||||
color: #6c6f85;
|
||||
font-size: 1.8rem;
|
||||
text-align: center;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
h3 {
|
||||
color: #dc8a78;
|
||||
font-size: 1.3rem;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
h4 {
|
||||
color: #8c8fa1;
|
||||
font-size: 1.1rem;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
a {
|
||||
text-decoration: none;
|
||||
padding: 8px;
|
||||
color: #8aadf4;
|
||||
}
|
||||
|
||||
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 #494d64;
|
||||
border-radius: 9px;
|
||||
color: #8aadf4;
|
||||
display: inline-block;
|
||||
background-color: #363a4f;
|
||||
text-decoration: none;
|
||||
width: 80px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
@keyframes hover {
|
||||
0% { box-shadow: 0 0 8px 4px #24273a; }
|
||||
15% { box-shadow: 0 0 8px 4px #494d64; }
|
||||
50% { box-shadow: 0 0 8px 4px #b7bdf8; }
|
||||
85% { box-shadow: 0 0 8px 4px #494d64; }
|
||||
100% { box-shadow: 0 0 8px 4px #24273a; }
|
||||
}
|
||||
|
||||
@keyframes card {
|
||||
0% { box-shadow: 0 0 8px 4px #24273a; }
|
||||
50% { box-shadow: 0 0 8px 4px #df8e1d; }
|
||||
100% { box-shadow: 0 0 8px 4px #24273a; }
|
||||
}
|
||||
|
||||
.card {
|
||||
background: #363a4f;
|
||||
text-align: center;
|
||||
border-radius: 6px;
|
||||
border-top-left-radius: 18px;
|
||||
border-top-right-radius: 18px;
|
||||
animation: card 3s linear infinite;
|
||||
max-width: 800px;
|
||||
margin: 0px auto;
|
||||
}
|
||||
|
||||
.cardTop {
|
||||
background: #1e2030;
|
||||
border-top-left-radius: 18px;
|
||||
border-top-right-radius: 18px;
|
||||
}
|
||||
|
||||
#pong {
|
||||
margin: 6px;
|
||||
border-radius: 9px;
|
||||
background: #494d64;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
+158
@@ -0,0 +1,158 @@
|
||||
/*
|
||||
* text / border: #8c7862
|
||||
* foreground: #89bea6
|
||||
* background: #61937c
|
||||
*/
|
||||
|
||||
|
||||
body {
|
||||
font-family: "Departure Mono", sans-serif;
|
||||
font-optical-sizing: auto;
|
||||
font-weight: 400;
|
||||
color: #8c7862;
|
||||
background: #61937c;
|
||||
line-height: 1.5;
|
||||
margin-inline: auto;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.inside {
|
||||
max-width: 60rem;
|
||||
margin: 0 auto;
|
||||
padding: 2rem 1.5rem;
|
||||
background: #89bea6;
|
||||
border: 4px solid #8c7862;
|
||||
}
|
||||
|
||||
nav {
|
||||
padding: 1rem;
|
||||
text-align: center;
|
||||
width: 6rem;
|
||||
}
|
||||
|
||||
nav ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.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 {
|
||||
margin: auto;
|
||||
display: inline-block;
|
||||
width: 60rem;
|
||||
vertical-align: bottom;
|
||||
border: solid 4px #8c7862;
|
||||
}
|
||||
|
||||
.stats {
|
||||
font-size: 18px;
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
h1 {
|
||||
max-width: 650px;
|
||||
text-align: left;
|
||||
padding: 8px 1.5rem;
|
||||
}
|
||||
|
||||
h2 {
|
||||
border: solid 2px #8c7862;
|
||||
margin: auto;
|
||||
padding: 8px;
|
||||
text-align: center;
|
||||
width: 400px;
|
||||
}
|
||||
|
||||
h3 {
|
||||
text-align: center;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 1rem;
|
||||
}
|
||||
|
||||
a {
|
||||
border: solid 2px #8c7862;
|
||||
border-radius: 12px;
|
||||
display: inline-block;
|
||||
margin: 6px;
|
||||
margin-top: 0px;
|
||||
max-width: 8rem;
|
||||
padding: 8px;
|
||||
text-align: center;
|
||||
text-decoration: none;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
a:hover, a:active {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
a.button {
|
||||
margin: 14px 10%;
|
||||
padding: 4px 12px;
|
||||
display: inline-block;
|
||||
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; }
|
||||
50% { box-shadow: 0 0 8px 4px #7287fd; }
|
||||
85% { box-shadow: 0 0 8px 4px #bcc0cc; }
|
||||
100% { box-shadow: 0 0 8px 4px #eff1f5; }
|
||||
}
|
||||
|
||||
@keyframes card {
|
||||
0% { box-shadow: 0 0 8px 4px #eff1f5; }
|
||||
50% { box-shadow: 0 0 8px 4px #fe640b; }
|
||||
100% { box-shadow: 0 0 8px 4px #eff1f5; }
|
||||
}
|
||||
|
||||
.card {
|
||||
text-align: center;
|
||||
margin: 0px auto;
|
||||
margin-top: 25px;
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
.reserve {
|
||||
max-height: 800px;
|
||||
}
|
||||
|
||||
#pong {
|
||||
margin: 6px;
|
||||
background: #61937c;
|
||||
}
|
||||
+16
-18
@@ -3,28 +3,26 @@
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<title>Trianta</title>
|
||||
<link rel="stylesheet" href="css/home.css" />
|
||||
<link rel="stylesheet" href="/default.css">
|
||||
<link rel="stylesheet" href="https://www.nerdfonts.com/assets/css/webfont.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="navigation" style="margin-bottom: 30px;">
|
||||
<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 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 id="main">
|
||||
<div class="card">
|
||||
<h2 class="cardTop">Pong</h2>
|
||||
<canvas width="750" height="585" id="pong"></canvas>
|
||||
<script src="js/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>
|
||||
<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/js/pong.js">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>
|
||||
|
||||
Generated
+29
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"name": "trianta.dev",
|
||||
"version": "0.2.2",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "trianta.dev",
|
||||
"version": "0.2.2",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"typescript": "^5.5.4"
|
||||
}
|
||||
},
|
||||
"node_modules/typescript": {
|
||||
"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",
|
||||
"tsserver": "bin/tsserver"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.17"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"name": "trianta.dev",
|
||||
"version": "0.2.2",
|
||||
"description": "My personal website",
|
||||
"main": "index.html",
|
||||
"scripts": {
|
||||
"build": "tsc",
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://lab.trianta.dev/Trianta/trianta.dev.git"
|
||||
},
|
||||
"author": "trianta",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"typescript": "^5.5.4"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
DirectoryIndex 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>
|
||||
@@ -0,0 +1 @@
|
||||
DirectoryIndex 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>
|
||||
@@ -0,0 +1 @@
|
||||
DirectoryIndex 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>
|
||||
@@ -0,0 +1 @@
|
||||
DirectoryIndex 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>
|
||||
+302
@@ -0,0 +1,302 @@
|
||||
enum BoardState {
|
||||
SNAKE = 0,
|
||||
FOOD = 1,
|
||||
CHECKED = 2 // For search algorithms
|
||||
}
|
||||
|
||||
// Bit functions for ease
|
||||
function isBitSet(value: number, bit: number): boolean {
|
||||
return ((value >> bit) % 2 != 0)
|
||||
}
|
||||
|
||||
function bitSet(value: number, bit: number): number {
|
||||
return value | 1 << bit;
|
||||
}
|
||||
|
||||
function bitClear(value: number, bit: number): number {
|
||||
return value & ~(1 << bit);
|
||||
}
|
||||
|
||||
class Point {
|
||||
x: number;
|
||||
y: number;
|
||||
|
||||
constructor(x = 0, y = 0) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
}
|
||||
|
||||
copy(other: Point) {
|
||||
this.x = other.x;
|
||||
this.y = other.y;
|
||||
}
|
||||
|
||||
add(other: Point) {
|
||||
var result = new Point;
|
||||
result.x = this.x + other.x;
|
||||
result.y = this.y + other.y;
|
||||
return result;
|
||||
}
|
||||
|
||||
subtract(other: Point) {
|
||||
var result = new Point;
|
||||
result.x = this.x - other.x;
|
||||
result.y = this.y - other.y;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
class SnakeCore {
|
||||
canvas: HTMLCanvasElement;
|
||||
context: CanvasRenderingContext2D;
|
||||
grid: number;
|
||||
timeout: number;
|
||||
width: number;
|
||||
height: number;
|
||||
board: number[][];
|
||||
body: Point[];
|
||||
food: Point;
|
||||
gameover: boolean;
|
||||
foodAte: boolean;
|
||||
|
||||
constructor() {
|
||||
this.canvas = document.getElementById('snake') as HTMLCanvasElement;
|
||||
this.context = this.canvas.getContext('2d') as CanvasRenderingContext2D;
|
||||
this.grid = 25; // size of grid squares
|
||||
this.timeout = 32; // speed in ms
|
||||
this.width = 25;
|
||||
this.height = 15;
|
||||
this.board = [];
|
||||
for (let i = 0; i < this.height; i++)
|
||||
this.board.push(new Array(this.width));
|
||||
this.body = [];
|
||||
this.food = new Point();
|
||||
this.gameover = false;
|
||||
this.foodAte = true;
|
||||
this.body.push(new Point(12, 8));
|
||||
this.board[8][12] = 1;
|
||||
}
|
||||
|
||||
get head(): Point {
|
||||
return this.body[this.body.length - 1];
|
||||
}
|
||||
|
||||
reset() {
|
||||
console.debug("[TRACE] Reset was triggered");
|
||||
this.gameover = false;
|
||||
this.foodAte = true;
|
||||
for (let i = 0; i < this.height; i++) {
|
||||
for (let j = 0; j < this.width; j++) {
|
||||
this.board[i][j] = 0;
|
||||
}
|
||||
}
|
||||
while (this.body.length > 0)
|
||||
this.body.pop();
|
||||
while (g_snakebot.path.length > 0)
|
||||
g_snakebot.path.pop();
|
||||
this.startRandom();
|
||||
this.foodRegen();
|
||||
this.draw();
|
||||
}
|
||||
|
||||
startRandom() {
|
||||
this.body.push(new Point(Math.floor(Math.random() * this.width), Math.floor(Math.random() * this.height)));
|
||||
}
|
||||
|
||||
foodRegen() {
|
||||
if (!this.foodAte)
|
||||
return;
|
||||
console.debug("[TRACE] Food reset was triggered");
|
||||
this.foodAte = false;
|
||||
while (true) {
|
||||
let tmp = new Point(Math.floor(Math.random() * this.width), Math.floor(Math.random() * this.height));
|
||||
if (isBitSet(this.board[tmp.y][tmp.x], BoardState.SNAKE))
|
||||
continue;
|
||||
this.board[tmp.y][tmp.x] = bitSet(this.board[tmp.y][tmp.x], BoardState.FOOD);
|
||||
this.food.copy(tmp);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Simulate game logic
|
||||
simulate() {
|
||||
// Move snake
|
||||
let next: Point = new Point;
|
||||
next.copy(g_snakebot.nextMove());
|
||||
if (next.x < 0 || next.x > g_snake.width || next.y < 0 || next.y > g_snake.height) {
|
||||
g_snake.gameover = true;
|
||||
return;
|
||||
}
|
||||
if (isBitSet(g_snake.board[next.y][next.x], BoardState.SNAKE) && (g_snake.body.length > 1)) {
|
||||
g_snake.gameover = true; // Game should end (Snake touching snake)
|
||||
return;
|
||||
}
|
||||
|
||||
g_snake.board[next.y][next.x] = bitSet(g_snake.board[next.y][next.x], BoardState.SNAKE);
|
||||
g_snake.body.push(next);
|
||||
if (!isBitSet(g_snake.board[next.y][next.x], BoardState.FOOD)) {
|
||||
let old: Point = g_snake.body.shift() as Point;
|
||||
g_snake.board[old.y][old.x] = bitClear(g_snake.board[old.y][old.x], BoardState.SNAKE);
|
||||
} else {
|
||||
g_snake.board[next.y][next.x] = bitClear(g_snake.board[next.y][next.x], BoardState.FOOD);
|
||||
g_snake.foodAte = true;
|
||||
while (g_snakebot.path.length > 0)
|
||||
g_snakebot.path.pop();
|
||||
}
|
||||
}
|
||||
|
||||
// Draw game to canvas
|
||||
draw() {
|
||||
// Clear the screen
|
||||
g_snake.context.clearRect(0, 0, g_snake.canvas.width, g_snake.canvas.height);
|
||||
|
||||
// Draw game
|
||||
for (let i = 0; i < g_snake.height; i++) {
|
||||
for (let j = 0; j < g_snake.width; j++) {
|
||||
if (isBitSet(g_snake.board[i][j], BoardState.SNAKE))
|
||||
g_snake.context.fillStyle = "green";
|
||||
else if (isBitSet(g_snake.board[i][j], BoardState.FOOD))
|
||||
g_snake.context.fillStyle = "red";
|
||||
else
|
||||
continue;
|
||||
g_snake.context.fillRect(j * g_snake.grid, i * g_snake.grid, g_snake.grid, g_snake.grid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Update text on page to match game
|
||||
updatePageText() {
|
||||
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 {
|
||||
pathUntrimmed: Point[];
|
||||
path: Point[];
|
||||
|
||||
constructor() {
|
||||
this.pathUntrimmed = [];
|
||||
this.path = [];
|
||||
}
|
||||
|
||||
bfs() {
|
||||
var search: Point[] = [g_snake.head];
|
||||
while (search.length !== 0) {
|
||||
let current: Point = search.shift() as Point;
|
||||
if (isBitSet(g_snake.board[current.y][current.x], BoardState.CHECKED))
|
||||
continue;
|
||||
this.pathUntrimmed.push(current);
|
||||
let locals: Point[] = new Array(4);
|
||||
for (var i = 0; i < 4; i++) {
|
||||
locals[i] = new Point;
|
||||
locals[i].copy(current);
|
||||
}
|
||||
locals[0].y += 1;
|
||||
locals[1].x += 1;
|
||||
locals[2].y -= 1;
|
||||
locals[3].x -= 1;
|
||||
for (const local of locals) {
|
||||
if (local.x < 0 || local.x > g_snake.width - 1 || local.y < 0 || local.y > g_snake.height - 1)
|
||||
continue;
|
||||
let value = g_snake.board[local.y][local.x];
|
||||
if (isBitSet(value, BoardState.FOOD)) {
|
||||
this.pathUntrimmed.push(local);
|
||||
return;
|
||||
}
|
||||
if (isBitSet(value, BoardState.CHECKED) || isBitSet(value, BoardState.SNAKE))
|
||||
continue;
|
||||
search.push(local);
|
||||
}
|
||||
g_snake.board[current.y][current.x] = bitSet(g_snake.board[current.y][current.x], BoardState.CHECKED);
|
||||
}
|
||||
}
|
||||
|
||||
trim() {
|
||||
let reachedSnake = false;
|
||||
this.path.push(this.pathUntrimmed.pop() as Point); // Push food location
|
||||
while (this.pathUntrimmed.length !== 0) {
|
||||
let location: Point = this.pathUntrimmed.pop();
|
||||
if (reachedSnake)
|
||||
continue;
|
||||
if (isBitSet(g_snake.board[location.y][location.x], BoardState.SNAKE)) {
|
||||
reachedSnake = true;
|
||||
continue;
|
||||
}
|
||||
var delta = new Point;
|
||||
delta = location.subtract(this.path[this.path.length - 1]);
|
||||
if ((Math.abs(delta.x) + Math.abs(delta.y)) === 1)
|
||||
this.path.push(location);
|
||||
}
|
||||
}
|
||||
|
||||
unvisit() {
|
||||
for (let i = 0; i < g_snake.height; i++) {
|
||||
for (let j = 0; j < g_snake.width; j++) {
|
||||
g_snake.board[i][j] = bitClear(g_snake.board[i][j], BoardState.CHECKED);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
nextMove() {
|
||||
// Get new path to food
|
||||
if (this.path.length === 0)
|
||||
this.pathRefresh();
|
||||
var next: Point = new Point;
|
||||
next.copy(this.path.pop());
|
||||
var delta = new Point;
|
||||
delta = next.subtract(g_snake.head);
|
||||
if (delta.x > 1)
|
||||
console.log("[ERR] delta.x > 1");
|
||||
else if (delta.x < -1)
|
||||
console.log("[ERR] delta.x < 1");
|
||||
if (delta.y > 1)
|
||||
console.log("[ERR] delta.y > 1");
|
||||
else if (delta.y < -1)
|
||||
console.log("[ERR] delta.y < 1");
|
||||
return next;
|
||||
}
|
||||
|
||||
pathRefresh() {
|
||||
this.bfs();
|
||||
this.trim();
|
||||
this.unvisit();
|
||||
}
|
||||
}
|
||||
|
||||
const g_snake: SnakeCore = new SnakeCore();
|
||||
const g_snakebot: Bot = new Bot();
|
||||
|
||||
// game loop
|
||||
function snakeloop() {
|
||||
// Reset of needed
|
||||
if (g_snake.gameover || g_snake.getPageNumbers())
|
||||
g_snake.reset();
|
||||
|
||||
// Simulate movement of snake
|
||||
g_snake.simulate();
|
||||
|
||||
// Regenerate food if needed
|
||||
g_snake.foodRegen();
|
||||
|
||||
g_snake.draw();
|
||||
g_snake.updatePageText();
|
||||
}
|
||||
|
||||
// start the game
|
||||
setInterval(snakeloop, g_snake.timeout);
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"outDir": "./build",
|
||||
"allowJs": true,
|
||||
"target": "es5"
|
||||
},
|
||||
"include": ["./src/**/*"]
|
||||
}
|
||||
Reference in New Issue
Block a user