Skip to content

Commit b95a6b0

Browse files
lucemanslucemans
committed
Update consistency & alignment
1 parent 6945912 commit b95a6b0

File tree

17 files changed

+235
-54
lines changed

17 files changed

+235
-54
lines changed

‎web/src/api/schema.gen.ts‎

Lines changed: 56 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,34 @@ export type paths = {
1111
path?: never;
1212
cookie?: never;
1313
};
14-
get?: never;
14+
/**
15+
* Get all sites personal
16+
* @description Gets a list of all the sites you have access to
17+
*/
18+
get: {
19+
parameters: {
20+
query?: never;
21+
header?: never;
22+
path?: never;
23+
cookie?: never;
24+
};
25+
requestBody?: never;
26+
responses: {
27+
200: {
28+
headers: {
29+
[name: string]: unknown;
30+
};
31+
content: {
32+
"application/json; charset=utf-8": components["schemas"]["Site"][];
33+
};
34+
};
35+
};
36+
};
1537
put?: never;
1638
/**
1739
* Create a new site
1840
* @description Creates a new site given a create request
41+
* (user-only)
1942
*/
2043
post: {
2144
parameters: {
@@ -594,7 +617,10 @@ export type paths = {
594617
};
595618
};
596619
put?: never;
597-
/** Create a site key */
620+
/**
621+
* Create a site key
622+
* @description (user-only)
623+
*/
598624
post: {
599625
parameters: {
600626
query?: never;
@@ -636,7 +662,10 @@ export type paths = {
636662
get?: never;
637663
put?: never;
638664
post?: never;
639-
/** Delete a site key */
665+
/**
666+
* Delete a site key
667+
* @description (user-only)
668+
*/
640669
delete: {
641670
parameters: {
642671
query?: never;
@@ -875,6 +904,7 @@ export type paths = {
875904
/**
876905
* Get all teams
877906
* @description Gets a list of all the teams you have access to
907+
* (user-only)
878908
*/
879909
get: {
880910
parameters: {
@@ -896,7 +926,10 @@ export type paths = {
896926
};
897927
};
898928
put?: never;
899-
/** Create a team */
929+
/**
930+
* Create a team
931+
* @description (user-only)
932+
*/
900933
post: {
901934
parameters: {
902935
query?: never;
@@ -958,6 +991,7 @@ export type paths = {
958991
/**
959992
* Update a team
960993
* @description Updates a team with the given name
994+
* (user-only) (due to team-owner overwrite)
961995
*/
962996
put: {
963997
parameters: {
@@ -984,6 +1018,7 @@ export type paths = {
9841018
/**
9851019
* Delete a team
9861020
* @description Deletes a team
1021+
* (user-only) (due to team-owner overwrite)
9871022
*/
9881023
delete: {
9891024
parameters: {
@@ -1042,7 +1077,10 @@ export type paths = {
10421077
};
10431078
};
10441079
put?: never;
1045-
/** Invite a user to a team */
1080+
/**
1081+
* Invite a user to a team
1082+
* @description (user-only) (due to team-owner overwrite)
1083+
*/
10461084
post: {
10471085
parameters: {
10481086
query?: never;
@@ -1084,7 +1122,10 @@ export type paths = {
10841122
get?: never;
10851123
put?: never;
10861124
post?: never;
1087-
/** Delete a team invite */
1125+
/**
1126+
* Delete a team invite
1127+
* @description (user-only) (due to team-owner overwrite)
1128+
*/
10881129
delete: {
10891130
parameters: {
10901131
query?: never;
@@ -1202,6 +1243,7 @@ export type paths = {
12021243
/**
12031244
* Upload a team avatar
12041245
* @description Uploads an avatar for a team
1246+
* (user-only) (due to team-owner overwrite)
12051247
*/
12061248
post: {
12071249
parameters: {
@@ -1267,7 +1309,10 @@ export type paths = {
12671309
};
12681310
};
12691311
put?: never;
1270-
/** Create a team key */
1312+
/**
1313+
* Create a team key
1314+
* @description (user-only)
1315+
*/
12711316
post: {
12721317
parameters: {
12731318
query?: never;
@@ -1557,7 +1602,7 @@ export type components = {
15571602
* Deployment
15581603
* @example {
15591604
* "context": "test",
1560-
* "created_at": "2025-04-01T05:35:50.968993860+00:00",
1605+
* "created_at": "2025-04-01T05:55:46.154258712+00:00",
15611606
* "deployment_id": "d_1234567890",
15621607
* "site_id": "s_1234567890"
15631608
* }
@@ -1624,13 +1669,13 @@ export type components = {
16241669
/**
16251670
* Key
16261671
* @example {
1627-
* "created_at": "2025-04-01T05:35:50.969062001+00:00",
1672+
* "created_at": "2025-04-01T05:55:46.154323592+00:00",
16281673
* "created_by": "u_1234567890",
1629-
* "expires_at": "2025-05-01T05:35:50.969062181+00:00",
1674+
* "expires_at": "2025-05-01T05:55:46.154323772+00:00",
16301675
* "key_id": "k_site_12345678901234567890",
16311676
* "key_resource": "s_1234567890",
16321677
* "key_type": "site",
1633-
* "last_used": "2025-04-01T05:35:50.969062111+00:00",
1678+
* "last_used": "2025-04-01T05:55:46.154323692+00:00",
16341679
* "permissions": "TBD",
16351680
* "vanity": "4567890"
16361681
* }

‎web/src/gui/deployments/DeploymentList.tsx‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ import { useSiteDeployments } from '@/api';
66

77
import { DeploymentPreview } from './DeploymentPreview';
88

9-
export const DeploymentList: FC<{ siteId?: string; max?: number }> = ({
10-
siteId,
11-
max,
12-
}) => {
9+
export const DeploymentList: FC<{
10+
siteId?: string;
11+
max?: number;
12+
showHeader?: boolean;
13+
}> = ({ siteId, max, showHeader = true }) => {
1314
const { data: deployments } = useSiteDeployments(siteId);
1415

1516
const maxEntries = max ?? deployments?.length ?? 10;
@@ -18,18 +19,20 @@ export const DeploymentList: FC<{ siteId?: string; max?: number }> = ({
1819

1920
return (
2021
<div className="space-y-2">
21-
<div className="flex items-center justify-between">
22-
<h2 className="h2">Deployment List</h2>
23-
{max && max > 0 && (
24-
<Link
25-
to="/site/$siteId/deployments"
26-
params={{ siteId: siteId ?? '' }}
27-
className="link flex items-center gap-1"
28-
>
29-
View More <FiArrowRight />
30-
</Link>
31-
)}
32-
</div>
22+
{showHeader && (
23+
<div className="flex items-center justify-between">
24+
<h2 className="h2">Deployment List</h2>
25+
{max && max > 0 && (
26+
<Link
27+
to="/site/$siteId/deployments"
28+
params={{ siteId: siteId ?? '' }}
29+
className="link flex items-center gap-1"
30+
>
31+
View More <FiArrowRight />
32+
</Link>
33+
)}
34+
</div>
35+
)}
3336
{deployments && deployments.length > 0 && (
3437
<ul className="space-y-2">
3538
{deployments.slice(0, maxEntries).map((deployment) => (

‎web/src/gui/site/SiteList.tsx‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,23 @@ import { useSites, useTeamSites } from '@/api';
55
import { SiteCreateButton } from './SiteCreateButton';
66
import { SitePreview } from './SitePreview';
77

8-
export const SiteList: FC<{ teamId?: string; external?: boolean }> = ({
9-
teamId,
10-
external,
11-
}) => {
8+
export const SiteList: FC<{
9+
teamId?: string;
10+
external?: boolean;
11+
showHeader?: boolean;
12+
}> = ({ teamId, external, showHeader = true }) => {
1213
const { data: sites } = teamId ? useTeamSites(teamId) : useSites();
1314

1415
return (
1516
<div className="space-y-2">
16-
<div className="flex items-center justify-between">
17-
<h2 className="h2">Sites</h2>
18-
{sites?.length != 0 && <SiteCreateButton team_id={teamId} />}
19-
</div>
17+
{showHeader && (
18+
<div className="flex items-center justify-between">
19+
<h2 className="h2">Sites</h2>
20+
{sites?.length != 0 && (
21+
<SiteCreateButton team_id={teamId} />
22+
)}
23+
</div>
24+
)}
2025
{sites && sites.length > 0 && (
2126
<ul className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
2227
{sites.map((site) => (

‎web/src/routes/_authed/site/$siteId/analytics.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { createFileRoute } from '@tanstack/react-router';
2+
import { LuBarChart } from 'react-icons/lu';
23

34
import { SCPage } from '@/layouts';
45

@@ -9,7 +10,15 @@ export const Route = createFileRoute('/_authed/site/$siteId/analytics')({
910
function RouteComponent() {
1011
return (
1112
<SCPage title="Analytics">
12-
<div className="card">Analytics here</div>
13+
<div className="card flex flex-row items-center justify-center gap-2">
14+
<LuBarChart className="text-4xl" />
15+
<div className="flex flex-col justify-center gap-1">
16+
<div className="text-base font-bold">Coming soon</div>
17+
<div className="text-sm text-gray-500">
18+
We&apos;re working on it!
19+
</div>
20+
</div>
21+
</div>
1322
</SCPage>
1423
);
1524
}

‎web/src/routes/_authed/site/$siteId/deployments.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ function RouteComponent() {
1212

1313
return (
1414
<SCPage title="Deployments">
15-
<div className="card">Deployments here</div>
16-
<DeploymentList siteId={siteId} />
15+
<DeploymentList siteId={siteId} showHeader={false} />
1716
</SCPage>
1817
);
1918
}

‎web/src/routes/_authed/site/$siteId/settings/_s.actions.tsx‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
11
import { createFileRoute } from '@tanstack/react-router';
2+
import { LuHammer } from 'react-icons/lu';
23

34
export const Route = createFileRoute(
45
'/_authed/site/$siteId/settings/_s/actions'
56
)({
67
component: RouteComponent,
8+
context: () => ({
9+
title: 'Actions',
10+
subtitle: 'Administrative (and destructive) actions',
11+
}),
712
});
813

914
function RouteComponent() {
10-
return <div className="card">Actions go here</div>;
15+
return (
16+
<div className="card flex flex-row items-center justify-center gap-2">
17+
<LuHammer className="text-4xl" />
18+
<div className="flex flex-col justify-center gap-1">
19+
<div className="text-base font-bold">Coming soon</div>
20+
<div className="text-sm text-gray-500">
21+
We&apos;re working on it!
22+
</div>
23+
</div>
24+
</div>
25+
);
1126
}

‎web/src/routes/_authed/site/$siteId/settings/_s.ci.tsx‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
import { createFileRoute } from '@tanstack/react-router';
2+
import { LuGitBranch } from 'react-icons/lu';
23

34
export const Route = createFileRoute('/_authed/site/$siteId/settings/_s/ci')({
45
component: RouteComponent,
6+
context: () => ({
7+
title: 'CI/CD',
8+
subtitle: 'Manage your site CI/CD',
9+
}),
510
});
611

712
function RouteComponent() {
8-
return <div className="card">CI go here</div>;
13+
return (
14+
<div className="card flex flex-row items-center justify-center gap-2">
15+
<LuGitBranch className="text-4xl" />
16+
<div className="flex flex-col justify-center gap-1">
17+
<div className="text-base font-bold">Coming soon</div>
18+
<div className="text-sm text-gray-500">
19+
We&apos;re working on it!
20+
</div>
21+
</div>
22+
</div>
23+
);
924
}

‎web/src/routes/_authed/site/$siteId/settings/_s.index.tsx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ import { createFileRoute } from '@tanstack/react-router';
22

33
import { useSite } from '@/api';
44
import { Button, Input } from '@/components';
5-
import SiteTeamTransfer from '@/gui/transferDialog/siteTeamTransfer';
65

76
export const Route = createFileRoute('/_authed/site/$siteId/settings/_s/')({
87
component: RouteComponent,
8+
context: () => ({
9+
title: 'Site Settings',
10+
subtitle: 'Manage your site settings',
11+
}),
912
});
1013

1114
function RouteComponent() {
@@ -14,8 +17,8 @@ function RouteComponent() {
1417

1518
return (
1619
<div className="card space-y-4">
17-
<div>
18-
<div>Site Name</div>
20+
<div className="space-y-2">
21+
<div className="font-bold">Site Name</div>
1922
<div className="flex gap-2">
2023
<Input value={site?.name} />
2124
<Button onClick={() => alert('Not implemented')}>

‎web/src/routes/_authed/site/$siteId/settings/_s.rules.tsx‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
11
import { createFileRoute } from '@tanstack/react-router';
2+
import { LuFilter } from 'react-icons/lu';
23

34
export const Route = createFileRoute('/_authed/site/$siteId/settings/_s/rules')(
45
{
56
component: RouteComponent,
7+
context: () => ({
8+
title: 'Routing Rules',
9+
subtitle: 'Manage your site routing logic',
10+
}),
611
}
712
);
813

914
function RouteComponent() {
10-
return <div className="card">Rules go here</div>;
15+
return (
16+
<div className="card flex flex-row items-center justify-center gap-2">
17+
<LuFilter className="text-4xl" />
18+
<div className="flex flex-col justify-center gap-1">
19+
<div className="text-base font-bold">Coming soon</div>
20+
<div className="text-sm text-gray-500">
21+
We&apos;re working on it!
22+
</div>
23+
</div>
24+
</div>
25+
);
1126
}

‎web/src/routes/_authed/site/$siteId/settings/_s.transfer.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ export const Route = createFileRoute(
77
'/_authed/site/$siteId/settings/_s/transfer'
88
)({
99
component: RouteComponent,
10+
context: () => ({
11+
title: 'Site Transfer',
12+
subtitle: 'Transfer your site to another team',
13+
}),
1014
});
1115

1216
function RouteComponent() {

0 commit comments

Comments
 (0)