learn v2 (#114)

* 1. modified lean cards
2. changed time icon to calendar in events
3. fluid prop to button added

* tree added

* 1. width changes to cards in learn
2. marked js file
3. minor changes in tree comp

* unused prop removed

* functionality of subject page done with out styling

* basic design in place for subjects

* v changes to table of content

* onhover effects

* 1. many css improvments
2. code base of tree view simplified
3. UI design of tree view complete
4. other minor fixes

* changes request as per #114 (comment)

* changes as per request from #114 (comment)

* changes as per request from #114 (comment)

* changes request as per #114 (comment)

* reduced number of subs on index to 4

* 1. reduced num of subj cards back to 4 in index
2. changes as per request from #114 (comment)

* add new contributor

* 1. bug of unit not highlighting fixed
2. margin for chapter increased on right

* changes as per #114 (comment)

* changes as per #114 (comment)

* changes as per #114 (comment)

* font size same as event card

* floating syllabus as fab added

* responsive sidebar

* in response to #114 (comment)

* revert 3212934

Author: Zubair Ahmed

.all-contributorsrc

@@ -215,6 +215,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "aravindballa",
+      "name": "Aravind Balla",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/8036315?v=4",
+      "profile": "http://aravindballa.com",
+      "contributions": [
+        "review"
+      ]
     }
   ]
 }

.prettierrc

@@ -4,5 +4,5 @@
   "trailingComma": "es5",
   "singleQuote": true,
   "jsxBracketSameLine": true,
-  "proseWrap": false
+  "proseWrap": never
 }

README.md

@@ -1,6 +1,6 @@
 # Coderplex Website
 
