Compare commits

..

No commits in common. "d3f77572e9de914bc4233d10b9ca6ab5e5038c0a" and "a7543193740a22c0ce58ea0c1066e137c1961b10" have entirely different histories.

12 changed files with 110 additions and 298 deletions

View File

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

View File

@ -1,67 +1,75 @@
/*
* base text: #06CDFF
* important text: #8200FF
* background: #03001C
*/
body { body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
color: #06CDFF; font-size: 14px;
background: #03001C; color: #cad3f5;
line-height: 1.5; line-height: 1.5;
max-width: 1920px;
margin-inline: auto; margin-inline: auto;
margin: 0 auto; background: #24273a;
} margin: 0px auto;
.inside {
max-width: 80rem;
margin: 0 auto;
padding: 2rem 1.5rem;
} }
#navigation { #navigation {
padding: 1rem; background: #181926;
text-align: center; display: flex;
border-bottom-left-radius: 18px;
border-bottom-right-radius: 18px;
} }
.trianta { .navItem {
font-size: 3.5rem !important; margin: 6px;
color: #06CDFF !important; margin-top: 0px;
border: none !important; padding: 8px;
margin: -1rem; line-height: 21px;
}
.canvas {
margin: auto;
display: inline-block; display: inline-block;
width: 60rem;
vertical-align: bottom;
border: solid 4px #06CDFF;
} }
.stats { #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; font-size: 18px;
display: inline-block;
width: 12rem;
vertical-align: middle;
} }
h1 { h1 {
max-width: 650px; width: 130px;
text-align: left; text-align: center;
padding: 8px 1.5rem; display: inline-block;
font-size: 1.8rem;
margin: 0px;
padding: 8px;
border-top-left-radius: 18px;
border-top-right-radius: 18px;
} }
h2 { h2 {
border: solid 2px #06CDFF; color: #6c6f85;
margin: auto; font-size: 1.8rem;
padding: 8px;
text-align: center; text-align: center;
width: 400px; margin-top: 0;
margin-bottom: 0.5rem;
} }
h3 { h3 {
text-align: center; color: #dc8a78;
font-size: 1.3rem;
margin-top: 0;
margin-bottom: 0;
}
h4 {
color: #8c8fa1;
font-size: 1.1rem;
margin-top: 0; margin-top: 0;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
} }
@ -71,64 +79,67 @@ p {
} }
a { a {
background-color: #03001C;
border: solid 2px #06CDFF;
border-radius: 12px;
color: #06CDFF;
display: inline-block;
margin: 6px;
margin-top: 0px;
max-width: 8rem;
padding: 8px;
text-align: center;
text-decoration: none; text-decoration: none;
width: 100%; padding: 8px;
color: #8aadf4;
} }
a:hover, a:active { a:hover, a:active {
border-radius: 9px;
text-decoration: underline; text-decoration: underline;
text-shadow: 1px 1px 1px #333;
animation: hover 3s linear infinite;
} }
a.button { a.button {
margin: 14px 10%; margin: 14px 10%;
padding: 4px 12px; padding: 4px 12px;
border: 1px outset #494d64;
border-radius: 9px;
color: #8aadf4;
display: inline-block; display: inline-block;
background-color: #363a4f;
text-decoration: none; text-decoration: none;
width: 80px; width: 80px;
text-align: center; text-align: center;
} }
a:visited {
border: solid 2px #8200FF;
color: #8200FF;
}
@keyframes hover { @keyframes hover {
0% { box-shadow: 0 0 8px 4px #eff1f5; } 0% { box-shadow: 0 0 8px 4px #24273a; }
15% { box-shadow: 0 0 8px 4px #bcc0cc; } 15% { box-shadow: 0 0 8px 4px #494d64; }
50% { box-shadow: 0 0 8px 4px #7287fd; } 50% { box-shadow: 0 0 8px 4px #b7bdf8; }
85% { box-shadow: 0 0 8px 4px #bcc0cc; } 85% { box-shadow: 0 0 8px 4px #494d64; }
100% { box-shadow: 0 0 8px 4px #eff1f5; } 100% { box-shadow: 0 0 8px 4px #24273a; }
} }
@keyframes card { @keyframes card {
0% { box-shadow: 0 0 8px 4px #eff1f5; } 0% { box-shadow: 0 0 8px 4px #24273a; }
50% { box-shadow: 0 0 8px 4px #fe640b; } 50% { box-shadow: 0 0 8px 4px #df8e1d; }
100% { box-shadow: 0 0 8px 4px #eff1f5; } 100% { box-shadow: 0 0 8px 4px #24273a; }
} }
.card { .card {
background: #363a4f;
text-align: center; text-align: center;
border-radius: 6px;
border-top-left-radius: 18px;
border-top-right-radius: 18px;
animation: card 3s linear infinite;
width: 800px;
height: 800px;
margin: 0px auto; margin: 0px auto;
margin-top: 25px; margin-top: 25px;
margin-bottom: 25px; margin-bottom: 25px;
} }
.reserve { .cardTop {
max-height: 800px; background: #1e2030;
border-top-left-radius: 18px;
border-top-right-radius: 18px;
} }
#pong { #pong {
margin: 6px; margin: 6px;
background: #03001C; border-radius: 9px;
background: #494d64;
} }

View File

@ -3,21 +3,36 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>Trianta</title> <title>Trianta</title>
<link rel="stylesheet" href="/default.css" /> <link rel="stylesheet" href="default.css" />
</head> </head>
<body> <body>
<div class="inside">
<div>
<a href="/" class="trianta">TRIANTA</a>
<p>Function over form by design</p>
</div>
<div id="navigation"> <div id="navigation">
<a href="https://www.github.com/trimutex">GitHub</a> <a class="navItem" href="https://www.github.com/trimutex">GitHub</a>
<a href="https://lab.trianta.dev/Trianta">Projects</a> <a class="navItem" href="https://lab.trianta.dev/Trianta">Projects</a>
<a href="/completed">Completed</a> <p class="navItem" style="text-align: right; flex-grow: 1;">Trianta</p>
<a href="/current">Current</a> </div>
<a href="/other">Other</a> <div id="main">
<a href="/contact">Contact</a> <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>
<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>
<canvas width="625" height="375" id="snake"></canvas>
<script src="public/snake.js"></script>
<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>
</div> </div>
</div> </div>
</body> </body>

View File

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

View File

@ -1,61 +0,0 @@
<!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 id="navigation">
<a href="https://www.github.com/trimutex">GitHub</a>
<a href="https://lab.trianta.dev/Trianta">Projects</a>
<a href="/completed">Completed</a>
<a href="/current">Current</a>
<a href="/other">Other</a>
<a href="/contact">Contact</a>
</div>
<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>
</body>
</html>

View File

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

View File

@ -1,27 +0,0 @@
<!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 id="navigation">
<a href="https://www.github.com/trimutex">GitHub</a>
<a href="https://lab.trianta.dev/Trianta">Projects</a>
<a href="/completed">Completed</a>
<a href="/current">Current</a>
<a href="/other">Other</a>
<a href="/contact">Contact</a>
</div>
<h2>Contact Methods</h2>
<p>E-mail: gregcraw2001@gmail.com</p>
<p>Discord: trianta</p>
</div>
</body>
</html>

View File

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

View File

@ -1,38 +0,0 @@
<!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 id="navigation">
<a href="https://www.github.com/trimutex">GitHub</a>
<a href="https://lab.trianta.dev/Trianta">Projects</a>
<a href="/completed">Completed</a>
<a href="/current">Current</a>
<a href="/other">Other</a>
<a href="/contact">Contact</a>
</div>
<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>
</body>
</html>

View File

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

View File

@ -1,68 +0,0 @@
<!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 id="navigation">
<a href="https://www.github.com/trimutex">GitHub</a>
<a href="https://lab.trianta.dev/Trianta">Projects</a>
<a href="/completed">Completed</a>
<a href="/current">Current</a>
<a href="/other">Other</a>
<a href="/contact">Contact</a>
</div>
<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>
</body>
</html>

View File

@ -158,7 +158,7 @@ class SnakeCore {
else if (isBitSet(g_snake.board[i][j], BoardState.FOOD)) else if (isBitSet(g_snake.board[i][j], BoardState.FOOD))
g_snake.context.fillStyle = "red"; g_snake.context.fillStyle = "red";
else else
continue; g_snake.context.fillStyle = "black";
g_snake.context.fillRect(j * g_snake.grid, i * g_snake.grid, g_snake.grid, g_snake.grid); g_snake.context.fillRect(j * g_snake.grid, i * g_snake.grid, g_snake.grid, g_snake.grid);
} }
} }
@ -169,21 +169,6 @@ class SnakeCore {
document.getElementById("snakeHead").innerHTML = "x: " + this.body[this.body.length - 1].x + " y: " + this.body[this.body.length - 1].y; 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 ; 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 { class Bot {
@ -285,7 +270,7 @@ const g_snakebot: Bot = new Bot();
// game loop // game loop
function snakeloop() { function snakeloop() {
// Reset of needed // Reset of needed
if (g_snake.gameover || g_snake.getPageNumbers()) if (g_snake.gameover)
g_snake.reset(); g_snake.reset();
// Simulate movement of snake // Simulate movement of snake