Skip to content

Commit

Permalink
added new pages
Browse files Browse the repository at this point in the history
  • Loading branch information
sagarika-padmanaban committed Jan 25, 2024
1 parent 2e072a6 commit a79e670
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 180 deletions.
31 changes: 0 additions & 31 deletions src/app/RootLayout.js

This file was deleted.

145 changes: 25 additions & 120 deletions src/app/layout.js
Original file line number Diff line number Diff line change
@@ -1,126 +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 Dashboard from "./ui/pages/admin/Dashboard"
import ProgressPage from "./progress/progress";
import ProfilePage from "./profile/profile";
import EditProfile from "./ui/pages/edit-profile/edit-profile"
import ChangePassword from "./ui/pages/change-password/change-password"
import ProjectSetting from "@/components/Project/ProjectSettings";
import DatasetDetails from "@/components/datasets/DatasetDetails";
import DatasetSettingTabs from "@/components/datasets/DatasetSettingTab";
import AutomateDatasets from "@/components/datasets/AutomateDatasets";
import CreateNewDatasetInstanceAPI from "@/components/datasets/CreateNewDatasetInstance";
// Import necessary modules from Next.js
"use client"
import Head from 'next/head';
import { ThemeProvider } from '@emotion/react';

// Import your custom theme
import themeDefault from '../themes/theme';

// 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="/admin"
element={ProtectedRouteWrapper(<Layout component={<Dashboard />} />)}
/>
<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/:datasetId/datasetsetting"
element={ProtectedRouteWrapper(
<Layout component={<DatasetSettingTabs />} Backbutton={true} />
)}
/>
<Route
path="datasets/automate"
element={ProtectedRouteWrapper(
<Layout component={<AutomateDatasets />} Backbutton={true} />
)}
/>
<Route
path="create-Dataset-Instance-Button"
element={ProtectedRouteWrapper(
<Layout component={<CreateNewDatasetInstanceAPI />} Backbutton={true} />
)}
/>
<Route
path="projects/:id/projectsetting"
element={ProtectedRouteWrapper(
<Layout component={<ProjectSetting />} Backbutton={true} />
)}
/>
<Route
path="/edit-profile"
element={ProtectedRouteWrapper(<Layout component={<EditProfile />} Backbutton={true} />)}
/>
<Route
path="/Change-Password"
element={ProtectedRouteWrapper(<Layout component={<ChangePassword />} Backbutton={true} />)}
/>
<Route
path="datasets"
element={ProtectedRouteWrapper(
<Layout component={<Dataset />} />
)}
/>
<Route
path="datasets/:datasetId"
element={ProtectedRouteWrapper(
<Layout component={<DatasetDetails />} Backbutton={true} />
)}
/>
<Route
path="workspaces/:id"
element={ProtectedRouteWrapper(
<Layout component={<Workspace />} Backbutton={true} />
)}
/>
<Route
path="workspaces/:id/workspacesetting"
element={ProtectedRouteWrapper(
<Layout component={<WorkspaceSettingTabs />} Backbutton={true} />
)}
/>

<Route
path="/profile/:id"
element={ProtectedRouteWrapper(<Layout component={<ProfilePage />} Backbutton={true} />)}
/>
<Route
path="/progress/:id"
element={ProtectedRouteWrapper(<Layout component={<ProgressPage />} Backbutton={true} />)}
/>
</Routes>
</HashRouter>
</RootLayout>
)
}
<>
<html lang="en">
<Head>

</Head>

<body>
<Providers>
<ThemeProvider theme={themeDefault}>
{children}
</ThemeProvider>
</Providers>
</body>
</html>
</>
);
}
63 changes: 62 additions & 1 deletion src/app/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,22 @@ 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 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 Dashboard from "./ui/pages/admin/Dashboard"
import ProgressPage from "./progress/progress";
import ProfilePage from "./profile/profile";
import EditProfile from "./ui/pages/edit-profile/edit-profile"
import ChangePassword from "./ui/pages/change-password/change-password"
import ProjectSetting from "@/components/Project/ProjectSettings";
import DatasetDetails from "@/components/datasets/DatasetDetails";
import DatasetSettingTabs from "@/components/datasets/DatasetSettingTab";
import AutomateDatasets from "@/components/datasets/AutomateDatasets";
import CreateNewDatasetInstanceAPI from "@/components/datasets/CreateNewDatasetInstance";

