diff --git a/.gitignore b/.gitignore index 51bf003..e7fb1a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /out .next node_modules -.DS_Store \ No newline at end of file +.DS_Store +yarn.lock \ No newline at end of file diff --git a/README.md b/README.md index 07f29f4..1d89228 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,10 @@ 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 +- `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` diff --git a/assets/styles/base/fonts.scss b/assets/styles/base/fonts.scss index ab7ea55..d62f8d6 100644 --- a/assets/styles/base/fonts.scss +++ b/assets/styles/base/fonts.scss @@ -1,11 +1,11 @@ @font-face { font-family: 'bebas_neuebold'; - src: url('/static/fonts/bebasneue_bold-webfont.eot'); - src: url('/static/fonts/bebasneue_bold-webfont.eot?#iefix') format('embedded-opentype'), - url('/static/fonts/bebasneue_bold-webfont.woff2') format('woff2'), - url('/static/fonts/bebasneue_bold-webfont.woff') format('woff'), - url('/static/fonts/bebasneue_bold-webfont.ttf') format('truetype'), - url('/static/fonts/bebasneue_bold-webfont.svg#bebas_neuebold') format('svg'); + src: url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.eot'); + src: url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.eot?#iefix') format('embedded-opentype'), + url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.woff2') format('woff2'), + url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.woff') format('woff'), + url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.ttf') format('truetype'), + url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.svg#bebas_neuebold') format('svg'); font-weight: normal; font-style: normal; } 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'; diff --git a/next.config.js b/next.config.js index e313a14..ee0c684 100644 --- a/next.config.js +++ b/next.config.js @@ -1,6 +1,10 @@ -const withSass = require('@zeit/next-sass') +const withSass = require('@zeit/next-sass'); + +const dev = process && process.env && process.env.NODE_ENV === 'development'; + module.exports = withSass({ + assetPrefix: dev ? '' : '/nona-creative.github.io-ETHprize', exportPathMap: function(defaultPathMap) { return { '/': { page: '/' } 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", diff --git a/pages/_document.js b/pages/_document.js index 50993e4..684849d 100644 --- a/pages/_document.js +++ b/pages/_document.js @@ -8,7 +8,7 @@ export default class MyDocument extends Document { - +