diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f012b6d..c2b77de 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -35,6 +35,7 @@ jobs: key: ${{ secrets.SSH_KEY }} script: | cd ${{ secrets.TARGET_DIR }}/ffsaf + cp ../vite.env src/main/webapp/.env chmod 740 mvnw JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 ./mvnw package -Pnative -DskipTests @@ -65,3 +66,16 @@ jobs: echo 'Container is not running' exit 1 # This mark the pipeline as failed fi + + - name: Build site and copy it + uses: appleboy/ssh-action@v1.0.0 + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.SSH_USER }} + port: ${{ secrets.SSH_PORT }} + key: ${{ secrets.SSH_KEY }} + script: | + cd ${{ secrets.TARGET_DIR }}/ffsaf/src/main/webapp + npm run build + rm -rf ${{ secrets.TARGET_DIR }}/ffsaf-site + mv dist ${{ secrets.TARGET_DIR }}/ffsaf-site \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5956351..5d5ae23 100644 --- a/pom.xml +++ b/pom.xml @@ -78,12 +78,6 @@ 1.18.22 provided - - - io.quarkiverse.quinoa - quarkus-quinoa-deployment - 2.3.2 - diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7f5e3c7..64cd538 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,9 +14,6 @@ quarkus.hibernate-orm.physical-naming-strategy=fr.titionfire.ffsaf.data.SafcaNam quarkus.http.cors=true quarkus.quartz.start-mode=forced -%dev.quarkus.quinoa=false -quarkus.quinoa.ui-dir=src/main/webapp - database.prefix = test2_ database.database=ffsaf database.hostname=localhost diff --git a/src/main/webapp/src/main.jsx b/src/main/webapp/src/main.jsx index f902d0e..1d389e6 100644 --- a/src/main/webapp/src/main.jsx +++ b/src/main/webapp/src/main.jsx @@ -2,8 +2,6 @@ import React from 'react' import ReactDOM from 'react-dom/client' import App from './App.jsx' import './index.css' -import keycloak from "./Keycloak.js"; -import {ReactKeycloakProvider} from "@react-keycloak/web"; import {KeycloakContextProvider} from "./hooks/useAuth.jsx"; ReactDOM.createRoot(document.getElementById('root')).render(