diff --git a/.jhipster/AuditLog.json b/.jhipster/AuditLog.json index bbb2252..34dc6de 100644 --- a/.jhipster/AuditLog.json +++ b/.jhipster/AuditLog.json @@ -37,11 +37,11 @@ "pagination": "pagination", "relationships": [ { - "relationshipSide": "left", - "relationshipType": "many-to-one", + "otherEntityField": "username", "otherEntityName": "utenteApp", "relationshipName": "utente", - "otherEntityField": "username" + "relationshipSide": "left", + "relationshipType": "many-to-one" } ], "searchEngine": "no", diff --git a/.jhipster/Conferma.json b/.jhipster/Conferma.json index f84c19f..368b5d9 100644 --- a/.jhipster/Conferma.json +++ b/.jhipster/Conferma.json @@ -20,18 +20,18 @@ "pagination": "pagination", "relationships": [ { - "relationshipSide": "left", - "relationshipType": "many-to-one", + "otherEntityField": "username", "otherEntityName": "utenteApp", "relationshipName": "confermataDa", - "otherEntityField": "username" + "relationshipSide": "left", + "relationshipType": "many-to-one" }, { - "relationshipSide": "right", - "relationshipType": "one-to-one", "otherEntityName": "prenotazione", "otherEntityRelationshipName": "conferma", - "relationshipName": "prenotazione" + "relationshipName": "prenotazione", + "relationshipSide": "right", + "relationshipType": "one-to-one" } ], "searchEngine": "no", diff --git a/.jhipster/Disponibilita.json b/.jhipster/Disponibilita.json index a461c5f..a66c679 100644 --- a/.jhipster/Disponibilita.json +++ b/.jhipster/Disponibilita.json @@ -44,12 +44,12 @@ "pagination": "infinite-scroll", "relationships": [ { - "relationshipSide": "left", - "relationshipType": "many-to-one", + "otherEntityField": "nome", "otherEntityName": "struttura", "otherEntityRelationshipName": "disponibilita", "relationshipName": "struttura", - "otherEntityField": "nome" + "relationshipSide": "left", + "relationshipType": "many-to-one" } ], "searchEngine": "no", diff --git a/.jhipster/Liberatoria.json b/.jhipster/Liberatoria.json index a665712..4752b49 100644 --- a/.jhipster/Liberatoria.json +++ b/.jhipster/Liberatoria.json @@ -13,18 +13,18 @@ "name": "Liberatoria", "relationships": [ { - "relationshipSide": "left", - "relationshipType": "many-to-one", + "otherEntityField": "username", "otherEntityName": "utenteApp", "otherEntityRelationshipName": "liberatorie", "relationshipName": "utente", - "otherEntityField": "username" + "relationshipSide": "left", + "relationshipType": "many-to-one" }, { - "relationshipSide": "left", - "relationshipType": "many-to-one", "otherEntityName": "modelloLiberatoria", - "relationshipName": "modelloLiberatoria" + "relationshipName": "modelloLiberatoria", + "relationshipSide": "left", + "relationshipType": "many-to-one" } ], "searchEngine": "no", diff --git a/.jhipster/Messaggio.json b/.jhipster/Messaggio.json index 57046f0..8d8469c 100644 --- a/.jhipster/Messaggio.json +++ b/.jhipster/Messaggio.json @@ -21,11 +21,11 @@ "name": "Messaggio", "relationships": [ { - "relationshipSide": "left", - "relationshipType": "many-to-one", + "otherEntityField": "username", "otherEntityName": "utenteApp", "relationshipName": "utente", - "otherEntityField": "username" + "relationshipSide": "left", + "relationshipType": "many-to-one" } ], "searchEngine": "no", diff --git a/.jhipster/ModelloLiberatoria.json b/.jhipster/ModelloLiberatoria.json index b11bb60..cadd268 100644 --- a/.jhipster/ModelloLiberatoria.json +++ b/.jhipster/ModelloLiberatoria.json @@ -29,11 +29,11 @@ "name": "ModelloLiberatoria", "relationships": [ { - "relationshipSide": "left", - "relationshipType": "many-to-one", "otherEntityName": "struttura", "otherEntityRelationshipName": "moduliLiberatorie", - "relationshipName": "struttura" + "relationshipName": "struttura", + "relationshipSide": "left", + "relationshipType": "many-to-one" } ], "searchEngine": "no", diff --git a/.jhipster/Notifica.json b/.jhipster/Notifica.json index cdad1ed..ce44860 100644 --- a/.jhipster/Notifica.json +++ b/.jhipster/Notifica.json @@ -41,10 +41,10 @@ "pagination": "pagination", "relationships": [ { - "relationshipSide": "left", - "relationshipType": "many-to-one", "otherEntityName": "conferma", - "relationshipName": "conferma" + "relationshipName": "conferma", + "relationshipSide": "left", + "relationshipType": "many-to-one" } ], "searchEngine": "no", diff --git a/.jhipster/Prenotazione.json b/.jhipster/Prenotazione.json index fa27d1a..0dad1cc 100644 --- a/.jhipster/Prenotazione.json +++ b/.jhipster/Prenotazione.json @@ -36,25 +36,25 @@ "pagination": "pagination", "relationships": [ { - "relationshipSide": "left", - "relationshipType": "one-to-one", "otherEntityName": "conferma", "otherEntityRelationshipName": "prenotazione", - "relationshipName": "conferma" + "relationshipName": "conferma", + "relationshipSide": "left", + "relationshipType": "one-to-one" }, { - "relationshipSide": "left", - "relationshipType": "many-to-one", + "otherEntityField": "username", "otherEntityName": "utenteApp", "relationshipName": "utente", - "otherEntityField": "username" + "relationshipSide": "left", + "relationshipType": "many-to-one" }, { - "relationshipSide": "left", - "relationshipType": "many-to-one", + "otherEntityField": "nome", "otherEntityName": "struttura", "relationshipName": "struttura", - "otherEntityField": "nome" + "relationshipSide": "left", + "relationshipType": "many-to-one" } ], "searchEngine": "no", diff --git a/.jhipster/Struttura.json b/.jhipster/Struttura.json index 0836a22..1870061 100644 --- a/.jhipster/Struttura.json +++ b/.jhipster/Struttura.json @@ -43,18 +43,18 @@ "pagination": "pagination", "relationships": [ { - "relationshipSide": "right", - "relationshipType": "one-to-many", "otherEntityName": "disponibilita", "otherEntityRelationshipName": "struttura", - "relationshipName": "disponibilita" + "relationshipName": "disponibilita", + "relationshipSide": "right", + "relationshipType": "one-to-many" }, { - "relationshipSide": "right", - "relationshipType": "one-to-many", "otherEntityName": "modelloLiberatoria", "otherEntityRelationshipName": "struttura", - "relationshipName": "moduliLiberatorie" + "relationshipName": "moduliLiberatorie", + "relationshipSide": "right", + "relationshipType": "one-to-many" } ], "searchEngine": "no", diff --git a/.jhipster/UtenteApp.json b/.jhipster/UtenteApp.json index badaff7..e1b7609 100644 --- a/.jhipster/UtenteApp.json +++ b/.jhipster/UtenteApp.json @@ -22,8 +22,8 @@ { "fieldName": "ruolo", "fieldType": "Ruolo", - "fieldValues": "USER,INCARICATO,ADMIN", - "fieldValidateRules": ["required"] + "fieldValidateRules": ["required"], + "fieldValues": "USER,INCARICATO,ADMIN" }, { "fieldName": "attivo", @@ -74,19 +74,19 @@ "name": "UtenteApp", "relationships": [ { - "relationshipSide": "left", - "relationshipType": "one-to-one", + "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "internalUser", - "otherEntityField": "login", + "relationshipSide": "left", + "relationshipType": "one-to-one", "relationshipWithBuiltInEntity": true }, { - "relationshipSide": "right", - "relationshipType": "one-to-many", "otherEntityName": "liberatoria", "otherEntityRelationshipName": "utente", - "relationshipName": "liberatorie" + "relationshipName": "liberatorie", + "relationshipSide": "right", + "relationshipType": "one-to-many" } ], "searchEngine": "no", diff --git a/.yo-rc.json b/.yo-rc.json index f2294b9..51114d7 100644 --- a/.yo-rc.json +++ b/.yo-rc.json @@ -35,6 +35,7 @@ "lastLiquibaseTimestamp": 1765383090000, "microfrontend": null, "microfrontends": [], + "monorepository": true, "nativeLanguage": "it", "packageName": "it.sw.pa.comune.artegna", "prodDatabaseType": "postgresql", @@ -42,10 +43,9 @@ "rememberMeKey": "c3201ccf39b5d82ef696ad12b95009f33d980fc0468a86e957ad91487d1fe80d9440f72a1d09721585bc96b11048fda07240", "serverPort": null, "serviceDiscoveryType": null, + "skipCommitHook": true, "syncUserWithIdp": null, "testFrameworks": ["cypress"], - "withAdminUi": true, - "monorepository": true, - "skipCommitHook": true + "withAdminUi": true } } diff --git a/docker-compose/.yo-rc.json b/docker-compose/.yo-rc.json new file mode 100644 index 0000000..1d37ee2 --- /dev/null +++ b/docker-compose/.yo-rc.json @@ -0,0 +1,10 @@ +{ + "generator-jhipster": { + "appsFolders": ["smartbooking"], + "deploymentType": "docker-compose", + "directoryPath": "../../", + "jwtSecretKey": "MDQwNzk2YjgyMzE3NjQxNWViNzQyZThjNmJjNjI1YzBmZGRiYzBmYzMxNjg2ODM4MGMxOTFjM2NiNGUxMDE1ZWFiODA0ZTA1M2JkZjM5NThhNTc3YzViY2MxY2IxYTNiYWQ0Zg==", + "monitoring": "no", + "serviceDiscoveryType": "no" + } +} diff --git a/docker-compose/README-DOCKER-COMPOSE.md b/docker-compose/README-DOCKER-COMPOSE.md new file mode 100644 index 0000000..fa780ff --- /dev/null +++ b/docker-compose/README-DOCKER-COMPOSE.md @@ -0,0 +1,14 @@ +# JHipster generated Docker-Compose configuration + +## Usage + +Launch all your infrastructure by running: `docker compose up -d`. + +## Configured Docker services + +### Applications and dependencies: + +- smartbooking (monolith application) +- smartbooking's postgresql database + +### Additional Services: diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml new file mode 100644 index 0000000..6585951 --- /dev/null +++ b/docker-compose/docker-compose.yml @@ -0,0 +1,31 @@ +services: + smartbooking: + image: git.bigc.it/sbierti/smartbooking:latest + environment: + - _JAVA_OPTIONS=-Xmx512m -Xms256m + - SPRING_PROFILES_ACTIVE=prod,api-docs + - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true + - SPRING_DATASOURCE_URL=jdbc:postgresql://smartbooking-postgresql:5432/smartbooking + - SPRING_LIQUIBASE_URL=jdbc:postgresql://smartbooking-postgresql:5432/smartbooking + - JHIPSTER_SLEEP=30 + ports: + - 8080:8080 + depends_on: + - postgresql + postgresql: + image: postgres:18.1 + # volumes: + # - ~/volumes/jhipster/smartbooking/postgresql/:/var/lib/postgresql/data/ + environment: + - POSTGRES_USER=smartbooking + - POSTGRES_HOST_AUTH_METHOD=trust + healthcheck: + test: [ 'CMD-SHELL', 'pg_isready -U $${POSTGRES_USER}' ] + interval: 5s + timeout: 5s + retries: 10 + # If you want to expose these ports outside your dev PC, + # remove the "127.0.0.1:" prefix + ports: + - 127.0.0.1:5432:5432 + diff --git a/src/main/webapp/app/account/register/register.vue b/src/main/webapp/app/account/register/register.vue index 48a1de6..7ffbec8 100644 --- a/src/main/webapp/app/account/register/register.vue +++ b/src/main/webapp/app/account/register/register.vue @@ -139,11 +139,11 @@

-
+
diff --git a/src/main/webapp/app/core/home/home.vue b/src/main/webapp/app/core/home/home.vue index b9ef515..a66a635 100644 --- a/src/main/webapp/app/core/home/home.vue +++ b/src/main/webapp/app/core/home/home.vue @@ -11,20 +11,21 @@
{{ t$('home.logged.message', { username }) }}
-
{{ t$('home.profile.incomplete.message') }} -   - {{ t$('home.profile.incomplete.link') }} +
+ {{ t$('home.profile.incomplete.link') }} +
-
+
{{ t$('global.messages.info.register.noaccount') }}  diff --git a/src/main/webapp/app/entities/disponibilita/disponibilita.vue b/src/main/webapp/app/entities/disponibilita/disponibilita.vue index 53bcf0a..aba6983 100644 --- a/src/main/webapp/app/entities/disponibilita/disponibilita.vue +++ b/src/main/webapp/app/entities/disponibilita/disponibilita.vue @@ -125,8 +125,8 @@ - +