From 1a2cd75e5d156fbb48a4e8347b7ff01e49b2d8a1 Mon Sep 17 00:00:00 2001 From: Kamran Ahmed Date: Sat, 19 Oct 2019 22:49:47 +0400 Subject: [PATCH] Fix - Page styles not being applied --- components/faq-list/index.js | 33 +++++++++++++++ components/faq-list/style.js | 17 ++++++++ components/featured-content/index.js | 6 +-- components/featured-content/style.js | 4 ++ .../style.js => components/tos-page/index.js | 7 +++- pages/about.js | 16 +++++++ pages/about/index.js | 42 ------------------- pages/about/style.js | 16 ------- pages/home.js | 16 +++++++ pages/home/index.js | 20 --------- pages/home/style.js | 5 --- pages/index.js | 2 +- pages/{privacy/index.js => privacy.js} | 12 +++--- pages/privacy/style.js | 17 -------- pages/{terms/index.js => terms.js} | 14 +++---- 15 files changed, 109 insertions(+), 118 deletions(-) create mode 100644 components/faq-list/index.js create mode 100644 components/faq-list/style.js rename pages/terms/style.js => components/tos-page/index.js (65%) create mode 100644 pages/about.js delete mode 100644 pages/about/index.js delete mode 100644 pages/about/style.js create mode 100644 pages/home.js delete mode 100644 pages/home/index.js delete mode 100644 pages/home/style.js rename pages/{privacy/index.js => privacy.js} (98%) delete mode 100644 pages/privacy/style.js rename pages/{terms/index.js => terms.js} (98%) diff --git a/components/faq-list/index.js b/components/faq-list/index.js new file mode 100644 index 000000000..7d2a5063a --- /dev/null +++ b/components/faq-list/index.js @@ -0,0 +1,33 @@ +import { FaqContainer, FaqItem } from './style'; + +const FaqList = () => ( + + +
+

What is roadmap.sh?

+

Roadmap.sh is the community curated roadmaps and paths for the budding developers. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aliquid assumenda iure maiores nemo nihil odio perspiciatis recusandae repellendus sed vero. Adipisci consectetur esse explicabo illum natus neque perferendis quis ullam.

+

If you really want to Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab asperiores commodi consequatur, culpa cumque dolorum, eos hic illo obcaecati odit quam quod reiciendis, rem reprehenderit saepe sed tempore tenetur vitae!

+
+ + +
+

What are the plans for roadmap.sh?

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolore eaque eius esse, facere id ipsum, minima nam, nisi quos reprehenderit saepe tempora vitae voluptate. Atque deleniti dolores eos laboriosam repellat.

+
+ + +
+

What is the source of revenue?

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Commodi consequuntur, harum impedit numquam porro quod unde! Aperiam dolorum ducimus expedita fugiat, impedit nesciunt, quaerat qui recusandae repellendus tenetur ut voluptatibus!

+
+ + +
+

Can I contribute?

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Commodi consequuntur, harum impedit numquam porro quod unde! Aperiam dolorum ducimus expedita fugiat, impedit nesciunt, quaerat qui recusandae repellendus tenetur ut voluptatibus!

+
+ + +); + +export default FaqList; \ No newline at end of file diff --git a/components/faq-list/style.js b/components/faq-list/style.js new file mode 100644 index 000000000..a404b9ac6 --- /dev/null +++ b/components/faq-list/style.js @@ -0,0 +1,17 @@ +import styled from 'styled-components'; + +export const FaqContainer = styled.div` + padding: 40px 0; +`; + +export const FaqItem = styled.div` + padding: 20px 20px; + + p { + color: #333; + } + + p:last-child { + margin-bottom: 0; + } +`; \ No newline at end of file diff --git a/components/featured-content/index.js b/components/featured-content/index.js index 44cbc1c5a..52fbd0bc3 100644 --- a/components/featured-content/index.js +++ b/components/featured-content/index.js @@ -1,7 +1,7 @@ -import { FeaturedContentWrap } from './style'; +import { FeaturedContentWrap, FeaturedWrap } from './style'; const FeaturedContent = (props) => ( - <> +
@@ -131,7 +131,7 @@ const FeaturedContent = (props) => (
- + ); FeaturedContent.defaultProps = { diff --git a/components/featured-content/style.js b/components/featured-content/style.js index ef28ade32..103f7c8fc 100644 --- a/components/featured-content/style.js +++ b/components/featured-content/style.js @@ -1,5 +1,9 @@ import styled from 'styled-components'; +export const FeaturedWrap = styled.div` + padding: 50px 0; +`; + export const FeaturedContentWrap = styled.div` .featured-head { text-align: center; diff --git a/pages/terms/style.js b/components/tos-page/index.js similarity index 65% rename from pages/terms/style.js rename to components/tos-page/index.js index c8965cbe7..402316cf2 100644 --- a/pages/terms/style.js +++ b/components/tos-page/index.js @@ -1,6 +1,11 @@ import styled from 'styled-components'; -export const TermsWrap = styled.div` +export const TosPage = styled.div` + h2 { + font-weight: 700; + margin-bottom: 16px; + } + h4 { margin-top: 25px; margin-bottom: 10px; diff --git a/pages/about.js b/pages/about.js new file mode 100644 index 000000000..776227841 --- /dev/null +++ b/pages/about.js @@ -0,0 +1,16 @@ +import AboutHeader from '../components/about-header/index'; +import PageFooter from '../components/page-footer/index'; +import PageHeader from '../components/page-header/index'; +import DefaultLayout from '../layouts/default/index'; +import FaqList from '../components/faq-list/index'; + +const About = () => ( + + + + + + +); + +export default About; \ No newline at end of file diff --git a/pages/about/index.js b/pages/about/index.js deleted file mode 100644 index a3e0e7080..000000000 --- a/pages/about/index.js +++ /dev/null @@ -1,42 +0,0 @@ -import AboutHeader from '../../components/about-header'; -import PageFooter from '../../components/page-footer'; -import PageHeader from '../../components/page-header'; -import { FaqContainer } from './style'; -import DefaultLayout from '../../layouts/default'; - -const About = () => ( - - - - -
-
-

What is roadmap.sh?

-

Roadmap.sh is the community curated roadmaps and paths for the budding developers. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aliquid assumenda iure maiores nemo nihil odio perspiciatis recusandae repellendus sed vero. Adipisci consectetur esse explicabo illum natus neque perferendis quis ullam.

-

If you really want to Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab asperiores commodi consequatur, culpa cumque dolorum, eos hic illo obcaecati odit quam quod reiciendis, rem reprehenderit saepe sed tempore tenetur vitae!

-
-
-
-
-

What are the plans for roadmap.sh?

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolore eaque eius esse, facere id ipsum, minima nam, nisi quos reprehenderit saepe tempora vitae voluptate. Atque deleniti dolores eos laboriosam repellat.

-
-
-
-
-

What is the source of revenue?

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Commodi consequuntur, harum impedit numquam porro quod unde! Aperiam dolorum ducimus expedita fugiat, impedit nesciunt, quaerat qui recusandae repellendus tenetur ut voluptatibus!

-
-
-
-
-

Can I contribute?

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Commodi consequuntur, harum impedit numquam porro quod unde! Aperiam dolorum ducimus expedita fugiat, impedit nesciunt, quaerat qui recusandae repellendus tenetur ut voluptatibus!

-
-
- - - -); - -export default About; \ No newline at end of file diff --git a/pages/about/style.js b/pages/about/style.js deleted file mode 100644 index 746d6c667..000000000 --- a/pages/about/style.js +++ /dev/null @@ -1,16 +0,0 @@ -import styled from 'styled-components'; - -export const FaqContainer = styled.div` - padding: 40px 0; - - .faq-item { - padding: 20px 20px; - - p { - color: #333; - } - p:last-child { - margin-bottom: 0; - } - } -`; \ No newline at end of file diff --git a/pages/home.js b/pages/home.js new file mode 100644 index 000000000..c980aaa88 --- /dev/null +++ b/pages/home.js @@ -0,0 +1,16 @@ +import FeaturedContent from '../components/featured-content/index'; +import HeroSection from '../components/hero-section/index'; +import PageFooter from '../components/page-footer/index'; +import PageHeader from '../components/page-header/index'; +import DefaultLayout from '../layouts/default/index'; + +const Home = (props) => ( + + + + + + +); + +export default Home; \ No newline at end of file diff --git a/pages/home/index.js b/pages/home/index.js deleted file mode 100644 index cebddc272..000000000 --- a/pages/home/index.js +++ /dev/null @@ -1,20 +0,0 @@ -import FeaturedContent from '../../components/featured-content'; -import HeroSection from '../../components/hero-section'; -import PageFooter from '../../components/page-footer'; -import PageHeader from '../../components/page-header'; -import DefaultLayout from '../../layouts/default'; -import { FeaturedWrap } from './style'; - - -const Home = (props) => ( - - - - - - - - -); - -export default Home; \ No newline at end of file diff --git a/pages/home/style.js b/pages/home/style.js deleted file mode 100644 index 6b8fec651..000000000 --- a/pages/home/style.js +++ /dev/null @@ -1,5 +0,0 @@ -import styled from 'styled-components'; - -export const FeaturedWrap = styled.div` - padding: 50px 0; -`; \ No newline at end of file diff --git a/pages/index.js b/pages/index.js index c3af1e3fa..6066fa5d0 100644 --- a/pages/index.js +++ b/pages/index.js @@ -1,4 +1,4 @@ -import Home from './home/index'; +import Home from './home'; import DefaultLayout from '../layouts/default'; const Index = () => ( diff --git a/pages/privacy/index.js b/pages/privacy.js similarity index 98% rename from pages/privacy/index.js rename to pages/privacy.js index 43cd9a872..534fa3229 100644 --- a/pages/privacy/index.js +++ b/pages/privacy.js @@ -1,11 +1,11 @@ -import PageHeader from '../../components/page-header'; -import PageFooter from '../../components/page-footer'; -import DefaultLayout from '../../layouts/default'; -import { PrivacyWrap } from './style'; +import PageHeader from '../components/page-header/index'; +import PageFooter from '../components/page-footer/index'; +import { TosPage } from '../components/tos-page/index'; +import DefaultLayout from '../layouts/default/index'; const Privacy = () => ( - +
@@ -105,7 +105,7 @@ const Privacy = () => (
- + ); diff --git a/pages/privacy/style.js b/pages/privacy/style.js deleted file mode 100644 index b3bbc7d6c..000000000 --- a/pages/privacy/style.js +++ /dev/null @@ -1,17 +0,0 @@ -import styled from 'styled-components'; - -export const PrivacyWrap = styled.div` - h4 { - margin-top: 25px; - margin-bottom: 10px; - font-weight: 600; - } - - p { - color: #999; - } - - a { - color: #333; - } -`; \ No newline at end of file diff --git a/pages/terms/index.js b/pages/terms.js similarity index 98% rename from pages/terms/index.js rename to pages/terms.js index 14185a5bb..a653ff5a3 100644 --- a/pages/terms/index.js +++ b/pages/terms.js @@ -1,15 +1,15 @@ -import PageFooter from '../../components/page-footer'; -import PageHeader from '../../components/page-header'; -import DefaultLayout from '../../layouts/default'; -import { TermsWrap } from './style'; +import PageFooter from '../components/page-footer/index'; +import PageHeader from '../components/page-header/index'; +import { TosPage } from '../components/tos-page/index'; +import DefaultLayout from '../layouts/default/index'; const Terms = () => ( - +
-

Terms of Service

+

Terms of Service

Please note that your use of and access to our services (defined below) are subject to the following terms; if you do not agree to all of the following, you may not use or access the services in any manner.

@@ -158,7 +158,7 @@ const Terms = () => (
- + );