diff --git a/.circleci/config.yml b/.circleci/config.yml index b675244..75ab329 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,9 +1,19 @@ -version: 2 +version: 2.1 jobs: build: docker: - image: circleci/node:7 steps: - checkout - - run: npm install - - run: npm test + - run: + name: Install project dependencies + command: npm install + - run: + name: Install the latest version of eslint + command: sudo npm install -g eslint + - run: + name: Run eslint + command: eslint . + - run: + name: Run test suite + command: npm test diff --git a/.eslintignore b/.eslintignore index 1facb5d..2ecf3d7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1,4 @@ /src/serviceWorker.js + +/build/* +**/__snapshots__ diff --git a/.gitignore b/.gitignore index c35f9a8..85d9ba3 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,7 @@ yarn-debug.log* yarn-error.log* package-lock.json +# nodenv local version +.node-version + /.vscode diff --git a/.vscode/settings.json b/.vscode/settings.json index 3d423fd..c14524f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "files.associations": { "*.js": "javascriptreact" - } + }, + "files.insertFinalNewline": true } diff --git a/README.md b/README.md index 21ed95e..15e146e 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,17 @@ Travel Map (_aka Geornal_) is a hobby project built as part of the [Project-Unic ## Development +### Dependencies + +All project dependencies, aside from those listed below, are listed within `package.json`. + +| Dependency | Version | +|---|---| +| npm | `6.14.4` | +| node | `12.14.1` | + +It is highly encouraged that you use a Node version manager, such as [nodenv](https://github.com/nodenv/nodenv), to easily manage different projects on your machine which are utilizing npm/node. + ### Getting Started When working on the application locally: diff --git a/package.json b/package.json index 3b161e5..7820dbe 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@apollo/react-hooks": "^3.1.3", + "@apollo/react-hooks": "^3.1.5", "@urbica/react-map-gl": "^1.12.3", "@urbica/react-map-gl-cluster": "^0.2.0", "apollo-boost": "^0.4.4", @@ -12,7 +12,6 @@ "dotenv": "^8.2.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.2", - "eslint-plugin-import": "^2.18.2", "express": "^4.17.1", "express-favicon": "^2.0.1", "express-static": "^1.2.6", @@ -22,20 +21,20 @@ "jwt-decode": "^2.2.0", "lodash": "^4.17.15", "lodash.flowright": "^3.5.0", - "mapbox-gl": "^1.6.1", + "mapbox-gl": "^1.9.1", "node-sass": "^4.13.0", "path": "^0.12.7", "prop-types": "^15.7.2", - "react": "^16.12.0", - "react-apollo": "^3.1.3", - "react-dom": "^16.12.0", + "react": "^16.13.1", + "react-apollo": "^3.1.5", + "react-dom": "^16.13.1", "react-ga": "^2.7.0", "react-map-gl": "^5.1.2", "react-map-gl-geocoder": "^2.0.11", - "react-mapbox-gl": "^4.7.3", + "react-mapbox-gl": "^4.8.3", "react-meta-tags": "^0.7.4", "react-router-dom": "^5.1.2", - "react-scripts": "3.0.1", + "react-scripts": "^3.4.1", "react-simple-maps": "^0.12.1", "socket.io-client": "^2.3.0", "supercluster": "^7.0.0", @@ -76,10 +75,11 @@ "devDependencies": { "babel-jest": "^24.8.0", "enzyme-to-json": "^3.4.4", - "eslint": "^5.16.0", - "eslint-config-airbnb-base": "^13.2.0", + "eslint": "^6.8.0", + "eslint-config-airbnb-base": "^14.1.0", + "eslint-plugin-import": "^2.20.2", "eslint-plugin-jest": "^23.8.2", "husky": "^2.7.0", - "jest": "24.7.1" + "jest": "^24.9.0" } } diff --git a/src/pages/Profile/subpages/Settings/Basics.scss b/src/pages/Profile/subpages/Settings/Basics.scss index 41f9a5c..6c7069e 100644 --- a/src/pages/Profile/subpages/Settings/Basics.scss +++ b/src/pages/Profile/subpages/Settings/Basics.scss @@ -20,7 +20,7 @@ } #birthday { - background: #f8f8fc url("images/arrow_down.png") right no-repeat; + background: #f8f8fc url("../../../../images/arrow_down.png") right no-repeat; } [type="date"]::-webkit-inner-spin-button {