feat: some location optimization
This commit is contained in:
@@ -5,8 +5,8 @@ import LoginPage from "./pages/login";
|
|||||||
import { AppProvider } from "./providers/AuthProvider";
|
import { AppProvider } from "./providers/AuthProvider";
|
||||||
|
|
||||||
const HomePage: FunctionComponent = () => {
|
const HomePage: FunctionComponent = () => {
|
||||||
const location = useLocation();
|
const { route } = useLocation();
|
||||||
location.route("/login");
|
route("/login");
|
||||||
return <div>Redirecting to login...</div>;
|
return <div>Redirecting to login...</div>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ interface MenuItemProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const MenuItem: FunctionComponent<MenuItemProps> = ({ title, link }: MenuItemProps) => {
|
const MenuItem: FunctionComponent<MenuItemProps> = ({ title, link }: MenuItemProps) => {
|
||||||
const location = useLocation();
|
const { route, path } = useLocation();
|
||||||
const active = location.path === link;
|
const active = path === link;
|
||||||
const menuItemClasses = tv({
|
const menuItemClasses = tv({
|
||||||
base: classes.menu_item,
|
base: classes.menu_item,
|
||||||
variants: {
|
variants: {
|
||||||
@@ -24,7 +24,7 @@ const MenuItem: FunctionComponent<MenuItemProps> = ({ title, link }: MenuItemPro
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
return (
|
return (
|
||||||
<div class={menuItemClasses({ activity: active ? "active" : "inactive" })} onClick={() => location.route(link)}>
|
<div class={menuItemClasses({ activity: active ? "active" : "inactive" })} onClick={() => route(link, true)}>
|
||||||
{title}
|
{title}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { useLocation } from "preact-iso";
|
|||||||
import classes from "./login.module.scss";
|
import classes from "./login.module.scss";
|
||||||
const LoginPage: FunctionComponent = () => {
|
const LoginPage: FunctionComponent = () => {
|
||||||
const { isLoggedIn } = useAppContext();
|
const { isLoggedIn } = useAppContext();
|
||||||
const location = useLocation();
|
const { route } = useLocation();
|
||||||
return (
|
return (
|
||||||
<div class={classes.login_container}>
|
<div class={classes.login_container}>
|
||||||
<div class={classes.login_card}>
|
<div class={classes.login_card}>
|
||||||
@@ -16,7 +16,7 @@ const LoginPage: FunctionComponent = () => {
|
|||||||
<Button
|
<Button
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
isLoggedIn.value = true;
|
isLoggedIn.value = true;
|
||||||
location.route("/profile/settings");
|
route("/profile/settings", true);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Login
|
Login
|
||||||
|
|||||||
Reference in New Issue
Block a user