CHANGE: updated compose file

This commit is contained in:
2025-02-24 23:20:19 +01:00
parent 0bb12318cc
commit db98eecd87
9 changed files with 1691 additions and 427 deletions

5
.gitignore vendored
View File

@@ -31,3 +31,8 @@ DB/pg_data
.env.* .env.*
.env .env
!.env.example !.env.example
.idea
.vscode
node_modules

19
.vscode/launch.json vendored
View File

@@ -1,19 +0,0 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Backend",
"type": "go",
"request": "launch",
"mode": "auto",
"program": "${workspaceFolder}/Backend",
"dlvFlags": ["--check-go-version=false"],
"env": {
"DEBUG": "true"
}
}
]
}

15
.vscode/settings.json vendored
View File

@@ -1,15 +0,0 @@
{
"sqltools.connections": [
{
"previewLimit": 50,
"server": "localhost",
"port": 5432,
"askForPassword": true,
"driver": "PostgreSQL",
"name": "arbeitszeiten",
"database": "arbeitszeitmessung",
"username": "arbeit_zeit"
}
],
"makefile.configureOnOpen": false
}

View File

@@ -10,8 +10,8 @@ import (
func OpenDatabase() (*sql.DB, error) { func OpenDatabase() (*sql.DB, error) {
dbHost := helper.GetEnv("POSTGRES_HOST", "localhost") dbHost := helper.GetEnv("POSTGRES_HOST", "localhost")
dbName := helper.GetEnv("POSTGRES_DB", "arbeitszeitmessung") dbName := helper.GetEnv("POSTGRES_DB", "arbeitszeitmessung")
dbUser := helper.GetEnv("POSTGRES_USER", "arbeit_zeit") dbUser := helper.GetEnv("POSTGRES_API_USER", "arbeit_zeit")
dbPassword := helper.GetEnv("POSTGRES_PASS", "password") dbPassword := helper.GetEnv("POSTGRES_API_PASS", "password")
connStr := fmt.Sprintf("postgres://%s:%s@%s:5432/%s?sslmode=disable&TimeZone=Europe/Berlin", dbUser, dbPassword, dbHost, dbName) connStr := fmt.Sprintf("postgres://%s:%s@%s:5432/%s?sslmode=disable&TimeZone=Europe/Berlin", dbUser, dbPassword, dbHost, dbName)
return sql.Open("postgres", connStr) return sql.Open("postgres", connStr)

View File

@@ -39,6 +39,7 @@
grid-template-columns: subgrid; grid-template-columns: subgrid;
grid-column: 1 / -1; grid-column: 1 / -1;
border-color: var(--color-neutral-400); border-color: var(--color-neutral-400);
transition: background-color 0.2s ease-in-out;
} }
.grid-sub:hover { .grid-sub:hover {
@@ -56,6 +57,7 @@
margin: 0 10%; margin: 0 10%;
} }
.grid-sub {} .grid-sub {
}
} }
} }

File diff suppressed because it is too large Load Diff

View File

@@ -61,13 +61,13 @@ EXECUTE FUNCTION update_zuletzt_geandert();
-- audittabelle für arbeitsstunden bestätigung -- audittabelle für arbeitsstunden bestätigung
DROP TABLE IF EXISTS "buchung_wochen"; -- DROP TABLE IF EXISTS "buchung_wochen";
CREATE TABLE "buchung_wochen" ( -- CREATE TABLE "buchung_wochen" (
"personal_nummer" int4, -- "personal_nummer" int4,
"woche_start" date, -- "woche_start" date,
"buchungen" []bigserial, -- "buchungen" []bigserial,
"bestaetigt" bool DEFAULT FALSE, -- "bestaetigt" bool DEFAULT FALSE,
); -- );
-- Adds crypto extension -- Adds crypto extension

View File

@@ -26,8 +26,6 @@ services:
environment: environment:
POSTGRES_HOST: db POSTGRES_HOST: db
POSTGRES_DB: ${POSTGRES_DB} POSTGRES_DB: ${POSTGRES_DB}
POSTGRES_USER: ${POSTGRES_API_USER}
POSTGRES_PASS: ${POSTGRES_API_PASSWORD}
EXPOSED_PORT: ${EXPOSED_PORT} EXPOSED_PORT: ${EXPOSED_PORT}
DEBUG: true DEBUG: true
ports: ports:

View File

@@ -21,8 +21,6 @@ services:
environment: environment:
POSTGRES_HOST: db POSTGRES_HOST: db
POSTGRES_DB: ${POSTGRES_DB} POSTGRES_DB: ${POSTGRES_DB}
POSTGRES_USER: ${POSTGRES_API_USER}
POSTGRES_PASS: ${POSTGRES_API_PASSWORD}
EXPOSED_PORT: ${EXPOSED_PORT} EXPOSED_PORT: ${EXPOSED_PORT}
ports: ports:
- ${EXPOSED_PORT}:8080 - ${EXPOSED_PORT}:8080