netcore-blueprint 1.0.22 → 1.0.24

package/BlueprintTemplate/Blueprint.sln

@@ -1,43 +1,43 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.10.35013.160
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blueprint.API", "Blueprint.API\Blueprint.API.csproj", "{69D89003-25CF-4E3A-9BEF-78F9247B24E1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blueprint.Core", "Blueprint.Core\Blueprint.Core.csproj", "{5E5F367C-FAD3-4254-8E88-D82D797E3731}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blueprint.Infra", "Blueprint.Infra\Blueprint.Infra.csproj", "{83F3E527-28B2-4C5F-A265-E15E76530238}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blueprint.Test", "Blueprint.Test\Blueprint.Test.csproj", "{A4F5B5E9-32D8-4C4D-AED1-E2D6A9083A2E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{69D89003-25CF-4E3A-9BEF-78F9247B24E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69D89003-25CF-4E3A-9BEF-78F9247B24E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69D89003-25CF-4E3A-9BEF-78F9247B24E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69D89003-25CF-4E3A-9BEF-78F9247B24E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5E5F367C-FAD3-4254-8E88-D82D797E3731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E5F367C-FAD3-4254-8E88-D82D797E3731}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E5F367C-FAD3-4254-8E88-D82D797E3731}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5E5F367C-FAD3-4254-8E88-D82D797E3731}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83F3E527-28B2-4C5F-A265-E15E76530238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83F3E527-28B2-4C5F-A265-E15E76530238}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83F3E527-28B2-4C5F-A265-E15E76530238}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83F3E527-28B2-4C5F-A265-E15E76530238}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4F5B5E9-32D8-4C4D-AED1-E2D6A9083A2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4F5B5E9-32D8-4C4D-AED1-E2D6A9083A2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4F5B5E9-32D8-4C4D-AED1-E2D6A9083A2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4F5B5E9-32D8-4C4D-AED1-E2D6A9083A2E}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {57FA2C18-6D77-434E-8FF6-DF1DDEE44F71}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35013.160
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blueprint.API", "Blueprint.API\Blueprint.API.csproj", "{69D89003-25CF-4E3A-9BEF-78F9247B24E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blueprint.Core", "Blueprint.Core\Blueprint.Core.csproj", "{5E5F367C-FAD3-4254-8E88-D82D797E3731}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blueprint.Infra", "Blueprint.Infra\Blueprint.Infra.csproj", "{83F3E527-28B2-4C5F-A265-E15E76530238}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blueprint.Test", "Blueprint.Test\Blueprint.Test.csproj", "{A4F5B5E9-32D8-4C4D-AED1-E2D6A9083A2E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{69D89003-25CF-4E3A-9BEF-78F9247B24E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69D89003-25CF-4E3A-9BEF-78F9247B24E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69D89003-25CF-4E3A-9BEF-78F9247B24E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69D89003-25CF-4E3A-9BEF-78F9247B24E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E5F367C-FAD3-4254-8E88-D82D797E3731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E5F367C-FAD3-4254-8E88-D82D797E3731}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E5F367C-FAD3-4254-8E88-D82D797E3731}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E5F367C-FAD3-4254-8E88-D82D797E3731}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83F3E527-28B2-4C5F-A265-E15E76530238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83F3E527-28B2-4C5F-A265-E15E76530238}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83F3E527-28B2-4C5F-A265-E15E76530238}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83F3E527-28B2-4C5F-A265-E15E76530238}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4F5B5E9-32D8-4C4D-AED1-E2D6A9083A2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4F5B5E9-32D8-4C4D-AED1-E2D6A9083A2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4F5B5E9-32D8-4C4D-AED1-E2D6A9083A2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4F5B5E9-32D8-4C4D-AED1-E2D6A9083A2E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {57FA2C18-6D77-434E-8FF6-DF1DDEE44F71}
+	EndGlobalSection
+EndGlobal

package/BlueprintTemplate/Dockerfile

