Skip to content
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
22 changes: 22 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build
/static

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
2 changes: 1 addition & 1 deletion src/navbar/NavigationBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function NavigationBar() {
to="/resources"
state={{ option: 2 }}
>
> Research
> Readings
</Link>
<Link
className="dropdown-link"
Expand Down
12 changes: 11 additions & 1 deletion src/resources/Organizations.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,17 @@ import React from "react";
import "./resources.css";

function Organizations() {
return <div>Organizations</div>;
return (
<div>
<h2>Organizations</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat.
</p>
</div>
);
}

export default Organizations;
18 changes: 18 additions & 0 deletions src/resources/Readings.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from "react";
import "./resources.css";

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove a blank line

function Readings() {
return (
<div>
<h2>Readings</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat.
</p>
</div>
);
}

export default Readings;
8 changes: 0 additions & 8 deletions src/resources/Research.js

This file was deleted.

24 changes: 5 additions & 19 deletions src/resources/Resources.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { useState, useEffect, useRef } from "react";
import { useLocation } from "react-router-dom";
import "./resources.css";
import Tutorials from "./Tutorials";
import Research from "./Research";
import Readings from "./Readings";
import Organizations from "./Organizations";

function Resources() {
Expand Down Expand Up @@ -52,42 +52,28 @@ function Tab() {
Organizations
</button>
</div>

<div className="resources-contents">
<div
className={
tabState === 1 ? "resources-content active" : "resources-content"
}
>
<h2>Tutorials</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
aliquip ex ea commodo consequat.
</p>
<Tutorials />
</div>

<div
className={
tabState === 2 ? "resources-content active" : "resources-content"
}
>
<h2>Readings</h2>
<p>Something about Early Research Scholars Programs.</p>
<Readings />
</div>

<div
className={
tabState === 3 ? "resources-content active" : "resources-content"
}
>
<h2>Organizations</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
aliquip ex ea commodo consequat.
</p>
<Organizations />
</div>
</div>
</>
Expand Down
12 changes: 11 additions & 1 deletion src/resources/Tutorials.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,17 @@ import React from "react";
import "./resources.css";

function Tutorials() {
return <div>Tutorials</div>;
return (
<div>
<h2>Tutorials</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat.
</p>
</div>
);
}

export default Tutorials;
Loading