From ea6347cfaa3387ae70c4c42ca87ca007edd68e1c Mon Sep 17 00:00:00 2001 From: gitricko Date: Mon, 17 Nov 2025 03:42:03 +0000 Subject: [PATCH 1/9] Extra files for local development --- .node-version | 1 + Makefile | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 .node-version create mode 100644 Makefile diff --git a/.node-version b/.node-version new file mode 100644 index 0000000..25bf17f --- /dev/null +++ b/.node-version @@ -0,0 +1 @@ +18 \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..fa79741 --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ + + +mongo-start: + docker compose -f ./docker-compose-local.yml up -d mongo + +mongo-stop: + docker compose -f ./docker-compose-local.yml down mongo + +mongo-restart: mongo-stop mongo-start + +mongo-reset: mongo-stop + docker rm -f tradenote_db + mongo-start \ No newline at end of file From 0357c8b9d5dcbc2b346b2d15346abac86af31b80 Mon Sep 17 00:00:00 2001 From: gitricko Date: Mon, 17 Nov 2025 03:48:47 +0000 Subject: [PATCH 2/9] devcontainer --- .devcontainer/devcontainer.json | 22 ++++++++++++++++++++++ .node-version | 1 - 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/devcontainer.json delete mode 100644 .node-version diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..7312da1 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,22 @@ +{ + "name": "Node.js 18 Environment", + // Start from a general image (like the Universal Base Image) + "image": "mcr.microsoft.com/devcontainers/universal:2-linux", + + // Install the Node.js 18 feature + "features": { + "ghcr.io/devcontainers/features/node:1": { + "version": "18" + } + }, + + // Customizations for VS Code (like extensions) + "customizations": { + "vscode": { + "extensions": [ + "dbaeumer.vscode-eslint", + "mongodb.mongodb-vscode" + ] + } + } +} \ No newline at end of file diff --git a/.node-version b/.node-version deleted file mode 100644 index 25bf17f..0000000 --- a/.node-version +++ /dev/null @@ -1 +0,0 @@ -18 \ No newline at end of file From 851809fe0f9657fb6ad9eec086d21ee5157dd4cd Mon Sep 17 00:00:00 2001 From: gitricko Date: Sun, 16 Nov 2025 19:52:27 -0800 Subject: [PATCH 3/9] Delete .devcontainer directory --- .devcontainer/devcontainer.json | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 7312da1..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "Node.js 18 Environment", - // Start from a general image (like the Universal Base Image) - "image": "mcr.microsoft.com/devcontainers/universal:2-linux", - - // Install the Node.js 18 feature - "features": { - "ghcr.io/devcontainers/features/node:1": { - "version": "18" - } - }, - - // Customizations for VS Code (like extensions) - "customizations": { - "vscode": { - "extensions": [ - "dbaeumer.vscode-eslint", - "mongodb.mongodb-vscode" - ] - } - } -} \ No newline at end of file From 5d9d9630a8c8a07c3872527128e13b48c3bd02c7 Mon Sep 17 00:00:00 2001 From: gitricko Date: Mon, 17 Nov 2025 04:20:24 +0000 Subject: [PATCH 4/9] dev quick commands --- Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fa79741..5c870ac 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ - +.PHONY: node-env-prep mongo-start mongo-stop mongo-restart mongo-reset node-build dev-start mongo-start: docker compose -f ./docker-compose-local.yml up -d mongo @@ -10,4 +10,18 @@ mongo-restart: mongo-stop mongo-start mongo-reset: mongo-stop docker rm -f tradenote_db - mongo-start \ No newline at end of file + mongo-start + +node-env-prep: + . $$NVM_DIR/nvm.sh; nvm install 18 + . $$NVM_DIR/nvm.sh; nvm use 18 + . $$NVM_DIR/nvm.sh; nvm use 18; npm install + +node-build: node-env-prep + . $$NVM_DIR/nvm.sh; nvm use 18; npm run build + +dev-start: mongo-start node-env-prep + . $$NVM_DIR/nvm.sh; nvm use 18; \ + MONGO_URI=mongodb://tradenote:tradenote@localhost:27017/tradenote?authSource=admin \ + TRADENOTE_DATABASE=tradenote APP_ID=123456 MASTER_KEY=123456 TRADENOTE_PORT=8080 \ + npm start \ No newline at end of file From 43362583700e2ed18d88d25edaa7b3e5a84daa91 Mon Sep 17 00:00:00 2001 From: gitricko Date: Mon, 17 Nov 2025 04:37:31 +0000 Subject: [PATCH 5/9] dev-command completes --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5c870ac..c5c77ad 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ mongo-restart: mongo-stop mongo-start mongo-reset: mongo-stop docker rm -f tradenote_db - mongo-start + $(MAKE) mongo-start node-env-prep: . $$NVM_DIR/nvm.sh; nvm install 18 @@ -20,8 +20,8 @@ node-env-prep: node-build: node-env-prep . $$NVM_DIR/nvm.sh; nvm use 18; npm run build -dev-start: mongo-start node-env-prep +dev-start: mongo-start node-build . $$NVM_DIR/nvm.sh; nvm use 18; \ MONGO_URI=mongodb://tradenote:tradenote@localhost:27017/tradenote?authSource=admin \ TRADENOTE_DATABASE=tradenote APP_ID=123456 MASTER_KEY=123456 TRADENOTE_PORT=8080 \ - npm start \ No newline at end of file + npm run start \ No newline at end of file From ae5055020c0d2c701d75152bb811e7f424e004cd Mon Sep 17 00:00:00 2001 From: gitricko Date: Mon, 17 Nov 2025 04:38:07 +0000 Subject: [PATCH 6/9] Dont build docker with changes to Makefile --- .github/workflows/docker-publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 3959641..01d8946 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -7,6 +7,7 @@ on: - 'brokers/**' - 'README.md' - '.gitignore' + - 'Makefile' pull_request: branches: [ main ] @@ -14,6 +15,7 @@ on: - 'brokers/**' - 'README.md' - '.gitignore' + - 'Makefile' release: types: [ published ] From 7ec0c48a230a9994e4f380274196a26bc7f4e054 Mon Sep 17 00:00:00 2001 From: gitricko Date: Mon, 17 Nov 2025 04:44:53 +0000 Subject: [PATCH 7/9] Test locally --- .github/workflows/docker-publish.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 01d8946..d22e053 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -32,6 +32,25 @@ on: jobs: + build-local: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: npm install + run: | + npm install + + - name: npm run build + run: | + npm run build + + - name: npm run preview + run: | + npm run preview -- --port 8080 & sleep 10; curl -f http://localhost:8080 || exit 1 + build-test: runs-on: ubuntu-latest From fa5181d1c3eda845b1930526508220fa9e46e5f3 Mon Sep 17 00:00:00 2001 From: gitricko Date: Mon, 17 Nov 2025 04:46:17 +0000 Subject: [PATCH 8/9] dev --- .github/workflows/docker-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index d22e053..c33d23d 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -53,6 +53,7 @@ jobs: build-test: runs-on: ubuntu-latest + needs: build-local steps: - name: Checkout repository From ad5845177c2364b887bc71501cdc8708dd565cfd Mon Sep 17 00:00:00 2001 From: gitricko Date: Mon, 17 Nov 2025 04:48:31 +0000 Subject: [PATCH 9/9] dev --- .github/workflows/docker-publish.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index c33d23d..502bba2 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -39,13 +39,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: npm install - run: | - npm install - - name: npm run build run: | - npm run build + make node-build - name: npm run preview run: |