Skip to content

Commit 039baad

Browse files
committed
Rename api resource as resources
1 parent 913fa64 commit 039baad

File tree

10 files changed

+48
-44
lines changed

10 files changed

+48
-44
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ configs/**/credential.*
1414
/build
1515
/.deploy
1616
/src/public/uploads
17-
/src/public/user
17+
/src/public/users
1818
/src/native/styles/index.js
1919
my-release-key.keystore
2020

specs/endToEnd/apis/locale.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ describe('#locale', () => {
1919

2020
describe('#Unauthorized User', () => {
2121
// GET /api/locale/{validLocaleName}
22-
describe('GET /api/locale/{validLocaleName}', () => {
22+
describe('GET /api/locales/{validLocaleName}', () => {
2323
it('should download valid locale', (done) => {
2424
async.eachSeries(validLocales, (validLocale, cb) => {
2525
request
26-
.get(constants.BASE + '/api/locale/' + validLocale)
26+
.get(constants.BASE + '/api/locales/' + validLocale)
2727
.end((err, res) => {
2828
expect(err).to.equal(null);
2929
expect(res).to.not.be.undefined;
@@ -38,11 +38,11 @@ describe('#locale', () => {
3838
});
3939

4040
// GET /api/locale/{invalidLocaleName}
41-
describe('GET /api/locale/{invalidLocaleName}', () => {
41+
describe('GET /api/locales/{invalidLocaleName}', () => {
4242
it('should reject invalid locale', (done) => {
4343
async.eachSeries(invalidLocales, (invalidLocale, cb) => {
4444
request
45-
.get(constants.BASE + '/api/locale/' + invalidLocale)
45+
.get(constants.BASE + '/api/locales/' + invalidLocale)
4646
.end((err, res) => {
4747
expect(err).to.equal(null);
4848
expect(res).to.not.be.undefined;

specs/endToEnd/apis/todo.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ describe('#todo', () => {
2121

2222
describe('#Unauthorized User', () => {
2323
// POST /api/todo
24-
describe('POST /api/todo', () => {
24+
describe('POST /api/todos', () => {
2525
it('should create todo', (done) => {
2626
async.eachSeries(fakeTodos, (fakeTodo, cb) => {
2727
request
28-
.post(constants.BASE + '/api/todo')
28+
.post(constants.BASE + '/api/todos')
2929
.send(fakeTodo)
3030
.end((err, res) => {
3131
expect(err).to.equal(null);
@@ -42,10 +42,10 @@ describe('#todo', () => {
4242
});
4343

4444
// GET /api/todo
45-
describe('GET /api/todo', () => {
45+
describe('GET /api/todos', () => {
4646
it('should list todos', (done) => {
4747
request
48-
.get(constants.BASE + '/api/todo')
48+
.get(constants.BASE + '/api/todos')
4949
.end((err, res) => {
5050
expect(err).to.equal(null);
5151
expect(res).to.not.be.undefined;

specs/endToEnd/apis/user.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ describe('#user', () => {
2121

2222
describe('#Unauthorized User', () => {
2323
// POST /api/user
24-
describe('POST /api/user', () => {
24+
describe('POST /api/users', () => {
2525
fakeUser = {
2626
name: features.user[0].name,
2727
email: features.user[0].email.value,
2828
password: features.user[0].password,
2929
};
3030
it('should create user', (done) => {
3131
request
32-
.post(constants.BASE + '/api/user')
32+
.post(constants.BASE + '/api/users')
3333
.send(fakeUser)
3434
.end((err, res) => {
3535
expect(err).to.equal(null);
@@ -43,7 +43,7 @@ describe('#user', () => {
4343
});
4444
it('should fail when email is duplicate', (done) => {
4545
request
46-
.post(constants.BASE + '/api/user')
46+
.post(constants.BASE + '/api/users')
4747
.send(fakeUser)
4848
.end((err, res) => {
4949
expect(err).to.equal(null);
@@ -57,14 +57,14 @@ describe('#user', () => {
5757
});
5858

5959
// POST /api/user/login
60-
describe('POST /api/user/login', () => {
60+
describe('POST /api/users/login', () => {
6161
it('should auth valid user', (done) => {
6262
fakeUser = {
6363
email: features.user[0].email.value,
6464
password: features.user[0].password,
6565
};
6666
request
67-
.post(constants.BASE + '/api/user/login')
67+
.post(constants.BASE + '/api/users/login')
6868
.send(fakeUser)
6969
.end((err, res) => {
7070
expect(err).to.equal(null);
@@ -78,7 +78,7 @@ describe('#user', () => {
7878
});
7979
it('should reject invalid user', (done) => {
8080
request
81-
.post(constants.BASE + '/api/user/login')
81+
.post(constants.BASE + '/api/users/login')
8282
.send({})
8383
.end((err, res) => {
8484
expect(err).to.equal(null);
@@ -95,7 +95,7 @@ describe('#user', () => {
9595
describe('GET /api/user/logout', () => {
9696
it('should unauth user', (done) => {
9797
request
98-
.get(constants.BASE + '/api/user/logout')
98+
.get(constants.BASE + '/api/users/logout')
9999
.end((err, res) => {
100100
expect(err).to.equal(null);
101101
expect(res).to.not.be.undefined;
@@ -107,10 +107,10 @@ describe('#user', () => {
107107
});
108108

109109
// GET /api/user/me
110-
describe('GET /api/user/me', () => {
110+
describe('GET /api/users/me', () => {
111111
it('should be rejected', (done) => {
112112
request
113-
.get(constants.BASE + '/api/user/me')
113+
.get(constants.BASE + '/api/users/me')
114114
.end((err, res) => {
115115
expect(err).to.equal(null);
116116
expect(res).to.not.be.undefined;
@@ -125,13 +125,13 @@ describe('#user', () => {
125125

126126
describe('#Authorized User', () => {
127127
// GET /api/user/me
128-
describe('GET /api/user/me', () => {
128+
describe('GET /api/users/me', () => {
129129
it('should show user', (done) => {
130130
User.findOne({}, (err, user) => {
131131
expect(err).to.equal(null);
132132
let token = user.toJwtToken();
133133
request
134-
.get(constants.BASE + '/api/user/me')
134+
.get(constants.BASE + '/api/users/me')
135135
.set('Cookie', 'token=' + token)
136136
.end((err, res) => {
137137
expect(err).to.equal(null);

src/common/api/firebase.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export default (apiEngine) => ({
2-
readToken: () => apiEngine.get('/api/user/me/firebase/token'),
2+
readToken: () => apiEngine.get('/api/users/me/firebase/token'),
33
});

src/common/api/locale.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export default (apiEngine) => ({
2-
read: (locale) => apiEngine.get(`/api/locale/${locale}`),
2+
read: (locale) => apiEngine.get(`/api/locales/${locale}`),
33
});

src/common/api/todo.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export default (apiEngine) => ({
44
// resolve(apiEngine.get('/api/todo'));
55
// }, 5000);
66
// }),
7-
list: () => apiEngine.get('/api/todo'),
8-
create: (todo) => apiEngine.post('/api/todo', { data: todo }),
9-
remove: (id) => apiEngine.del(`/api/todo/${id}`),
7+
list: () => apiEngine.get('/api/todos'),
8+
create: (todo) => apiEngine.post('/api/todos', { data: todo }),
9+
remove: (id) => apiEngine.del(`/api/todos/${id}`),
1010
});

src/common/api/user.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
export default (apiEngine) => ({
2-
register: (user) => apiEngine.post('/api/user', { data: user }),
3-
login: (user) => apiEngine.post('/api/user/login', { data: user }),
4-
logout: () => apiEngine.get('/api/user/logout'),
5-
show: () => apiEngine.get('/api/user/me'),
6-
update: (user) => apiEngine.put('/api/user/me', { data: user }),
2+
register: (user) => apiEngine.post('/api/users', { data: user }),
3+
login: (user) => apiEngine.post('/api/users/login', { data: user }),
4+
logout: () => apiEngine.get('/api/users/logout'),
5+
show: () => apiEngine.get('/api/users/me'),
6+
update: (user) => apiEngine.put('/api/users/me', { data: user }),
77
uploadAvatar: (avatar) =>
8-
apiEngine.post('/api/user/me/avatar', { files: { avatar } }),
8+
apiEngine.post('/api/users/me/avatar', { files: { avatar } }),
99
});

src/server/controllers/user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export default {
7070
// use `req.file` to access the avatar file
7171
// and use `req.body` to access other fileds
7272
res.json({
73-
downloadURL: `/user/${req.user._id}/${req.file.filename}`,
73+
downloadURL: `/users/${req.user._id}/${req.file.filename}`,
7474
});
7575
},
7676
};

src/server/routes/api.js

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,24 @@ import todoController from '../controllers/todo';
99

1010
export default ({ app }) => {
1111
// user
12-
app.post('/api/user', bodyParser.json, userController.create);
13-
app.post('/api/user/login', bodyParser.json, userController.login);
14-
app.get('/api/user/logout', userController.logout);
15-
app.get('/api/user/me', authRequired, userController.show);
16-
app.put('/api/user/me', authRequired, bodyParser.json, userController.update);
12+
app.post('/api/users', bodyParser.json, userController.create);
13+
app.post('/api/users/login', bodyParser.json, userController.login);
14+
app.get('/api/users/logout', userController.logout);
15+
app.get('/api/users/me', authRequired, userController.show);
16+
app.put('/api/users/me',
17+
authRequired,
18+
bodyParser.json,
19+
userController.update
20+
);
1721
if (configs.firebase) {
1822
let firebaseController = require('../controllers/firebase').default;
19-
app.get('/api/user/me/firebase/token',
23+
app.get('/api/users/me/firebase/token',
2024
authRequired, firebaseController.readToken);
2125
}
22-
app.post('/api/user/me/avatar',
26+
app.post('/api/users/me/avatar',
2327
authRequired,
2428
fileUpload.disk({
25-
destination: 'user/{userId}',
29+
destination: 'users/{userId}',
2630
filename: 'avatar.jpg',
2731
}).single('avatar'),
2832
userController.uploadAvatar);
@@ -34,10 +38,10 @@ export default ({ app }) => {
3438
);
3539

3640
// locale
37-
app.get('/api/locale/:locale', localeController.show);
41+
app.get('/api/locales/:locale', localeController.show);
3842

3943
// todo
40-
app.post('/api/todo', bodyParser.json, todoController.create);
41-
app.get('/api/todo', todoController.list);
42-
app.delete('/api/todo/:id', todoController.remove);
44+
app.post('/api/todos', bodyParser.json, todoController.create);
45+
app.get('/api/todos', todoController.list);
46+
app.delete('/api/todos/:id', todoController.remove);
4347
};

0 commit comments

Comments
 (0)