status-im
/
ETHReport
mirror of https://github.com/status-im/ETHReport.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feat/setting-up-search-functionality

This commit is contained in:
Sharyn 2018-07-09 14:14:34 +02:00
parent 6656e25aaf ac32c86b62
commit bf631f5719
7 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
.next .next
node_modules node_modules
.DS_Store .DS_Store
yarn.lock

11
README.md
View File

@ -4,9 +4,10 @@ ETHPrize single page React website
## Setting up ## Setting up
- `git clone git@github.com:Nona-Creative/ETHPrize.git` - `git clone git@github.com:Nona-Creative/ETHPrize.git`
- `npm install` - `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` ## Deploy to staging
- `npm run deploy` to deploy
`npm run deploy` to deploy to `https://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/nona-creative.github.io-ETHprize`
`yarn lint` runs the eslinter

12
assets/styles/base/fonts.scss
View File

@ -1,11 +1,11 @@
@font-face { @font-face {
font-family: 'bebas_neuebold'; font-family: 'bebas_neuebold';
src: url('/static/fonts/bebasneue_bold-webfont.eot'); src: url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.eot');
src: url('/static/fonts/bebasneue_bold-webfont.eot?#iefix') format('embedded-opentype'), src: url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.eot?#iefix') format('embedded-opentype'),
url('/static/fonts/bebasneue_bold-webfont.woff2') format('woff2'), url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.woff2') format('woff2'),
url('/static/fonts/bebasneue_bold-webfont.woff') format('woff'), url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.woff') format('woff'),
url('/static/fonts/bebasneue_bold-webfont.ttf') format('truetype'), url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.ttf') format('truetype'),
url('/static/fonts/bebasneue_bold-webfont.svg#bebas_neuebold') format('svg'); url('/nona-creative.github.io-ETHprize/static/fonts/bebasneue_bold-webfont.svg#bebas_neuebold') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

4
components/resources/index.js
View File

@ -1,8 +1,8 @@
import React from 'react'; import React from 'react';
import Parser from 'html-react-parser'; import Parser from 'html-react-parser';
import Slider from 'react-slick'; import Slider from 'react-slick';
import Modal from '../../components/modal'; import Modal from '../modal';
import WordCloud from '../../components/wordCloud'; import WordCloud from '../wordCloud';
import Data from '../../data/resources/wordclouds'; import Data from '../../data/resources/wordclouds';
import './style.scss'; import './style.scss';

6
next.config.js
View File

@ -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 = module.exports =
withSass({ withSass({
assetPrefix: dev ? '' : '/nona-creative.github.io-ETHprize',
exportPathMap: function(defaultPathMap) { exportPathMap: function(defaultPathMap) {
return { return {
'/': { page: '/' } '/': { page: '/' }

2
package.json
View File

@ -14,7 +14,7 @@
}, },
"config": { "config": {
"deployToGit": { "deployToGit": {
"repository": "git@github.com:Nona-Creative/ETHPrize.git", "repository": "git@github.com:Nona-Creative/nona-creative.github.io-ETHprize.git",
"branch": "master", "branch": "master",
"folder": "out", "folder": "out",
"script": "npm run prod-build", "script": "npm run prod-build",

2
pages/_document.js
View File

@ -8,7 +8,7 @@ export default class MyDocument extends Document {
<Head> <Head>
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="_next/static/style.css" /> <link rel="stylesheet" href="_next/static/style.css" />
<link rel="stylesheet" type="text/css" charset="UTF-8" href="//cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.css" /> <link rel="stylesheet" type="text/css" charSet="UTF-8" href="//cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.css" />
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick-theme.min.css" /> <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick-theme.min.css" />
<link href="//fonts.googleapis.com/css?family=Roboto+Mono:400,700" rel="stylesheet" /> <link href="//fonts.googleapis.com/css?family=Roboto+Mono:400,700" rel="stylesheet" />
</Head> </Head>