Skip to content

Commit

Permalink
Merge pull request #338 from climatescope/feature/prep-master
Browse files Browse the repository at this point in the history 
Release v4.0.0
  • Loading branch information
@danielfdsilva
danielfdsilva authored Nov 26, 2018
2 parents 80138b4 + a11c670 commit 38bbcbd
Show file tree
Hide file tree
Showing 2,222 changed files with 26,989 additions and 35,541 deletions.
29 changes: 0 additions & 29 deletions .build_scripts/deploy.sh
View file

This file was deleted.

Binary file removed .build_scripts/deploy_key.enc
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions .bundle/config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
BUNDLE_PATH: "bundle/cache"
BUNDLE_DISABLE_SHARED_GEMS: "true"
93 changes: 93 additions & 0 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
version: 2
jobs:
build:
docker:
- image: developmentseed/developmentseed.org:slim

working_directory: ~/repo

environment:
- STAGING_BRANCH: v2018
- PRODUCTION_BRANCH: master
- GH_REF: [email protected]:climatescope/climatescope.org.git
- GH_NAME: "Development Seed"
- GH_EMAIL: "[email protected]"

steps:
- checkout

# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: yarn install

- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}

- run: yarn test

- add_ssh_keys:
fingerprints:
- "d8:2c:2c:13:f8:dd:60:d2:e4:df:de:90:f8:55:d5:4c"

