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.

Sign up for GitHub

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

minor fix #43

Merged
merged 3 commits into from
Jan 23, 2024
Merged

minor fix #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43146c9
minor fix
kartikvirendrar Jan 22, 2024
73d832b
minor fix
kartikvirendrar Jan 23, 2024
f2f3f1a
added backend url env param
kartikvirendrar Jan 23, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/nextjs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ jobs:
NEXT_PUBLIC_MSG_SENDER_ID: ${{ secrets.NEXT_PUBLIC_MSG_SENDER_ID }}
NEXT_PUBLIC_APP_ID: ${{ secrets.NEXT_PUBLIC_APP_ID }}
NEXT_PUBLIC_MEASUREMENT_ID: ${{ secrets.NEXT_PUBLIC_MEASUREMENT_ID }}
NEXT_PUBLIC_BACKEND_URL: ${{ secrets.NEXT_PUBLIC_BACKEND_URL }}
run: ${{ steps.detect-package-manager.outputs.runner }} next build
- name: Upload artifact
uses: actions/upload-pages-artifact@v2
Expand Down
96 changes: 27 additions & 69 deletions src/app/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,31 @@
"use client";
import RootLayout from "./rootLayout";
import Home from "./ui/pages/home/home"
import { HashRouter, Route, Routes, Navigate } from "react-router-dom"
import { authenticateUser } from "@/utils/utils";
import Login from "./ui/pages/login/login";
import Layout from "./ui/Layout";
import MyOrganization from "./ui/pages/organizations/organizations";
import ProjectList from "./ui/pages/projects/project";
import Projects from "./ui/pages/projects/projectDetails";
import Dataset from "./ui/pages/dataset/dataset";
import Workspace from "./ui/pages/workspace/workspace";
import WorkspaceSettingTabs from "./ui/pages/workspace/workspacesetting/setting";
import SignUp from "./ui/pages/invite/invite";
import ForgotPassword from "./ui/pages/forgot-password/forgot-password";
// Import necessary modules from Next.js
"use client"
import Head from 'next/head';
import { ThemeProvider } from '@emotion/react';

export default function Root() {
const ProtectedRoute = ({ user, children }) => {
if (!authenticateUser()) {
return <Navigate to="/login" />;
}
return children;
};
// Import your custom theme
import themeDefault from '../themes/theme';

const ProtectedRouteWrapper = (component) => {
return <ProtectedRoute>{component}</ProtectedRoute>;
};
// Import the StoreProvider and CSS
import Providers from './StoreProvider';
import './index.css';

export default function RootLayout({ children }) {
return (
<RootLayout>
<HashRouter>
<Routes>
<Route path="/" element={<Home/>} />
<Route path="/login" element={<Login/>} />
<Route path="/forgot-password" element={<ForgotPassword />} />
<Route path="/invite/:inviteCode" element={<SignUp />} />
<Route
path="/organizations/:orgId"
element={ProtectedRouteWrapper(<Layout component={<MyOrganization />} />)}
/>
<Route
path="/projects"
element={ProtectedRouteWrapper(<Layout component={<ProjectList />} />)}
/>
<Route
path="projects/:id"
element={ProtectedRouteWrapper(
<Layout component={<Projects />} Backbutton={true} backPressNavigationPath={"/projects"} />
)}
/>
<Route
path="datasets"
element={ProtectedRouteWrapper(
<Layout component={<Dataset />} />
)}
/>
<Route
path="workspaces/:id"
element={ProtectedRouteWrapper(
<Layout component={<Workspace />} Backbutton={true} />
)}
/>
<Route
path="workspaces/:id/workspacesetting"
element={ProtectedRouteWrapper(
<Layout component={<WorkspaceSettingTabs />} Backbutton={true} />
)}
/>
</Routes>
</HashRouter>
</RootLayout>
)
}
<>
<html lang="en">
<Head>

</Head>

<body>
<Providers>
<ThemeProvider theme={themeDefault}>
{children}
</ThemeProvider>
</Providers>
</body>
</html>
</>
);
}
76 changes: 76 additions & 0 deletions src/app/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
"use client";
import RootLayout from "./layout";
import Home from "./ui/pages/home/home"
import { HashRouter, Route, Routes, Navigate } from "react-router-dom"
import { authenticateUser } from "@/utils/utils";
import Login from "./ui/pages/login/login";
import Layout from "./ui/Layout";
import MyOrganization from "./ui/pages/organizations/organizations";
import ProjectList from "./ui/pages/projects/project";
import Projects from "./ui/pages/projects/projectDetails";
import Dataset from "./ui/pages/dataset/dataset";
import Workspace from "./ui/pages/workspace/workspace";
import WorkspaceSettingTabs from "./ui/pages/workspace/workspacesetting/setting";
import SignUp from "./ui/pages/invite/invite";
import ForgotPassword from "./ui/pages/forgot-password/forgot-password";

export default function Root() {
if (typeof window !== 'undefined') {
const ProtectedRoute = ({ user, children }) => {
if (!authenticateUser()) {
return <Navigate to="/login" />;
}
return children;
};


const ProtectedRouteWrapper = (component) => {
return <ProtectedRoute>{component}</ProtectedRoute>;
};

return (
<RootLayout>
<HashRouter>
<Routes>
<Route path="/" element={<Home/>} />
<Route path="/login" element={<Login/>} />
<Route path="/forgot-password" element={<ForgotPassword />} />
<Route path="/invite/:inviteCode" element={<SignUp />} />
<Route
path="/organizations/:orgId"
element={ProtectedRouteWrapper(<Layout component={<MyOrganization />} />)}
/>
<Route
path="/projects"
element={ProtectedRouteWrapper(<Layout component={<ProjectList />} />)}
/>
<Route
path="projects/:id"
element={ProtectedRouteWrapper(
<Layout component={<Projects />} Backbutton={true} backPressNavigationPath={"/projects"} />
)}
/>
<Route
path="datasets"
element={ProtectedRouteWrapper(
<Layout component={<Dataset />} />
)}
/>
<Route
path="workspaces/:id"
element={ProtectedRouteWrapper(
<Layout component={<Workspace />} Backbutton={true} />
)}
/>
<Route
path="workspaces/:id/workspacesetting"
element={ProtectedRouteWrapper(
<Layout component={<WorkspaceSettingTabs />} Backbutton={true} />
)}
/>
</Routes>
</HashRouter>
</RootLayout>
)
}
}
31 changes: 0 additions & 31 deletions src/app/rootLayout.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/app/ui/pages/home/home.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.