Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RoleGame
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martin Lehoux
RoleGame
Commits
56f77469
Commit
56f77469
authored
6 years ago
by
Martin Lehoux
Browse files
Options
Downloads
Plain Diff
Merge branch 'patch-0.2.2' into 'master'
v0.2.2 See merge request
!5
parents
b79686ae
486471bf
No related branches found
No related tags found
1 merge request
!5
v0.2.2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
index.js
+0
-4
0 additions, 4 deletions
index.js
routes/auth.js
+3
-0
3 additions, 0 deletions
routes/auth.js
with
3 additions
and
4 deletions
index.js
+
0
−
4
View file @
56f77469
...
@@ -2,7 +2,6 @@ const express = require('express');
...
@@ -2,7 +2,6 @@ const express = require('express');
const
session
=
require
(
'
express-session
'
);
const
session
=
require
(
'
express-session
'
);
const
bodyParser
=
require
(
'
body-parser
'
);
const
bodyParser
=
require
(
'
body-parser
'
);
const
mongoose
=
require
(
'
mongoose
'
);
const
mongoose
=
require
(
'
mongoose
'
);
const
bcrypt
=
require
(
'
bcrypt
'
);
const
morgan
=
require
(
'
morgan
'
);
const
morgan
=
require
(
'
morgan
'
);
const
mongoDBStore
=
require
(
'
connect-mongodb-session
'
)(
session
);
const
mongoDBStore
=
require
(
'
connect-mongodb-session
'
)(
session
);
...
@@ -14,9 +13,6 @@ const loginChecker = require('./middlewares/loginChecker');
...
@@ -14,9 +13,6 @@ const loginChecker = require('./middlewares/loginChecker');
// Utils
// Utils
const
render
=
require
(
'
./utils/render
'
);
const
render
=
require
(
'
./utils/render
'
);
const
{
warn
,
error
}
=
require
(
'
./utils/notifications
'
);
const
{
warn
,
error
}
=
require
(
'
./utils/notifications
'
);
// Models
const
User
=
require
(
'
./models/user
'
);
const
Notification
=
require
(
'
./models/notification
'
);
// Routes
// Routes
const
authRouter
=
require
(
'
./routes/auth
'
);
const
authRouter
=
require
(
'
./routes/auth
'
);
...
...
This diff is collapsed.
Click to expand it.
routes/auth.js
+
3
−
0
View file @
56f77469
const
express
=
require
(
'
express
'
);
const
express
=
require
(
'
express
'
);
const
bcrypt
=
require
(
'
bcrypt
'
);
const
bcrypt
=
require
(
'
bcrypt
'
);
const
User
=
require
(
'
../models/user
'
);
const
User
=
require
(
'
../models/user
'
);
const
render
=
require
(
'
../utils/render
'
);
const
{
warn
,
error
}
=
require
(
'
../utils/notifications
'
);
const
router
=
express
.
Router
();
const
router
=
express
.
Router
();
router
.
get
(
'
/signup
'
,
(
req
,
res
)
=>
{
router
.
get
(
'
/signup
'
,
(
req
,
res
)
=>
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment