Skip to content

Commit

Permalink
Merge pull request #176 from unepwcmc/refresh
Browse files Browse the repository at this point in the history
Refresh
  • Loading branch information
WKocur authored Jun 8, 2021
2 parents fb76287 + ce1b25c commit 32b176c
Show file tree
Hide file tree
Showing 834 changed files with 308,286 additions and 6,559 deletions.
18 changes: 0 additions & 18 deletions .babelrc

This file was deleted.

8 changes: 8 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ie 11
last 1 edge version
last 1 safari version
last 1 firefox version
last 1 chrome version
node 10.15
> 0.2%
not dead
47 changes: 47 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
module.exports = {
'env': {
'browser': true,
'es6': true,
'node': true
},
'extends': [
'eslint:recommended',
'plugin:vue/recommended'
],
'globals': {
'Atomics': 'readonly',
'SharedArrayBuffer': 'readonly'
},
'parserOptions': {
'ecmaVersion': 2018,
'sourceType': 'module'
},
'plugins': [
'vue'
],
'rules': {
'indent': [
'error',
2
],
'linebreak-style': [
'error',
'unix'
],
'quotes': [
'error',
'single'
],
'semi': [
'error',
'never'
],
'padding-line-between-statements': [
'error',
{ 'blankLine': 'always', 'prev': '*', 'next': 'return' },
{ 'blankLine': 'always', 'prev': ['const', 'let', 'var'], 'next': '*' },
{ 'blankLine': 'any', 'prev': ['const', 'let', 'var'], 'next': ['const', 'let', 'var'] }
],
'no-console': 'off'
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
.byebug_history
/public/packs
/public/packs-test
/public/downloads/national
/node_modules
yarn-debug.log*
.yarn-integrity
Expand Down
3 changes: 0 additions & 3 deletions .postcssrc.yml

This file was deleted.

37 changes: 37 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
language: ruby
branches:
only:
- master
- develop
- refresh
sudo: false
before_install:
- nvm ls-remote
- nvm install 10.15.1
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.6.0
- export PATH=$HOME/.yarn/bin:$PATH
- sudo apt-get install software-properties-common
- sudo apt-get update
cache:
yarn: true
install:
- bundle install
bundler_args: "--without development production staging"
rvm:
- 2.6.1
addons:
postgresql: 9.6
chrome: stable
before_script:
- psql -c 'create database travis_ci_test' -U postgres
- cp config/database.yml.travis config/database.yml
- cp config/secrets.yml.travis config/secrets.yml
- "/usr/local/bin/yarn install"
script:
- RAILS_ENV=test bundle exec rails webpacker:compile
- RAILS_ENV=test bin/rake db:migrate db:seed
- RAILS_ENV=test bundle exec rake import:prebakedstats
- RAILS_ENV=test rails test
notifications:
slack:
secure: fir6j1zLw4dZbg8YQ5mo3yIfrEH/F2s+UqeY6/wuXyv7ZQVjOWrR5CpRI08mq6m0TnrVDKtlewc2VaPf//ftFckTig7tZOHBDeI8mwo5YV6PMEjmqs2LX2X9MTNHA/gwhjBycT+YQTURIedXafsMUEYCwNRMs28bunshfqW+5cUKDbOIDWPa8facnOiCpMkdK2hFF23kLV1t3ZZXZAeD2Mjeh08VmdyRMk23IoGoKd2RI0DeSzEwDVARo/cQbtZx85SLbFFZv4mk9OKivRncyZ/nLznMKOugTOkhrd4dxOK6rv1i5hdrPz7HGpwBzdlPpQ+cXYeHgzGipEpaDe/S5jGRS8jcfn1PPl5WLh66wqrBr9dtbIV9sBtL+hQk24PkydLyJPi/CJYxyyOgiItgOkXFokF41R/NgJOM+70s+X8ujUAaUuCvDdoBgLkBHUpzFLOWSmjQnWeF9rn5JVUD+z/V2xYv78Pqm6orFPErrj22N0dhzF9fEtTgOL08/DKfeYV5qa5LNu7/kGgUdHfXTaR/C+tcE2Jieb+46yYfl15Tmy2IfEneqedyuBEthcErjEX4wVF8GaVevhmUphD1UkKGC6vLXnl5daYf9t404LlMWqCb3Xer514u81PWdHNRZfDYpofwdYCf+bU/26uQ0VgBlC3PsczxMfH4l8Cb7rY=
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,10 @@
* Dyanimic charts
* Mapbox map with WDPA Carto layer and ArcGIS habitats layers
* Import static stats from file

## 1.0.0

**Ocean+ Habitats refresh**

* Site refresh including underlying data and frontend
* Features individual country pages as well as global overview
7 changes: 6 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

# The most popular solution to the EU cookie law for Rails applications.
gem 'cookieconsent'
# prefix rails c commands with ap for pretty results
gem 'awesome_print'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
Expand All @@ -14,7 +16,7 @@ gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem 'sassc-rails', '~> 2.1.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
Expand All @@ -41,6 +43,9 @@ gem 'dotenv-rails', '~> 2.2', '>= 2.2.1'

gem 'httparty', '~> 0.16.2'

gem 'rubyzip', '>= 1.0.0' # will load new rubyzip version
gem 'zip-zip' # will load compatibility for old rubyzip API.

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
Expand Down
Loading

0 comments on commit 32b176c

Please sign in to comment.