florian/Codiki
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: florian/Codiki:main-debipogi
Branches Tags
florian/Codiki:main florian/Codiki:main-debipogi florian/Codiki:gradle-setup florian/Codiki:trafic-logging florian/Codiki:signals-conversion
..
compare: florian/Codiki:4469000695d83f97db065868d43c3683bc8dab5b
Branches Tags
florian/Codiki:main-debipogi florian/Codiki:main florian/Codiki:gradle-setup florian/Codiki:trafic-logging florian/Codiki:signals-conversion
1 Commits
main-debipogi .. 4469000695
Author SHA1 Message Date
Florian THIERRY 4469000695 Fix left side menu. 2026-02-03 16:14:18 +01:00
7 changed files with 3588 additions and 2771 deletions
Expand all files Collapse all files
.gitea/workflows/build-and-deploy.yml
+13 -13
View File
@@ -4,7 +4,7 @@ on:
push: push:
branches: branches:
- main - main
- main-debipogi
jobs: jobs:
build-and-deploy: build-and-deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -19,7 +19,7 @@ jobs:
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa
git clone --branch debipogi ssh://gitea@gitea.takiguchi.ovh:12960/Codiki/codiki-properties.git --config core.sshCommand='ssh -o StrictHostKeyChecking=no' git clone -b hexagonal-reforged ssh://gitea@gitea.takiguchi.ovh:12960/Codiki/codiki-properties.git --config core.sshCommand='ssh -o StrictHostKeyChecking=no'
- name: 📄 Edit configuration - name: 📄 Edit configuration
run: | run: |
@@ -45,11 +45,11 @@ jobs:
- name: 📤 Transfer artifacts to remote server - name: 📤 Transfer artifacts to remote server
env: env:
SSH_PRIVATE_KEY: ${{ secrets.D_PROD_SSH_PRIVATE_KEY }} SSH_PRIVATE_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }}
REMOTE_USER: ${{ secrets.D_PROD_REMOTE_USER }} REMOTE_USER: ${{ secrets.PROD_REMOTE_USER }}
REMOTE_HOST: ${{ secrets.D_PROD_REMOTE_HOST }} REMOTE_HOST: ${{ secrets.PROD_REMOTE_HOST }}
REMOTE_PORT: ${{ secrets.D_PROD_REMOTE_PORT }} REMOTE_PORT: ${{ secrets.PROD_REMOTE_PORT }}
REMOTE_PATH: ${{ secrets.D_PROD_REMOTE_PATH }} REMOTE_PATH: ${{ secrets.PROD_REMOTE_PATH }}
run: | run: |
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
@@ -61,15 +61,15 @@ jobs:
- name: 🚀 Launch application onto remote server - name: 🚀 Launch application onto remote server
env: env:
SSH_PRIVATE_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }} SSH_PRIVATE_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }}
REMOTE_USER: ${{ secrets.D_PROD_REMOTE_USER }} REMOTE_USER: ${{ secrets.PROD_REMOTE_USER }}
REMOTE_HOST: ${{ secrets.D_PROD_REMOTE_HOST }} REMOTE_HOST: ${{ secrets.PROD_REMOTE_HOST }}
REMOTE_PORT: ${{ secrets.D_PROD_REMOTE_PORT }} REMOTE_PORT: ${{ secrets.PROD_REMOTE_PORT }}
REMOTE_PATH: ${{ secrets.D_PROD_REMOTE_PATH }} REMOTE_PATH: ${{ secrets.PROD_REMOTE_PATH }}
run: | run: |
ssh -o StrictHostKeyChecking=no $REMOTE_HOST -l $REMOTE_USER -p $REMOTE_PORT << EOC ssh -o StrictHostKeyChecking=no $REMOTE_HOST -l $REMOTE_USER -p $REMOTE_PORT << EOC
cd $REMOTE_PATH cd $REMOTE_PATH
sudo /usr/bin/docker load < $REMOTE_PATH/codiki-backend.tar sudo /usr/bin/docker load < $REMOTE_PATH/codiki-backend.tar
sudo /usr/bin/docker load < $REMOTE_PATH/codiki-frontend.tar sudo /usr/bin/docker load < $REMOTE_PATH/codiki-frontend.tar
sudo /usr/bin/docker compose --file /home/codiki/docker-compose.yml down sudo /usr/bin/docker compose down
sudo /usr/bin/docker compose --file /home/codiki/docker-compose.yml up --detach sudo /usr/bin/docker compose up --detach
EOC EOC
backend/codiki-launcher/src/main/resources/application-local.yml
+2 -2
View File
@@ -1,7 +1,7 @@
application: application:
pictures: pictures:
path: /Users/fthierry/Documents/Developpement/codiki-hexagonal/backend/pictures-folder path: /home/florian/Developpement/codiki-hexagonal/backend/pictures-folder/
temp-path: /Users/fthierry/Documents/Developpement/codiki-hexagonal/backend/pictures-folder/temp temp-path : /home/florian/Developpement/codiki-hexagonal/backend/pictures-folder/temp/
logging: logging:
level: level:
backend/pom.xml
+4 -4
View File
@@ -16,9 +16,9 @@
<maven.compiler.source>21</maven.compiler.source> <maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target> <maven.compiler.target>21</maven.compiler.target>
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version> <jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
<java-jwt.version>4.5.1</java-jwt.version> <java-jwt.version>4.5.0</java-jwt.version>
<postgresql.version>42.7.10</postgresql.version> <postgresql.version>42.7.8</postgresql.version>
<tika-core.version>3.3.0</tika-core.version> <tika-core.version>3.2.3</tika-core.version>
<commons-lang3.version>3.20.0</commons-lang3.version> <commons-lang3.version>3.20.0</commons-lang3.version>
</properties> </properties>
@@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
<version>4.0.5</version> <version>4.0.1</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
docker-compose.yml
+2 -2
View File
@@ -12,7 +12,7 @@ services:
POSTGRES_PASSWORD: <POSTGRES_PASSWORD> POSTGRES_PASSWORD: <POSTGRES_PASSWORD>
PGDATA: /var/lib/postgresql/data/pgdata PGDATA: /var/lib/postgresql/data/pgdata
volumes: volumes:
- "/home/codiki/database:/var/lib/postgresql/data/pgdata" - "./docker/postgresql/pgdata:/var/lib/postgresql/data/pgdata"
restart: always restart: always
codiki-backend: codiki-backend:
@@ -23,7 +23,7 @@ services:
ports: ports:
- "50011:8080" - "50011:8080"
volumes: volumes:
- "/home/codiki/pictures:/opt/codiki/pictures" - "/opt/codiki/pictures:/opt/codiki/pictures"
networks: networks:
- "codiki-network" - "codiki-network"
restart: always restart: always
frontend/conf/nginx.conf
+1 -1
View File
@@ -44,7 +44,7 @@ http {
} }
location ~ ^/api { location ~ ^/api {
proxy_pass http://192.168.1.154:50011; proxy_pass http://192.168.1.153:50011;
proxy_set_header Host $host:$server_port; proxy_set_header Host $host:$server_port;
proxy_set_header X-Forwarded-Host $server_name; proxy_set_header X-Forwarded-Host $server_name;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
frontend/package-lock.json
Generated
+3548 -2731
View File
File diff suppressed because it is too large Load Diff
frontend/package.json
+19 -19
View File
@@ -17,26 +17,26 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "21.2.10", "@angular/animations": "^21.1.2",
"@angular/cdk": "21.2.8", "@angular/cdk": "^21.1.2",
"@angular/common": "21.2.10", "@angular/common": "^21.1.2",
"@angular/compiler": "21.2.10", "@angular/compiler": "^21.1.2",
"@angular/core": "21.2.10", "@angular/core": "^21.1.2",
"@angular/forms": "21.2.10", "@angular/forms": "^21.1.2",
"@angular/material": "21.2.8", "@angular/material": "^21.1.2",
"@angular/platform-browser": "21.2.10", "@angular/platform-browser": "^21.1.2",
"@angular/platform-browser-dynamic": "21.2.10", "@angular/platform-browser-dynamic": "^21.1.2",
"@angular/router": "21.2.10", "@angular/router": "^21.1.2",
"rxjs": "7.8.2", "rxjs": "~7.8.2",
"tslib": "2.8.1" "tslib": "^2.8.1"
}, },
"devDependencies": { "devDependencies": {
"@angular/build": "21.2.8", "@angular/build": "^21.1.2",
"@angular/cli": "21.2.8", "@angular/cli": "^21.1.2",
"@angular/compiler-cli": "21.2.10", "@angular/compiler-cli": "^21.1.2",
"@angular/localize": "21.2.10", "@angular/localize": "^21.1.2",
"@types/jasmine": "6.0.0", "@types/jasmine": "~5.1.15",
"jasmine-core": "6.2.0", "jasmine-core": "~5.13.0",
"typescript": "5.9.3" "typescript": "~5.9.3"
} }
} }