chore: solve the conflict

Author: adamma1024

.github/workflows/cd.yml

@@ -0,0 +1,23 @@
+name: CD Pipeline
+
+on:
+  push:
+    branches:
+      - releases/*
+  pull_request:
+    branches:
+      - releases/*
+
+jobs:
+  build-and-publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Log in to Docker Hub
+        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin
+
+      - name: Build, Tag, Push Docker image
+        run: bash docker_auto_push.sh

docker-compose.yml

@@ -3,6 +3,7 @@ services:
     build:
       context: ./fe_repo/
       dockerfile: Dockerfile
+    image: adamma1024/cvcoach_web:v2.0
     ports:
       - "12345:8081"
     environment:

docker_auto_push.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Define the path to the docker-compose.yml file
+COMPOSE_FILE="docker-compose.yml"
+
+# Define the Docker Hub repository and tag prefix
+REPO="adamma1024/cvcoach_web"
+TAG_PREFIX="v"
+
+# Function to extract the image version from the docker-compose.yml file
+extract_image_version() {
+	local compose_file=$1
+	local version=$(grep -A 5 "image:" "$compose_file" | grep -E "image: $REPO:$TAG_PREFIX[0-9]+\.[0-9]+" | awk -F':' '{print $3}')
+	echo "$version"
+}
+
+# Function to build, tag, and push the Docker image
+build_and_push() {
+	local version=$1
+	local image_tag="$REPO:$version"
+
+	echo "Building image: $REPO"
+	docker compose build
+
+	echo "Tagging image: $image_tag"
+	docker tag "$REPO" "$image_tag"
+
+	echo "Pushing image: $image_tag"
+	docker push "$image_tag"
+}
+
+# Main script execution
+main() {
+	# Ensure the docker-compose.yml file exists
+	if [[ ! -f "$COMPOSE_FILE" ]]; then
+		echo "Error: $COMPOSE_FILE not found."
+		exit 1
+	fi
+
+	# Extract the image version for the 'web' service
+	local version=$(extract_image_version "$COMPOSE_FILE")
+
+	if [[ -z "$version" ]]; then
+		echo "Error: Unable to extract image version."
+		exit 1
+	fi
+	echo "Version: " $version
+
+	# Build, tag, and push the Docker image
+	build_and_push "$version"
+}
+
+# Run the main function
+main

fe_repo/Dockerfile

@@ -12,6 +12,7 @@ COPY package.json ./
 
 # Step 5: Copy the rest of the application source code
 COPY . .
+RUN rm -rf ./node_modules
 RUN pnpm install
 
 # Step 6: Build the Vite project for production

fe_repo/package.json

@@ -18,6 +18,7 @@
     "@emotion/styled": "^11.13.0",
     "@mui/base": "5.0.0-beta.58",
     "@mui/system": "^6.1.1",
+    "@react-oauth/google": "^0.12.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "uuid": "^10.0.0"