diff --git a/control-panel.compose.yml b/control-panel.compose.yml new file mode 100644 index 00000000..25e8d93c --- /dev/null +++ b/control-panel.compose.yml @@ -0,0 +1,50 @@ +networks: + loki: + +services: + loki: + image: grafana/loki:latest + ports: + - "3100:3100" + command: -config.file=/etc/loki/local-config.yaml + networks: + - loki + + promtail: + image: grafana/promtail:latest + volumes: + - /var/log:/var/log + command: -config.file=/etc/promtail/config.yml + networks: + - loki + + grafana: + environment: + - GF_PATHS_PROVISIONING=/etc/grafana/provisioning + - GF_AUTH_ANONYMOUS_ENABLED=true + - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin + - GF_FEATURE_TOGGLES_ENABLE=alertingSimplifiedRouting,alertingQueryAndExpressionsStepMode + entrypoint: + - sh + - -euc + - | + mkdir -p /etc/grafana/provisioning/datasources + cat < /etc/grafana/provisioning/datasources/ds.yaml + apiVersion: 1 + datasources: + - name: Loki + type: loki + access: proxy + orgId: 1 + url: http://loki:3100 + basicAuth: false + isDefault: true + version: 1 + editable: false + EOF + /run.sh + image: grafana/grafana:latest + ports: + - "3000:3000" + networks: + - loki diff --git a/evault.docker-compose.yml b/evault.docker-compose.yml index adc8b9c5..2d0dd2b0 100644 --- a/evault.docker-compose.yml +++ b/evault.docker-compose.yml @@ -16,7 +16,7 @@ services: - W3ID=${W3ID} volumes: - secrets:/app/secrets - networks: + networks: - graphnet depends_on: - neo4j diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/AndroidProjectSystem.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/AndroidProjectSystem.xml new file mode 100644 index 00000000..4a53bee8 --- /dev/null +++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/infrastructure/web3-adapter/package.json b/infrastructure/web3-adapter/package.json index 13634372..7b3eb359 100644 --- a/infrastructure/web3-adapter/package.json +++ b/infrastructure/web3-adapter/package.json @@ -18,6 +18,8 @@ "axios": "^1.6.7", "evault-core": "workspace:*", "graphql-request": "^6.1.0", + "pino": "^9.8.0", + "pino-loki": "^2.6.0", "sqlite3": "^5.1.7", "test": "^3.3.0", "uuid": "^11.1.0", @@ -35,6 +37,8 @@ "jest": { "preset": "ts-jest", "testEnvironment": "node", - "testMatch": ["**/__tests__/**/*.test.ts"] + "testMatch": [ + "**/__tests__/**/*.test.ts" + ] } } diff --git a/infrastructure/web3-adapter/src/index.ts b/infrastructure/web3-adapter/src/index.ts index 6941eb11..fa24ffe2 100644 --- a/infrastructure/web3-adapter/src/index.ts +++ b/infrastructure/web3-adapter/src/index.ts @@ -4,6 +4,7 @@ import axios from "axios"; import { v4 as uuidv4 } from "uuid"; import { MappingDatabase } from "./db"; import { EVaultClient } from "./evault/evault"; +import { logger } from "./logging"; import { fromGlobal, toGlobal } from "./mapper/mapper"; import type { IMapping } from "./mapper/mapper.types"; @@ -306,6 +307,15 @@ export class Web3Adapter { if (!this.mapping[tableName]) return; console.log("We get here?"); // If we already have a mapping, use that global ID + + logger.info({ + message: "Handling change", + dataId: data.id, + tableName, + existingGlobalId, + participants, + }); + if (existingGlobalId) { if (this.lockedIds.includes(existingGlobalId)) return; const global = await toGlobal({ diff --git a/infrastructure/web3-adapter/src/logging/index.ts b/infrastructure/web3-adapter/src/logging/index.ts new file mode 100644 index 00000000..052df779 --- /dev/null +++ b/infrastructure/web3-adapter/src/logging/index.ts @@ -0,0 +1,2 @@ +export * from "./transport"; +export * from "./logger"; diff --git a/infrastructure/web3-adapter/src/logging/logger.ts b/infrastructure/web3-adapter/src/logging/logger.ts new file mode 100644 index 00000000..f0bcd9b0 --- /dev/null +++ b/infrastructure/web3-adapter/src/logging/logger.ts @@ -0,0 +1,4 @@ +import pino from "pino"; +import { transport } from "./transport"; + +export const logger = pino(transport); diff --git a/infrastructure/web3-adapter/src/logging/transport.ts b/infrastructure/web3-adapter/src/logging/transport.ts new file mode 100644 index 00000000..c333bacf --- /dev/null +++ b/infrastructure/web3-adapter/src/logging/transport.ts @@ -0,0 +1,16 @@ +import { transport as pinoTransport } from "pino"; +import type { LokiOptions } from "pino-loki"; + +export const transport = pinoTransport({ + target: "pino-loki", + options: { + host: process.env.LOKI_URL || "http://localhost:3100", + labels: { + app: "web3-adapter", + }, + basicAuth: { + username: process.env.LOKI_USERNAME || "admin", + password: process.env.LOKI_PASSWORD || "admin", + }, + }, +}); diff --git a/platforms/pictique-api/src/database/data-source.ts b/platforms/pictique-api/src/database/data-source.ts index 879fe0c2..937a204f 100644 --- a/platforms/pictique-api/src/database/data-source.ts +++ b/platforms/pictique-api/src/database/data-source.ts @@ -12,6 +12,7 @@ import { PostgresSubscriber } from "../web3adapter/watchers/subscriber"; config({ path: path.resolve(__dirname, "../../../../.env") }); +console.log("SAODIHUOPIFHDSA", process.env.PICTIQUE_DATABASE_URL) export const AppDataSource = new DataSource({ type: "postgres", url: process.env.PICTIQUE_DATABASE_URL, diff --git a/platforms/pictique-api/src/index.ts b/platforms/pictique-api/src/index.ts index 78f3721f..c0ab28b3 100644 --- a/platforms/pictique-api/src/index.ts +++ b/platforms/pictique-api/src/index.ts @@ -16,7 +16,7 @@ import { adapter } from "./web3adapter/watchers/subscriber"; config({ path: path.resolve(__dirname, "../../../.env") }); const app = express(); -const port = process.env.PORT || 3000; +const port = process.env.PORT || 1111; // Initialize database connection and adapter AppDataSource.initialize() diff --git a/platforms/pictique/src/routes/(auth)/auth/+page.svelte b/platforms/pictique/src/routes/(auth)/auth/+page.svelte index d4c5715e..929ca9b9 100644 --- a/platforms/pictique/src/routes/(auth)/auth/+page.svelte +++ b/platforms/pictique/src/routes/(auth)/auth/+page.svelte @@ -47,6 +47,7 @@ class="h-max-[600px] w-max-[400px] mb-5 flex flex-col items-center gap-5 rounded-xl bg-[#F476481A] p-5" >

Scan the QR code using your eID App to login

+ {#if qrData}
{qrData} + {/if}

The code is valid for 60 seconds Please refresh the page if it expires