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

feat: env-based feature flag for backoffice #621

Merged
merged 5 commits into from
Jan 31, 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
5 changes: 3 additions & 2 deletions .env.local.sample
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
NEXT_PUBLIC_API_URL=http://localhost:4000
NEXT_PUBLIC_QRCODE_HOST=seium.org
NEXT_PUBLIC_API_URL=http://locahost:4000
NEXT_PUBLIC_QRCODE_HOST=seium.org
NEXT_PUBLIC_BACKOFFICE_FEATURE_FLAG=true
13 changes: 13 additions & 0 deletions components/FeatureFlags/BackOfficeWrapper.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
type BackOfficeWrapperProps = {
children: React.ReactNode;
};

export default function BackOfficeWrapper({
children,
}: BackOfficeWrapperProps) {
if (process.env.NEXT_PUBLIC_BACKOFFICE_FEATURE_FLAG === "true") {
return <>{children}</>;
}

return null;
}
45 changes: 25 additions & 20 deletions components/Navbar/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { faBars, faTimes } from "@fortawesome/free-solid-svg-icons";
import { useAuth } from "@context/Auth";
import JoinUs from "@components/JoinUs";
import styles from "./style.module.css";
import BackOfficeWrapper from "@components/FeatureFlags/BackOfficeWrapper";

const navigation = [
{ name: "Schedule", slug: "/schedule" },
Expand Down Expand Up @@ -76,15 +77,17 @@ export default function Navbar({ bgColor, fgColor, button, children }) {
{item.name}
</Link>
))}
{isAuthenticated ? null : (
<Link
key="login"
href="/login"
className="font-iregular text-sm text-white text-opacity-40 hover:text-opacity-100"
>
Login
</Link>
)}
<BackOfficeWrapper>
{isAuthenticated ? null : (
<Link
key="login"
href="/login"
className="font-iregular text-sm text-white text-opacity-40 hover:text-opacity-100"
>
Login
</Link>
)}
</BackOfficeWrapper>
</div>
{isAuthenticated ? (
<Menu as="div" className="relative z-50 ml-3">
Expand Down Expand Up @@ -186,17 +189,19 @@ export default function Navbar({ bgColor, fgColor, button, children }) {
</Link>
</Disclosure.Button>
))}
{!isAuthenticated && (
<Disclosure.Button
key="login"
as="a"
className="block rounded-md py-6 text-center font-ibold text-3xl text-white hover:text-quinary"
>
<Link key="login" href="/login">
Login
</Link>
</Disclosure.Button>
)}
<BackOfficeWrapper>
{!isAuthenticated && (
<Disclosure.Button
key="login"
as="a"
className="block rounded-md py-6 text-center font-ibold text-3xl text-white hover:text-quinary"
>
<Link key="login" href="/login">
Login
</Link>
</Disclosure.Button>
)}
</BackOfficeWrapper>
{isAuthenticated && (
<Disclosure.Button
key="login"
Expand Down
1 change: 1 addition & 0 deletions layout/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import Footer from "@components/Footer";
function Home() {
return (
<Navbar bgColor="secondary" button="quinary" fgColor="white">
{/* FIXME: The parameter could probably be better in some way */}
<Hero />
<Schedule />
<Sponsors />
Expand Down
1 change: 1 addition & 0 deletions layout/Sponsor/Visitors/Visitors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const SponsorVisitors: React.FC = () => {
setVisitors(response.data);
}
})
// FIXME: This should be displayed as a toast notification
.catch((error) => console.log(error));
}, [user]);

Expand Down
24 changes: 24 additions & 0 deletions middleware.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { NextResponse } from "next/server";
import type { NextRequest } from "next/server";

export function middleware(request: NextRequest) {
if (process.env.NEXT_PUBLIC_BACKOFFICE_FEATURE_FLAG === "false") {
return NextResponse.redirect(new URL("/404", request.url));
}
}

export const config = {
matcher: [
"/attendee/:path*",
"/attendees/:path*",
"/badge/:path*",
"/product/:path*",
"/register/:path*",
"/sponsor/:path*",
"/staff/:path*",
"/forgot-password/:path*",
"/login/:path*",
"/reset/:path*",
"/signup/:path*",
],
};
4 changes: 2 additions & 2 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Header from "@components/Header";

import "../styles/globals.css";

function MyApp({ Component, pageProps }) {
function App({ Component, pageProps }) {
return (
<AuthProvider>
<Header />
Expand All @@ -12,4 +12,4 @@ function MyApp({ Component, pageProps }) {
);
}

export default MyApp;
export default App;
Loading