Infrastructure/zipline
1
Fork 0
mirror of https://github.com/diced/zipline.git synced 2025-04-04 23:21:17 -05:00
Code Issues Activity

feat: new configuration options

Browse source
This commit is contained in:
dicedtomato 2022-07-14 03:05:16 +00:00 • committed by GitHub
parent 61c5df750a
commit 786e6d5799
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 216 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/components/pages/Stats.tsx
View file

@ -43,14 +43,16 @@ export default function Stats() {
</Card>
</SimpleGrid>
<Card name='Files per User' mt={22}>
<SmallTable
columns={[
{ id: 'username', name: 'Name' },
{ id: 'count', name: 'Files' },
]}
rows={stats ? stats.count_by_user : []} />
</Card>
{stats.count_by_user.length ? (
<Card name='Files per User' mt={22}>
<SmallTable
columns={[
{ id: 'username', name: 'Name' },
{ id: 'count', name: 'Files' },
]}
rows={stats ? stats.count_by_user : []} />
</Card>
) : null}
<Card name='Types' mt={22}>
<SmallTable
columns={[

3
src/lib/config.ts
View file

@ -1,6 +1,7 @@
import { Config } from './config/Config';
import readConfig from './config/readConfig';
import validateConfig from './config/validateConfig';
if (!global.config) global.config = validateConfig(readConfig());
export default global.config;
export default global.config as Config;

8
src/lib/config/Config.ts
View file

@ -105,10 +105,18 @@ export interface ConfigRatelimit {
admin: number;
}
export interface ConfigWebsite {
// Change the title from Zipline to something else
title: string;
// If zipline should show files per user in the stats page
show_files_per_user: boolean;
}
export interface Config {
core: ConfigCore;
uploader: ConfigUploader;
urls: ConfigUrls;
ratelimit: ConfigRatelimit;
datasource: ConfigDatasource;
website: ConfigWebsite;
}

3
src/lib/config/readConfig.ts
View file

@ -80,6 +80,9 @@ export default function readConfig() {
map('RATELIMIT_USER', 'number', 'ratelimit.user'),
map('RATELIMIT_ADMIN', 'number', 'ratelimit.admin'),
map('WEBSITE_TITLE', 'string', 'website.title'),
map('WEBSITE_SHOW_FILES_PER_USER', 'boolean', 'website.show_files_per_user'),
];
const config = {};

4
src/lib/config/validateConfig.ts
View file

@ -50,6 +50,10 @@ const validator = object({
user: number().default(0),
admin: number().default(0),
}),
website: object({
title: string().default('Zipliner'),
show_files_per_user: boolean().default(true),
}),
});
export default function validate(config): Config {

1
src/pages/_app.tsx
View file

@ -8,7 +8,6 @@ export default function MyApp({ Component, pageProps }) {
return (
<Provider store={store}>
<Head>
<title>{Component.title}</title>
<meta name='viewport' content='minimum-scale=1, initial-scale=1, width=device-width' />
</Head>
<ZiplineTheming Component={Component} pageProps={pageProps} />

2
src/pages/api/shorten.ts
View file

@ -33,7 +33,7 @@ async function handler(req: NextApiReq, res: NextApiRes) {
Logger.get('url').info(`User ${user.username} (${user.id}) shortenned a url ${url.destination} (${url.id})`);
return res.json({ url: `${zconfig.core.secure ? 'https' : 'http'}://${req.headers.host}${zconfig.urls.route}/${req.body.vanity ? req.body.vanity : invis ? invis.invis : url.id}` });
return res.json({ url: `${zconfig.core.https ? 'https' : 'http'}://${req.headers.host}${zconfig.urls.route}/${req.body.vanity ? req.body.vanity : invis ? invis.invis : url.id}` });
}
export default withZipline(handler);

5
src/pages/api/stats.ts
View file

@ -1,5 +1,6 @@
import { NextApiReq, NextApiRes, withZipline } from 'middleware/withZipline';
import prisma from 'lib/prisma';
import config from 'lib/config';
async function handler(req: NextApiReq, res: NextApiRes) {
const user = await req.user();
@ -12,6 +13,10 @@ async function handler(req: NextApiReq, res: NextApiRes) {
take: 1,
});
if (config.website.show_files_per_user) {
(stats.data as any).count_by_user = [];
}
return res.json(stats.data);
}

2
src/pages/api/upload.ts
View file

@ -95,7 +95,7 @@ async function handler(req: NextApiReq, res: NextApiRes) {
const domain = user.domains[Math.floor(Math.random() * user.domains.length)];
files.push(`${domain}${zconfig.uploader.route === '/' ? '' : zconfig.uploader.route}/${invis ? invis.invis : image.file}`);
} else {
files.push(`${zconfig.core.secure ? 'https' : 'http'}://${req.headers.host}${zconfig.uploader.route === '/' ? '' : zconfig.uploader.route}/${invis ? invis.invis : image.file}`);
files.push(`${zconfig.core.https ? 'https' : 'http'}://${req.headers.host}${zconfig.uploader.route === '/' ? '' : zconfig.uploader.route}/${invis ? invis.invis : image.file}`);
}
}

28
src/pages/dashboard/files.tsx
View file

@ -3,19 +3,33 @@ import useLogin from 'hooks/useLogin';
import Layout from 'components/Layout';
import Files from 'components/pages/Files';
import { LoadingOverlay } from '@mantine/core';
import { GetServerSideProps } from 'next';
import Head from 'next/head';
export default function FilesPage() {
export default function FilesPage({ title }) {
const { user, loading } = useLogin();
if (loading) return <LoadingOverlay visible={loading} />;
return (
<Layout
user={user}
>
<Files />
</Layout>
<>
<Head>
<title>{title} - Files</title>
</Head>
<Layout
user={user}
>
<Files />
</Layout>
</>
);
}
FilesPage.title = 'Zipline - Files';
export const getServerSideProps: GetServerSideProps = async () => {
return {
props: {
title: global.config.website.title,
},
};
};

29
src/pages/dashboard/index.tsx
View file

@ -3,19 +3,32 @@ import useLogin from 'hooks/useLogin';
import Layout from 'components/Layout';
import Dashboard from 'components/pages/Dashboard';
import { LoadingOverlay } from '@mantine/core';
import { GetServerSideProps } from 'next';
import Head from 'next/head';
export default function DashboardPage() {
export default function DashboardPage({ title, meta }) {
const { user, loading } = useLogin();
if (loading) return <LoadingOverlay visible={loading} />;
return (
<Layout
user={user}
>
<Dashboard />
</Layout>
<>
<Head>
<title>{title}</title>
</Head>
<Layout
user={user}
>
<Dashboard />
</Layout>
</>
);
}
DashboardPage.title = 'Zipline';
export const getServerSideProps: GetServerSideProps = async () => {
return {
props: {
title: global.config.website.title,
},
};
};

27
src/pages/dashboard/invites.tsx
View file

@ -3,19 +3,32 @@ import useLogin from 'hooks/useLogin';
import Layout from 'components/Layout';
import Invites from 'components/pages/Invites';
import { LoadingOverlay } from '@mantine/core';
import Head from 'next/head';
import { GetServerSideProps } from 'next';
export default function InvitesPage() {
export default function InvitesPage({ title }) {
const { user, loading } = useLogin();
if (loading) return <LoadingOverlay visible={loading} />;
return (
<Layout
user={user}
>
<Invites />
</Layout>
<>
<Head>
<title>{title} - Invites</title>
</Head>
<Layout
user={user}
>
<Invites />
</Layout>
</>
);
}
InvitesPage.title = 'Zipline - Invites';
export const getServerSideProps: GetServerSideProps = async () => {
return {
props: {
title: global.config.website.title,
},
};
};

27
src/pages/dashboard/manage.tsx
View file

@ -3,19 +3,32 @@ import useLogin from 'hooks/useLogin';
import Layout from 'components/Layout';
import Manage from 'components/pages/Manage';
import { LoadingOverlay } from '@mantine/core';
import { GetServerSideProps } from 'next';
import Head from 'next/head';
export default function ManagePage() {
export default function ManagePage({ title }) {
const { user, loading } = useLogin();
if (loading) return <LoadingOverlay visible={loading} />;
return (
<Layout
user={user}
>
<Manage />
</Layout>
<>
<Head>
<title>{title} - Manage User</title>
</Head>
<Layout
user={user}
>
<Manage />
</Layout>
</>
);
}
ManagePage.title = 'Zipline - Manage';
export const getServerSideProps: GetServerSideProps = async () => {
return {
props: {
title: global.config.website.title,
},
};
};

27
src/pages/dashboard/stats.tsx
View file

@ -3,19 +3,32 @@ import useLogin from 'hooks/useLogin';
import Layout from 'components/Layout';
import Stats from 'components/pages/Stats';
import { LoadingOverlay } from '@mantine/core';
import { GetServerSideProps } from 'next';
import Head from 'next/head';
export default function StatsPage() {
export default function StatsPage({ title }) {
const { user, loading } = useLogin();
if (loading) return <LoadingOverlay visible={loading} />;
return (
<Layout
user={user}
>
<Stats />
</Layout>
<>
<Head>
<title>{title} - Stats</title>
</Head>
<Layout
user={user}
>
<Stats />
</Layout>
</>
);
}
StatsPage.title = 'Zipline - Stats';
export const getServerSideProps: GetServerSideProps = async () => {
return {
props: {
title: global.config.website.title,
},
};
};

27
src/pages/dashboard/text.tsx
View file

@ -3,19 +3,32 @@ import useLogin from 'hooks/useLogin';
import Layout from 'components/Layout';
import UploadText from 'components/pages/UploadText';
import { LoadingOverlay } from '@mantine/core';
import { GetServerSideProps } from 'next';
import Head from 'next/head';
export default function UploadTextPage() {
export default function UploadTextPage({ title }) {
const { user, loading } = useLogin();
if (loading) return <LoadingOverlay visible={loading} />;
return (
<Layout
user={user}
>
<UploadText/>
</Layout>
<>
<Head>
<title>{title} - Upload Text</title>
</Head>
<Layout
user={user}
>
<UploadText/>
</Layout>
</>
);
}
UploadTextPage.title = 'Zipline - Upload Text';
export const getServerSideProps: GetServerSideProps = async () => {
return {
props: {
title: global.config.website.title,
},
};
};

27
src/pages/dashboard/upload.tsx
View file

@ -3,19 +3,32 @@ import useLogin from 'hooks/useLogin';
import Layout from 'components/Layout';
import Upload from 'components/pages/Upload';
import { LoadingOverlay } from '@mantine/core';
import { GetServerSideProps } from 'next';
import Head from 'next/head';
export default function UploadPage() {
export default function UploadPage({ title }) {
const { user, loading } = useLogin();
if (loading) return <LoadingOverlay visible={loading} />;
return (
<Layout
user={user}
>
<Upload/>
</Layout>
<>
<Head>
<title>{title} - Upload</title>
</Head>
<Layout
user={user}
>
<Upload/>
</Layout>
</>
);
}
UploadPage.title = 'Zipline - Upload';
export const getServerSideProps: GetServerSideProps = async () => {
return {
props: {
title: global.config.website.title,
},
};
};

27
src/pages/dashboard/urls.tsx
View file

@ -3,19 +3,32 @@ import useLogin from 'hooks/useLogin';
import Layout from 'components/Layout';
import Urls from 'components/pages/Urls';
import { LoadingOverlay } from '@mantine/core';
import { GetServerSideProps } from 'next';
import Head from 'next/head';
export default function UrlsPage() {
export default function UrlsPage({ title }) {
const { user, loading } = useLogin();
if (loading) return <LoadingOverlay visible={loading} />;
return (
<Layout
user={user}
>
<Urls />
</Layout>
<>
<Head>
<title>{title} - URLs</title>
</Head>
<Layout
user={user}
>
<Urls />
</Layout>
</>
);
}
UrlsPage.title = 'Zipline - URLs';
export const getServerSideProps: GetServerSideProps = async () => {
return {
props: {
title: global.config.website.title,
},
};
};

27
src/pages/dashboard/users.tsx
View file

@ -3,19 +3,32 @@ import useLogin from 'hooks/useLogin';
import Layout from 'components/Layout';
import Users from 'components/pages/Users';
import { LoadingOverlay } from '@mantine/core';
import { GetServerSideProps } from 'next';
import Head from 'next/head';
export default function UsersPage() {
export default function UsersPage({ title }) {
const { user, loading } = useLogin();
if (loading) return <LoadingOverlay visible={loading} />;
return (
<Layout
user={user}
>
<Users />
</Layout>
<>
<Head>
<title>{title} - Users</title>
</Head>
<Layout
user={user}
>
<Users />
</Layout>
</>
);
}
UsersPage.title = 'Zipline - Users';
export const getServerSideProps: GetServerSideProps = async () => {
return {
props: {
title: global.config.website.title,
},
};
};