Skip to content

Commit

Permalink
Merge 174115c into ca5adc0
Browse files Browse the repository at this point in the history
  • Loading branch information
fire-cracker committed Feb 19, 2019
2 parents ca5adc0 + 174115c commit 5fb1121
Show file tree
Hide file tree
Showing 15 changed files with 436 additions and 192 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
logs
*.log
.DS_Store

.vscode
npm-debug.log*

dist
Expand Down
2 changes: 2 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import swaggerDocument from './swagger';
import auth from './server/api/middlewares/authentication/authenticate';
import userRoute from './server/api/routes/user';
import articleRoute from './server/api/routes/article';
import bookmarkRoutes from './server/api/routes/bookmark';

dotenv.config();

Expand Down Expand Up @@ -37,6 +38,7 @@ app.use(auth.initialize());
app.use('/api/users', userRoute);
app.use('/api/articles', articleRoute);
app.use('/docs', swagger.serve, swagger.setup(swaggerDocument));
app.use('/api', bookmarkRoutes);

app.get('/', (req, res) => res.status(200).send({
status: 'connection successful',
Expand Down
Loading

0 comments on commit 5fb1121

Please sign in to comment.