@@ -0,0 +1,22 @@
+# Use the official .NET 8.0 SDK to build the project
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+WORKDIR /app
+
+# Copy solution and restore dependencies
+COPY Innocons.sln ./
+COPY Innocons.API/*.csproj Innocons.API/
+COPY Innocons.Core/*.csproj Innocons.Core/
+COPY Innocons.Infra/*.csproj Innocons.Infra/
+RUN dotnet restore Innocons.API/Innocons.API.csproj
+
+# Copy all source files
+COPY . .
+
+# Build and publish the API project
+RUN dotnet publish Innocons.API/Innocons.API.csproj -c Release -o /app/publish
+
+# Use the appropriate runtime image based on target platform
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
+WORKDIR /app
+COPY --from=build /app/publish .
+ENTRYPOINT ["dotnet", "Innocons.API.dll"]

package/BlueprintTemplate/README.md

@@ -0,0 +1,22 @@
+0. Run migration first (Package manager console)
+	- Add-Migration InitialCreate
+1. Push the image to docker hub	
+	- chmod +x build-and-push.sh
+	- run docker desktop as administrator
+	- docker login
+	- (git bash) ./build-and-push.sh truonghusk17 innocons-api latest
+2. Use the image
+	- Run docker compose file
+3. Clone to repo: 
+	- git remote add origin https://gitlab.com/test1835013/innocons.git
+	- git branch -M main
+	- git push -u origin main
+4. Add variables to gitlab
+	- Change these values: 
+		+ truonghusk17/innocons-api
+		+ truong@192.168.1.20
+		+ innocons-api
+5. Change connection string to connect to DB (Systems Manager)
+	- In laptop, when running mysql directly: 			"MySql": "Server=host.docker.internal;port=3306;Database=test9;User=root;",
+	- In pi, when running mysql in docker container: 	"MySql": "Server=mysql;Database=test9;User=root;Password=password;AllowPublicKeyRetrieval=true;",
+	- Localhost: Using the appsetting file in the project as default one

package/BlueprintTemplate/build-and-push.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Verify inputs
+if [ -z "$1" ] || [ -z "$2" ]; then
+  echo "❌ Usage: ./build-and-push.sh <dockerhub-username> <repository-name> [tag]"
+  exit 1
+fi
+
+USERNAME=$1
+REPOSITORY=$2
+TAG=${3:-latest} # Default tag is 'latest'
+IMAGE_NAME="$USERNAME/$REPOSITORY:$TAG"
+
+echo "🔹 Checking Docker login..."
+
+# More reliable way to check Docker login status
+if ! docker system info > /dev/null 2>&1; then
+  echo "❌ Cannot connect to Docker daemon. Is Docker running?"
+  exit 1
+fi
+
+# Check if we can access Docker Hub
+if ! docker pull hello-world > /dev/null 2>&1; then
+  echo "❌ Not authenticated with Docker Hub or no network connection"
+  echo "🔹 Please log in by running: docker login"
+  echo "🔹 Then re-run this script."
+  exit 1
+fi
+
+echo "✅ Docker Hub authentication verified"
+
+echo "🔹 Setting up buildx..."
+docker buildx create --name multiarch --use || true
+docker buildx inspect --bootstrap
+
+echo "🔹 Building multi-platform Docker image..."
+docker buildx build \
+  --platform linux/amd64,linux/arm64 \
+  -t "$IMAGE_NAME" \
+  --push . || { echo "❌ Build failed"; exit 1; }
+
+echo "✅ Images successfully pushed to Docker Hub for both platforms: $IMAGE_NAME"

package/BlueprintTemplate/docker-run/.env

@@ -0,0 +1,3 @@
+AWS_REGION=<region>
+AWS_ACCESS_KEY=<access-key>
+AWS_SECRET=<secret-key>

package/BlueprintTemplate/docker-run/docker-compose.yml

@@ -0,0 +1,41 @@
+version: '3.8'
+
+services:
+  innocons-api:
+    image: truonghusk17/innocons-api:latest
+    container_name: innocons-api
+    restart: unless-stopped
+    ports:
+      - "8081:80"
+      - "8444:443"
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Staging
+      - ASPNETCORE_URLS=http://+:80
+      - AWS_REGION=${AWS_REGION}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY}
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET}
+    # depends_on:
+    #   - mysql
+    networks:
+      - backend-network
+
+  # mysql:
+  #   image: mysql:8.0
+  #   container_name: mysql
+  #   restart: always
+  #   environment:
+  #     MYSQL_ROOT_PASSWORD: password
+  #     MYSQL_DATABASE: test9
+  #   ports:
+  #     - "3306:3306"
+  #   volumes:
+  #     - mysql_data:/var/lib/mysql
+  #   networks:
+  #     - backend-network
+
+networks:
+  backend-network:
+    driver: bridge
+
+# volumes:
+#   mysql_data:

package/BlueprintTemplate/gitignore

@@ -1,17 +1,17 @@
-# Build and output directories  
-bin/  
-obj/  
-_nugetLib/  
-
-# Visual Studio and VS Code settings  
-.vs/  
-.vscode/  
-
-# Debug logs  
-debug.log  
-
-# Ignore all .cache files  
-*.cache  
-
-# Ignore all AssemblyInfo.cs files  
-**/AssemblyInfo.cs  
+# Build and output directories  
+bin/  
+obj/  
+_nugetLib/  
+
+# Visual Studio and VS Code settings  
+.vs/  
+.vscode/  
+
+# Debug logs  
+debug.log  
+
+# Ignore all .cache files  
+*.cache  
+
+# Ignore all AssemblyInfo.cs files  
+**/AssemblyInfo.cs  