export default function Root() {
if (typeof window !== 'undefined') {
Expand All @@ -36,6 +46,10 @@ export default function Root() {
<Route path="/login" element={<Login/>} />
<Route path="/forgot-password" element={<ForgotPassword />} />
<Route path="/invite/:inviteCode" element={<SignUp />} />
<Route
path="/admin"
element={ProtectedRouteWrapper(<Layout component={<Dashboard />} />)}
/>
<Route
path="/organizations/:orgId"
element={ProtectedRouteWrapper(<Layout component={<MyOrganization />} />)}
Expand All @@ -50,12 +64,50 @@ export default function Root() {
<Layout component={<Projects />} Backbutton={true} backPressNavigationPath={"/projects"} />
)}
/>
<Route
path="datasets/:datasetId/datasetsetting"
element={ProtectedRouteWrapper(
<Layout component={<DatasetSettingTabs />} Backbutton={true} />
)}
/>
<Route
path="datasets/automate"
element={ProtectedRouteWrapper(
<Layout component={<AutomateDatasets />} Backbutton={true} />
)}
/>
<Route
path="create-Dataset-Instance-Button"
element={ProtectedRouteWrapper(
<Layout component={<CreateNewDatasetInstanceAPI />} Backbutton={true} />
)}
/>
<Route
path="projects/:id/projectsetting"
element={ProtectedRouteWrapper(
<Layout component={<ProjectSetting />} Backbutton={true} />
)}
/>
<Route
path="/edit-profile"
element={ProtectedRouteWrapper(<Layout component={<EditProfile />} Backbutton={true} />)}
/>
<Route
path="/Change-Password"
element={ProtectedRouteWrapper(<Layout component={<ChangePassword />} Backbutton={true} />)}
/>
<Route
path="datasets"
element={ProtectedRouteWrapper(
<Layout component={<Dataset />} />
)}
/>
<Route
path="datasets/:datasetId"
element={ProtectedRouteWrapper(
<Layout component={<DatasetDetails />} Backbutton={true} />
)}
/>
<Route
path="workspaces/:id"
element={ProtectedRouteWrapper(
Expand All @@ -68,6 +120,15 @@ export default function Root() {
<Layout component={<WorkspaceSettingTabs />} Backbutton={true} />
)}
/>

<Route
path="/profile/:id"
element={ProtectedRouteWrapper(<Layout component={<ProfilePage />} Backbutton={true} />)}
/>
<Route
path="/progress/:id"
element={ProtectedRouteWrapper(<Layout component={<ProgressPage />} Backbutton={true} />)}
/>
</Routes>
</HashRouter>
</RootLayout>
Expand Down
20 changes: 0 additions & 20 deletions src/app/page1.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/common/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ const handleopenproject=(id,type)=>{
md={3}
>
<Link href="/projects">
<Image
<img

src="https://i.imgur.com/56Ut9oz.png"
alt="anudesh"
Expand Down
8 changes: 4 additions & 4 deletions src/components/datasets/DraftDataPopulation.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ const DraftDataPopulation = () => {
// const Fields = ["draft_data_json", "input_language", "output_language", "input_text", "output_text", "machine_translation", "context", "labse_score", "rating", "domain", "parent_data", "instance_id"];

const loggedInUserData = useSelector((state) => state.getLoggedInData.data);
const DatasetInstances = useSelector((state) => state.getDatasetsByType.data);
const DatasetTypes = useSelector((state) => state.GetDatasetType.data);
const dataitemsList = useSelector((state) => state.getDataitemsById.data);
const DatasetInstances = useSelector((state) => state.getDatasetsByType?.data);
const DatasetTypes = useSelector((state) => state.GetDatasetType?.data);
const dataitemsList = useSelector((state) => state.getDataitemsById?.data);


useEffect(() => {
Expand Down Expand Up @@ -87,7 +87,7 @@ const DraftDataPopulation = () => {
};
useEffect(() => {
setLoading(false);
if (dataitemsList.results?.length > 0) {
if (dataitemsList?.results?.length > 0) {
let values = Object.keys(dataitemsList.results[0])
setField(values)
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/datasets/PopulateAiModel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const PopulateAiModel = () => {
// };
useEffect(() => {
setLoading(false);
if (dataitemsList.results?.length > 0) {
if (dataitemsList?.results?.length > 0) {
let values = Object.keys(dataitemsList.results[0])
setField(values)
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/user/AppInfo.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

import { Grid, Typography, Hidden, ThemeProvider } from "@mui/material";
import "../../styles/Dataset.css";
import Image from "next/image";
export default function AppInfo() {
/* eslint-disable react-hooks/exhaustive-deps */

Expand All @@ -10,7 +9,7 @@ export default function AppInfo() {
<Grid container>
<Hidden only="xs">
<Grid item xs={10} sm={10} md={10} lg={10} xl={10} >
<Image src={"https://i.imgur.com/56Ut9oz.png"} alt="anudesh-logo" style={{ width: "85px", margin: "10% 0px 0% 35px", borderRadius: "50%" }} />
<img src="https://i.imgur.com/56Ut9oz.png" alt="anudesh-logo" style={{ width: "85px", margin: "10% 0px 0% 35px", borderRadius: "50%" }} />
</Grid>
</Hidden>

Expand Down

0 comments on commit a79e670

Please sign in to comment.