Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
4rthem committed Dec 3, 2024
1 parent 839c954 commit 7109396
Show file tree
Hide file tree
Showing 15 changed files with 768 additions and 55 deletions.
9 changes: 4 additions & 5 deletions .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
COMPOSE_PROJECT_NAME=ps
COMPOSE_FILE=docker-compose.yml
COMPOSE_PROFILES=databox,expose,notify,uploader,db,report,tools,mailhog,dashboard,soketi
COMPOSE_PROFILES=databox,expose,notify,uploader,db,report,tools,mailhog,dashboard,soketi,novu

# Leave empty if 443, include ':' otherwise
HTTPS_PORT_PREFIX=${HTTPS_PORT_PREFIX:-}
Expand Down Expand Up @@ -292,8 +292,8 @@ SOKETI_SECRET=__CHANGE_ME_A8PRgk5qpfLxkfLU

NOVU_VERSION=2.1.0

NOVU_API_BASE_URL=https://api-novu.${PHRASEA_DOMAIN}${HTTPS_PORT_PREFIX}
NOVU_FRONT_BASE_URL=https://novu.${PHRASEA_DOMAIN}${HTTPS_PORT_PREFIX}
NOVU_API_URL=https://api-novu.${PHRASEA_DOMAIN}${HTTPS_PORT_PREFIX}
NOVU_FRONT_URL=https://novu.${PHRASEA_DOMAIN}${HTTPS_PORT_PREFIX}
NOVU_WS_URL=https://ws-novu.${PHRASEA_DOMAIN}${HTTPS_PORT_PREFIX}

NOVU_REDIS_HOST=redis
Expand All @@ -302,10 +302,9 @@ NOVU_REDIS_PASSWORD=
NOVU_REDIS_CACHE_SERVICE_HOST=redis
NOVU_REDIS_CACHE_SERVICE_PORT=6379
NOVU_JWT_SECRET=__CHANGE_ME_8Gt1eIKSWgd7Ex5UMJTmkA
NOVU_SECRET_KEY=__CHANGE_ME_8djg5x5MJTmkA
NOVU_STORE_ENCRYPTION_KEY=__CHANGE_ME_y8cPSNUNvomVxLgdQVp7

NOVU_WS_CONTEXT_PATH=

NOVU_MONGO_MAX_POOL_SIZE=200
NOVU_MONGO_MIN_POOL_SIZE=75

Expand Down
1 change: 1 addition & 0 deletions dashboard/client/config-compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
'UPLOADER_CLIENT_URL',
'ZIPPY_URL',
'SOKETI_USAGE_URL',
'NOVU_FRONT_URL',
];

const e = {};
Expand Down
11 changes: 7 additions & 4 deletions dashboard/client/src/Dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export default function Dashboard({}: Props) {
RABBITMQ_CONSOLE_URL,
TRAEFIK_CONSOLE_URL,
SOKETI_USAGE_URL,
NOVU_FRONT_URL,
} = config.env;

const roles = user?.roles ?? [];
Expand Down Expand Up @@ -176,7 +177,9 @@ export default function Dashboard({}: Props) {
)}
</Grid>
{roles.includes('tech') && (
<Grid container spacing={2} marginTop={1}>
<Grid container spacing={2} marginTop={1} sx={{
mb: 5
}}>
{PGADMIN_URL && (
<Grid item>
<Link
Expand Down Expand Up @@ -265,14 +268,14 @@ export default function Dashboard({}: Props) {
</Link>
</Grid>
)}
{SOKETI_USAGE_URL && (
{NOVU_FRONT_URL && (
<Grid item>
<Link
href={SOKETI_USAGE_URL}
href={NOVU_FRONT_URL}
target={'_blank'}
rel={'noreferrer noopener'}
>
Soketi Usage
Novu
</Link>
</Grid>
)}
Expand Down
1 change: 1 addition & 0 deletions dashboard/client/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ declare global {
UPLOADER_CLIENT_URL: string;
ZIPPY_URL: string;
SOKETI_USAGE_URL: string;
NOVU_FRONT_URL: string;
};
} & WindowConfig;
}
Expand Down
4 changes: 4 additions & 0 deletions databox/api/.env
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@ SECRETS_SECRET_KEY=
###> sentry/sentry-symfony ###
SENTRY_DSN=
###< sentry/sentry-symfony ###

###> symfony/novu-notifier ###
NOVU_DSN=novu://API_KEY@default
###< symfony/novu-notifier ###
2 changes: 2 additions & 0 deletions databox/api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@
"symfony/framework-bundle": "^6.3",
"symfony/lock": "^6.3",
"symfony/mime": "^6.3",
"symfony/notifier": "^6.3",
"symfony/novu-notifier": "^6.3",
"symfony/property-access": "^6.3",
"symfony/property-info": "^6.3",
"symfony/psr-http-message-bridge": "^2.3",
Expand Down
177 changes: 161 additions & 16 deletions databox/api/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7109396

Please sign in to comment.