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

small fix to login flow #223

Merged
merged 1 commit into from
Aug 1, 2024
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
2 changes: 1 addition & 1 deletion frontend/src/components/nav/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const Sidebar = ({ show, onClose }: Props) => {
title="Terms of Service"
icon={<FaScroll />}
onClick={() => {
navigate("/terms");
navigate("/tos");
onClose();
}}
/>
Expand Down
21 changes: 12 additions & 9 deletions frontend/src/pages/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,25 @@ const About = () => {
<h1 className="mb-8 text-4xl font-extrabold tracking-tight leading-none md:text-5xl lg:text-6xl">
About
</h1>
<p className="mb-8 text-lg font-normal lg:text-xl sm:px-16 lg:px-48">
<p className="mb-4 text-lg font-normal lg:text-xl sm:px-16 lg:px-48">
This is a simple store to help make it easy to buy, sell and build
robots. It is maintained by{" "}
<button
onClick={() => window.open("https://kscale.io")}
className="text-blue-700 underline"
robots.
</p>
<p className="text-lg font-normal lg:text-xl sm:px-16 lg:px-48">
It is maintained by{" "}
<a
href="https://kscale.dev"
className="text-blue-700 underline hover:text-blue-900"
>
K-Scale Labs
</button>{" "}
</a>{" "}
with open-source code freely available on{" "}
<button
onClick={() => window.open("https://github.com/kscalelabs/store")}
<a
href="https://github.com/kscalelabs/store"
className="text-blue-700 underline"
>
Github
</button>
</a>
.
</p>
</div>
Expand Down
16 changes: 13 additions & 3 deletions frontend/src/pages/Logout.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { Card, CardContent, CardHeader } from "components/ui/Card";
import Header from "components/ui/Header";
import Spinner from "components/ui/Spinner";
import { useAlertQueue } from "hooks/alerts";
import { useAuthentication } from "hooks/auth";
Expand All @@ -19,9 +21,17 @@ const Logout = () => {
}, []);

return (
<div>
<h1 className="mb-4">Log Out</h1>
<Spinner />
<div className="mx-8">
<div className="flex justify-center items-center">
<Card className="w-[400px] shadow-md bg-white text-black rounded-lg">
<CardHeader>
<Header title="Logout" />
</CardHeader>
<CardContent className="flex justify-center">
<Spinner />
</CardContent>
</Card>
</div>
</div>
);
};
Expand Down
Loading