Skip to content

Commit 8d504e8

Browse files
committed
refactor(api:users): use import syntax
1 parent 9fd5313 commit 8d504e8

File tree

8 files changed

+22
-23
lines changed

8 files changed

+22
-23
lines changed

app/templates/server/api/user(auth)/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict';
22

3-
var express = require('express');
4-
var controller = require('./user.controller');
5-
var auth = require('../../auth/auth.service');
3+
import express from 'express';
4+
import controller from './user.controller';
5+
import auth from '../../auth/auth.service';
66

77
var router = express.Router();
88

app/templates/server/api/user(auth)/user.controller.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
'use strict';
22
<% if (filters.mongooseModels) { %>
3-
var User = require('./user.model');<% } %><% if (filters.sequelizeModels) { %>
4-
var sqldb = require('../../sqldb');
5-
var User = sqldb.User;<% } %>
6-
var passport = require('passport');
7-
var config = require('../../config/environment');
8-
var jwt = require('jsonwebtoken');
3+
import User from './user.model';<% } %><% if (filters.sequelizeModels) { %>
4+
import {User} from '../../sqldb';<% } %>
5+
import passport from 'passport';
6+
import config from '../../config/environment';
7+
import jwt from 'jsonwebtoken';
98

109
function validationError(res, statusCode) {
1110
statusCode = statusCode || 422;

app/templates/server/api/user(auth)/user.events.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
'use strict';
66

7-
var EventEmitter = require('events').EventEmitter;<% if (filters.mongooseModels) { %>
8-
var User = require('./user.model');<% } if (filters.sequelizeModels) { %>
9-
var User = require('../../sqldb').User;<% } %>
7+
import {EventEmitter} from 'events';<% if (filters.mongooseModels) { %>
8+
import User from './user.model';<% } if (filters.sequelizeModels) { %>
9+
import {User} from '../../sqldb';<% } %>
1010
var UserEvents = new EventEmitter();
1111

1212
// Set max event listeners (0 == unlimited)

app/templates/server/api/user(auth)/user.integration.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

3-
var app = require('../..');<% if (filters.mongooseModels) { %>
4-
var User = require('./user.model');<% } %><% if (filters.sequelizeModels) { %>
5-
var User = require('../../sqldb').User;<% } %>
6-
var request = require('supertest');
3+
import app from '../..';<% if (filters.mongooseModels) { %>
4+
import User from './user.model';<% } %><% if (filters.sequelizeModels) { %>
5+
import {User} from '../../sqldb';<% } %>
6+
import request from 'supertest';
77

88
describe('User API:', function() {
99
var user;

app/templates/server/api/user(auth)/user.model(mongooseModels).js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict';
22

3+
import crypto from 'crypto';
34
var mongoose = require('bluebird').promisifyAll(require('mongoose'));
4-
var Schema = mongoose.Schema;
5-
var crypto = require('crypto');<% if (filters.oauth) { %>
5+
var Schema = mongoose.Schema;<% if (filters.oauth) { %>
66
var authTypes = ['github', 'twitter', 'facebook', 'google'];<% } %>
77

88
var UserSchema = new Schema({

app/templates/server/api/user(auth)/user.model(sequelizeModels).js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var crypto = require('crypto');<% if (filters.oauth) { %>
3+
import crypto from 'crypto';<% if (filters.oauth) { %>
44
var authTypes = ['github', 'twitter', 'facebook', 'google'];<% } %>
55

66
var validatePresenceOf = function(value) {

app/templates/server/api/user(auth)/user.model.spec(mongooseModels).js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

3-
var app = require('../..');
4-
var User = require('./user.model');
3+
import app from '../..';
4+
import User from './user.model';
55
var user;
66
var genUser = function() {
77
user = new User({

app/templates/server/api/user(auth)/user.model.spec(sequelizeModels).js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

3-
var app = require('../..');
4-
var User = require('../../sqldb').User;
3+
import app from '../..';
4+
import {User} from '../../sqldb';
55
var user;
66
var genUser = function() {
77
user = User.build({

0 commit comments

Comments
 (0)