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

[WIP] Simplified view organization #939

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
+435 −319
Open

[WIP] Simplified view organization #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
feb2d55
Only link to up-to-date tasks on SOTA page
WrathfulSpatula Oct 25, 2024
40256ae
Slight wording change
WrathfulSpatula Oct 25, 2024
13dacda
Featured Tasks on homepage
WrathfulSpatula Nov 26, 2024
538291e
Show SotaChart task name
WrathfulSpatula Nov 26, 2024
742ede3
Progress Chart on homepage
WrathfulSpatula Nov 26, 2024
200cad8
Per issue #938
WrathfulSpatula Dec 23, 2024
df7970b
Merge branch 'main' into 938-simplify
WrathfulSpatula Dec 23, 2024
4dc13f5
Merge branch 'main' into 938-simplify
WrathfulSpatula Dec 23, 2024
ef747c9
Fix imports
WrathfulSpatula Jan 3, 2025
c429585
Featured tasks
WrathfulSpatula Jan 3, 2025
d7f1599
Fix missing import
WrathfulSpatula Jan 3, 2025
de87aa4
Fix main router
WrathfulSpatula Jan 3, 2025
ce62de1
Fix main router
WrathfulSpatula Jan 3, 2025
b96bd7e
Fix main nav
WrathfulSpatula Jan 3, 2025
773e9ba
Per review
WrathfulSpatula Jan 7, 2025
ec77d24
Per review
WrathfulSpatula Jan 7, 2025
c81e0a0
Per #940 and #943
WrathfulSpatula Jan 9, 2025
3814068
Fix nbsp
WrathfulSpatula Jan 9, 2025
e99300a
text-start
WrathfulSpatula Jan 9, 2025
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
18 changes: 15 additions & 3 deletions src/MainRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -64,7 +64,7 @@ const MainRouter = (props) => {
exact
path='/'
>
<Home isLoggedIn={isLoggedIn} isHomepage />
<Trends isLoggedIn={isLoggedIn} />
</Route>
<Route
exact
Expand Down Expand Up @@ -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'
Expand Down
69 changes: 69 additions & 0 deletions src/components/Committee.js
View file
Open in desktop

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

21 changes: 7 additions & 14 deletions src/components/MainNavLeft.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading
Loading