From 9557bb694c9ee899faa4162f3caa2260df4a897e Mon Sep 17 00:00:00 2001
From: Fergus Molloy <fergus@molloy.xyz>
Date: Fri, 18 Jul 2025 15:39:09 +0100
Subject: [PATCH] move to Makefile

---
 Justfile          | 30 ------------------------------
 Makefile          | 25 +++++++++++++++++++++++++
 package-lock.json |  6 ++++++
 src/main.rs       |  4 +---
 ui/Justfile       |  5 -----
 ui/Makefile       |  5 +++++
 6 files changed, 37 insertions(+), 38 deletions(-)
 delete mode 100644 Justfile
 create mode 100644 Makefile
 create mode 100644 package-lock.json
 delete mode 100644 ui/Justfile
 create mode 100644 ui/Makefile

diff --git a/Justfile b/Justfile
deleted file mode 100644
index 958a625..0000000
--- a/Justfile
+++ /dev/null
@@ -1,30 +0,0 @@
-run *ARGS: build
-	./target/debug/nuchat {{ARGS}}
-
-start: build
-	./target/debug/nuchat 2>&1 > target/debug/logs/nuchat.log &
-
-build: build-cargo build-ui 
-
-build-cargo:
-	@mkdir -p target/debug/logs
-	@mkdir -p dist
-	cargo build
-
-[working-directory: "ui"]
-build-ui:
-	npm install
-	npm run build
-
-test: integration unit
-
-integration:
-	if [ ! $(curl -sf "localhost:7000/api/healthcheck" )  ]; then just run; fi
-	cargo test --test '*'
-
-unit:
-	cargo test --lib --bins
-
-docker *ARGS:
-	docker compose build
-	docker compose up {{ARGS}}
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..cb71118
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,25 @@
+dist: ui
+	cd ui && make dist
+
+target/debug/nuchat: src dist
+	cargo build
+
+target/release/nuchat: src dist
+	cargo build --release
+
+.PHONY: build release test docker run start
+build: target/debug/nuchat
+
+release: target/release/nuchat
+
+test: build
+	cargo test
+
+docker:
+	docker compose build
+
+run: docker
+	docker compose up
+
+start:
+	docker compose up -d
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..2598de5
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "nuchat",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
diff --git a/src/main.rs b/src/main.rs
index a2dd69d..f458ab5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,9 +20,7 @@ struct Args {
 async fn main() -> Result<(), std::io::Error> {
     let args = Args::parse();
     let str_address = format!("{}:{}", args.host, args.port);
-    let address: SocketAddr = str_address
-        .parse()
-        .unwrap_or_else(|_| panic!("could not parse address: {str_address}"));
+    let address: SocketAddr = str_address.parse().unwrap(); // _or_else(|_| panic!("could not parse address: {str_address}"));
     let listener = tokio::net::TcpListener::bind(address).await?;
     let result = run(listener)?.await;
     event!(Level::INFO, "Server stopped");
diff --git a/ui/Justfile b/ui/Justfile
deleted file mode 100644
index 571cff1..0000000
--- a/ui/Justfile
+++ /dev/null
@@ -1,5 +0,0 @@
-install:
-	npm install
-
-build: install
-	npm run build
diff --git a/ui/Makefile b/ui/Makefile
new file mode 100644
index 0000000..7f82717
--- /dev/null
+++ b/ui/Makefile
@@ -0,0 +1,5 @@
+dist: node_modules
+	npm run build
+
+node_modules: package.json package-lock.json
+	npm ci