Infrastructure/zipline
1
Fork 0
Code Issues Pull requests Activity

fix: things (#401)

Browse source 
* fix: use relative path for volumes

* fix: null check oauth config

* fix: attempt refresh if error is on /dashboard

---------

Co-authored-by: dicedtomato <35403473+diced@users.noreply.github.com>
This commit is contained in:
Jayvin Hernandez 2023-05-10 22:39:08 -07:00 committed by GitHub
parent 24b06c76fb
commit 1ddd351242
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker-compose.dev.yml
View file

@ -23,8 +23,8 @@ services:
env_file: env_file:
- .env.local - .env.local
volumes: volumes:
- '$PWD/uploads:/zipline/uploads' - './uploads:/zipline/uploads'
- '$PWD/public:/zipline/public' - './public:/zipline/public'
depends_on: depends_on:
- 'postgres' - 'postgres'

2
docker-compose.yml
View file

@ -29,7 +29,7 @@ services:
- CORE_LOGGER=true - CORE_LOGGER=true
volumes: volumes:
- './uploads:/zipline/uploads' - './uploads:/zipline/uploads'
- '$PWD/public:/zipline/public' - './public:/zipline/public'
depends_on: depends_on:
- 'postgres' - 'postgres'

2
src/lib/middleware/getServerSideProps.ts
View file

@ -61,7 +61,7 @@ export const getServerSideProps: GetServerSideProps<ServerSideProps> = async (ct
user_registration: config.features.user_registration, user_registration: config.features.user_registration,
oauth_registration: config.features.oauth_registration, oauth_registration: config.features.oauth_registration,
oauth_providers: JSON.stringify(oauth_providers), oauth_providers: JSON.stringify(oauth_providers),
bypass_local_login: config.oauth.bypass_local_login, bypass_local_login: config.oauth?.bypass_local_login ?? false,
chunks_size: config.chunks.chunks_size, chunks_size: config.chunks.chunks_size,
max_size: config.chunks.max_size, max_size: config.chunks.max_size,
totp_enabled: config.mfa.totp_enabled, totp_enabled: config.mfa.totp_enabled,

12
src/pages/500.tsx
View file

@ -2,8 +2,10 @@ import { Button, Stack, Title, Tooltip } from '@mantine/core';
import MutedText from 'components/MutedText'; import MutedText from 'components/MutedText';
import Head from 'next/head'; import Head from 'next/head';
import Link from 'next/link'; import Link from 'next/link';
import { useRouter } from 'next/router';
export default function FiveHundred() { export default function FiveHundred() {
const { asPath } = useRouter();
return ( return (
<> <>
<Head> <Head>
@ -24,9 +26,13 @@ export default function FiveHundred() {
<Tooltip label={"Take a look at Zipline's logs and the browser console for more info"}> <Tooltip label={"Take a look at Zipline's logs and the browser console for more info"}>
<MutedText>Internal server error</MutedText> <MutedText>Internal server error</MutedText>
</Tooltip> </Tooltip>
<Button component={Link} href='/dashboard'> {asPath === '/dashboard' ? (
Head to the Dashboard <Button onClick={() => window.location.reload()}>Attempt Refresh</Button>
</Button> ) : (
<Button component={Link} href='/dashboard'>
Head to the Dashboard
</Button>
)}
</Stack> </Stack>
</> </>
); );