From ddaeae82dcddc98951b025c753605487f3d56181 Mon Sep 17 00:00:00 2001 From: Sharyn Date: Mon, 9 Jul 2018 10:40:49 +0200 Subject: [PATCH 1/8] Setting up Github pages repo for deployment --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 51472ce..85a434b 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "config": { "deployToGit": { - "repository": "git@github.com:Nona-Creative/ETHPrize.git", + "repository": "git@github.com:Nona-Creative/nona-creative.github.io-ETHprize.git", "branch": "master", "folder": "out", "script": "npm run prod-build", From e657b8fb0bad0c739e79417352fa982144d75f4d Mon Sep 17 00:00:00 2001 From: Sharyn Date: Mon, 9 Jul 2018 10:44:42 +0200 Subject: [PATCH 2/8] Updating Readme --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 07f29f4..15342fd 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,11 @@ ETHPrize single page React website ## Setting up - `git clone git@github.com:Nona-Creative/ETHPrize.git` - `npm install` +- `npm run dev` runs the site at `localhost:3000` +- `yarn lint` runs the eslinter -`npm run dev` runs the site at `localhost:3000` - -`npm run deploy` to deploy to `https://nona-creative.github.io/ETHPrize` - -`yarn lint` runs the eslinter +## Deploy to staging +- Make sure `master` branch is up to date with develop +- `npm run deploy` to deploy +- This pushes compiled code to a second repo at `https://github.com/Nona-Creative/nona-creative.github.io-ETHprize` +- View staging Github page at `https://nona-creative.github.io/ETHPrize` From af7ea409cce1ddc253cf35375d8fba11700c7130 Mon Sep 17 00:00:00 2001 From: Sharyn Date: Mon, 9 Jul 2018 10:45:50 +0200 Subject: [PATCH 3/8] Editing Readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 15342fd..8f51001 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ ETHPrize single page React website - `yarn lint` runs the eslinter ## Deploy to staging -- Make sure `master` branch is up to date with develop +- Make sure `master` branch is up to date with `develop` branch - `npm run deploy` to deploy -- This pushes compiled code to a second repo at `https://github.com/Nona-Creative/nona-creative.github.io-ETHprize` +- This pushes the compiled code to a second repo at `https://github +.com/Nona-Creative/nona-creative.github.io-ETHprize` - View staging Github page at `https://nona-creative.github.io/ETHPrize` From f56a32f23d6ac12717544734ad4aa745c9887753 Mon Sep 17 00:00:00 2001 From: Sharyn Date: Mon, 9 Jul 2018 10:47:08 +0200 Subject: [PATCH 4/8] Formatting --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 8f51001..182c4de 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,5 @@ ETHPrize single page React website ## Deploy to staging - Make sure `master` branch is up to date with `develop` branch - `npm run deploy` to deploy -- This pushes the compiled code to a second repo at `https://github -.com/Nona-Creative/nona-creative.github.io-ETHprize` +- This pushes the compiled code to a second repo at `https://github.com/Nona-Creative/nona-creative.github.io-ETHprize` - View staging Github page at `https://nona-creative.github.io/ETHPrize` From 05272af60dfbc478aa5e40008f246879b0dea947 Mon Sep 17 00:00:00 2001 From: Sharyn Date: Mon, 9 Jul 2018 10:48:30 +0200 Subject: [PATCH 5/8] Editing Readme --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 182c4de..aff39f4 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ ETHPrize single page React website - `yarn lint` runs the eslinter ## Deploy to staging -- Make sure `master` branch is up to date with `develop` branch - `npm run deploy` to deploy - This pushes the compiled code to a second repo at `https://github.com/Nona-Creative/nona-creative.github.io-ETHprize` - View staging Github page at `https://nona-creative.github.io/ETHPrize` From 3a9c9b052ad3a05544ed920410f3c254486c415e Mon Sep 17 00:00:00 2001 From: Sharyn Date: Mon, 9 Jul 2018 11:07:56 +0200 Subject: [PATCH 6/8] Fixing paths --- components/resources/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/resources/index.js b/components/resources/index.js index bbc45da..f730659 100644 --- a/components/resources/index.js +++ b/components/resources/index.js @@ -1,8 +1,8 @@ import React from 'react'; import Parser from 'html-react-parser'; import Slider from 'react-slick'; -import Modal from '../../components/modal'; -import WordCloud from '../../components/wordCloud'; +import Modal from '../modal'; +import WordCloud from '../wordCloud'; import Data from '../../data/resources/wordclouds'; import './style.scss'; From bb6600318bd5ee276c2dcd436a2f913d4c56e638 Mon Sep 17 00:00:00 2001 From: Sharyn Date: Mon, 9 Jul 2018 11:22:49 +0200 Subject: [PATCH 7/8] Updating staging URL in Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aff39f4..3bce4d1 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,4 @@ ETHPrize single page React website ## Deploy to staging - `npm run deploy` to deploy - This pushes the compiled code to a second repo at `https://github.com/Nona-Creative/nona-creative.github.io-ETHprize` -- View staging Github page at `https://nona-creative.github.io/ETHPrize` +- View staging Github page at `https://nona-creative.github.io/nona-creative.github.io-ETHprize/` From 165a675600918ab4e808cc6ccebc26c3f9eec7e4 Mon Sep 17 00:00:00 2001 From: Sharyn Date: Mon, 9 Jul 2018 11:40:27 +0200 Subject: [PATCH 8/8] Updating staging URL in Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3bce4d1..1d89228 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,4 @@ ETHPrize single page React website ## Deploy to staging - `npm run deploy` to deploy - This pushes the compiled code to a second repo at `https://github.com/Nona-Creative/nona-creative.github.io-ETHprize` -- View staging Github page at `https://nona-creative.github.io/nona-creative.github.io-ETHprize/` +- View staging Github page at `https://nona-creative.github.io/nona-creative.github.io-ETHprize`