Merge pull request #88 from jlawrence11/main

Docker added.

.github/workflows/docker-image.yml

@@ -0,0 +1,18 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)

Dockerfile

@@ -0,0 +1,18 @@
+FROM node:18-bullseye AS builder
+
+WORKDIR /devel
+RUN apt-get update ; apt-get upgrade -y ; apt-get install -y build-essential
+COPY . .
+RUN npm i ; npm run build
+
+FROM node:18-alpine
+
+EXPOSE 8080
+WORKDIR /exec
+RUN apk add --update nodejs npm
+COPY --from=builder /devel/ . 
+RUN adduser -D jankclient
+
+USER jankclient
+
+CMD ["npm", "start"]

README.md

@@ -1,8 +1,8 @@
 # Jank Client
 Jank Client is a [Spacebar](https://spacebar.chat) Client written in TS, HTML, and CSS.
 
-To run it, clone the repo and do `npm install`, then
+To build it, clone the repo and run `npm install`, then `npm run build`
-`node index.js`
+To run it, use `npm start`
 or do the equivalent with bun
 
 Both [Bun](https://bun.sh) and [Node.js](https://nodejs.org) are supported, and should function as expected.

compose.yaml

@@ -0,0 +1,8 @@
+services:
+  jank:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    restart: unless-stopped
+    ports: 
+      - "8080:8080"

src/webpage/member.ts

@@ -290,12 +290,8 @@ class Member extends SnowFlake {
 				hypomember.bio = _;
 				regen();
 			});
-			return; //Returns early to stop errors
+			color = (this.accent_color ? "#" + this.accent_color.toString(16) : "transparent") as string;
-			if (this.accent_color) {
+
-				color = "#" + this.accent_color.toString(16);
-			} else {
-				color = "transparent";
-			}
 			const colorPicker = settingsLeft.addColorInput(
 				I18n.getTranslation("profileColor"),
 				(_) => {},
@@ -304,7 +300,7 @@ class Member extends SnowFlake {
 			colorPicker.watchForChange((_) => {
 				console.log();
 				color = _;
-				hypomember.accent_color = Number.parseInt("0x" + _.substr(1), 16);
+				hypomember.accent_color = Number.parseInt("0x" + _.substr(1, 16));
 				changed = true;
 				regen();
 			});