Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.0.2 #311

Merged
merged 25 commits into from
May 22, 2024
Merged

3.0.2 #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0f2fec6
added tsc to uat build
bwsarge May 1, 2024
47a36ee
prevent API from updating isAdmin or tier
bwsarge May 1, 2024
68fe9c9
changed error to pass, added pass functionality
bwsarge May 1, 2024
669af27
dont deactivate the checker
bwsarge May 1, 2024
e345f3e
renamed file
bwsarge May 1, 2024
aa7ff5b
updated messages
bwsarge May 1, 2024
5d76641
removed unncessary count
bwsarge May 1, 2024
751727a
updated tests
bwsarge May 1, 2024
4f80e77
Merge pull request #300 from bettersg/feat/harmonise-uat-prod-build
sarge1989 May 4, 2024
b51f737
Merge pull request #302 from bettersg/feat/checkers-admin-status-can-…
sarge1989 May 4, 2024
f1a0300
added leaderboard features
bwsarge May 5, 2024
18e81eb
loosenned equality constraints
bwsarge May 5, 2024
86b2e37
allow checkers to revote if they passed
bwsarge May 5, 2024
846179a
removed unnecessary declaration
bwsarge May 5, 2024
3e970eb
updated test
bwsarge May 5, 2024
ad33d7e
removed extra stuff
bwsarge May 5, 2024
0e3389d
updated leaderboard query to isActive only
bwsarge May 5, 2024
101a604
truncate name and log erros
bwsarge May 5, 2024
a9b1c0a
fixed bug
sarge1989 May 6, 2024
8c1cca6
fixed
sarge1989 May 6, 2024
2fa843c
updated vote assessment
bwsarge May 6, 2024
f3af0a7
slight rejigging
bwsarge May 6, 2024
003b46a
updated leaderboard saving
sarge1989 May 7, 2024
1985692
Merge pull request #304 from bettersg/feat/allow-checkers-to-pass
sarge1989 May 22, 2024
53f0d5f
Merge pull request #306 from bettersg/feat/leaderboard
sarge1989 May 22, 2024
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
90 changes: 45 additions & 45 deletions checkers-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions checkers-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"build:uat": "vite build --mode uat",
"build:uat": "tsc && vite build --mode uat",
"build:watch": "vite build --mode dev --watch",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
"dependencies": {
"@firebase/storage": "^0.12.0",
"@heroicons/react": "^2.0.18",
"@material-tailwind/react": "^2.1.4",
"@material-tailwind/react": "^2.1.9",
"@tanstack/react-query": "^5.20.1",
"@tanstack/react-query-devtools": "^5.20.1",
"apexcharts": "^3.44.0",
Expand Down
2 changes: 2 additions & 0 deletions checkers-app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
DashboardPage,
ViewVotePage,
MyVotesPage,
LeaderboardPage,
} from "./pages";
import { createBrowserRouter, RouterProvider } from "react-router-dom";
import { useUser } from "./providers/UserContext";
Expand All @@ -16,6 +17,7 @@ export const router = createBrowserRouter([
{ path: "/", element: <DashboardPage /> },
{ path: "/votes", element: <MyVotesPage /> },
{ path: "/achievements", element: <AchievementPage /> },
{ path: "/leaderboard", element: <LeaderboardPage /> },
{
path: "/messages/:messageId/voteRequests/:voteRequestId",
element: <ViewVotePage />,
Expand Down
2 changes: 1 addition & 1 deletion checkers-app/src/components/common/BotNavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default function NavbarDefault() {
variant="text"
className="rounded-full"
onClick={() => {
navigate("/achievements");
navigate("/leaderboard");
}}
ripple
>
Expand Down
42 changes: 42 additions & 0 deletions checkers-app/src/components/common/ToolTip.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { Tooltip, Typography } from "@material-tailwind/react";

interface TooltipProps {
header: string;
text: string;
}

export function TooltipWithHelperIcon({ header, text }: TooltipProps) {
return (
<Tooltip
content={
<div className="w-80">
<Typography color="white" className="font-medium">
{header}
</Typography>
<Typography
variant="small"
color="white"
className="font-normal opacity-80"
>
{text}
</Typography>
</div>
}
>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
strokeWidth={2}
className="h-5 w-5 cursor-pointer text-blue-gray-500"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
d="M11.25 11.25l.041-.02a.75.75 0 011.063.852l-.708 2.836a.75.75 0 001.063.853l.041-.021M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9-3.75h.008v.008H12V8.25z"
/>
</svg>
</Tooltip>
);
}
13 changes: 13 additions & 0 deletions checkers-app/src/components/leaderboard/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Typography } from "@material-tailwind/react";
import { LeaderboardTable } from "./table";

export default function Leaderboard() {
return (
<div className="left-right-padding">
<Typography color="blue-gray" className="font-normal">
Refreshes every month
</Typography>
<LeaderboardTable />
</div>
);
}
Loading
Loading