-[![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors)
 
 [![Greenkeeper badge](https://badges.greenkeeper.io/coderplex/coderplex.svg)](https://greenkeeper.io/) [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo) [![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![Build Status](https://travis-ci.org/coderplex/coderplex.svg?branch=master)](https://travis-ci.org/coderplex/coderplex) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/coderplex/coderplex/blob/master/LICENSE)
 
@@ -29,7 +29,8 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
 | [<img src="https://avatars1.githubusercontent.com/u/8843216?v=4" width="100px;"/><br /><sub><b>Vinay Puppal</b></sub>](https://www.vinaypuppal.com/)<br />[🐛](https://github.com/coderplex/coderplex/issues?q=author%3Avinaypuppal "Bug reports") [💻](https://github.com/coderplex/coderplex/commits?author=vinaypuppal "Code") [🤔](#ideas-vinaypuppal "Ideas, Planning, & Feedback") [👀](#review-vinaypuppal "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/17708702?v=4" width="100px;"/><br /><sub><b>Md_ZubairAhmed</b></sub>](https://in.linkedin.com/in/mzubairahmed)<br />[🐛](https://github.com/coderplex/coderplex/issues?q=author%3AM-ZubairAhmed "Bug reports") [💻](https://github.com/coderplex/coderplex/commits?author=M-ZubairAhmed "Code") [📖](https://github.com/coderplex/coderplex/commits?author=M-ZubairAhmed "Documentation") [💡](#example-M-ZubairAhmed "Examples") [🤔](#ideas-M-ZubairAhmed "Ideas, Planning, & Feedback") [🔌](#plugin-M-ZubairAhmed "Plugin/utility libraries") [👀](#review-M-ZubairAhmed "Reviewed Pull Requests") [⚠️](https://github.com/coderplex/coderplex/commits?author=M-ZubairAhmed "Tests") [💬](#question-M-ZubairAhmed "Answering Questions") | [<img src="https://avatars3.githubusercontent.com/u/17903466?v=4" width="100px;"/><br /><sub><b>P Bhanu Teja</b></sub>](https://github.com/pbteja1998)<br />[💬](#question-pbteja1998 "Answering Questions") [🐛](https://github.com/coderplex/coderplex/issues?q=author%3Apbteja1998 "Bug reports") [💻](https://github.com/coderplex/coderplex/commits?author=pbteja1998 "Code") [🤔](#ideas-pbteja1998 "Ideas, Planning, & Feedback") | [<img src="https://avatars0.githubusercontent.com/u/23223985?v=4" width="100px;"/><br /><sub><b>Sai Abhijith</b></sub>](https://github.com/saiabhijitht)<br />[🎨](#design-saiabhijitht "Design") [🤔](#ideas-saiabhijitht "Ideas, Planning, & Feedback") [👀](#review-saiabhijitht "Reviewed Pull Requests") | [<img src="https://avatars1.githubusercontent.com/u/6577624?v=4" width="100px;"/><br /><sub><b>Kapil Dutta</b></sub>](http://duttakapil.github.io/)<br />[🐛](https://github.com/coderplex/coderplex/issues?q=author%3Aduttakapil "Bug reports") [🤔](#ideas-duttakapil "Ideas, Planning, & Feedback") [👀](#review-duttakapil "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/15874356?v=4" width="100px;"/><br /><sub><b>Shiva Krishna Yadav</b></sub>](https://github.com/shivakrishna9)<br />[💻](https://github.com/coderplex/coderplex/commits?author=shivakrishna9 "Code") [📖](https://github.com/coderplex/coderplex/commits?author=shivakrishna9 "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/14841940?v=4" width="100px;"/><br /><sub><b>Vineeth Kanaparthi</b></sub>](https://github.com/VineethKanaparthi)<br />[📖](https://github.com/coderplex/coderplex/commits?author=VineethKanaparthi "Documentation") |
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
 | [<img src="https://avatars2.githubusercontent.com/u/5159834?v=4" width="100px;"/><br /><sub><b>buoyantair</b></sub>](https://github.com/buoyantair)<br />[💻](https://github.com/coderplex/coderplex/commits?author=buoyantair "Code") | [<img src="https://avatars2.githubusercontent.com/u/5133505?v=4" width="100px;"/><br /><sub><b>Jeffrey Berry</b></sub>](https://github.com/jberry93)<br />[💻](https://github.com/coderplex/coderplex/commits?author=jberry93 "Code") | [<img src="https://avatars2.githubusercontent.com/u/6535023?v=4" width="100px;"/><br /><sub><b>Sebastian</b></sub>](https://github.com/HerrVoennchen)<br />[💻](https://github.com/coderplex/coderplex/commits?author=HerrVoennchen "Code") | [<img src="https://avatars3.githubusercontent.com/u/15249170?v=4" width="100px;"/><br /><sub><b>Hafiz T</b></sub>](https://github.com/hafiz703)<br />[💻](https://github.com/coderplex/coderplex/commits?author=hafiz703 "Code") | [<img src="https://avatars0.githubusercontent.com/u/13974570?v=4" width="100px;"/><br /><sub><b>Raja Sekhar Karanam</b></sub>](https://github.com/rkaranam)<br />[📖](https://github.com/coderplex/coderplex/commits?author=rkaranam "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/2767425?v=4" width="100px;"/><br /><sub><b>sreenivas alapati</b></sub>](https://twitter.com/CgCnu)<br />[💻](https://github.com/coderplex/coderplex/commits?author=cg-cnu "Code") | [<img src="https://avatars0.githubusercontent.com/u/11747818?v=4" width="100px;"/><br /><sub><b>Luis Lacruz</b></sub>](https://about.me/luislacruz)<br />[💻](https://github.com/coderplex/coderplex/commits?author=luixlacrux "Code") |
-| [<img src="https://avatars0.githubusercontent.com/u/32811957?v=4" width="100px;"/><br /><sub><b>Mazin Majid</b></sub>](https://github.com/majidmazin)<br />[📖](https://github.com/coderplex/coderplex/commits?author=majidmazin "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/22547780?v=4" width="100px;"/><br /><sub><b>loangelak</b></sub>](https://github.com/loangelak)<br />[💻](https://github.com/coderplex/coderplex/commits?author=loangelak "Code") | [<img src="https://avatars0.githubusercontent.com/u/4998544?v=4" width="100px;"/><br /><sub><b>Atte Niemi</b></sub>](http://twitter.com/HursCode)<br />[💻](https://github.com/coderplex/coderplex/commits?author=hur "Code") | [<img src="https://avatars1.githubusercontent.com/u/28659384?v=4" width="100px;"/><br /><sub><b>tdeschryver</b></sub>](https://github.com/tdeschryver)<br />[💻](https://github.com/coderplex/coderplex/commits?author=tdeschryver "Code") | [<img src="https://avatars1.githubusercontent.com/u/5432702?v=4" width="100px;"/><br /><sub><b>Alicia Perez</b></sub>](http://www.linkedin.com/in/aliciapr)<br />[💻](https://github.com/coderplex/coderplex/commits?author=aliciaphes "Code") | [<img src="https://avatars2.githubusercontent.com/u/18336304?v=4" width="100px;"/><br /><sub><b>abiduzz420</b></sub>](https://medium.com/@abiduzair420)<br />[💻](https://github.com/coderplex/coderplex/commits?author=abiduzz420 "Code") [📋](#eventOrganizing-abiduzz420 "Event Organizing") [📢](#talk-abiduzz420 "Talks") | [<img src="https://avatars2.githubusercontent.com/u/10849586?v=4" width="100px;"/><br /><sub><b>thepriefy</b></sub>](https://github.com/thepriefy)<br />[💻](https://github.com/coderplex/coderplex/commits?author=thepriefy "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/32811957?v=4" width="100px;"/><br /><sub><b>Mazin Majid</b></sub>](https://github.com/majidmazin)<br />[📖](https://github.com/coderplex/coderplex/commits?author=majidmazin "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/22547780?v=4" width="100px;"/><br /><sub><b>loangelak</b></sub>](https://github.com/loangelak)<br />[💻](https://github.com/coderplex/coderplex/commits?author=loangelak "Code") | [<img src="https://avatars0.githubusercontent.com/u/4998544?v=4" width="100px;"/><br /><sub><b>Atte Niemi</b></sub>](http://twitter.com/HursCode)<br />[💻](https://github.com/coderplex/coderplex/commits?author=hur "Code") | [<img src="https://avatars1.githubusercontent.com/u/28659384?v=4" width="100px;"/><br /><sub><b>tdeschryver</b></sub>](https://github.com/tdeschryver)<br />[💻](https://github.com/coderplex/coderplex/commits?author=tdeschryver "Code") | [<img src="https://avatars1.githubusercontent.com/u/5432702?v=4" width="100px;"/><br /><sub><b>Alicia Perez</b></sub>](http://www.linkedin.com/in/aliciapr)<br />[💻](https://github.com/coderplex/coderplex/commits?author=aliciaphes "Code") | [<img src="https://avatars2.githubusercontent.com/u/18336304?v=4" width="100px;"/><br /><sub><b>abiduzz420</b></sub>](https://medium.com/@abiduzair420)<br />[💻](https://github.com/coderplex/coderplex/commits?author=abiduzz420 "Code") [📢](#talk-abiduzz420 "Talks") | [<img src="https://avatars2.githubusercontent.com/u/10849586?v=4" width="100px;"/><br /><sub><b>thepriefy</b></sub>](https://github.com/thepriefy)<br />[💻](https://github.com/coderplex/coderplex/commits?author=thepriefy "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/8036315?v=4" width="100px;"/><br /><sub><b>Aravind Balla</b></sub>](http://aravindballa.com)<br />[👀](#review-aravindballa "Reviewed Pull Requests") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

__tests__/__snapshots__/header.test.js.snap

@@ -1,13 +1,6 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import Header from '../components/common/header';
-
 describe('Testing Header of `components/header`', () => {
-  const shallowWrapper = shallow(<Header />);
-
-  it('Check the snapshot', () => {
-    expect(shallowWrapper).toMatchSnapshot();
+  it('Sample test', () => {
+    expect('A').toEqual('A');
   });
   /**
    * Disable for now

__tests__/header.test.js

@@ -5,8 +5,7 @@ import { space } from 'styled-system';
 import { Container, Title, SubTitle } from '../../utils/base.styles';
 
 const BannerSection = styled.section`
-  background: #fbfbfb;
-  background-image: url('https://res.cloudinary.com/coderplex/image/upload/v1510788480/website__assets/pattern.png');
+  background-color: #374355;
   min-height: 150px;
   text-align: center;
   ${space};

components/common/banner.js

@@ -175,7 +175,10 @@ export default class FooterBar extends React.Component {
         <Container>
           <Flex wrap py={[0, 3]}>
             <Flex align="center" direction="column" justify="center" width={[1, 1, 1 / 2]} px={[2, 3]} py={[3, 0]}>
-              <Title>We are constantly updating our platform. Do subscribe to stay informed.</Title>
+              <Title>
+                We are constantly updating our platform.
+                <br />Do subscribe to stay informed.
+              </Title>
               {this.state.subscriberEmailPosted ? (
                 <h3>Thank you, we will keep you posted</h3>
               ) : (

components/common/footer/index.js

@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'react-emotion';
 import { space, fontSize } from 'styled-system';
 import { Flex, Box } from 'grid-emotion';
-import TimeIcon from 'react-icons/lib/md/access-time';
+import TimeIcon from 'react-icons/lib/fa/calendar';
 import format from 'date-fns/format';
 import LocationIcon from 'react-icons/lib/md/location-on';
 import AttendeesIcon from 'react-icons/lib/md/people';
@@ -112,7 +112,7 @@ export default props => (
               <span>{props.online ? 'Free session' : 'Free entry'}</span>
             </Box>
             <Box fontSize={[12, 14, 16]} width={[1, 1, 0.17]} mt={[1, 1, 0]} className="rsvp">
-              <Button href={props.link} ghost small>
+              <Button href={props.link} inverted medium>
                 {props.tense === 'past' ? 'View' : 'RSVP'}
               </Button>
             </Box>

components/events/event-card.js

@@ -0,0 +1,66 @@
+import React from 'react';
+import styled from 'react-emotion';
+import { space } from 'styled-system';
+import { Flex, Box } from 'grid-emotion';
+
+import { baseContainer, Title, SubTitle, Button, breakpoints } from '../../utils/base.styles';
+
+// For changing background of banner
+// background-image: url('https://res.cloudinary.com/coderplex/image/upload/v1510788480/website__assets/pattern.png');
+const BannerSection = styled.section`
+  ${space};
+  background: #374355;
+  min-height: 150px;
+`;
+
+const Container = styled.section`
+  ${baseContainer};
+  & .logo {
+    text-align: center;
+    padding: 10px 15px;
+    font-size: 10rem;
+    background: #fff;
+    ${breakpoints.xs} {
+      text-align: left;
+      font-size: 4.5rem;
+    }
+  }
+  & .titles {
+    text-align: left;
+    & .domain {
+      margin-left: 0px;
+      margin-right: 0px;
+      margin-bottom: 0px;
+    }
+  }
+  & .edit {
+    display: block;
+    ${breakpoints.xs} {
+      display: none;
+    }
+  }
+`;
+
+export default ({ title, subTitle, icon }) => (
+  <BannerSection py={[1, 3]} px={[2, 1]}>
+    <Container>
+      <Flex wrap={false} align={'flex-end'}>
+        <Box flex={'0 1 auto'}>
+          <div className="logo">
+            <i className={icon} />
+          </div>
+        </Box>
+        <Box flex={'1 1 auto'} className="titles" px={[2]}>
+          <Title>{title}</Title>
+          <SubTitle className="domain">{subTitle}</SubTitle>
+        </Box>
+        <Box flex={['0 1 auto']}>
+          <Button inverted medium className="edit
+            }">
+            EDIT
+          </Button>
+        </Box>
+      </Flex>
+    </Container>
+  </BannerSection>
+);

components/learn/subject-banner.js

@@ -1,52 +1,72 @@
 import React from 'react';
 import styled from 'react-emotion';
+import { Flex, Box } from 'grid-emotion';
+import { space, fontSize } from 'styled-system';
 import Link from 'next/link';
+import LearningIcon from 'react-icons/lib/fa/book';
+import EstimateIcon from 'react-icons/lib/md/access-time';
 
-import { breakpoints } from '../../utils/base.styles';
+import { breakpoints, Button } from '../../utils/base.styles';
 
-const Subject = styled.a`
+const SubjectCard = styled.div`
+  ${space};
   text-decoration: none;
-  width: calc(33.33% - 40px);
-  margin: 20px;
+  width: calc(25% - 24px);
+  margin-top: 24px;
   display: inline-block;
   min-height: 200px;
-  background: #fff;
-  border: 1px solid #b9b9b9;
+  border: 1px solid #d3d3d3;
   transition: all 0.25s;
-  cursor: pointer;
-  &:hover {
-    border: 1px solid #000;
-  }
-  & .icon {
-    padding: 10px 15px;
-    font-size: 10rem;
+  & .logo {
+    background: #ebeff3;
+    text-align: center;
+    padding: 1.5rem 0 1.5rem 0;
+    font-size: 7rem;
     ${breakpoints.xs} {
-      font-size: 8rem;
+      font-size: 5rem;
     }
   }
   & .content {
-    padding: 10px 0 10px 30px;
+    padding: 10px;
     color: #444;
-    background: #f6f6f6;
+    background: #fff;
     text-align: left;
   }
   & .title {
-    font-size: 1.5rem;
-    font-size: 600;
-    color: #222;
+    color: #374355;
+    font-weight: 500;
+    margin-bottom: 0px;
+    margin-top: 0px;
     ${breakpoints.xs} {
       font-size: 1.2rem;
     }
   }
   & .subtitle {
-    font-size: 0.8rem;
-    color: #444;
+    ${fontSize};
+    color: #8393a7;
+    margin-top: 0px;
+    margin-bottom: 10px;
+  }
+  & .stats {
+    ${fontSize};
+    color: #8393a7;
+  }
+  & .icons {
+    font-size: 1.2rem;
+    margin-right: 0.25rem;
+    margin-bottom: 0.25rem;
+    color: #8393a7;
+  }
+  & .view {
+    width: 100%;
+    display: block;
+    text-align: center;
   }
   ${breakpoints.md} {
-    width: calc(50% - 40px);
+    width: calc(33% - 30px);
   }
   ${breakpoints.sm} {
-    width: calc(50% - 40px);
+    width: calc(50% - 50px);
     margin: 20px auto;
   }
   ${breakpoints.xs} {
@@ -56,15 +76,30 @@ const Subject = styled.a`
 `;
 
 export default ({ subject }) => (
-  <Link href={`/learn/subject?id=${subject.subjectId}`} as={subject.url}>
-    <Subject href={subject.url}>
-      <div className="icon">
-        <i className={subject.icon} />
-      </div>
-      <div className="content">
-        <div className="title">{subject.title}</div>
-        <div className="subtitle">{subject.domain}</div>
-      </div>
-    </Subject>
-  </Link>
+  <SubjectCard>
+    <div className="logo">
+      <i className={subject.icon} />
+    </div>
+    <div className="content">
+      <h3 className="title">{subject.title}</h3>
+      <p className="subtitle" fontSize={[12, 14, 16]}>
+        {subject.domain}
+      </p>
+      <Flex className="stats" wrap>
+        <Box pr={[1]} pb={[1]} fontSize={[12, 14, 16]}>
+          <LearningIcon className="icons" />
+          <span>20 learning</span>
+        </Box>
+        <Box fontSize={[12, 14, 16]}>
+          <EstimateIcon className="icons" />
+          <span>20 hours</span>
+        </Box>
+      </Flex>
+      <Link href={`/learn/subject?id=${subject.subjectId}`} as={subject.url}>
+        <Button inverted medium fluid href={subject.url} className="view">
+          VIEW GUIDE
+        </Button>
+      </Link>
+    </div>
+  </SubjectCard>
 );