diff --git a/compose.yml b/compose.yml deleted file mode 100644 index adb2eab..0000000 --- a/compose.yml +++ /dev/null @@ -1,13 +0,0 @@ -#version: '3' - -services: - sampleweb: - build: . -# ports: -# - "8000:3000" - labels: - - "traefik.http.routers.sampleweb.rule=Host(`ward.truyen.network`) && PathPrefix(`/`)" - - "traefik.http.routers.sampleweb.entrypoints=websecure" -# - "traefik.http.routers.sampleweb.tls=true" -# - "traefik.http.routers.sampleweb.tls.certresolver=letsencrypt" - - "traefik.enable=true" diff --git a/docker/compose.yml b/docker/compose.yml new file mode 100644 index 0000000..2c5733b --- /dev/null +++ b/docker/compose.yml @@ -0,0 +1,17 @@ +services: + ward: + build: ward + labels: + - "traefik.http.routers.sampleweb.rule=Host(`ward.truyen.network`) && PathPrefix(`/`)" + - "traefik.http.routers.sampleweb.entrypoints=websecure" +# - "traefik.http.routers.sampleweb.tls=true" +# - "traefik.http.routers.sampleweb.tls.certresolver=letsencrypt" + - "traefik.enable=true" + root: + build: root + labels: + - "traefik.http.routers.sampleweb.rule=Host(`truyen.network`) && PathPrefix(`/`)" + - "traefik.http.routers.sampleweb.entrypoints=websecure" +# - "traefik.http.routers.sampleweb.tls=true" +# - "traefik.http.routers.sampleweb.tls.certresolver=letsencrypt" + - "traefik.enable=true" diff --git a/Dockerfile b/docker/root/Dockerfile similarity index 85% rename from Dockerfile rename to docker/root/Dockerfile index 2eab014..c2d749a 100644 --- a/Dockerfile +++ b/docker/root/Dockerfile @@ -1,7 +1,7 @@ FROM node:lts-alpine3.20 WORKDIR /app -COPY src/ . +COPY ../../src/root . RUN npm install --global serve EXPOSE 3000 diff --git a/docker/ward/Dockerfile b/docker/ward/Dockerfile new file mode 100644 index 0000000..63420cd --- /dev/null +++ b/docker/ward/Dockerfile @@ -0,0 +1,9 @@ +FROM node:lts-alpine3.20 + +WORKDIR /app +COPY ../../src/ward . + +RUN npm install --global serve +EXPOSE 3000 +CMD [ "serve", "." ] +#http://localhost:3000 diff --git a/makefile b/makefile index d1a6483..1473ebb 100644 --- a/makefile +++ b/makefile @@ -12,10 +12,10 @@ docker: docker-compose docker-compose: docker-compose-up docker-compose-up: - docker compose up -d + docker compose -f docker/compose/yml up -d docker-compose-down: - docker compose down + docker compose -f docker/compose/yml down docker-build: docker build -t $(imageName) . diff --git a/src/root/css/main.css b/src/root/css/main.css new file mode 100644 index 0000000..761559c --- /dev/null +++ b/src/root/css/main.css @@ -0,0 +1,81 @@ +/* Author: Ward Truyen + * Version: 1.3.0 + */ + +html, +body { + margin: 0px; + padding: 0px; + background-image: linear-gradient(30deg, #FF72736F 70%, #FF72732F); + height: 100%; + display: flex; + flex-direction: column; +} + +main { + margin: auto; + width: 80%; + border: 2px solid darkgreen; + padding: 10px; + background-color: white; + box-shadow: 3px 3px 3px black; +} + +h1 { + margin-top: 4px; + margin-bottom: 8px; + text-decoration: underline; +} + +header { + padding: 2px 16px 4px 16px; + /* width: 100%; */ + border-bottom: 1px solid black; + /* background-image: linear-gradient(#0000008f, #0000004f); */ + background-color: #80808080; + /* linear-gradient(#0000008f, #0000004f);*/ + /* margin-top: 16px; */ + text-shadow: 1px 1px 1px #0000004f; +} + +header a { + /* border: solid 1px black; */ + padding: 2px; + margin: 1px; +} + +footer { + padding: 8px 16px 4px 16px; + /* width: 100%; */ + border-top: 1px solid black; + /* background-color: #0000004f; */ + background-image: linear-gradient(#0000008f, #0000004f); + /* margin-top: 16px; */ + margin-top: auto; + text-shadow: 1px 1px 1px #0000004f; +} + +footer h1, +footer h2, +footer h3, +footer p { + display: inline; + margin: 0px; +} + +.float-right { + float: right; +} + +.text-red { + color: red; +} + +.button-red { + background-color: red; +} + +.button-black { + background-color: black; + color: white; +} diff --git a/src/root/index.html b/src/root/index.html new file mode 100644 index 0000000..0e524c2 --- /dev/null +++ b/src/root/index.html @@ -0,0 +1,21 @@ + + + + + WTerminal home + + + + + +
+