package/README.md

@@ -0,0 +1,74 @@
+1. Create the blueprint
+	- create a new project
+	- Set up Node.js package for the blueprint
+		+ Create the folder netcore-blueprint in the root directory, and initialize a new Node.js package: 
+			mkdir netcore-blueprint
+			cd netcore-blueprint
+			npm init -y
+		+ Add a bin field in package.json to define the command that will execute the blueprint: 
+			"bin": {
+			  "truongdx8-netcore-blueprint": "./create.js"
+			}
+		+ Add dependencies like fs and path if needed
+	- Write the script to copy the Blueprint files
+		+ Create an create.js file in the netcore-blueprint directory
+		+ In create.js file, write the code to copy .NET Core template files to a new directory with the provided project name: 
+			#!/usr/bin/env node
+
+			const fs = require("fs");
+			const path = require("path");
+
+			const projectName = process.argv[2];
+			if (!projectName) {
+			  console.error("Please specify the project name.");
+			  process.exit(1);
+			}
+
+			// Define paths
+			const templatePath = path.join(__dirname, "../"); // Root of the template
+			const destinationPath = path.join(process.cwd(), projectName);
+
+			function copyTemplateFiles(src, dest) {
+			  fs.mkdirSync(dest, { recursive: true });
+			  fs.readdirSync(src).forEach((file) => {
+				const srcPath = path.join(src, file);
+				const destPath = path.join(dest, file);
+				if (fs.statSync(srcPath).isDirectory()) {
+				  copyTemplateFiles(srcPath, destPath);
+				} else {
+				  fs.copyFileSync(srcPath, destPath);
+				}
+			  });
+			}
+
+			// Copy everything from the template to the new project directory
+			copyTemplateFiles(templatePath, destinationPath);
+
+			console.log(`Project ${projectName} created at ${destinationPath}`);
+
+		+ Make create.js executable: 
+			. chmod +x create.js
+		+ Test: node create.js innocons
+	- Publish the Package to npm: 
+		+ npm login
+		+ npm publish --access public
+		+ npm cache clean --force
+	- Use the blueprint: 
+		+ npm uninstall -g netcore-blueprint
+		+ npm install -g netcore-blueprint
+		+ npm list -g netcore-blueprint
+		+ netcore-blueprint innocons
+2. Start a new project: 
+	- Git: 
+		+ Add gitignore & git
+		+ Change branch name from master to main 
+			. git branch -m main
+			. Create repo without README file
+			. Push the first commit: 
+				git remote add origin <REMOTE_URL>
+				git push origin main
+	- Add routing: 
+		+ Add some first components
+		+ Add routing in app-routing.module.ts
+	- content.component: Add header & footer
+	- Add content to each new component

package/create.js

