Skip to content

Commit

Permalink
Merge 3ecbe09 into 763588d
Browse files Browse the repository at this point in the history
  • Loading branch information
ebenezerdon committed Feb 12, 2019
2 parents 763588d + 3ecbe09 commit 4ecfbc2
Show file tree
Hide file tree
Showing 10 changed files with 660 additions and 30 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ dist
package-lock.json
.DS_Store
coverage
.env
2 changes: 2 additions & 0 deletions src/app/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Login } from './login';
import Article from './article';
import Footer from './footer';
import Navbar from './navBar/NavbarComponent';
import { Subject } from './subject';
import ProfileComponent from './profile';

const App = () => (
Expand All @@ -17,6 +18,7 @@ const App = () => (
<Route path="/signup" component={Signup} exact />
<Route path="/profile" component={ProfileComponent} exact />
<Route path="/login" component={Login} exact />
<Route path="/subject" component={Subject} exact />
<Route path="/articles" component={Article} exact />
</Switch>
<Footer />
Expand Down
15 changes: 8 additions & 7 deletions src/app/navBar/NavbarComponent.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { Link } from 'react-router-dom';
import './navBar.scss';

const NavbarComponent = () => {
Expand All @@ -15,19 +16,19 @@ const NavbarComponent = () => {
<div className="categories">
<ul className="right hide-on-med-and-down">
<li>
<a href="#!">Science</a>
<Link to="/subject">Science</Link>
</li>
<li>
<a href="#!">Technology</a>
<Link to="/subject">Technology</Link>
</li>
<li>
<a href="#!">Engineering</a>
<Link to="/subject">Engineering</Link>
</li>
<li>
<a href="#!">Arts</a>
<Link to="/subject">Arts</Link>
</li>
<li>
<a href="#!">Mathematics</a>
<Link to="/subject">Mathematics</Link>
</li>
</ul>
<a href="#!" data-target="mobile-demo" className="sidenav-trigger">
Expand All @@ -37,11 +38,11 @@ const NavbarComponent = () => {
<div className="hide-on-med-and-down show">
<ul>
<li>
<a href="/login">SignIn</a>
<Link to="/login">SignIn</Link>
</li>
<li>|</li>
<li>
<a href="/signup">SignUp</a>
<Link to="/signup">SignUp</Link>
</li>
</ul>
</div>
Expand Down
49 changes: 28 additions & 21 deletions src/app/navBar/__snapshots__/NavbarComponent.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -30,39 +30,44 @@ exports[` Component should render the NavBar 1`] = `
className="right hide-on-med-and-down"
>
<li>
<a
href="#!"
<Link
replace={false}
to="/subject"
>
Science
</a>
</Link>
</li>
<li>
<a
href="#!"
<Link
replace={false}
to="/subject"
>
Technology
</a>
</Link>
</li>
<li>
<a
href="#!"
<Link
replace={false}
to="/subject"
>
Engineering
</a>
</Link>
</li>
<li>
<a
href="#!"
<Link
replace={false}
to="/subject"
>
Arts
</a>
</Link>
</li>
<li>
<a
href="#!"
<Link
replace={false}
to="/subject"
>
Mathematics
</a>
</Link>
</li>
</ul>
<a
Expand All @@ -82,21 +87,23 @@ exports[` Component should render the NavBar 1`] = `
>
<ul>
<li>
<a
href="/login"
<Link
replace={false}
to="/login"
>
SignIn
</a>
</Link>
</li>
<li>
|
</li>
<li>
<a
href="/signup"
<Link
replace={false}
to="/signup"
>
SignUp
</a>
</Link>
</li>
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/app/profile/__snapshots__/profile.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exports[` Component should render the NavBar 1`] = `
className="card small"
>
<div
className="card-image waves-effect waves-block waves-light"
className="card-image"
>
<img
alt="profilepicture"
Expand Down Expand Up @@ -153,7 +153,7 @@ exports[` Component should render the NavBar 1`] = `
className="card small"
>
<div
className="card-image waves-effect waves-block waves-light removespace"
className="card-image removespace"
>
<img
alt="profilepicture"
Expand Down
217 changes: 217 additions & 0 deletions src/app/subject/SubjectComponent.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
/* eslint-disable max-len */
import React, { Fragment } from 'react';
import './subject.scss';

const SubjectComponent = () => {
return (
<Fragment>
<div className="container">
<div className="col s12 center-align">
<h3>Arts</h3>
</div>
<div className="row">
<div className="col s12 m6 l4">
<div className="card">
<div className="card-image">
<img
className="activator"
alt="Cover"
src="https://i.pinimg.com/564x/b2/69/9d/b2699de28deffa0883978ffecfd977a1.jpg?b=t"
/>
</div>
<div className="card-content right-align">
<span className="card-title activator flow-text truncate center-align">
How to Develop Your Ideas
</span>
<strong>by: Bugs Burney</strong>
<div>
<a href="/#">Read more</a>
</div>
</div>
<div className="card-reveal">
<span className="card-title grey-text text-darken-4">
How to Develop Your Ideas
<i className="material-icons right">close</i>
</span>
<p>
This article explains how I learnt to share my ideas through
art.
</p>
<div>
<a href="/#">Click here to read</a>
</div>
</div>
</div>
</div>
<div className="col s12 m6 l4">
<div className="card">
<div className="card-image">
<img
className="activator"
alt="Cover"
src="https://i.pinimg.com/564x/b2/69/9d/b2699de28deffa0883978ffecfd977a1.jpg?b=t"
/>
</div>
<div className="card-content right-align">
<span className="card-title activator flow-text truncate center-align">
How to Develop Your Ideas
</span>
<strong>by: Bugs Burney</strong>
<div>
<a href="/#">Read more</a>
</div>
</div>
<div className="card-reveal">
<span className="card-title grey-text text-darken-4">
How to Develop Your Ideas
<i className="material-icons right">close</i>
</span>
<p>
This article explains how I learnt to share my ideas through
art.
</p>
<div>
<a href="/#">Click here to read</a>
</div>
</div>
</div>
</div>
<div className="col s12 m6 l4">
<div className="card">
<div className="card-image">
<img
className="activator"
alt="Cover"
src="https://i.pinimg.com/564x/b2/69/9d/b2699de28deffa0883978ffecfd977a1.jpg?b=t"
/>
</div>
<div className="card-content right-align">
<span className="card-title activator flow-text truncate center-align">
How to Develop Your Ideas
</span>
<strong>by: Bugs Burney</strong>
<div>
<a href="/#">Read more</a>
</div>
</div>
<div className="card-reveal">
<span className="card-title grey-text text-darken-4">
How to Develop Your Ideas
<i className="material-icons right">close</i>
</span>
<p>
This article explains how I learnt to share my ideas through
art.
</p>
<div>
<a href="/#">Click here to read</a>
</div>
</div>
</div>
</div>
<div className="col s12 m6 l4">
<div className="card">
<div className="card-image">
<img
className="activator"
alt="Cover"
src="https://i.pinimg.com/564x/b2/69/9d/b2699de28deffa0883978ffecfd977a1.jpg?b=t"
/>
</div>
<div className="card-content right-align">
<span className="card-title activator flow-text truncate center-align">
How to Develop Your Ideas
</span>
<strong>by: Bugs Burney</strong>
<div>
<a href="/#">Read more</a>
</div>
</div>
<div className="card-reveal">
<span className="card-title grey-text text-darken-4">
How to Develop Your Ideas
<i className="material-icons right">close</i>
</span>
<p>
This article explains how I learnt to share my ideas through
art.
</p>
<div>
<a href="/#">Click here to read</a>
</div>
</div>
</div>
</div>
<div className="col s12 m6 l4">
<div className="card">
<div className="card-image">
<img
className="activator"
alt="Cover"
src="https://i.pinimg.com/564x/b2/69/9d/b2699de28deffa0883978ffecfd977a1.jpg?b=t"
/>
</div>
<div className="card-content right-align">
<span className="card-title activator flow-text truncate center-align">
How to Develop Your Ideas
</span>
<strong>by: Bugs Burney</strong>
<div>
<a href="/#">Read more</a>
</div>
</div>
<div className="card-reveal">
<span className="card-title grey-text text-darken-4">
How to Develop Your Ideas
<i className="material-icons right">close</i>
</span>
<p>
This article explains how I learnt to share my ideas through
art.
</p>
<div>
<a href="/#">Click here to read</a>
</div>
</div>
</div>
</div>
<div className="col s12 m6 l4">
<div className="card">
<div className="card-image">
<img
className="activator"
alt="Cover"
src="https://i.pinimg.com/564x/b2/69/9d/b2699de28deffa0883978ffecfd977a1.jpg?b=t"
/>
</div>
<div className="card-content right-align">
<span className="card-title activator flow-text truncate center-align">
How to Develop Your Ideas
</span>
<strong>by: Bugs Burney</strong>
<div>
<a href="/#">Read more</a>
</div>
</div>
<div className="card-reveal">
<span className="card-title grey-text text-darken-4">
How to Develop Your Ideas
<i className="material-icons right">close</i>
</span>
<p>
This article explains how I learnt to share my ideas through
art.
</p>
<div>
<a href="/#">Click here to read</a>
</div>
</div>
</div>
</div>
</div>
</div>
</Fragment>
);
};

export default SubjectComponent;
Loading

0 comments on commit 4ecfbc2

Please sign in to comment.