Truyen home

+

Under construction

+
+ + + + + diff --git a/src/css/darkmode.css b/src/ward/css/darkmode.css similarity index 100% rename from src/css/darkmode.css rename to src/ward/css/darkmode.css diff --git a/src/css/game.css b/src/ward/css/game.css similarity index 100% rename from src/css/game.css rename to src/ward/css/game.css diff --git a/src/css/main.css b/src/ward/css/main.css similarity index 100% rename from src/css/main.css rename to src/ward/css/main.css diff --git a/src/css/wterminal.css b/src/ward/css/wterminal.css similarity index 100% rename from src/css/wterminal.css rename to src/ward/css/wterminal.css diff --git a/src/dropdown.html b/src/ward/dropdown.html similarity index 100% rename from src/dropdown.html rename to src/ward/dropdown.html diff --git a/src/img/kitty.jpg b/src/ward/img/kitty.jpg similarity index 100% rename from src/img/kitty.jpg rename to src/ward/img/kitty.jpg diff --git a/src/index.html b/src/ward/index.html similarity index 100% rename from src/index.html rename to src/ward/index.html diff --git a/src/js/cookie.js b/src/ward/js/cookie.js similarity index 100% rename from src/js/cookie.js rename to src/ward/js/cookie.js diff --git a/src/js/darkmode-cookie.js b/src/ward/js/darkmode-cookie.js similarity index 100% rename from src/js/darkmode-cookie.js rename to src/ward/js/darkmode-cookie.js diff --git a/src/js/ext-cookies.js b/src/ward/js/ext-cookies.js similarity index 100% rename from src/js/ext-cookies.js rename to src/ward/js/ext-cookies.js diff --git a/src/js/ext-eval.js b/src/ward/js/ext-eval.js similarity index 100% rename from src/js/ext-eval.js rename to src/ward/js/ext-eval.js diff --git a/src/js/ext-featuretest.js b/src/ward/js/ext-featuretest.js similarity index 100% rename from src/js/ext-featuretest.js rename to src/ward/js/ext-featuretest.js diff --git a/src/js/ext-passw.js b/src/ward/js/ext-passw.js similarity index 100% rename from src/js/ext-passw.js rename to src/ward/js/ext-passw.js diff --git a/src/js/ext-popvar.js b/src/ward/js/ext-popvar.js similarity index 100% rename from src/js/ext-popvar.js rename to src/ward/js/ext-popvar.js diff --git a/src/js/ext-stresstest.js b/src/ward/js/ext-stresstest.js similarity index 100% rename from src/js/ext-stresstest.js rename to src/ward/js/ext-stresstest.js diff --git a/src/js/ext-timerdebug.js b/src/ward/js/ext-timerdebug.js similarity index 100% rename from src/js/ext-timerdebug.js rename to src/ward/js/ext-timerdebug.js diff --git a/src/js/ext-transfer.js b/src/ward/js/ext-transfer.js similarity index 100% rename from src/js/ext-transfer.js rename to src/ward/js/ext-transfer.js diff --git a/src/js/ext-variables.js b/src/ward/js/ext-variables.js similarity index 100% rename from src/js/ext-variables.js rename to src/ward/js/ext-variables.js diff --git a/src/js/game-pong-context2d.js b/src/ward/js/game-pong-context2d.js similarity index 100% rename from src/js/game-pong-context2d.js rename to src/ward/js/game-pong-context2d.js diff --git a/src/js/static-terminal-buttons.js b/src/ward/js/static-terminal-buttons.js similarity index 100% rename from src/js/static-terminal-buttons.js rename to src/ward/js/static-terminal-buttons.js diff --git a/src/js/wterminal-autoextend.js b/src/ward/js/wterminal-autoextend.js similarity index 100% rename from src/js/wterminal-autoextend.js rename to src/ward/js/wterminal-autoextend.js diff --git a/src/js/wterminal.js b/src/ward/js/wterminal.js similarity index 100% rename from src/js/wterminal.js rename to src/ward/js/wterminal.js diff --git a/src/pong.html b/src/ward/pong.html similarity index 100% rename from src/pong.html rename to src/ward/pong.html diff --git a/src/snd/glass-knock.mp3 b/src/ward/snd/glass-knock.mp3 similarity index 100% rename from src/snd/glass-knock.mp3 rename to src/ward/snd/glass-knock.mp3 diff --git a/src/snd/short-success.mp3 b/src/ward/snd/short-success.mp3 similarity index 100% rename from src/snd/short-success.mp3 rename to src/ward/snd/short-success.mp3 diff --git a/src/static-terminal.html b/src/ward/static-terminal.html similarity index 100% rename from src/static-terminal.html rename to src/ward/static-terminal.html