@@ -1,75 +1,75 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-const path = require('path');
-const { execSync } = require('child_process'); // ✅ Fix: Import execSync
-
-// Get the project name from command-line arguments
-const projectName = process.argv[2];
-if (!projectName) {
-  console.error("❌ Please specify the project name.");
-  process.exit(1);
-}
-
-const templatePath = path.join(__dirname, "BlueprintTemplate"); // Copy from BlueprintTemplate
-const destinationPath = path.join(process.cwd(), projectName);
-
-// Function to copy and rename files
-function copyAndRenameFiles(src, dest, oldName, newName) {
-  if (fs.lstatSync(src).isDirectory()) {
-    fs.mkdirSync(dest, { recursive: true });
-    const entries = fs.readdirSync(src, { withFileTypes: true });
-
-    for (let entry of entries) {
-      let srcPath = path.join(src, entry.name);
-      let destPath = path.join(dest, entry.name.replace(new RegExp(oldName, 'g'), newName));
-      copyAndRenameFiles(srcPath, destPath, oldName, newName);
-    }
-  } else {
-    let content = fs.readFileSync(src, 'utf8');
-    content = content.replace(new RegExp(oldName, 'g'), newName); // Replace occurrences of Blueprint
-    fs.writeFileSync(dest, content, 'utf8');
-  }
-}
-
-// Ensure the destination folder doesn't already exist
-if (fs.existsSync(destinationPath)) {
-  console.error(`❌ Project directory "${projectName}" already exists.`);
-  process.exit(1);
-}
-
-fs.mkdirSync(destinationPath, { recursive: true });
-
-// Copy and rename all files
-fs.readdirSync(templatePath).forEach(item => {
-  const srcPath = path.join(templatePath, item);
-  let destPath = path.join(destinationPath, item.replace(/Blueprint/g, projectName));
-
-  if (item === "gitignore") {
-    destPath = path.join(destinationPath, ".gitignore"); // Rename gitignore
-  }
-
-  console.log(`✅ Copying and renaming ${item}...`);
-  copyAndRenameFiles(srcPath, destPath, "Blueprint", projectName);
-});
-
-console.log(`🎉 Project "${projectName}" created successfully at ${destinationPath}`);
-console.log(`📌 Open "${projectName}.sln" in Visual Studio to get started!`);
-
-// Initialize Git and commit the first commit
-try {
-  process.chdir(destinationPath); // Move into project directory
-
-  console.log("🚀 Initializing Git repository...");
-  execSync('git init', { stdio: 'inherit' });
-
-  console.log("📂 Adding all files...");
-  execSync('git add .', { stdio: 'inherit' });
-
-  console.log("✅ Creating first commit...");
-  execSync('git commit -m "Initial commit from netcore-blueprint"', { stdio: 'inherit' });
-
-  console.log("🎉 Git repository initialized successfully!");
-} catch (error) {
-  console.error("❌ Failed to initialize Git:", error);
-}
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process'); // ✅ Fix: Import execSync
+
+// Get the project name from command-line arguments
+const projectName = process.argv[2];
+if (!projectName) {
+  console.error("❌ Please specify the project name.");
+  process.exit(1);
+}
+
+const templatePath = path.join(__dirname, "BlueprintTemplate"); // Copy from BlueprintTemplate
+const destinationPath = path.join(process.cwd(), projectName);
+
+// Function to copy and rename files
+function copyAndRenameFiles(src, dest, oldName, newName) {
+  if (fs.lstatSync(src).isDirectory()) {
+    fs.mkdirSync(dest, { recursive: true });
+    const entries = fs.readdirSync(src, { withFileTypes: true });
+
+    for (let entry of entries) {
+      let srcPath = path.join(src, entry.name);
+      let destPath = path.join(dest, entry.name.replace(new RegExp(oldName, 'g'), newName));
+      copyAndRenameFiles(srcPath, destPath, oldName, newName);
+    }
+  } else {
+    let content = fs.readFileSync(src, 'utf8');
+    content = content.replace(new RegExp(oldName, 'g'), newName); // Replace occurrences of Blueprint
+    fs.writeFileSync(dest, content, 'utf8');
+  }
+}
+
+// Ensure the destination folder doesn't already exist
+if (fs.existsSync(destinationPath)) {
+  console.error(`❌ Project directory "${projectName}" already exists.`);
+  process.exit(1);
+}
+
+fs.mkdirSync(destinationPath, { recursive: true });
+
+// Copy and rename all files
+fs.readdirSync(templatePath).forEach(item => {
+  const srcPath = path.join(templatePath, item);
+  let destPath = path.join(destinationPath, item.replace(/Blueprint/g, projectName));
+
+  if (item === "gitignore") {
+    destPath = path.join(destinationPath, ".gitignore"); // Rename gitignore
+  }
+
+  console.log(`✅ Copying and renaming ${item}...`);
+  copyAndRenameFiles(srcPath, destPath, "Blueprint", projectName);
+});
+
+console.log(`🎉 Project "${projectName}" created successfully at ${destinationPath}`);
+console.log(`📌 Open "${projectName}.sln" in Visual Studio to get started!`);
+
+// Initialize Git and commit the first commit
+try {
+  process.chdir(destinationPath); // Move into project directory
+
+  console.log("🚀 Initializing Git repository...");
+  execSync('git init', { stdio: 'inherit' });
+
+  console.log("📂 Adding all files...");
+  execSync('git add .', { stdio: 'inherit' });
+
+  console.log("✅ Creating first commit...");
+  execSync('git commit -m "Initial commit from netcore-blueprint"', { stdio: 'inherit' });
+
+  console.log("🎉 Git repository initialized successfully!");
+} catch (error) {
+  console.error("❌ Failed to initialize Git:", error);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netcore-blueprint",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "A custom .NET Core project blueprint",
   "main": "create.js",
   "bin": {