Skip to content

Commit

Permalink
Merge commit 'f6e22c0b41ec1852b04b5e8165d501a2873049f2' into feature/…
Browse files Browse the repository at this point in the history
…search-box-99

* commit 'f6e22c0b41ec1852b04b5e8165d501a2873049f2':
  Implemented multinet support (resolves #110)
  Use a non-released version of nearlib with chunks API support (resolves #115)
  Resolved the compatibility issues with nearcore 0.4 (resolves #115)
  Fixed the double-reversed ordering issue on the Transactions list page
  Implemented Transaction Details Page (#109)
  Fixed actions ordering
  Feature/e2e (resolves #89)

# Conflicts:
#	frontend/package.json
  • Loading branch information
deacix committed Oct 31, 2019
2 parents 58b3677 + f6e22c0 commit b2cd0f0
Show file tree
Hide file tree
Showing 55 changed files with 2,732 additions and 1,449 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -62,3 +62,6 @@ typings/

# backend ignores
backend/db

# frontend ignores
frontend/cypress/videos
2 changes: 1 addition & 1 deletion backend/Dockerfile
Expand Up @@ -14,4 +14,4 @@ RUN mkdir ./db && \
chown -R nobody: .

USER nobody
CMD ["/bin/sh", "-c", "exec npm run start"]
CMD ["/bin/sh", "-c", "if stat -t .env-* >/dev/null 2>&1 ; then for env in .env-*; do source \"$env\" && npm run start & done ; wait ; else exec npm run start ; fi"]
14 changes: 0 additions & 14 deletions backend/config/config.json

This file was deleted.

17 changes: 17 additions & 0 deletions backend/config/database.js
@@ -0,0 +1,17 @@
const dbPrefix =
process.env.NEAR_DB_PREFIX || process.env.WAMP_NEAR_NETWORK_NAME;

module.exports = {
development: {
dialect: "sqlite",
storage: `db/${dbPrefix || "development"}-database.sqlite`
},
test: {
dialect: "sqlite",
storage: `db/${dbPrefix || "test"}-database.sqlite`
},
production: {
dialect: "sqlite",
storage: `db/${dbPrefix || "production"}-database.sqlite`
}
};
2 changes: 1 addition & 1 deletion backend/models/index.js
Expand Up @@ -5,7 +5,7 @@ const path = require("path");
const Sequelize = require("sequelize");
const basename = path.basename(__filename);
const env = process.env.NODE_ENV || "development";
const config = require(__dirname + "/../config/config.json")[env];
const config = require(__dirname + "/../config/database")[env];
const db = {};

const sequelize = new Sequelize(
Expand Down

0 comments on commit b2cd0f0

Please sign in to comment.