Fatty link spa (ZcashFoundation#62)

Ham on the links
skyl · Jan 15, 2023 · 8fe5610 · 8fe5610
1 parent cd7a1eb
commit 8fe5610
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 21 deletions.
diff --git a/ts/react/free2z/src/EditPage.tsx b/ts/react/free2z/src/EditPage.tsx
@@ -129,6 +129,7 @@ export default function EditPage() {
             //     setLoading(false)
             //     return new Promise()
             // }
+            // setLoading(true)
             return axios.post('/api/zpage/', page, {
                 headers: headers
             }).then((res) => {
@@ -227,12 +228,14 @@ export default function EditPage() {
     }
 
     useEffect(() => {
+        // setLoading(true)
         // console.log("USE EFFECTG PARAMS", id)
         if (id === "new") {
             // console.log("PARAMS NEW SETTING BLANK")
             // wtf??
             setPage(newPage)
             setErrors(noErrors)
+            // setLoading(false)
             return
         }
         // console.log("call refreshPage fun useEffect")

diff --git a/ts/react/free2z/src/Profile.tsx b/ts/react/free2z/src/Profile.tsx
@@ -35,6 +35,8 @@ import TuziIcon from "./components/TuziIcon"
 // import TwitterOAuthButton from "./components/TwitterOAuthButton"
 import TwitterLoginButton from "./components/TwitterLoginButton"
 
+import { Link as RouterLink } from 'react-router-dom';
+
 
 export default function Profile() {
     const location = useLocation()
@@ -369,7 +371,8 @@ export default function Profile() {
                             </Typography>
                             <Link
                                 target="_blank"
-                                href="/fans-and-stars"
+                                to="/fans-and-stars"
+                                component={RouterLink}
                             >
                                 <QuestionMark />
                             </Link>

diff --git a/ts/react/free2z/src/components/Footer.tsx b/ts/react/free2z/src/components/Footer.tsx
@@ -1,5 +1,6 @@
-import { Grid, Link, Box, Stack } from "@mui/material"
-import { useNavigate } from "react-router-dom"
+import { Link, Box, Stack } from "@mui/material"
+import { Link as RouterLink } from 'react-router-dom';
+
 
 export default function Footer() {
 
@@ -16,13 +17,17 @@ export default function Footer() {
                 <Link color="inherit" variant="caption" href="/docs/">
                     Help
                 </Link>
-                <Link color="inherit" variant="caption" href="/terms">
+                <Link
+                    color="inherit" variant="caption" to="/terms"
+                    component={RouterLink}
+                >
                     Terms of Service
                 </Link>
                 <Link
                     color="inherit"
                     variant="caption"
-                    href="/privacy-policy"
+                    to="/privacy-policy"
+                    component={RouterLink}
                 >
                     Privacy Policy
                 </Link>

diff --git a/ts/react/free2z/src/components/MakePageComment.tsx b/ts/react/free2z/src/components/MakePageComment.tsx
@@ -22,8 +22,7 @@ import { getURI, current_f2z_address } from "../Constants"
 import QRAddress from "./QRAddress"
 import { QuestionMarkRounded } from "@mui/icons-material"
 import MathMarkdown from "./MathMarkdown"
-// import { Link, Navigate } from 'react-router-dom';
-
+import { Link as RouterLink } from 'react-router-dom';
 export interface MakePageCommentProps {
     free2zaddr: string
 }
@@ -50,7 +49,8 @@ export default function MakePageComment(props: MakePageCommentProps) {
                             <InputAdornment position="end">
                                 <Link
                                     target="_blank"
-                                    href="/flavored-markdown"
+                                    to="/flavored-markdown"
+                                    component={RouterLink}
                                 >
                                     <QuestionMarkRounded color="info" />
                                 </Link>

diff --git a/ts/react/free2z/src/components/PageListRow2.tsx b/ts/react/free2z/src/components/PageListRow2.tsx
@@ -6,6 +6,9 @@ import CreatorDonate from "./CreatorDonate";
 import { PageInterface } from "./PageRenderer";
 import UpDownPage from "./UpDownPage";
 
+import { Link as RouterLink } from 'react-router-dom';
+
+
 export interface PageListRowProps extends PageInterface {
     mine: boolean
 }
@@ -58,7 +61,10 @@ export default function PageListRow(page: PageListRowProps) {
                     <CardHeader
                         disableTypography={true}
                         avatar={
-                            <Link href={`/${page.creator.username}`}>
+                            <Link
+                                to={`/${page.creator.username}`}
+                                component={RouterLink}
+                            >
                                 <Avatar
                                     // Kinda small
                                     // sx={{
@@ -89,7 +95,8 @@ export default function PageListRow(page: PageListRowProps) {
                                     //     WebkitLineClamp: "2",
                                     //     WebkitBoxOrient: "vertical",
                                     // }}
-                                    href={page.mine ? `/edit/${page.vanity || page.free2zaddr}` : page.get_url}
+                                    component={RouterLink}
+                                    to={page.mine ? `/edit/${page.vanity || page.free2zaddr}` : page.get_url}
                                 >
                                     {page.title}
                                 </Link>
@@ -107,8 +114,9 @@ export default function PageListRow(page: PageListRowProps) {
                                     }}
                                 >
                                     by <Link
-                                        href={`/${page.creator.username}`}
+                                        to={`/${page.creator.username}`}
                                         color="secondary"
+                                        component={RouterLink}
                                     >
                                         {page.creator.username}
                                     </Link>

diff --git a/ts/react/free2z/src/components/SimpleNav.tsx b/ts/react/free2z/src/components/SimpleNav.tsx
@@ -10,6 +10,9 @@ import { Divider, Grid, IconButton, Tooltip } from "@mui/material"
 
 import DarkMode from "./DarkMode"
 
+import { Link as RouterLink } from 'react-router-dom';
+
+
 export default function SimpleNav() {
     const location = useLocation()
     const navigate = useNavigate()
@@ -26,8 +29,9 @@ export default function SimpleNav() {
                 <Grid item xs={2} md={1}>
                     <Tooltip title="Home" color="primary">
                         <IconButton
-                            href="/"
+                            to="/"
                             size="large"
+                            component={RouterLink}
                         >
                             <Home />
                         </IconButton>
@@ -40,7 +44,8 @@ export default function SimpleNav() {
                             <IconButton
                                 color="info"
                                 size="large"
-                                href="/profile"
+                                to="/profile"
+                                component={RouterLink}
                             >
                                 <ManageAccounts />
                             </IconButton>
@@ -54,7 +59,8 @@ export default function SimpleNav() {
                             <IconButton
                                 size="large"
                                 color="secondary"
-                                href="/find"
+                                to="/find"
+                                component={RouterLink}
                             >
                                 <Search />
                             </IconButton>
@@ -66,12 +72,8 @@ export default function SimpleNav() {
                         <IconButton
                             size="large"
                             color="success"
-                            href="/edit/new"
-                            onClick={() => {
-                                navigate("/edit/new")
-                                // not sure why we have this :9
-                                window.location.replace("/edit/new")
-                            }}
+                            to="/edit/new"
+                            component={RouterLink}
                         >
                             <AddCircle />
                         </IconButton>

diff --git a/ts/react/free2z/src/components/YouAreSubscribed.tsx b/ts/react/free2z/src/components/YouAreSubscribed.tsx
@@ -14,6 +14,8 @@ import TuziIcon from "./TuziIcon";
 import Cookies from "js-cookie";
 import { Box } from "@mui/system";
 import { getRando } from "./EditFundPage";
+import { Link as RouterLink } from 'react-router-dom';
+
 
 export const STOKED = [
     "stoked",
@@ -116,7 +118,8 @@ export default function YouAreSubscribed(props: PublicCreator) {
                             </Typography> */}
                             <Link
                                 target="_blank"
-                                href="/fans-and-stars"
+                                to="/fans-and-stars"
+                                component={RouterLink}
                             >
                                 <QuestionMark />
                             </Link>