Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
/src/serviceWorker.js

/build/*
**/__snapshots__
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@ yarn-debug.log*
yarn-error.log*
package-lock.json

# nodenv local version
.node-version

/.vscode
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"files.associations": {
"*.js": "javascriptreact"
}
},
"files.insertFinalNewline": true
}
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion src/pages/Profile/subpages/Settings/Basics.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down