Skip to content

Commit

Permalink
Merge branch 'chore/mongo' into develop
Browse files Browse the repository at this point in the history
* chore/mongo:
  Fixes Giveth#316, fixes Giveth#252.
  Fixes Giveth#314
  fix throwing delete in script, added catch
  Fixed milestones that were causing issues because some values were undefined. Started altering milestones that should be altered during migration. Fixes Giveth#336, Giveth#348
  Fixed the EthConversionRateTimestamp
  Update migration script, update milestone model - make image not required and remove item id
  Migration script for milestones and users
  Fix conversations, clean up
  A lot of changes to models, fixing queries and issues. Update readme
  Migrated milestones to mongoose
  Setup mongoose, translate user and campaign model to mongoose

# Conflicts:
#	package-lock.json
  • Loading branch information
vojtechsimetka committed Jun 18, 2018
2 parents 228bce1 + b910a3f commit 391689f
Show file tree
Hide file tree
Showing 45 changed files with 5,995 additions and 3,436 deletions.
12 changes: 10 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{
"presets": ["env"]
}
"presets": [
["env", {
"targets": {
"node": "current"
}
}],
"stage-1"
],
"plugins": []
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ Welcome to the server code for Giveth's [dapp](https://github.com/Giveth/giveth-
npm install
```
* note: due to a bug in yarn, `yarn install` currently does not work
7. Install Mongo (we recommend installing via [Brew](https://treehouse.github.io/installation-guides/mac/mongo-mac.html))
8. Run Mongo in a terminal window `mongod` or in the background `mongod --fork --syslog`
### Run server
The feathers server will need to connect to an ethereum node via websockets. Typically this will be a local TestRPC instance.
Expand Down
1 change: 1 addition & 0 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"default": 25,
"max": 100
},
"mongodb": "mongodb://localhost:27017/giveth",
"nedb": "../data",
"uploads": "../uploads",
"uploadsBaseUrl": "http://localhost:3030/uploads/",
Expand Down
Loading

0 comments on commit 391689f

Please sign in to comment.