Skip to content

Commit

Permalink
update ui, fix other problems
Browse files Browse the repository at this point in the history
  • Loading branch information
a-type committed Dec 14, 2024
1 parent b058b83 commit 5c6f26e
Show file tree
Hide file tree
Showing 25 changed files with 522 additions and 1,018 deletions.
2 changes: 1 addition & 1 deletion apps/gnocchi/hub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@vitejs/plugin-react-swc": "^3.5.0",
"concurrently": "^7.5.0",
"dotenv": "^16.0.1",
"typescript": "5.5.3",
"typescript": "5.7.2",
"unocss": "^0.58.0",
"vite": "^5.0.10"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/gnocchi/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"express": "^4.18.1",
"fs-extra": "^11.1.0",
"prettier": "^2.8.4",
"typescript": "5.5.3",
"typescript": "5.7.2",
"unocss": "^0.58.0",
"vite": "^5.0.10",
"vite-plugin-checker": "^0.6.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/humding/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@types/react-dom": "^18.2.25",
"@unocss/transformer-variant-group": "^0.58.0",
"@vitejs/plugin-react-swc": "3.5.0",
"typescript": "5.5.3",
"typescript": "5.7.2",
"vite": "5.2.11",
"vite-plugin-pwa": "^0.19.8"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/marginalia/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@types/unist": "^3.0.2",
"@unocss/transformer-variant-group": "^0.58.0",
"@vitejs/plugin-react-swc": "3.5.0",
"typescript": "5.5.3",
"typescript": "5.7.2",
"vite": "5.2.11",
"vite-plugin-pwa": "^0.19.8"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/names/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@types/react-dom": "^19.0.2",
"@unocss/transformer-variant-group": "^0.65.1",
"@vitejs/plugin-react-swc": "3.7.2",
"typescript": "5.5.3",
"typescript": "5.7.2",
"vite": "5.3.1",
"vite-plugin-pwa": "^0.20.0"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/palette/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@types/react-dom": "^19.0.2",
"@unocss/transformer-variant-group": "^0.65.1",
"@vitejs/plugin-react-swc": "3.7.2",
"typescript": "5.5.3",
"typescript": "5.7.2",
"vite": "5.3.1",
"vite-plugin-pwa": "^0.20.0"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/star-chart/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@types/react-dom": "^18.2.25",
"@unocss/transformer-variant-group": "^0.58.0",
"@vitejs/plugin-react-swc": "3.7.2",
"typescript": "5.5.3",
"typescript": "5.7.2",
"vite": "6.0.3",
"vite-plugin-pwa": "^0.19.8"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/trip-tick/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@types/react-dom": "^18.2.25",
"@unocss/preset-icons": "^0.55.7",
"@vitejs/plugin-react-swc": "^3.5.0",
"typescript": "5.5.3",
"typescript": "5.7.2",
"vite": "5.2.7",
"vite-plugin-pwa": "0.19.7"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/wish-wash/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
"@types/react-dom": "^19.0.2",
"react": "19.0.0",
"react-dom": "19.0.0",
"typescript": "5.5.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion apps/wish-wash/hub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@vitejs/plugin-react-swc": "^3.7.2",
"concurrently": "^7.5.0",
"dotenv": "^16.0.1",
"typescript": "5.5.3",
"typescript": "5.7.2",
"unocss": "^0.58.0",
"vite": "^5.0.10"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/wish-wash/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@types/react": "^19.0.1",
"@types/react-dom": "^19.0.2",
"@vitejs/plugin-react-swc": "3.7.0",
"typescript": "5.5.3",
"typescript": "5.7.2",
"vite": "5.3.1",
"vite-plugin-circular-dependency": "^0.2.1",
"vite-plugin-pwa": "^0.19.8"
Expand Down
2 changes: 1 addition & 1 deletion blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@unocss/reset": "^0.59.4",
"@unocss/transformer-variant-group": "^0.59.4",
"astro": "^4.7.1",
"typescript": "5.5.3",
"typescript": "5.7.2",
"unocss": "^0.59.4"
}
}
4 changes: 2 additions & 2 deletions cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"aws-cdk": "2.141.0",
"ts-node": "^10.9.2",
"tsx": "^4.10.4",
"typescript": "5.5.3",
"typescript": "5.7.2",
"vitest": "1.6.0"
},
"dependencies": {
Expand All @@ -25,9 +25,9 @@
"@biscuits/apps": "workspace:*",
"@octokit/rest": "^20.1.1",
"aws-cdk-lib": "2.141.0",
"constructs": "^10.0.0",
"dotenv": "16.4.5",
"env-cmd": "10.1.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.21"
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"cp-tpl": "1.0.9",
"eslint": "^8",
"eslint-plugin-react": "7.34.1",
"gql.tada": "1.8.10",
"husky": "^8.0.3",
"kill-port": "2.0.1",
"prettier": "3.2.5",
"turbo": "^1.9.3",
"typescript": "^5.4.5",
"gql.tada": "1.8.5"
"typescript": "^5.7.2"
},
"volta": {
"node": "22.12.0"
Expand Down
5 changes: 3 additions & 2 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
"@biscuits/graphql": "workspace:*",
"@biscuits/libraries": "workspace:*",
"@stripe/react-stripe-js": "2.7.3",
"@stripe/stripe-js": "4.2.0"
"@stripe/stripe-js": "4.2.0",
"gql.tada": "^1.8.10"
},
"peerDependencies": {
"@a-type/ui": "^1.0.0",
Expand All @@ -82,7 +83,7 @@
"@verdant-web/store": "4.1.0",
"copy": "^0.3.2",
"react": "19.0.0",
"typescript": "5.5.3",
"typescript": "5.7.2",
"unocss": "^0.58.0",
"vite-plugin-pwa": "0.19.2"
}
Expand Down
1 change: 0 additions & 1 deletion packages/client/src/components/Changelog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ const changelogQuery = graphql(`
details
createdAt
imageUrl
important
}
}
`);
Expand Down
42 changes: 20 additions & 22 deletions packages/client/src/components/UserMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ import {
Avatar,
Button,
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuItemProps,
DropdownMenuItemRightSlot,
DropdownMenuTrigger,
ErrorBoundary,
Icon,
} from '@a-type/ui';
Expand Down Expand Up @@ -52,7 +50,7 @@ export function UserMenu({

return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<DropdownMenu.Trigger asChild>
{children ?? (!isLoggedIn && loading && !isOffline) ?
<Button size="small" color="ghost" className={className}>
<Icon name="refresh" className="animate-spin" />
Expand All @@ -76,8 +74,8 @@ export function UserMenu({
<Icon name="gear" />
</Button>
}
</DropdownMenuTrigger>
<DropdownMenuContent>
</DropdownMenu.Trigger>
<DropdownMenu.Content>
{isOffline && (
<div className="pl-8 pr-4 py-1 text-gray-7 text-sm max-w-300px bg-attention-wash color-attention-dark">
Offline - some features may be unavailable
Expand All @@ -91,7 +89,7 @@ export function UserMenu({

{!isLoggedIn ?
<>
<DropdownMenuItem
<DropdownMenu.Item
asChild
className="theme-leek bg-primary-wash color-primary-dark"
>
Expand All @@ -101,71 +99,71 @@ export function UserMenu({
<Icon name="gift" />
</DropdownMenuItemRightSlot>
</a>
</DropdownMenuItem>
<DropdownMenuItem asChild>
</DropdownMenu.Item>
<DropdownMenu.Item asChild>
<LoginButton className="border-none transition-none shadow-none">
Log in
<DropdownMenuItemRightSlot>
<Icon name="arrowRight" />
</DropdownMenuItemRightSlot>
</LoginButton>
</DropdownMenuItem>
</DropdownMenu.Item>
</>
: <DropdownMenuItem asChild>
: <DropdownMenu.Item asChild>
<a href={`${CONFIG.HOME_ORIGIN}/settings?appReferrer=${appId}`}>
Mange plan
<DropdownMenuItemRightSlot>
<Icon name="profile" />
</DropdownMenuItemRightSlot>
</a>
</DropdownMenuItem>
</DropdownMenu.Item>
}
{getIsPWAInstalled() ?
<DropdownMenuItem onClick={openPwaHackCatalog}>
<DropdownMenu.Item onClick={openPwaHackCatalog}>
More apps
<DropdownMenuItemRightSlot>
<Icon name="new_window" />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
: <DropdownMenuItem asChild>
</DropdownMenu.Item>
: <DropdownMenu.Item asChild>
<a href={`${CONFIG.HOME_ORIGIN}`} target="_blank">
More apps
<DropdownMenuItemRightSlot>
<Icon name="new_window" />
</DropdownMenuItemRightSlot>
</a>
</DropdownMenuItem>
</DropdownMenu.Item>
}
{!disableAppSettings && (
<DropdownMenuItem asChild>
<DropdownMenu.Item asChild>
<a href={`/settings`}>
App settings
<DropdownMenuItemRightSlot>
<Icon name="gear" />
</DropdownMenuItemRightSlot>
</a>
</DropdownMenuItem>
</DropdownMenu.Item>
)}
<DropdownMenuItem asChild>
<DropdownMenu.Item asChild>
<a href={`${CONFIG.HOME_ORIGIN}/contact`} target="_blank">
Contact support
<DropdownMenuItemRightSlot>
<Icon name="profile" />
</DropdownMenuItemRightSlot>
</a>
</DropdownMenuItem>
</DropdownMenu.Item>
{!!isLoggedIn && (
<DropdownMenuItem asChild>
<DropdownMenu.Item asChild>
<LogoutButton className="border-none transition-none shadow-none">
Log out
<DropdownMenuItemRightSlot>
<Icon name="arrowRight" />
</DropdownMenuItemRightSlot>
</LogoutButton>
</DropdownMenuItem>
</DropdownMenu.Item>
)}
{extraItems}
</DropdownMenuContent>
</DropdownMenu.Content>
</DropdownMenu>
);
}
Expand Down
Loading

0 comments on commit 5c6f26e

Please sign in to comment.