Merge remote-tracking branch 'origin/dev' into templates

This commit is contained in:
2025-12-24 14:06:12 -06:00
6 changed files with 26 additions and 3 deletions

View File

@@ -70,9 +70,13 @@ const PrivateRoute = ({ children, adminOnly = false }) => {
};
function App() {
// Read basename from environment variable (defaults to empty string for root path)
// Set REACT_APP_BASENAME in .env to use a subpath (e.g., "/membership")
const basename = process.env.REACT_APP_BASENAME || '';
return (
<AuthProvider>
<BrowserRouter basename="/membership">
<BrowserRouter basename={basename}>
<Routes>
<Route path="/" element={<Landing />} />
<Route path="/register" element={<Register />} />

View File

@@ -88,7 +88,7 @@ const Landing = () => {
<img src={heroLoaf} alt="LOAF" className="w-full max-w-xs md:max-w-[370px] h-auto object-contain" />
</div>
<div className="flex flex-col gap-4 items-center justify-center w-full max-w-[339px]">
<Link to="/register" className="w-full">
<Link to="/become-a-member" className="w-full">
<Button style={{ fontFamily: "'Nunito sans', sans-serif" }} className="bg-[#DDD8EB] hover:bg-white text-[#422268] rounded-full px-6 py-6 sm:py-[32px] text-base sm:text-lg font-medium w-full transition-colors">
Become a Member
</Button>