benkyd/note-service-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified controllers to use API middleware in new directory, node 11.1.0 broke EVERYHTING so i have to resolve

Browse Source
This commit is contained in:
Ben
2018-11-06 16:34:02 +00:00
parent 562a2f80be
commit 1a12b690e4
10 changed files with 71 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

677
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
package.json
View File

@@ -13,8 +13,7 @@
"json-stringify-safe": "^5.0.1", "json-stringify-safe": "^5.0.1",
"jsonwebtoken": "^8.3.0", "jsonwebtoken": "^8.3.0",
"regenerator-runtime": "^0.12.1", "regenerator-runtime": "^0.12.1",
"sequelize": "^4.38.0", "sequelize": "^4.38.0"
"sqlite3": "^4.0.2"
}, },
"devDependencies": { "devDependencies": {
"babel-preset-env": "^1.7.0", "babel-preset-env": "^1.7.0",

0
src/controllers/API.js → src/controllers/api/API.js
View File

2
src/controllers/groupController.js
View File

@@ -1,5 +1,5 @@
import {ControllerHandler} from './controllerHandler'; import {ControllerHandler} from './controllerHandler';
import {API} from '../models/api/api'; import {API} from './api/api';
import {Notes} from '../models/notes/notes'; import {Notes} from '../models/notes/notes';
export class GroupController extends ControllerHandler { export class GroupController extends ControllerHandler {

2
src/controllers/index.js
View File

@@ -1,4 +1,4 @@
export let Controllers = {}; export const Controllers = {};
Controllers.UserController = require('./userController').UserController; Controllers.UserController = require('./userController').UserController;
Controllers.LoginController = require('./loginController').LoginController; Controllers.LoginController = require('./loginController').LoginController;

2
src/controllers/loginController.js
View File

@@ -1,5 +1,5 @@
import {ControllerHandler} from './controllerHandler'; import {ControllerHandler} from './controllerHandler';
import {API} from '../models/api/api'; import {API} from './api/api';
import {Database} from '../models/database/database' import {Database} from '../models/database/database'
import {User} from '../models/user/user'; import {User} from '../models/user/user';

2
src/controllers/middleware/auth.js
View File

@@ -1,5 +1,5 @@
import {MiddleWare} from './index'; import {MiddleWare} from './index';
import {API} from '../../models/api/API'; import {API} from '../api/api';
import {Logger} from '../../models/logger' import {Logger} from '../../models/logger'
import {AuthModel} from '../../models/auth/authModel'; import {AuthModel} from '../../models/auth/authModel';

2
src/controllers/noteController.js
View File

@@ -1,5 +1,5 @@
import {ControllerHandler} from './controllerHandler'; import {ControllerHandler} from './controllerHandler';
import {API} from '../models/api/api'; import {API} from './api/api';
import {Notes} from '../models/notes/notes'; import {Notes} from '../models/notes/notes';
export class NoteController extends ControllerHandler { export class NoteController extends ControllerHandler {

2
src/controllers/permaLinkController.js
View File

@@ -1,6 +1,6 @@
import {Logger} from '../models/logger'; import {Logger} from '../models/logger';
import {ControllerHandler} from './controllerHandler'; import {ControllerHandler} from './controllerHandler';
import {API} from '../models/api/api'; import {API} from './api/api';
import {Database} from '../models/database/database' import {Database} from '../models/database/database'
import {PermaLink} from '../models/permalinks/permalink'; import {PermaLink} from '../models/permalinks/permalink';

2
src/controllers/userController.js
View File

@@ -2,7 +2,7 @@ import bcrypt from 'bcrypt';
import {Logger} from '../models/logger'; import {Logger} from '../models/logger';
import {ControllerHandler} from './controllerHandler'; import {ControllerHandler} from './controllerHandler';
import {API} from '../models/api/api'; import {API} from './api/api';
import {Database} from '../models/database/database' import {Database} from '../models/database/database'
import {User} from '../models/user/user'; import {User} from '../models/user/user';