diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 66c5af18..31a33d98 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -13,7 +13,9 @@ import Navbar from "components/nav/Navbar"; import APIKeys from "components/pages/APIKeys"; import About from "components/pages/About"; import Browse from "components/pages/Browse"; +import BuyStompy from "components/pages/BuyStompy"; import Create from "components/pages/Create"; +import EmailSignup from "components/pages/EmailSignup"; import FileBrowser from "components/pages/FileBrowser"; import Home from "components/pages/Home"; import ListingDetails from "components/pages/ListingDetails"; @@ -30,18 +32,20 @@ const App = () => { -
+
} /> } /> + } /> } /> } /> } /> } /> - } /> + } /> + } /> } /> } /> } /> diff --git a/frontend/src/components/auth/AuthBlock.tsx b/frontend/src/components/auth/AuthBlock.tsx index e1b0eda0..453db7bf 100644 --- a/frontend/src/components/auth/AuthBlock.tsx +++ b/frontend/src/components/auth/AuthBlock.tsx @@ -11,11 +11,30 @@ import { Card, CardContent, CardFooter, CardHeader } from "components/ui/Card"; import Header from "components/ui/Header"; import Spinner from "components/ui/Spinner"; -export const AuthBlockInner = () => { +interface AuthBlockProps { + title?: string; + onClosed?: () => void; + signup?: boolean; +} + +const AuthBlock: React.FC = ({ title, onClosed, signup }) => { + return ( + + +
+ + + + ); +}; + +export const AuthBlockInner: React.FC<{ initialSignup?: boolean }> = ({ + initialSignup, +}) => { const auth = useAuthentication(); const { addErrorAlert } = useAlertQueue(); - const [isSignup, setIsSignup] = useState(false); + const [isSignup, setIsSignup] = useState(initialSignup ?? false); const [useSpinner, setUseSpinner] = useState(false); useEffect(() => { @@ -72,20 +91,4 @@ export const AuthBlockInner = () => { ); }; -interface AuthBlockProps { - title?: string; - onClosed?: () => void; -} - -const AuthBlock: React.FC = ({ title, onClosed }) => { - return ( - - -
- - - - ); -}; - export default AuthBlock; diff --git a/frontend/src/components/footer/Footer.tsx b/frontend/src/components/footer/Footer.tsx index d51de873..5456987a 100644 --- a/frontend/src/components/footer/Footer.tsx +++ b/frontend/src/components/footer/Footer.tsx @@ -21,6 +21,7 @@ const Footer = () => { pathname?.startsWith("/browse") === false && pathname?.startsWith("/login") === false && pathname?.startsWith("/item") === false && + pathname?.startsWith("/create") === false && pathname?.startsWith("/signup") === false; if (!showFooter) { @@ -28,7 +29,7 @@ const Footer = () => { } return ( -