Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fail #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fail #12

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion middleware/authentication.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export default function ({ store, redirect }) {
export default function ({ store, redirect, req }) {
console.log(req.session)
if (store.state.user) {
return redirect('/signin')
} else {
Expand Down
14 changes: 13 additions & 1 deletion nuxt.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
const bodyParser = require('body-parser')
const session = require('express-session')
const { I18N } = require('./config')

module.exports = {
/*
** Headers of the page
Expand Down Expand Up @@ -90,7 +93,16 @@ module.exports = {
}
},
serverMiddleware: [
// body-parser middleware
bodyParser.json(),
// session middleware
session({
secret: 'thaycacac',
resave: false,
saveUninitialized: false,
cookie: { maxAge: 60000 }
}),
// API middleware
'~/server/src/app.js'
'~/server/app.js'
]
}
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
"animejs": "^2.2.0",
"aos": "^3.0.0-beta.5",
"axios": "^0.18.0",
"body-parser": "^1.18.3",
"charming": "^2.2.4",
"cross-env": "^5.0.1",
"express": "^4.15.3",
"express-generator": "^4.16.0",
"express-session": "^1.15.6",
"mongoose": "^5.2.14",
"node-sass": "^4.9.3",
"nodemon": "^1.18.4",
Expand Down
78 changes: 39 additions & 39 deletions server/src/app.js → server/app.js
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
const DBConfig = require('./configuration/config')
const express = require('express')
const app = express()
const bodyParser = require('body-parser')
const mongoose = require('mongoose')
app.use(bodyParser.urlencoded({ extended: true }))
app.use(bodyParser.json())
require('./components/users/userController')
app.listen(5000, () => {
console.log(`Server started on port 5000`)
})
mongoose.Promise = global.Promise
mongoose.connect(DBConfig.dbconfig.nameDB, {
useNewUrlParser: true
})
.then(() => {
console.log('Database connected')
})
require('./components/users/user')
require('./components/lessons/lesson')
require('./components/listlessons/listlesson')
require('./components/emails/email')
const userDAL = require('./components/users/userDAL')
app.use('/api/user', userDAL)
const lessonDAL = require('./components/lessons/lessonDAL')
app.use('/api/lesson', lessonDAL)
const listlessonDAL = require('./components/listlessons/listlessonDAL')
app.use('/api/listLesson', listlessonDAL)
const emailDAL = require('./components/emails/emailDAL')
app.use('/api/email', emailDAL)
const DBConfig = require('./configuration/config')
const express = require('express')
const app = express()
const bodyParser = require('body-parser')
const mongoose = require('mongoose')

app.use(bodyParser.urlencoded({ extended: true }))
app.use(bodyParser.json())

require('./components/users/userController')

app.listen(5000, () => {
console.log(`Server started on port 5000`)
})

mongoose.Promise = global.Promise
mongoose.connect(DBConfig.dbconfig.nameDB, {
useNewUrlParser: true
})
.then(() => {
console.log('Database connected')
})

require('./components/users/user')
require('./components/lessons/lesson')
require('./components/listlessons/listlesson')
require('./components/emails/email')

const userDAL = require('./components/users/userDAL')
app.use('/api/user', userDAL)

const lessonDAL = require('./components/lessons/lessonDAL')
app.use('/api/lesson', lessonDAL)

const listlessonDAL = require('./components/listlessons/listlessonDAL')
app.use('/api/listLesson', listlessonDAL)

const emailDAL = require('./components/emails/emailDAL')
app.use('/api/email', emailDAL)
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
const mongoose = require('mongoose')
const Schema = mongoose.Schema
const User = new Schema({
username: {
type: String,
required: true,
trim: true,
unique: true
},
firstname: {
type: String,
required: true,
trim: true
},
lastname: {
type: String,
required: true,
trim: true
},
dob: {
type: Date,
required: true
},
email: {
type: String,
required: true,
unique: true
},
password: {
type: String,
required: true
}
})
module.exports = mongoose.model('User', User)
const mongoose = require('mongoose')
const Schema = mongoose.Schema

const User = new Schema({
username: {
type: String,
required: true,
trim: true,
unique: true
},
firstname: {
type: String,
required: true,
trim: true
},
lastname: {
type: String,
required: true,
trim: true
},
dob: {
type: Date,
required: true
},
email: {
type: String,
required: true,
unique: true
},
password: {
type: String,
required: true
}
})

module.exports = mongoose.model('User', User)
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
const express = require('express')
const router = express.Router()
const mongoose = require('mongoose')
const User = mongoose.model('User')
// TODO: handel when duplicate username or email
router.post('/signup', (req, res) => {
const user = new User(req.body)
user.save()
.then(() => {
res.status(201).json({
error: 'Register success'
})
})
.catch(err => {
console.log(err)
res.status(200).json({
error: 'Account already exists'
})
})
})
router.post('/signin', (req, res) => {
let user = req.body
User.findOne({username: user.username})
.then(result => {
if (result.password === user.password) {
res.status(200).json({
mesage: 'Login success',
error: ''
})
} else {
res.status(200).json({
mesage: '',
error: 'Wrong Password'
})
}
})
.catch(err => {
console.log(err)
res.status(200).json({
message: '',
error: 'Account not registered'
})
})
})
router.post('/getProfile', (req, res) => {
let username = req.body.username
User.findOne({username: username})
.then(result => {
res.status(200).json(result)
})
.catch(err => {
console.log(err)
res.status(200).json(err)
})
})
module.exports = router
const express = require('express')
const router = express.Router()
const mongoose = require('mongoose')
const User = mongoose.model('User')

// TODO: handel when duplicate username or email
router.post('/signup', (req, res) => {
const user = new User(req.body)
user.save()
.then(() => {
res.status(201).json({
error: 'Register success'
})
})
.catch(err => {
console.log(err)
res.status(200).json({
error: 'Account already exists'
})
})
})

router.post('/signin', (req, res) => {
let user = req.body
User.findOne({username: user.username})
.then(result => {
if (result.password === user.password) {
res.status(200).json({
mesage: 'Login success',
error: ''
})
} else {
res.status(200).json({
mesage: '',
error: 'Wrong Password'
})
}
})
.catch(err => {
console.log(err)
res.status(200).json({
message: '',
error: 'Account not registered'
})
})
})

router.post('/getProfile', (req, res) => {
let username = req.body.username
User.findOne({username: username})
.then(result => {
res.status(200).json(result)
})
.catch(err => {
console.log(err)
res.status(200).json(err)
})
})

module.exports = router
File renamed without changes.
Loading