Skip to content

Commit

Permalink
✂️ #2: refactor client and server
Browse files Browse the repository at this point in the history
  • Loading branch information
str0yka committed Nov 19, 2023
1 parent 0b65fea commit 4dd25f4
Show file tree
Hide file tree
Showing 31 changed files with 430 additions and 406 deletions.
2 changes: 2 additions & 0 deletions client/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.env

# Logs
logs
*.log
Expand Down
18 changes: 18 additions & 0 deletions client/src/@types/game.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
type Choice = 'PAPER' | 'ROCK' | 'SCISSORS';

interface User {
id: string;
username: string;
role: 'player' | 'spectator';
choice: Choice | null;
}

interface Player extends User {
role: 'player';
}

interface Room {
id: string;
players: Player[];
winner: null | Player | 'DRAW';
}
4 changes: 4 additions & 0 deletions client/src/@types/message.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
interface Message<Event extends string, Data> {
event: Event;
data: Data;
}
24 changes: 19 additions & 5 deletions client/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
import { createBrowserRouter, RouterProvider } from 'react-router-dom';
import { QueryClient, QueryClientProvider } from 'react-query';

import { HomePage } from './pages/HomePage';
import { GamePage } from './pages/GamePage';
import { Layout } from '~/components';
import { HomePage, GamePage } from '~/pages';
import { DYNAMIC, ROUTE } from '~/utils/constants';

const queryClient = new QueryClient();

const router = createBrowserRouter([
{ path: '/', element: <HomePage /> },
{ path: '/:roomId', element: <GamePage /> },
{
path: ROUTE.HOME,
element: <Layout />,
children: [
{ index: true, element: <HomePage /> },
{ path: ROUTE.ROOM(DYNAMIC.ROOM), element: <GamePage /> },
],
},
]);

export const App = () => <RouterProvider router={router} />;
export const App = () => (
<QueryClientProvider client={queryClient}>
<RouterProvider router={router} />
</QueryClientProvider>
);
28 changes: 28 additions & 0 deletions client/src/components/common/buttons/IconButton/IconButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import cn from 'classnames';

interface IconButtonProps extends React.ComponentProps<'button'> {
color?: 'success' | 'primary' | 'error' | 'warning' | 'neutral';
children?: React.ReactNode;
}

export const IconButton: React.FC<IconButtonProps> = ({
color = 'neutral',
children,
...props
}) => (
<button
className={cn(
'rounded border border-neutral-950/20 p-2 transition-transform enabled:hover:bg-neutral-950/10 enabled:active:scale-95',
{
neutral: '',
primary: 'bg-blue-400 enabled:hover:bg-blue-500',
success: 'bg-green-400 enabled:hover:bg-green-500',
error: 'bg-red-400 enabled:hover:bg-red-500',
warning: 'bg-orange-400 enabled:hover:bg-orange-500',
}[color],
)}
{...props}
>
{children}
</button>
);
1 change: 1 addition & 0 deletions client/src/components/common/buttons/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './Button/Button';
export * from './IconButton/IconButton';
21 changes: 21 additions & 0 deletions client/src/components/common/feedback/Spinner/Spinner.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
export const Spinner = () => (
<div role="status">
<svg
aria-hidden="true"
className="h-8 w-8 animate-spin fill-blue-400 text-gray-200"
viewBox="0 0 100 101"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor"
/>
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill"
/>
</svg>
<span className="sr-only">Loading...</span>
</div>
);
1 change: 1 addition & 0 deletions client/src/components/common/feedback/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Spinner/Spinner';
1 change: 1 addition & 0 deletions client/src/components/common/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export * from './buttons';
export * from './fields';
export * from './feedback';
2 changes: 1 addition & 1 deletion client/src/components/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './common';
export * from './layout';
7 changes: 7 additions & 0 deletions client/src/components/layout/Layout/Layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { Outlet } from 'react-router-dom';

export const Layout = () => (
<main className="flex h-screen items-center justify-center">
<Outlet />
</main>
);
1 change: 1 addition & 0 deletions client/src/components/layout/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Layout/Layout';
9 changes: 1 addition & 8 deletions client/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
import { createRoot } from 'react-dom/client';
import { QueryClient, QueryClientProvider } from 'react-query';

import { App } from './App.tsx';
import './index.css';

const queryClient = new QueryClient();

const container = document.getElementById('root')!;
const root = createRoot(container);
root.render(
<QueryClientProvider client={queryClient}>
<App />
</QueryClientProvider>,
);
root.render(<App />);
Loading

0 comments on commit 4dd25f4

Please sign in to comment.