Fixed bug with unknown fields
This commit is contained in:
parent
b2623e611f
commit
bffcfa575c
6 changed files with 9 additions and 8 deletions
|
|
@ -20,7 +20,7 @@
|
|||
},
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
"build": "cp ${ENV:-'../.env'} .env && react-scripts build",
|
||||
"build": "react-scripts build",
|
||||
"test": "react-scripts test",
|
||||
"eject": "react-scripts eject"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
"scripts": {
|
||||
"client": "npm start --prefix client",
|
||||
"server": "npm start --prefix server",
|
||||
"build": "npm run build --prefix client",
|
||||
"build": "npm run env-dist && npm run build --prefix client",
|
||||
"test": "npm run build && npm run server",
|
||||
"install-all": "npm i && npm i --prefix client && npm i --prefix server",
|
||||
"audit-all": "npm audit fix && npm audit fix --prefix client && npm audit fix --prefix server"
|
||||
"env-dist": "cp .env ./server/.env && cp .env ./client/.env"
|
||||
},
|
||||
"author": "C4 Patino",
|
||||
"license": "ISC",
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
var app = require('../app');
|
||||
var debug = require('debug')('server:server');
|
||||
var http = require('http');
|
||||
require('dotenv').config({ path: '../../.env' });
|
||||
require('dotenv').config();
|
||||
|
||||
var { sequelize } = require('../models/index');
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
module.exports = {
|
||||
async up(queryInterface, Sequelize) {
|
||||
await queryInterface.createTable('OrgMembers', {
|
||||
OrganizationOrgID: {
|
||||
orgID: {
|
||||
type: Sequelize.UUID,
|
||||
primaryKey: true,
|
||||
},
|
||||
UserUserID: {
|
||||
userID: {
|
||||
type: Sequelize.UUID,
|
||||
primaryKey: true,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ module.exports = (sequelize, DataTypes) => {
|
|||
Organization.belongsToMany(models.User, {
|
||||
as: 'orgMember',
|
||||
through: 'OrgMembers',
|
||||
uniqueKey: 'orgID',
|
||||
foreignKey: 'orgID',
|
||||
onDelete: 'CASCADE',
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
require('dotenv').config();
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const Sequelize = require('sequelize');
|
||||
const basename = path.basename(__filename);
|
||||
const env = process.env.NODE_ENV || 'development';
|
||||
const env = process.env.NODE_ENV;
|
||||
const config = require(__dirname + '/../config/config.json')[env];
|
||||
const db = {};
|
||||
|
||||
|
|
|
|||
Reference in a new issue