Merge branch 'ref/be/product' of https://github.com/LinaKK/seb44_main…

…_026 into ref/be/product

.github/workflows/gradle.yml

@@ -0,0 +1,132 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    defaults:
+      run:
+        working-directory: ./server
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 11
+      uses: actions/setup-java@v4
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+
+    - name: Grant execute permission to gradlew
+      run: chmod +x ./gradlew
+
+    - name: Build the project with Gradle
+      run: ./gradlew build --no-daemon --info --stacktrace
+
+    - name: List build directory (for debugging)
+      run: |
+        echo "Listing build/libs folder to check for the generated JAR files"
+        ls -la build/libs
+
+    - name: Authenticate to Google Cloud
+      id: auth
+      uses: google-github-actions/auth@v1
+      with:
+       credentials_json: ${{ secrets.GCP_SA_KEY }}
+
+    - name: Configure Docker to use gcloud as a credential helper
+      run: |
+        gcloud auth configure-docker us-central1-docker.pkg.dev
+
+    - name: Build Docker image
+      run: |
+        cp build/libs/greenNare-0.0.1-SNAPSHOT.jar ./app.jar
+        docker build -t us-central1-docker.pkg.dev/greennare-438213/cloud-run-source-deploy/greennare-image:latest .
+
+    - name: Push Docker image to GCP
+      run: |
+        docker push us-central1-docker.pkg.dev/greennare-438213/cloud-run-source-deploy/greennare-image
+
+
+  # docker-push:
+  #   needs: build
+  #   runs-on: ubuntu-latest
+
+  #   defaults:
+  #     run:
+  #       working-directory: ./server
+
+  #   steps:
+  #   - uses: actions/checkout@v4
+
+  #   - name: Authenticate to Google Cloud
+  #     id: auth
+  #     uses: google-github-actions/auth@v1
+  #     with:
+  #      credentials_json: ${{ secrets.GCP_SA_KEY }}
+
+  #   - name: Configure Docker to use gcloud as a credential helper
+  #     run: |
+  #       gcloud auth configure-docker 
+
+  #   - name: Build Docker image
+  #     run: |
+  #       docker build -t gcr.io/greennare-image:latest .
+
+  #   - name: Push Docker image to GCP
+  #     run: |
+  #       docker push us-central1-docker.pkg.dev/greennare-438213/cloud-run-source-deploy/greennare-image
+
+
+    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+    # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+
+    - name: Build with Gradle Wrapper
+      run: ./gradlew build
+
+    # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
+    # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
+    #
+    # - name: Setup Gradle
+    #   uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+    #   with:
+    #     gradle-version: '8.9'
+    #
+    # - name: Build with Gradle 8.9
+    #   run: gradle build
+
+  dependency-submission:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 11
+      uses: actions/setup-java@v4
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+
+    # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
+    # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
+    - name: Generate and submit dependency graph
+      uses: gradle/actions/dependency-submission@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0

client/package.json

@@ -24,7 +24,7 @@
     "react-loading-skeleton": "^3.3.1",
     "react-quill": "^2.0.0",
     "react-router-dom": "^6.14.1",
-    "react-scripts": "5.0.1",
+    "react-scripts": "^5.0.1",
     "react-textarea-autosize": "^8.5.2",
     "styled-components": "^6.0.1",
     "web-vitals": "^2.1.4"
@@ -69,6 +69,8 @@
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.8.8"
   },
-  "homepage": "https://codestates-seb.github.io/seb44_main_026/",
+
+  "homepage": "https://linakk.github.io/seb44_main_026/",
   "proxy": "https://greennare-service-826313586778.us-central1.run.app"
+
 }