Merge pull request #4 from vitabletech/develop

Develop to main

Author: msrajawat298

.devcontainer/.env

@@ -0,0 +1,7 @@
+PORT=5000
+DB_PASSWORD=notSecureChangeMe
+NODE_ENV=development
+APP_PORT=8080
+PHPMYADMIN_PORT=8081
+GIT_EMAIL=[email protected]
+GIT_USERNAME=msrajawat298

.devcontainer/devcontainer.json

@@ -0,0 +1,35 @@
+{
+	"name": "node-express-api-bootstrap",
+	"dockerComposeFile": "docker-compose.yml",
+	"service": "app",
+	"workspaceFolder": "/app",
+	"mounts": [
+		"source=${localWorkspaceFolder}/,target=/app,type=bind,consistency=cached"
+	],
+	"postCreateCommand": "/app/.devcontainer/postCreateCommands.sh",
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"christian-kohler.path-intellisense",
+				"dbaeumer.vscode-eslint",
+				"ms-azuretools.vscode-docker",
+				"ritwickdey.liveserver",
+				"rvest.vs-code-prettier-eslint",
+				"sonarsource.sonarlint-vscode",
+				"streetsidesoftware.code-spell-checker",
+				"orta.vscode-jest",
+				"vitabletech.snippetmaster",
+				// "alefragnani.project-manager",
+				// "github.copilot", 
+				// "github.copilot-chat",
+				// "hoovercj.vscode-power-mode",
+				// "jasonnutter.search-node-modules",
+				// "ms-vscode-remote.remote-containers",
+				// "ms-vscode.vscode-speech",
+				// "sburg.vscode-javascript-booster",
+			]
+		}
+	}
+}

docker-compose.yml renamed to .devcontainer/docker-compose.yml

@@ -7,7 +7,7 @@ services:
     volumes:
       - .:/app
     working_dir: /app
-    command: bash -c "chmod +x ./setup.sh && ./setup.sh"
+    command: bash -c "tail -f /dev/null"
     ports:
       - "${APP_PORT}:${PORT}" # Use the port number defined in .env for the host
     env_file:

.devcontainer/postCreateCommands.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Set up Git
+git config --global user.email $GIT_EMAIL
+git config --global user.name $GIT_USERNAME
+
+# Install dependencies
+npm install
+
+# Run the appropriate command based on the NODE_ENV variable
+if [[ $NODE_ENV == 'development' ]]; then
+    npm run dev
+else
+    npm start
+fi

.env_sample

@@ -8,9 +8,4 @@ DB_DIALECT=mysql
 DB_POOL_MAX=5
 DB_POOL_MIN=0
 DB_POOL_ACQUIRE=30000
-DB_POOL_IDLE=10000
-NODE_ENV=development
-APP_PORT=80
-PHPMYADMIN_PORT=8081
-[email protected]
-GIT_USERNAME=msrajawat298
+DB_POOL_IDLE=10000

.gitignore

@@ -80,7 +80,7 @@ web_modules/
 .env.test.local
 .env.production.local
 .env.local
-
+!.devcontainer/.env
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 .parcel-cache

.husky/pre-commit

@@ -1 +1,3 @@
-npx lint-staged
+npm run lint
+npx lint-staged
+npm run test:coverage

.vscode/extensions.json

@@ -11,9 +11,7 @@ DA:11,0
 DA:12,0
 LF:5
 LH:0
-BRDA:10,0,0,0
-BRDA:10,0,1,0
-BRF:2
+BRF:0
 BRH:0
 end_of_record
 TN: