From 896cd219fe4dc1bd11ac3d320727d602e1ecf9f7 Mon Sep 17 00:00:00 2001 From: dracco1993 Date: Fri, 27 Jun 2025 02:47:48 +0000 Subject: [PATCH 01/10] Tell git to use linux linefeeds --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..6313b56c --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf From c395b9112f7e3bdefaf6a8de2343d485ea36e25b Mon Sep 17 00:00:00 2001 From: dracco1993 Date: Fri, 27 Jun 2025 02:48:23 +0000 Subject: [PATCH 02/10] Add Docker configuration for devcontainer development environment --- .devcontainer/Dockerfile | 19 +++++++++++++++++++ .devcontainer/compose.yml | 9 +++++++++ .devcontainer/devcontainer.json | 19 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/compose.yml create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..2629912e --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,19 @@ +FROM mcr.microsoft.com/devcontainers/typescript-node:18 + +# Switch to a non-root user to avoid permission issues. +USER node + +# Set the working directory in the container. +WORKDIR /home/node/app + +# Copy package.json and package-lock.json to the container. +COPY --chown=node:node package*.json ./ + +# Install dependencies. +RUN npm install + +# Copy the rest of the application code to the container. +COPY --chown=node:node . . + +# Expose the port the app runs on. +EXPOSE 3000 diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yml new file mode 100644 index 00000000..1a654563 --- /dev/null +++ b/.devcontainer/compose.yml @@ -0,0 +1,9 @@ + +services: + app: + build: + context: .. + dockerfile: .devcontainer/Dockerfile + volumes: + - ..:/workspaces/:cached + command: npm run start diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..f0acaa91 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,19 @@ + +{ + "name": "systemcore-blocks-interface", + "dockerComposeFile": "compose.yml", + "service": "app", + "workspaceFolder": "/workspaces/", + "customizations": { + "vscode": { + "extensions": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "bradlc.vscode-tailwindcss" + ] + } + }, + "forwardPorts": [ + 3000 + ] +} From b344f750dff25373301c21408ca835e6a93512b4 Mon Sep 17 00:00:00 2001 From: dracco1993 Date: Fri, 27 Jun 2025 02:52:11 +0000 Subject: [PATCH 03/10] Change to double space, from tabs --- .devcontainer/devcontainer.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f0acaa91..7333597a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,19 +1,19 @@ { - "name": "systemcore-blocks-interface", - "dockerComposeFile": "compose.yml", - "service": "app", - "workspaceFolder": "/workspaces/", - "customizations": { - "vscode": { - "extensions": [ - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode", - "bradlc.vscode-tailwindcss" - ] - } - }, - "forwardPorts": [ - 3000 - ] + "name": "systemcore-blocks-interface", + "dockerComposeFile": "compose.yml", + "service": "app", + "workspaceFolder": "/workspaces/", + "customizations": { + "vscode": { + "extensions": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "bradlc.vscode-tailwindcss" + ] + } + }, + "forwardPorts": [ + 3000 + ] } From 2f347e55013bd5e462af4a9842c4d11fa8a9d4ef Mon Sep 17 00:00:00 2001 From: dracco1993 Date: Fri, 27 Jun 2025 02:53:44 +0000 Subject: [PATCH 04/10] Add python extention as well --- .devcontainer/devcontainer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7333597a..76e0a3fc 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,7 +9,8 @@ "extensions": [ "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", - "bradlc.vscode-tailwindcss" + "bradlc.vscode-tailwindcss", + "ms-python.python" ] } }, From ae30f7fbd6c3c99a2f906c450705ab817fc702a8 Mon Sep 17 00:00:00 2001 From: dracco1993 Date: Thu, 26 Jun 2025 23:22:32 -0400 Subject: [PATCH 05/10] "feat:add_devcontainer_configuration" --- .devcontainer/Dockerfile | 10 +--------- .devcontainer/compose.yml | 10 +++++++--- .devcontainer/devcontainer.json | 8 ++++++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2629912e..253340b9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,19 +1,11 @@ FROM mcr.microsoft.com/devcontainers/typescript-node:18 -# Switch to a non-root user to avoid permission issues. -USER node +WORKDIR /workspaces/systemcore-blocks-interface -# Set the working directory in the container. -WORKDIR /home/node/app - -# Copy package.json and package-lock.json to the container. COPY --chown=node:node package*.json ./ -# Install dependencies. RUN npm install -# Copy the rest of the application code to the container. COPY --chown=node:node . . -# Expose the port the app runs on. EXPOSE 3000 diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yml index 1a654563..339096a3 100644 --- a/.devcontainer/compose.yml +++ b/.devcontainer/compose.yml @@ -1,9 +1,13 @@ services: app: - build: + build: context: .. dockerfile: .devcontainer/Dockerfile volumes: - - ..:/workspaces/:cached - command: npm run start + - ..:/workspaces/${localWorkspaceFolderBasename}:cached + - node_modules:/workspaces/${localWorkspaceFolderBasename}/node_modules + command: sleep infinity + +volumes: + node_modules: diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 76e0a3fc..47ba8a07 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "name": "systemcore-blocks-interface", "dockerComposeFile": "compose.yml", "service": "app", - "workspaceFolder": "/workspaces/", + "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", "customizations": { "vscode": { "extensions": [ @@ -16,5 +16,9 @@ }, "forwardPorts": [ 3000 - ] + ], + "postCreateCommand": "npm install", + "postAttachCommand": { + "server": "npm run start" + } } From 969a7cc781fc040d6c48d3ac74ac65e4ee9a71e0 Mon Sep 17 00:00:00 2001 From: dracco1993 Date: Fri, 27 Jun 2025 07:26:28 +0000 Subject: [PATCH 06/10] Add .dockerignore things for better performance --- .dockerignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..e70b43eb --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +.git/ +node_modules/ +*.log From 3523dc30964cd2cc642fe13467eb417c45559353 Mon Sep 17 00:00:00 2001 From: dracco1993 Date: Fri, 27 Jun 2025 07:26:54 +0000 Subject: [PATCH 07/10] Correct devcontainer configuration --- .devcontainer/Dockerfile | 4 +++- .devcontainer/compose.yml | 6 +++--- .devcontainer/devcontainer.json | 7 +++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 253340b9..89609e8b 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,8 @@ FROM mcr.microsoft.com/devcontainers/typescript-node:18 -WORKDIR /workspaces/systemcore-blocks-interface +USER node + +WORKDIR /app/ COPY --chown=node:node package*.json ./ diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yml index 339096a3..02a520e5 100644 --- a/.devcontainer/compose.yml +++ b/.devcontainer/compose.yml @@ -1,12 +1,12 @@ services: app: - build: + # platform: linux/amd64 + build: context: .. dockerfile: .devcontainer/Dockerfile volumes: - - ..:/workspaces/${localWorkspaceFolderBasename}:cached - - node_modules:/workspaces/${localWorkspaceFolderBasename}/node_modules + - ..:/app:cached command: sleep infinity volumes: diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 47ba8a07..64542965 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,8 @@ "name": "systemcore-blocks-interface", "dockerComposeFile": "compose.yml", "service": "app", - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", + "remoteUser": "node", + "workspaceFolder": "/app/", "customizations": { "vscode": { "extensions": [ @@ -18,7 +19,5 @@ 3000 ], "postCreateCommand": "npm install", - "postAttachCommand": { - "server": "npm run start" - } + "postAttachCommand": "npm run start" } From 15712673cd62cbe401ec9dca254ed9b9176810c9 Mon Sep 17 00:00:00 2001 From: dracco1993 Date: Fri, 27 Jun 2025 07:27:36 +0000 Subject: [PATCH 08/10] Tell vite to pass the server to the host --- vite.config.mts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vite.config.mts b/vite.config.mts index 507b27af..bb542071 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -1,10 +1,10 @@ /// /// +import react from "@vitejs/plugin-react"; +import path from "path"; import { defineConfig } from "vite"; import { viteStaticCopy } from "vite-plugin-static-copy"; -import react from "@vitejs/plugin-react"; import tsconfigPaths from "vite-tsconfig-paths"; -import path from "path"; export default defineConfig({ plugins: [react(), tsconfigPaths(), viteStaticCopy({ @@ -17,6 +17,7 @@ export default defineConfig({ }), ], server: { + host: true, port: 3000, }, define: { From 981a518adbda3cd82914a4a6500441cbeed00add Mon Sep 17 00:00:00 2001 From: dracco1993 Date: Fri, 27 Jun 2025 07:32:34 +0000 Subject: [PATCH 09/10] Add PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..8d85e46d --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,21 @@ + + +## Description + + +## Motivation and Context + + + +## How Has This Been Tested? + + + + +## Screenshots (if appropriate): + +## Types of changes + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Breaking change (fix or feature that would change API specifications or require data migrations) From ebc620a1087537b84bb7d58ee7192283a68e7e46 Mon Sep 17 00:00:00 2001 From: dracco1993 Date: Fri, 27 Jun 2025 07:41:18 +0000 Subject: [PATCH 10/10] Remove unused platform docker config --- .devcontainer/compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yml index 02a520e5..464741fc 100644 --- a/.devcontainer/compose.yml +++ b/.devcontainer/compose.yml @@ -1,7 +1,6 @@ services: app: - # platform: linux/amd64 build: context: .. dockerfile: .devcontainer/Dockerfile