Merge pull request #939 from unitaryfund/938-simplify

[WIP] Simplified view organization
unitaryfund · Feb 13, 2025 · a72f081 · a72f081
2 parents 4c1b3cd + e99300a
commit a72f081
Show file tree

Hide file tree

Showing 15 changed files with 435 additions and 319 deletions.
diff --git a/src/MainRouter.js b/src/MainRouter.js
@@ -2,7 +2,7 @@ import { BrowserRouter as Router, Redirect, Route, Switch } from 'react-router-d
 import axios from 'axios'
 import React, { useState } from 'react'
 import config from './config'
-import Home from './views/Home'
+import Partners from './views/Partners'
 import Submissions from './views/Submissions'
 import LogIn from './views/LogIn'
 import Register from './views/Register'
@@ -11,7 +11,6 @@ import EditDetails from './views/EditDetails'
 import Forgot from './views/Forgot'
 import Recover from './views/Recover'
 import About from './views/About'
-import Partners from './views/Partners'
 import FAQ from './views/FAQ'
 import Profile from './views/Profile'
 import AddSubmission from './views/AddSubmission'
@@ -21,6 +20,7 @@ import Token from './views/Token'
 import Password from './views/Password'
 import Methods from './views/Methods'
 import Tasks from './views/Tasks'
+import Trends from './views/Trends'
 import Platforms from './views/Platforms'
 import Tags from './views/Tags'
 import Submission from './views/Submission'
@@ -64,7 +64,7 @@ const MainRouter = (props) => {
           exact
           path='/'
         >
-          <Home isLoggedIn={isLoggedIn} isHomepage />
+          <Trends isLoggedIn={isLoggedIn} />
         </Route>
         <Route
           exact
@@ -96,6 +96,18 @@ const MainRouter = (props) => {
         >
           <Methods isLoggedIn={isLoggedIn} />
         </Route>
+        <Route
+          exact
+          path='/Trends'
+        >
+          <Trends isLoggedIn={isLoggedIn} />
+        </Route>
+        <Route
+          exact
+          path='/Data'
+        >
+          <Tasks isLoggedIn={isLoggedIn} />
+        </Route>
         <Route
           exact
           path='/Tasks'

diff --git a/src/components/Committee.js b/src/components/Committee.js
diff --git a/src/components/MainNavLeft.js b/src/components/MainNavLeft.js
@@ -6,22 +6,15 @@ import { FaDiscord, FaGithub, FaTwitter } from 'react-icons/fa'
 const MainNavLeft = () => {
   return (
     <Nav className='metriq-navbar'>
-      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/Tasks' className='metriq-navbar-text' eventKey='1'>Tasks</Nav.Link>
-      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/Methods' className='metriq-navbar-text' eventKey='2'>Methods</Nav.Link>
-      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/DataSets' className='metriq-navbar-text' eventKey='3'>Data Sets</Nav.Link>
-      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/Platforms' className='metriq-navbar-text' eventKey='4'>Platforms</Nav.Link>
-      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/Tags' className='metriq-navbar-text' eventKey='5'>Tags</Nav.Link>
-      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/Submissions' className='metriq-navbar-text' eventKey='6'>Submissions</Nav.Link>
-      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/Progress' className='metriq-navbar-text' eventKey='7'>Progress</Nav.Link>
-      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/Sota' className='metriq-navbar-text' eventKey='8'>SOTA</Nav.Link>
-      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/QEDC' className='metriq-navbar-text' eventKey='9'>QED-C</Nav.Link>
-      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/VQA' className='metriq-navbar-text' eventKey='10'>VQA</Nav.Link>
       <NavDropdown id='metriq-navbar-dropdown' title='About' active='true' className='metriq-navbar-text' alignRight>
-        <NavDropdown.Item as={NavLink} activeClassName='active-dropdown-navlink' to='/About' eventKey='11'><p className='font-weight-bold'>About</p></NavDropdown.Item>
-        <NavDropdown.Item as={NavLink} activeClassName='active-dropdown-navlink' to='/Partners' eventKey='12'><p className='font-weight-bold'>Partners</p></NavDropdown.Item>
-        <NavDropdown.Item as={NavLink} activeClassName='active-dropdown-navlink' to='/FAQ' eventKey='13'><p className='font-weight-bold'>F.A.Q.</p></NavDropdown.Item>
-        <NavDropdown.Item as={NavLink} activeClassName='active-dropdown-navlink' to='/UserGuidelines' eventKey='14'><p className='font-weight-bold'>User Guidelines</p></NavDropdown.Item>
+        <NavDropdown.Item as={NavLink} activeClassName='active-dropdown-navlink' to='/About' eventKey='1'><p className='font-weight-bold'>About</p></NavDropdown.Item>
+        <NavDropdown.Item as={NavLink} activeClassName='active-dropdown-navlink' to='/Partners' eventKey='2'><p className='font-weight-bold'>Partners</p></NavDropdown.Item>
+        <NavDropdown.Item as={NavLink} activeClassName='active-dropdown-navlink' to='/FAQ' eventKey='3'><p className='font-weight-bold'>F.A.Q.</p></NavDropdown.Item>
+        <NavDropdown.Item as={NavLink} activeClassName='active-dropdown-navlink' to='/UserGuidelines' eventKey='4'><p className='font-weight-bold'>User Guidelines</p></NavDropdown.Item>
       </NavDropdown>
+      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/Trends' className='metriq-navbar-text' eventKey='5'>Trends</Nav.Link>
+      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/Progress' className='metriq-navbar-text' eventKey='6'>Progress</Nav.Link>
+      <Nav.Link as={NavLink} activeClassName='active-navlink' to='/Data' className='metriq-navbar-text' eventKey='7'>Data</Nav.Link>
       <span className='metriq-navbar-spacer' />
       <Nav.Link href='https://twitter.com/MetriqInfo' eventKey='15'> <FaTwitter color={`${'white'}`} size={25} className='metriq-navbar-social-icon' /> </Nav.Link>
       <Nav.Link href='http://discord.unitary.fund' eventKey='16'> <FaDiscord color={`${'white'}`} size={25} className='metriq-navbar-social-icon' /> </Nav.Link>