- run:
name: Building site staging
command: |
if [ "${CIRCLE_BRANCH}" == "${STAGING_BRANCH}" ]; then
yarn build-stage
else
echo "Skip building site"
fi
- run:
name: Deploy to Surge staging
command: |
if [ "${CIRCLE_BRANCH}" == "${STAGING_BRANCH}" ]; then
cp ./_site/index.html ./_site/200.html
./node_modules/surge/lib/cli.js --project ./_site --domain climatescope.surge.sh
else
echo "Not the branch you're looking for, skipping deploy"
fi
- run:
name: Building site prod
command: |
if [ "${CIRCLE_BRANCH}" == "${PRODUCTION_BRANCH}" ]; then
yarn build
else
echo "Skip building site"
fi
- run:
name: Deploy to Surge prod
command: |
if [ "${CIRCLE_BRANCH}" == "${PRODUCTION_BRANCH}" ]; then
cp ./_site/index.html ./_site/200.html
echo "global-climatescope.org" > ./_site/CNAME
./node_modules/surge/lib/cli.js --project ./_site --domain global-climatescope.org
else
echo "Not the branch you're looking for, skipping deploy"
fi
- run:
name: Deploy to GH Pages prod
command: |
if [ "${CIRCLE_BRANCH}" == "${PRODUCTION_BRANCH}" ]; then
cd _site
git init
git config user.name "$GH_NAME"
git config user.email "$GH_EMAIL"
git add .
git commit -m "CI deploy [skip ci]"
git remote add origin $GH_REF
git push origin --force --quiet HEAD:gh-pages
rm -rf .git
else
echo "Not the branch you're looking for, skipping deploy"
fi
216 changes: 30 additions & 186 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
@@ -1,189 +1,33 @@
{
"extends": ["standard"],
"env": {
"es6": true,
"browser": true
},
"plugins": [
"react"
],
"parserOptions": {
"ecmaVersion": 2018,
"ecmaFeatures": {
"globalReturn": true,
"jsx": true,
"modules": true
},

"env": {
"browser": false,
"es6": true,
"node": true,
},

"globals": {
"document": false,
"escape": false,
"navigator": false,
"unescape": false,
"window": false
},

"plugins": [
"react"
],

"rules": {
"block-scoped-var": 0,
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
"camelcase": 0,
"comma-dangle": [2, "never"],
"comma-spacing": [2, { "before": false, "after": true }],
"comma-style": [2, "last"],
"complexity": 0,
"consistent-return": 0,
"consistent-this": 0,
"curly": [2, "multi-line"],
"default-case": 0,
"dot-notation": 0,
"eol-last": 2,
"eqeqeq": [2, "allow-null"],
"func-names": 0,
"func-style": [0, "declaration"],
"generator-star": [2, "middle"],
"guard-for-in": 0,
"handle-callback-err": [2, "^(err|error|anySpecificError)$" ],
"indent": [2, 2],
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
"max-depth": 0,
"max-len": 0,
"max-nested-callbacks": 0,
"max-params": 0,
"max-statements": 0,
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
"new-parens": 2,
"no-alert": 0,
"no-array-constructor": 2,
"no-bitwise": 0,
"no-caller": 2,
"no-catch-shadow": 0,
"no-cond-assign": 2,
"no-console": 0,
"no-constant-condition": 0,
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-div-regex": 0,
"no-dupe-args": 2,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-else-return": 0,
"no-empty": 0,
"no-empty-class": 2,
"no-empty-label": 2,
"no-eq-null": 0,
"no-eval": 2,
"no-ex-assign": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": 0,
"no-extra-semi": 0,
"no-extra-strict": 0,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-func-assign": 2,
"no-implied-eval": 2,
"no-inline-comments": 0,
"no-inner-declarations": [2, "functions"],
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": 2,
"no-lone-blocks": 0,
"no-lonely-if": 0,
"no-loop-func": 0,
"no-mixed-requires": [0, false],
"no-mixed-spaces-and-tabs": [2, false],
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-multiple-empty-lines": [2, { "max": 1 }],
"no-native-reassign": 2,
"no-negated-in-lhs": 2,
"no-nested-ternary": 0,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-require": 2,
"no-new-wrappers": 2,
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-path-concat": 0,
"no-plusplus": 0,
"no-process-env": 0,
"no-process-exit": 0,
"no-proto": 2,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-reserved-keys": 0,
"no-restricted-modules": 0,
"no-return-assign": 2,
"no-script-url": 0,
"no-self-compare": 2,
"no-sequences": 2,
"no-shadow": 0,
"no-shadow-restricted-names": 2,
"no-spaced-func": 2,
"no-sparse-arrays": 2,
"no-sync": 0,
"no-ternary": 0,
"no-throw-literal": 2,
"no-trailing-spaces": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-undefined": 0,
"no-underscore-dangle": 0,
"no-unreachable": 2,
"no-unused-expressions": 0,
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
"no-use-before-define": 0,
"no-var": 0,
"no-void": 0,
"no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
"no-with": 2,
"no-wrap-func": 2,
"one-var": 0,
"operator-assignment": [0, "always"],
"padded-blocks": [2, "never"],
"quote-props": 0,
"quotes": [2, "single", "avoid-escape"],
"radix": 2,
"react/display-name": 2,
"react/jsx-boolean-value": 2,
"react/jsx-quotes": [2, "single", "avoid-escape"],
"react/jsx-no-undef": 2,
"react/jsx-sort-props": 0,
"react/jsx-uses-react": 2,
"react/jsx-uses-vars": 2,
"react/no-did-mount-set-state": 2,
"react/no-did-update-set-state": 2,
"react/no-multi-comp": 2,
"react/no-unknown-property": 2,
"react/prop-types": 2,
"react/react-in-jsx-scope": 2,
"react/self-closing-comp": 2,
"react/wrap-multilines": 2,
"semi": [2, "always"],
"semi-spacing": 0,
"sort-vars": 0,
"space-after-keywords": [2, "always"],
"space-before-blocks": [2, "always"],
"space-before-function-paren": [2, "always"],
"space-in-brackets": 0,
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"spaced-line-comment": [2, "always"],
"strict": 0,
"use-isnan": 2,
"valid-jsdoc": 0,
"valid-typeof": 2,
"vars-on-top": 0,
"wrap-iife": [2, "any"],
"wrap-regex": 0,
"yoda": [2, "never"]
"jsx": true
}
}
},
"rules": {
"react/display-name": 1 ,
"react/jsx-no-duplicate-props": 2,
"react/jsx-no-undef": 2,
"react/jsx-uses-react": 2,
"react/jsx-uses-vars": 2,
"react/no-danger": 0,
"react/no-deprecated": 2,
"react/no-did-mount-set-state": 2,
"react/no-direct-mutation-state": 2,
"react/no-is-mounted": 2,
"react/no-unknown-property": 2,
"react/prop-types": 2,
"react/react-in-jsx-scope": 2,
"prefer-promise-reject-errors": 0,
"jsx-quotes": [2, "prefer-single"]
}
}
Loading

0 comments on commit 38bbcbd

Please sign in to comment.