Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions apps/events/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,16 @@
},
"devDependencies": {
"@biomejs/biome": "1.9.4",
"@tailwindcss/vite": "^4.1.5",
"@tanstack/router-devtools": "^1.119.1",
"@tanstack/router-plugin": "^1.119.0",
"@types/node": "^22.15.3",
"@types/react": "^19.1.2",
"@types/react-dom": "^19.1.3",
"@types/uuid": "^10.0.0",
"@vitejs/plugin-react": "^4.4.1",
"autoprefixer": "^10.4.21",
"globals": "^16.0.0",
"postcss": "^8.5.3",
"tailwindcss": "^3.4.17",
"tailwindcss": "^4.1.5",
"vite-plugin-node-polyfills": "^0.23.0",
"vite-plugin-top-level-await": "^1.5.0",
"vite-plugin-wasm": "^3.4.1"
Expand Down
6 changes: 0 additions & 6 deletions apps/events/postcss.config.js

This file was deleted.

10 changes: 5 additions & 5 deletions apps/events/src/components/ui/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import * as React from 'react';
import { cn } from '@/lib/utils';

const buttonVariants = cva(
'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50',
'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50',
{
variants: {
variant: {
default: 'bg-primary text-primary-foreground shadow hover:bg-primary/90',
destructive: 'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90',
outline: 'border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground',
secondary: 'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
default: 'bg-primary text-primary-foreground shadow-sm hover:bg-primary/90',
destructive: 'bg-destructive text-destructive-foreground shadow-xs hover:bg-destructive/90',
outline: 'border border-input bg-background shadow-xs hover:bg-accent hover:text-accent-foreground',
secondary: 'bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80',
ghost: 'hover:bg-accent hover:text-accent-foreground',
link: 'text-primary underline-offset-4 hover:underline',
},
Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/components/ui/card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as React from 'react';
import { cn } from '@/lib/utils';

const Card = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(({ className, ...props }, ref) => (
<div ref={ref} className={cn('rounded-xl border bg-card text-card-foreground shadow', className)} {...props} />
<div ref={ref} className={cn('rounded-xl border bg-card text-card-foreground shadow-sm', className)} {...props} />
));
Card.displayName = 'Card';

Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/components/ui/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(({ className, type,
<input
type={type}
className={cn(
'flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50',
'flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-xs transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50',
className,
)}
ref={ref}
Expand Down
69 changes: 66 additions & 3 deletions apps/events/src/index.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,69 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import 'tailwindcss';

@plugin 'tailwindcss-animate';

@source '../../../packages/hypergraph-react/src/**/*.{js,ts,jsx,tsx}';

@custom-variant dark (&:is(.dark *));

@theme {
--radius-lg: var(--radius);
--radius-md: calc(var(--radius) - 2px);
--radius-sm: calc(var(--radius) - 4px);

--color-background: hsl(var(--background));
--color-foreground: hsl(var(--foreground));

--color-card: hsl(var(--card));
--color-card-foreground: hsl(var(--card-foreground));

--color-popover: hsl(var(--popover));
--color-popover-foreground: hsl(var(--popover-foreground));

--color-primary: hsl(var(--primary));
--color-primary-foreground: hsl(var(--primary-foreground));

--color-secondary: hsl(var(--secondary));
--color-secondary-foreground: hsl(var(--secondary-foreground));

--color-muted: hsl(var(--muted));
--color-muted-foreground: hsl(var(--muted-foreground));

--color-accent: hsl(var(--accent));
--color-accent-foreground: hsl(var(--accent-foreground));

--color-destructive: hsl(var(--destructive));
--color-destructive-foreground: hsl(var(--destructive-foreground));

--color-border: hsl(var(--border));
--color-input: hsl(var(--input));
--color-ring: hsl(var(--ring));

--color-chart-1: hsl(var(--chart-1));
--color-chart-2: hsl(var(--chart-2));
--color-chart-3: hsl(var(--chart-3));
--color-chart-4: hsl(var(--chart-4));
--color-chart-5: hsl(var(--chart-5));
}

/*
The default border color has changed to `currentcolor` in Tailwind CSS v4,
so we've added these compatibility styles to make sure everything still
looks the same as it did with Tailwind CSS v3.

If we ever want to remove these styles, we need to add an explicit border
color utility to any element that depends on these defaults.
*/
@layer base {
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: var(--color-gray-200, currentcolor);
}
}

@layer base {
:root {
--background: 0 0% 100%;
Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/routes/account-inbox/$inboxId.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function RouteComponent() {
<h1 className="text-2xl font-bold mb-6">Inbox Messages</h1>
<div className="space-y-4">
{messages.map((message) => (
<div key={message.id} className="bg-card rounded-lg p-4 shadow-sm border">
<div key={message.id} className="bg-card rounded-lg p-4 shadow-xs border">
<div className="text-lg mb-2">{message.plaintext}</div>
<div className="space-y-1 text-sm text-muted-foreground">
<div className="message-time">{new Date(message.createdAt).toLocaleString()}</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function Index() {
}

return (
<div className="flex flex-col gap-4 max-w-screen-sm mx-auto py-8">
<div className="flex flex-col gap-4 max-w-(--breakpoint-sm) mx-auto py-8">
<h2 className="text-lg font-bold">Invitations</h2>
{invitations.length === 0 && <div>No invitations</div>}
<ul className="text-xs">
Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/routes/playground.lazy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const Route = createLazyFileRoute('/playground')({
function RouteComponent() {
return (
<HypergraphSpaceProvider space="BDuZwkjCg3nPWMDshoYtpS" mapping={mapping}>
<div className="flex flex-col gap-4 max-w-screen-sm mx-auto py-8">
<div className="flex flex-col gap-4 max-w-(--breakpoint-sm) mx-auto py-8">
<h1 className="text-2xl font-bold">Playground</h1>
<Playground />
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/routes/settings/export-wallet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const Route = createFileRoute('/settings/export-wallet')({

function RouteComponent() {
return (
<div className="flex flex-col gap-4 max-w-screen-sm mx-auto py-8">
<div className="flex flex-col gap-4 max-w-(--breakpoint-sm) mx-auto py-8">
<ExportWallet />
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/routes/space/$spaceId.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function RouteComponent() {
return (
<div className="flex flex-col h-screen">
<div className="border-b border-gray-200">
<nav className="flex gap-4 max-w-screen-sm mx-auto py-8">
<nav className="flex gap-4 max-w-(--breakpoint-sm) mx-auto py-8">
<Link
to={'/space/$spaceId'}
params={{ spaceId }}
Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/routes/space/$spaceId/chat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function RouteComponent() {
}

return (
<div className="flex flex-col gap-4 max-w-screen-sm mx-auto py-8">
<div className="flex flex-col gap-4 max-w-(--breakpoint-sm) mx-auto py-8">
<HypergraphSpaceProvider space={spaceId} mapping={mapping}>
<SpaceChat spaceId={spaceId} />
</HypergraphSpaceProvider>
Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/routes/space/$spaceId/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function Space() {
}

return (
<div className="flex flex-col gap-4 max-w-screen-sm mx-auto py-8">
<div className="flex flex-col gap-4 max-w-(--breakpoint-sm) mx-auto py-8">
<HypergraphSpaceProvider space={spaceId} mapping={mapping}>
<Users />
<Todos />
Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/routes/space/$spaceId/playground.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function PlaygroundRouteComponent() {
}

return (
<div className="flex flex-col gap-4 max-w-screen-sm mx-auto py-8">
<div className="flex flex-col gap-4 max-w-(--breakpoint-sm) mx-auto py-8">
<HypergraphSpaceProvider space={spaceId} mapping={mapping}>
<TodosPublicGeo />
</HypergraphSpaceProvider>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function PublicIntegration() {
}

return (
<div className="flex flex-col gap-4 max-w-screen-sm mx-auto py-8">
<div className="flex flex-col gap-4 max-w-(--breakpoint-sm) mx-auto py-8">
<HypergraphSpaceProvider space={spaceId} mapping={mapping}>
<CreatePropertiesAndTypes />
<Todos2 />
Expand Down
2 changes: 1 addition & 1 deletion apps/events/src/routes/space/$spaceId/users.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function UsersRouteComponent() {
}

return (
<div className="flex flex-col gap-4 max-w-screen-sm mx-auto py-8">
<div className="flex flex-col gap-4 max-w-(--breakpoint-sm) mx-auto py-8">
<HypergraphSpaceProvider space={spaceId} mapping={mapping}>
<UsersMerged />
<UsersLocal />
Expand Down
59 changes: 0 additions & 59 deletions apps/events/tailwind.config.js

This file was deleted.

4 changes: 3 additions & 1 deletion apps/events/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import path from 'node:path';
import tailwindcss from '@tailwindcss/vite';
import { TanStackRouterVite } from '@tanstack/router-plugin/vite';
import react from '@vitejs/plugin-react';
import path from 'node:path';
import { defineConfig } from 'vite';
import { nodePolyfills } from 'vite-plugin-node-polyfills';
import topLevelAwait from 'vite-plugin-top-level-await';
Expand All @@ -19,6 +20,7 @@ export default defineConfig({
global: true,
},
}),
tailwindcss(),
],
resolve: {
alias: {
Expand Down
Loading
Loading