From 32de17e18f533cf18bb40348871b1fcd58bb8823 Mon Sep 17 00:00:00 2001 From: hakiemaul Date: Tue, 6 Jun 2017 20:51:44 +0700 Subject: [PATCH 1/5] backend done --- client/.babelrc | 14 ++++ client/.editorconfig | 9 +++ client/.eslintignore | 2 + client/.eslintrc.js | 27 +++++++ client/.gitignore | 6 ++ client/.postcssrc.js | 8 ++ client/README.md | 21 +++++ client/build/build.js | 35 +++++++++ client/build/check-versions.js | 48 ++++++++++++ client/build/dev-client.js | 9 +++ client/build/dev-server.js | 89 +++++++++++++++++++++ client/build/utils.js | 71 +++++++++++++++++ client/build/vue-loader.conf.js | 12 +++ client/build/webpack.base.conf.js | 67 ++++++++++++++++ client/build/webpack.dev.conf.js | 35 +++++++++ client/build/webpack.prod.conf.js | 120 +++++++++++++++++++++++++++++ client/config/dev.env.js | 6 ++ client/config/index.js | 38 +++++++++ client/config/prod.env.js | 3 + client/index.html | 11 +++ client/package.json | 69 +++++++++++++++++ client/src/App.vue | 23 ++++++ client/src/assets/logo.png | Bin 0 -> 6849 bytes client/src/components/Hello.vue | 53 +++++++++++++ client/src/main.js | 15 ++++ client/src/router/index.js | 15 ++++ client/static/.gitkeep | 0 server/.gitignore | 2 + server/app.js | 28 +++++++ server/controllers/auth.js | 82 ++++++++++++++++++++ server/controllers/responsectrl.js | 109 ++++++++++++++++++++++++++ server/controllers/threadctrl.js | 109 ++++++++++++++++++++++++++ server/controllers/userctrl.js | 68 ++++++++++++++++ server/models/response.js | 19 +++++ server/models/thread.js | 22 ++++++ server/models/user.js | 24 ++++++ server/package.json | 33 ++++++++ server/routes/index.js | 10 +++ server/routes/threads.js | 31 ++++++++ server/routes/users.js | 14 ++++ 40 files changed, 1357 insertions(+) create mode 100644 client/.babelrc create mode 100644 client/.editorconfig create mode 100644 client/.eslintignore create mode 100644 client/.eslintrc.js create mode 100644 client/.gitignore create mode 100644 client/.postcssrc.js create mode 100644 client/README.md create mode 100644 client/build/build.js create mode 100644 client/build/check-versions.js create mode 100644 client/build/dev-client.js create mode 100644 client/build/dev-server.js create mode 100644 client/build/utils.js create mode 100644 client/build/vue-loader.conf.js create mode 100644 client/build/webpack.base.conf.js create mode 100644 client/build/webpack.dev.conf.js create mode 100644 client/build/webpack.prod.conf.js create mode 100644 client/config/dev.env.js create mode 100644 client/config/index.js create mode 100644 client/config/prod.env.js create mode 100644 client/index.html create mode 100644 client/package.json create mode 100644 client/src/App.vue create mode 100644 client/src/assets/logo.png create mode 100644 client/src/components/Hello.vue create mode 100644 client/src/main.js create mode 100644 client/src/router/index.js create mode 100644 client/static/.gitkeep create mode 100644 server/.gitignore create mode 100644 server/app.js create mode 100644 server/controllers/auth.js create mode 100644 server/controllers/responsectrl.js create mode 100644 server/controllers/threadctrl.js create mode 100644 server/controllers/userctrl.js create mode 100644 server/models/response.js create mode 100644 server/models/thread.js create mode 100644 server/models/user.js create mode 100644 server/package.json create mode 100644 server/routes/index.js create mode 100644 server/routes/threads.js create mode 100644 server/routes/users.js diff --git a/client/.babelrc b/client/.babelrc new file mode 100644 index 0000000..13f0e47 --- /dev/null +++ b/client/.babelrc @@ -0,0 +1,14 @@ +{ + "presets": [ + ["env", { "modules": false }], + "stage-2" + ], + "plugins": ["transform-runtime"], + "comments": false, + "env": { + "test": { + "presets": ["env", "stage-2"], + "plugins": [ "istanbul" ] + } + } +} diff --git a/client/.editorconfig b/client/.editorconfig new file mode 100644 index 0000000..9d08a1a --- /dev/null +++ b/client/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/client/.eslintignore b/client/.eslintignore new file mode 100644 index 0000000..34af377 --- /dev/null +++ b/client/.eslintignore @@ -0,0 +1,2 @@ +build/*.js +config/*.js diff --git a/client/.eslintrc.js b/client/.eslintrc.js new file mode 100644 index 0000000..67c085d --- /dev/null +++ b/client/.eslintrc.js @@ -0,0 +1,27 @@ +// http://eslint.org/docs/user-guide/configuring + +module.exports = { + root: true, + parser: 'babel-eslint', + parserOptions: { + sourceType: 'module' + }, + env: { + browser: true, + }, + // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style + extends: 'standard', + // required to lint *.vue files + plugins: [ + 'html' + ], + // add your custom rules here + 'rules': { + // allow paren-less arrow functions + 'arrow-parens': 0, + // allow async-await + 'generator-star-spacing': 0, + // allow debugger during development + 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0 + } +} diff --git a/client/.gitignore b/client/.gitignore new file mode 100644 index 0000000..09552ad --- /dev/null +++ b/client/.gitignore @@ -0,0 +1,6 @@ +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/client/.postcssrc.js b/client/.postcssrc.js new file mode 100644 index 0000000..ea9a5ab --- /dev/null +++ b/client/.postcssrc.js @@ -0,0 +1,8 @@ +// https://github.com/michael-ciniawsky/postcss-load-config + +module.exports = { + "plugins": { + // to edit target browsers: use "browserlist" field in package.json + "autoprefixer": {} + } +} diff --git a/client/README.md b/client/README.md new file mode 100644 index 0000000..565bd2a --- /dev/null +++ b/client/README.md @@ -0,0 +1,21 @@ +# hacktivoverflow + +> A Vue.js project + +## Build Setup + +``` bash +# install dependencies +npm install + +# serve with hot reload at localhost:8080 +npm run dev + +# build for production with minification +npm run build + +# build for production and view the bundle analyzer report +npm run build --report +``` + +For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). diff --git a/client/build/build.js b/client/build/build.js new file mode 100644 index 0000000..6b8add1 --- /dev/null +++ b/client/build/build.js @@ -0,0 +1,35 @@ +require('./check-versions')() + +process.env.NODE_ENV = 'production' + +var ora = require('ora') +var rm = require('rimraf') +var path = require('path') +var chalk = require('chalk') +var webpack = require('webpack') +var config = require('../config') +var webpackConfig = require('./webpack.prod.conf') + +var spinner = ora('building for production...') +spinner.start() + +rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { + if (err) throw err + webpack(webpackConfig, function (err, stats) { + spinner.stop() + if (err) throw err + process.stdout.write(stats.toString({ + colors: true, + modules: false, + children: false, + chunks: false, + chunkModules: false + }) + '\n\n') + + console.log(chalk.cyan(' Build complete.\n')) + console.log(chalk.yellow( + ' Tip: built files are meant to be served over an HTTP server.\n' + + ' Opening index.html over file:// won\'t work.\n' + )) + }) +}) diff --git a/client/build/check-versions.js b/client/build/check-versions.js new file mode 100644 index 0000000..100f3a0 --- /dev/null +++ b/client/build/check-versions.js @@ -0,0 +1,48 @@ +var chalk = require('chalk') +var semver = require('semver') +var packageConfig = require('../package.json') +var shell = require('shelljs') +function exec (cmd) { + return require('child_process').execSync(cmd).toString().trim() +} + +var versionRequirements = [ + { + name: 'node', + currentVersion: semver.clean(process.version), + versionRequirement: packageConfig.engines.node + }, +] + +if (shell.which('npm')) { + versionRequirements.push({ + name: 'npm', + currentVersion: exec('npm --version'), + versionRequirement: packageConfig.engines.npm + }) +} + +module.exports = function () { + var warnings = [] + for (var i = 0; i < versionRequirements.length; i++) { + var mod = versionRequirements[i] + if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { + warnings.push(mod.name + ': ' + + chalk.red(mod.currentVersion) + ' should be ' + + chalk.green(mod.versionRequirement) + ) + } + } + + if (warnings.length) { + console.log('') + console.log(chalk.yellow('To use this template, you must update following to modules:')) + console.log() + for (var i = 0; i < warnings.length; i++) { + var warning = warnings[i] + console.log(' ' + warning) + } + console.log() + process.exit(1) + } +} diff --git a/client/build/dev-client.js b/client/build/dev-client.js new file mode 100644 index 0000000..18aa1e2 --- /dev/null +++ b/client/build/dev-client.js @@ -0,0 +1,9 @@ +/* eslint-disable */ +require('eventsource-polyfill') +var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true') + +hotClient.subscribe(function (event) { + if (event.action === 'reload') { + window.location.reload() + } +}) diff --git a/client/build/dev-server.js b/client/build/dev-server.js new file mode 100644 index 0000000..782dc6f --- /dev/null +++ b/client/build/dev-server.js @@ -0,0 +1,89 @@ +require('./check-versions')() + +var config = require('../config') +if (!process.env.NODE_ENV) { + process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV) +} + +var opn = require('opn') +var path = require('path') +var express = require('express') +var webpack = require('webpack') +var proxyMiddleware = require('http-proxy-middleware') +var webpackConfig = require('./webpack.dev.conf') + +// default port where dev server listens for incoming traffic +var port = process.env.PORT || config.dev.port +// automatically open browser, if not set will be false +var autoOpenBrowser = !!config.dev.autoOpenBrowser +// Define HTTP proxies to your custom API backend +// https://github.com/chimurai/http-proxy-middleware +var proxyTable = config.dev.proxyTable + +var app = express() +var compiler = webpack(webpackConfig) + +var devMiddleware = require('webpack-dev-middleware')(compiler, { + publicPath: webpackConfig.output.publicPath, + quiet: true +}) + +var hotMiddleware = require('webpack-hot-middleware')(compiler, { + log: () => {} +}) +// force page reload when html-webpack-plugin template changes +compiler.plugin('compilation', function (compilation) { + compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) { + hotMiddleware.publish({ action: 'reload' }) + cb() + }) +}) + +// proxy api requests +Object.keys(proxyTable).forEach(function (context) { + var options = proxyTable[context] + if (typeof options === 'string') { + options = { target: options } + } + app.use(proxyMiddleware(options.filter || context, options)) +}) + +// handle fallback for HTML5 history API +app.use(require('connect-history-api-fallback')()) + +// serve webpack bundle output +app.use(devMiddleware) + +// enable hot-reload and state-preserving +// compilation error display +app.use(hotMiddleware) + +// serve pure static assets +var staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory) +app.use(staticPath, express.static('./static')) + +var uri = 'http://localhost:' + port + +var _resolve +var readyPromise = new Promise(resolve => { + _resolve = resolve +}) + +console.log('> Starting dev server...') +devMiddleware.waitUntilValid(() => { + console.log('> Listening at ' + uri + '\n') + // when env is testing, don't need open it + if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') { + opn(uri) + } + _resolve() +}) + +var server = app.listen(port) + +module.exports = { + ready: readyPromise, + close: () => { + server.close() + } +} diff --git a/client/build/utils.js b/client/build/utils.js new file mode 100644 index 0000000..b1d54b4 --- /dev/null +++ b/client/build/utils.js @@ -0,0 +1,71 @@ +var path = require('path') +var config = require('../config') +var ExtractTextPlugin = require('extract-text-webpack-plugin') + +exports.assetsPath = function (_path) { + var assetsSubDirectory = process.env.NODE_ENV === 'production' + ? config.build.assetsSubDirectory + : config.dev.assetsSubDirectory + return path.posix.join(assetsSubDirectory, _path) +} + +exports.cssLoaders = function (options) { + options = options || {} + + var cssLoader = { + loader: 'css-loader', + options: { + minimize: process.env.NODE_ENV === 'production', + sourceMap: options.sourceMap + } + } + + // generate loader string to be used with extract text plugin + function generateLoaders (loader, loaderOptions) { + var loaders = [cssLoader] + if (loader) { + loaders.push({ + loader: loader + '-loader', + options: Object.assign({}, loaderOptions, { + sourceMap: options.sourceMap + }) + }) + } + + // Extract CSS when that option is specified + // (which is the case during production build) + if (options.extract) { + return ExtractTextPlugin.extract({ + use: loaders, + fallback: 'vue-style-loader' + }) + } else { + return ['vue-style-loader'].concat(loaders) + } + } + + // https://vue-loader.vuejs.org/en/configurations/extract-css.html + return { + css: generateLoaders(), + postcss: generateLoaders(), + less: generateLoaders('less'), + sass: generateLoaders('sass', { indentedSyntax: true }), + scss: generateLoaders('sass'), + stylus: generateLoaders('stylus'), + styl: generateLoaders('stylus') + } +} + +// Generate loaders for standalone style files (outside of .vue) +exports.styleLoaders = function (options) { + var output = [] + var loaders = exports.cssLoaders(options) + for (var extension in loaders) { + var loader = loaders[extension] + output.push({ + test: new RegExp('\\.' + extension + '$'), + use: loader + }) + } + return output +} diff --git a/client/build/vue-loader.conf.js b/client/build/vue-loader.conf.js new file mode 100644 index 0000000..7aee79b --- /dev/null +++ b/client/build/vue-loader.conf.js @@ -0,0 +1,12 @@ +var utils = require('./utils') +var config = require('../config') +var isProduction = process.env.NODE_ENV === 'production' + +module.exports = { + loaders: utils.cssLoaders({ + sourceMap: isProduction + ? config.build.productionSourceMap + : config.dev.cssSourceMap, + extract: isProduction + }) +} diff --git a/client/build/webpack.base.conf.js b/client/build/webpack.base.conf.js new file mode 100644 index 0000000..f47b326 --- /dev/null +++ b/client/build/webpack.base.conf.js @@ -0,0 +1,67 @@ +var path = require('path') +var utils = require('./utils') +var config = require('../config') +var vueLoaderConfig = require('./vue-loader.conf') + +function resolve (dir) { + return path.join(__dirname, '..', dir) +} + +module.exports = { + entry: { + app: './src/main.js' + }, + output: { + path: config.build.assetsRoot, + filename: '[name].js', + publicPath: process.env.NODE_ENV === 'production' + ? config.build.assetsPublicPath + : config.dev.assetsPublicPath + }, + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: { + 'vue$': 'vue/dist/vue.esm.js', + '@': resolve('src') + } + }, + module: { + rules: [ + { + test: /\.(js|vue)$/, + loader: 'eslint-loader', + enforce: 'pre', + include: [resolve('src'), resolve('test')], + options: { + formatter: require('eslint-friendly-formatter') + } + }, + { + test: /\.vue$/, + loader: 'vue-loader', + options: vueLoaderConfig + }, + { + test: /\.js$/, + loader: 'babel-loader', + include: [resolve('src'), resolve('test')] + }, + { + test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, + loader: 'url-loader', + options: { + limit: 10000, + name: utils.assetsPath('img/[name].[hash:7].[ext]') + } + }, + { + test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, + loader: 'url-loader', + options: { + limit: 10000, + name: utils.assetsPath('fonts/[name].[hash:7].[ext]') + } + } + ] + } +} diff --git a/client/build/webpack.dev.conf.js b/client/build/webpack.dev.conf.js new file mode 100644 index 0000000..5470402 --- /dev/null +++ b/client/build/webpack.dev.conf.js @@ -0,0 +1,35 @@ +var utils = require('./utils') +var webpack = require('webpack') +var config = require('../config') +var merge = require('webpack-merge') +var baseWebpackConfig = require('./webpack.base.conf') +var HtmlWebpackPlugin = require('html-webpack-plugin') +var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') + +// add hot-reload related code to entry chunks +Object.keys(baseWebpackConfig.entry).forEach(function (name) { + baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name]) +}) + +module.exports = merge(baseWebpackConfig, { + module: { + rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap }) + }, + // cheap-module-eval-source-map is faster for development + devtool: '#cheap-module-eval-source-map', + plugins: [ + new webpack.DefinePlugin({ + 'process.env': config.dev.env + }), + // https://github.com/glenjamin/webpack-hot-middleware#installation--usage + new webpack.HotModuleReplacementPlugin(), + new webpack.NoEmitOnErrorsPlugin(), + // https://github.com/ampedandwired/html-webpack-plugin + new HtmlWebpackPlugin({ + filename: 'index.html', + template: 'index.html', + inject: true + }), + new FriendlyErrorsPlugin() + ] +}) diff --git a/client/build/webpack.prod.conf.js b/client/build/webpack.prod.conf.js new file mode 100644 index 0000000..da44b65 --- /dev/null +++ b/client/build/webpack.prod.conf.js @@ -0,0 +1,120 @@ +var path = require('path') +var utils = require('./utils') +var webpack = require('webpack') +var config = require('../config') +var merge = require('webpack-merge') +var baseWebpackConfig = require('./webpack.base.conf') +var CopyWebpackPlugin = require('copy-webpack-plugin') +var HtmlWebpackPlugin = require('html-webpack-plugin') +var ExtractTextPlugin = require('extract-text-webpack-plugin') +var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') + +var env = config.build.env + +var webpackConfig = merge(baseWebpackConfig, { + module: { + rules: utils.styleLoaders({ + sourceMap: config.build.productionSourceMap, + extract: true + }) + }, + devtool: config.build.productionSourceMap ? '#source-map' : false, + output: { + path: config.build.assetsRoot, + filename: utils.assetsPath('js/[name].[chunkhash].js'), + chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') + }, + plugins: [ + // http://vuejs.github.io/vue-loader/en/workflow/production.html + new webpack.DefinePlugin({ + 'process.env': env + }), + new webpack.optimize.UglifyJsPlugin({ + compress: { + warnings: false + }, + sourceMap: true + }), + // extract css into its own file + new ExtractTextPlugin({ + filename: utils.assetsPath('css/[name].[contenthash].css') + }), + // Compress extracted CSS. We are using this plugin so that possible + // duplicated CSS from different components can be deduped. + new OptimizeCSSPlugin({ + cssProcessorOptions: { + safe: true + } + }), + // generate dist index.html with correct asset hash for caching. + // you can customize output by editing /index.html + // see https://github.com/ampedandwired/html-webpack-plugin + new HtmlWebpackPlugin({ + filename: config.build.index, + template: 'index.html', + inject: true, + minify: { + removeComments: true, + collapseWhitespace: true, + removeAttributeQuotes: true + // more options: + // https://github.com/kangax/html-minifier#options-quick-reference + }, + // necessary to consistently work with multiple chunks via CommonsChunkPlugin + chunksSortMode: 'dependency' + }), + // split vendor js into its own file + new webpack.optimize.CommonsChunkPlugin({ + name: 'vendor', + minChunks: function (module, count) { + // any required modules inside node_modules are extracted to vendor + return ( + module.resource && + /\.js$/.test(module.resource) && + module.resource.indexOf( + path.join(__dirname, '../node_modules') + ) === 0 + ) + } + }), + // extract webpack runtime and module manifest to its own file in order to + // prevent vendor hash from being updated whenever app bundle is updated + new webpack.optimize.CommonsChunkPlugin({ + name: 'manifest', + chunks: ['vendor'] + }), + // copy custom static assets + new CopyWebpackPlugin([ + { + from: path.resolve(__dirname, '../static'), + to: config.build.assetsSubDirectory, + ignore: ['.*'] + } + ]) + ] +}) + +if (config.build.productionGzip) { + var CompressionWebpackPlugin = require('compression-webpack-plugin') + + webpackConfig.plugins.push( + new CompressionWebpackPlugin({ + asset: '[path].gz[query]', + algorithm: 'gzip', + test: new RegExp( + '\\.(' + + config.build.productionGzipExtensions.join('|') + + ')$' + ), + threshold: 10240, + minRatio: 0.8 + }) + ) +} + +if (config.build.bundleAnalyzerReport) { + var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin + webpackConfig.plugins.push(new BundleAnalyzerPlugin()) +} + +module.exports = webpackConfig diff --git a/client/config/dev.env.js b/client/config/dev.env.js new file mode 100644 index 0000000..efead7c --- /dev/null +++ b/client/config/dev.env.js @@ -0,0 +1,6 @@ +var merge = require('webpack-merge') +var prodEnv = require('./prod.env') + +module.exports = merge(prodEnv, { + NODE_ENV: '"development"' +}) diff --git a/client/config/index.js b/client/config/index.js new file mode 100644 index 0000000..196da1f --- /dev/null +++ b/client/config/index.js @@ -0,0 +1,38 @@ +// see http://vuejs-templates.github.io/webpack for documentation. +var path = require('path') + +module.exports = { + build: { + env: require('./prod.env'), + index: path.resolve(__dirname, '../dist/index.html'), + assetsRoot: path.resolve(__dirname, '../dist'), + assetsSubDirectory: 'static', + assetsPublicPath: '/', + productionSourceMap: true, + // Gzip off by default as many popular static hosts such as + // Surge or Netlify already gzip all static assets for you. + // Before setting to `true`, make sure to: + // npm install --save-dev compression-webpack-plugin + productionGzip: false, + productionGzipExtensions: ['js', 'css'], + // Run the build command with an extra argument to + // View the bundle analyzer report after build finishes: + // `npm run build --report` + // Set to `true` or `false` to always turn it on or off + bundleAnalyzerReport: process.env.npm_config_report + }, + dev: { + env: require('./dev.env'), + port: 8080, + autoOpenBrowser: true, + assetsSubDirectory: 'static', + assetsPublicPath: '/', + proxyTable: {}, + // CSS Sourcemaps off by default because relative paths are "buggy" + // with this option, according to the CSS-Loader README + // (https://github.com/webpack/css-loader#sourcemaps) + // In our experience, they generally work as expected, + // just be aware of this issue when enabling this option. + cssSourceMap: false + } +} diff --git a/client/config/prod.env.js b/client/config/prod.env.js new file mode 100644 index 0000000..773d263 --- /dev/null +++ b/client/config/prod.env.js @@ -0,0 +1,3 @@ +module.exports = { + NODE_ENV: '"production"' +} diff --git a/client/index.html b/client/index.html new file mode 100644 index 0000000..fd5afb3 --- /dev/null +++ b/client/index.html @@ -0,0 +1,11 @@ + + + + + hacktivoverflow + + +
+ + + diff --git a/client/package.json b/client/package.json new file mode 100644 index 0000000..dbd1963 --- /dev/null +++ b/client/package.json @@ -0,0 +1,69 @@ +{ + "name": "hacktivoverflow", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "hakiemaul ", + "private": true, + "scripts": { + "dev": "node build/dev-server.js", + "start": "node build/dev-server.js", + "build": "node build/build.js", + "lint": "eslint --ext .js,.vue src" + }, + "dependencies": { + "vue": "^2.3.3", + "vue-router": "^2.3.1" + }, + "devDependencies": { + "autoprefixer": "^6.7.2", + "babel-core": "^6.22.1", + "babel-eslint": "^7.1.1", + "babel-loader": "^6.2.10", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "babel-register": "^6.22.0", + "chalk": "^1.1.3", + "connect-history-api-fallback": "^1.3.0", + "copy-webpack-plugin": "^4.0.1", + "css-loader": "^0.28.0", + "eslint": "^3.19.0", + "eslint-friendly-formatter": "^2.0.7", + "eslint-loader": "^1.7.1", + "eslint-plugin-html": "^2.0.0", + "eslint-config-standard": "^6.2.1", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^2.0.1", + "eventsource-polyfill": "^0.9.6", + "express": "^4.14.1", + "extract-text-webpack-plugin": "^2.0.0", + "file-loader": "^0.11.1", + "friendly-errors-webpack-plugin": "^1.1.3", + "html-webpack-plugin": "^2.28.0", + "http-proxy-middleware": "^0.17.3", + "webpack-bundle-analyzer": "^2.2.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "opn": "^4.0.2", + "optimize-css-assets-webpack-plugin": "^1.3.0", + "ora": "^1.2.0", + "rimraf": "^2.6.0", + "url-loader": "^0.5.8", + "vue-loader": "^12.1.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.3.3", + "webpack": "^2.6.1", + "webpack-dev-middleware": "^1.10.0", + "webpack-hot-middleware": "^2.18.0", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 4.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/client/src/App.vue b/client/src/App.vue new file mode 100644 index 0000000..97c2c84 --- /dev/null +++ b/client/src/App.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/client/src/assets/logo.png b/client/src/assets/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43 GIT binary patch literal 6849 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 +
+

{{ msg }}

+

Essential Links

+ +

Ecosystem

+ +
+ + + + + + diff --git a/client/src/main.js b/client/src/main.js new file mode 100644 index 0000000..ec10971 --- /dev/null +++ b/client/src/main.js @@ -0,0 +1,15 @@ +// The Vue build version to load with the `import` command +// (runtime-only or standalone) has been set in webpack.base.conf with an alias. +import Vue from 'vue' +import App from './App' +import router from './router' + +Vue.config.productionTip = false + +/* eslint-disable no-new */ +new Vue({ + el: '#app', + router, + template: '', + components: { App } +}) diff --git a/client/src/router/index.js b/client/src/router/index.js new file mode 100644 index 0000000..5bf9ea6 --- /dev/null +++ b/client/src/router/index.js @@ -0,0 +1,15 @@ +import Vue from 'vue' +import Router from 'vue-router' +import Hello from '@/components/Hello' + +Vue.use(Router) + +export default new Router({ + routes: [ + { + path: '/', + name: 'Hello', + component: Hello + } + ] +}) diff --git a/client/static/.gitkeep b/client/static/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 0000000..1dcef2d --- /dev/null +++ b/server/.gitignore @@ -0,0 +1,2 @@ +node_modules +.env \ No newline at end of file diff --git a/server/app.js b/server/app.js new file mode 100644 index 0000000..3de9326 --- /dev/null +++ b/server/app.js @@ -0,0 +1,28 @@ +const express = require('express'); +const bodyParser = require('body-parser'); +var app = express() +var mongoose = require('mongoose'); +var users = require('./routes/users'); +var threads = require('./routes/threads'); +var index = require('./routes/index'); + +var db_config = { + development: 'mongodb://localhost/hacktivoverflow', + test: 'mongodb://localhost/hacktivoverflow-test' +} + +var current_env = app.settings.env + +mongoose.connect(db_config[current_env]) + + +app.use(bodyParser.json()); +app.use(bodyParser.urlencoded({ extended: false })); + +app.use('/', index) +app.use('/api/users', users) +app.use('/api/threads', threads) + +app.listen(3000) + +module.exports = app; \ No newline at end of file diff --git a/server/controllers/auth.js b/server/controllers/auth.js new file mode 100644 index 0000000..31066bf --- /dev/null +++ b/server/controllers/auth.js @@ -0,0 +1,82 @@ +require('dotenv').config(); +const sec = process.env.TOKEN_SECRET; +const saltRounds = Number(process.env.SALT_ROUNDS); + +var User = require('../models/user'); +var bcrypt = require('bcrypt'); +var jwt = require('jsonwebtoken'); + +var login = function(req, res, next) { + var email = req.body.email; + var password = req.body.password; + + User.findOne({ email: email }, function(err, user) { + if(err) res.send(err); + if(user) { + bcrypt.compare(password, user.password) + .then(result => { + if(result) { + var token = jwt.sign({id: user._id, name: user.name, email: user.email }, sec); + res.send({token: token}) + } else { + res.send({ msg: 'Incorrect password' }); + } + }) + .catch(err => console.log(err)) + } else res.send({ msg: 'No such user' }) + }) +} + +var signup = function(req, res, next) { + var salt = bcrypt.genSaltSync(saltRounds); + var hash = bcrypt.hashSync(req.body.password, salt); + + var newUser = new User({ + name: req.body.name, + username: req.body.username, + email: req.body.email, + password: hash + }) + newUser.save((err, user) => { + if(err) { + res.send(err.errors) + } else res.send(user) + }) +} + +var userInfo = function(req, res, next) { + let token = req.body.token + + if(token) { + jwt.verify(token, sec, (err, decoded) => { + if(!err) { + req.body.user = decoded._id; + next() + } else { + res.send(err) + } + }) + } else { + res.send({msg: 'Not logged in'}) + } +} + +var authUser = function(req, res, next) { + let token = req.body.token + + if(token) { + jwt.verify(token, sec, (err, decoded) => { + if(decoded.id == req.params.id) { + next() + } else { + res.send(err) + } + }) + } else { + res.send({msg: 'Not logged in'}) + } +} + +module.exports = { + login, signup, userInfo, authUser +}; diff --git a/server/controllers/responsectrl.js b/server/controllers/responsectrl.js new file mode 100644 index 0000000..5bfec8c --- /dev/null +++ b/server/controllers/responsectrl.js @@ -0,0 +1,109 @@ +var Response = require('../models/response'); + +var create = function(req, res) { + let newResponse = new Response({ + title: req.body.title, + responseContent: req.body.responseContent, + creator: req.body.user, + parent: req.params.id, + createdAt: new Date() + }) + newResponse.save((err, createdResponse) => { + if(err) { + res.send(err) + } else { + res.send(createdResponse) + } + }) +} + +var get = function(req, res) { + Response.find(function (err, responses) { + res.send(err ? err : responses) + }); +} + +var getOne = function(req, res) { + Response.findById(req.params.repid, (err, response) => { + res.send(err ? err: response) + }) +} + +var update = function(req, res) { + Response.findById(req.params.repid, (err, response) => { + if(response.creator == req.body.user) { + response.responseContent = req.body.responseContent || response.responseContent + response.updatedAt = new Date() + response.save((err, editedResponse) => { + if(err) { + res.send(err) + } else { + res.send(editedResponse) + } + }) + } else { + res.send('Not authorized') + } + }) +} + +var upvote = function(req, res) { + Response.findById(req.params.repid, (err, response) => { + if(response.creator == req.body.user) { + var idxUp = response.upvotes.indexOf(req.body.user); + var idxDown = response.downvotes.indexOf(req.body.user); + if(idxUp == -1 && idxDown == -1) { + response.upvotes.push(req.body.user) + } else if (idxDown !== -1) { + response.downvotes.splice(idxDown, 1) + } + response.save((err, upvotedResponse) => { + if(err) { + res.send(err) + } else { + res.send(upvotedResponse) + } + }) + } else { + res.send('Not authorized') + } + }) +} + +var downvote = function(req, res) { + Response.findById(req.params.repid, (err, response) => { + if(response.creator == req.body.user) { + if(idxUp == -1 && idxDown == -1) { + response.downvotes.push(req.body.user) + } else if (idxUp !== -1) { + response.upvotes.splice(idxDown, 1) + } + response.save((err, downvotedResponse) => { + if(err) { + res.send(err) + } else { + res.send(downvotedResponse) + } + }) + } else { + res.send('Not authorized') + } + }) +} + +var remove = function(req, res) { + Response.findById(req.params.repid, (err, response) => { + if(response.creator == req.body.user) { + Response.findOneAndRemove({_id: req.params.repid}, (err, response) => { + if(err) res.send(err) + res.send(response) + }) + } else { + res.send('Not authorized') + } + }) +} + +module.exports = { + create, get, getOne, update, upvote, downvote, remove +}; \ No newline at end of file diff --git a/server/controllers/threadctrl.js b/server/controllers/threadctrl.js new file mode 100644 index 0000000..94e0789 --- /dev/null +++ b/server/controllers/threadctrl.js @@ -0,0 +1,109 @@ +var Thread = require('../models/thread'); + +var create = function(req, res) { + let newThread = new Thread({ + title: req.body.title, + threadContent: req.body.content, + creator: req.body.user, + createdAt: new Date() + }) + newThread.save((err, createdThread) => { + if(err) { + res.send(err) + } else { + res.send(createdThread) + } + }) +} + +var get = function(req, res) { + Thread.find(function (err, threads) { + res.send(err ? err : threads) + }); +} + +var getOne = function(req, res) { + Thread.findById(req.params.id, (err, thread) => { + res.send(err ? err: thread) + }) +} + +var update = function(req, res) { + Thread.findById(req.params.id, (err, thread) => { + if(thread.creator == req.body.user) { + thread.title = req.body.title || thread.title + thread.threadContent = req.body.threadContent || thread.threadContent + thread.updatedAt = new Date() + thread.save((err, editedThread) => { + if(err) { + res.send(err) + } else { + res.send(editedThread) + } + }) + } else { + res.send('Not authorized') + } + }) +} + +var upvote = function(req, res) { + Thread.findById(req.params.id, (err, thread) => { + if(thread.creator == req.body.user) { + var idxUp = thread.upvotes.indexOf(req.body.user); + var idxDown = thread.downvotes.indexOf(req.body.user); + if(idxUp == -1 && idxDown == -1) { + thread.upvotes.push(req.body.user) + } else if (idxDown !== -1) { + thread.downvotes.splice(idxDown, 1) + } + thread.save((err, upvotedThread) => { + if(err) { + res.send(err) + } else { + res.send(upvotedThread) + } + }) + } else { + res.send('Not authorized') + } + }) +} + +var downvote = function(req, res) { + Thread.findById(req.params.id, (err, thread) => { + if(thread.creator == req.body.user) { + if(idxUp == -1 && idxDown == -1) { + thread.downvotes.push(req.body.user) + } else if (idxUp !== -1) { + thread.upvotes.splice(idxDown, 1) + } + thread.save((err, downvotedThread) => { + if(err) { + res.send(err) + } else { + res.send(downvotedThread) + } + }) + } else { + res.send('Not authorized') + } + }) +} + +var remove = function(req, res) { + Thread.findById(req.params.id, (err, thread) => { + if(thread.creator == req.body.user) { + Thread.findOneAndRemove({_id: req.params.id}, (err, thread) => { + if(err) res.send(err) + res.send(thread) + }) + } else { + res.send('Not authorized') + } + }) +} + +module.exports = { + create, get, getOne, update, upvote, downvote, remove +}; \ No newline at end of file diff --git a/server/controllers/userctrl.js b/server/controllers/userctrl.js new file mode 100644 index 0000000..e3ccff4 --- /dev/null +++ b/server/controllers/userctrl.js @@ -0,0 +1,68 @@ +require('dotenv').config(); +const saltRounds = Number(process.env.SALT_ROUNDS); + +var bcrypt = require('bcrypt'); +var User = require('../models/user'); + +var create = function(req, res) { + var salt = bcrypt.genSaltSync(saltRounds); + var hash = bcrypt.hashSync(req.body.password, salt); + let newUser = new User({ + name: req.body.name, + email: req.body.email, + password: hash + }) + newUser.save((err, createdUser) => { + if(err) { + res.send(err) + } else { + res.send(createdUser) + } + }) +} + +var get = function(req, res) { + User.find(function (err, users) { + res.send(err ? err : users) + }); +} + +var getOne = function(req, res) { + User.findById(req.params.id, (err, user) => { + res.send(err ? err: user) + }) +} + +var update = function(req, res) { + User.findById(req.params.id, (err, user) => { + if(err) { + res.send(err) + } else { + if(req.body.password) { + var salt = bcrypt.genSaltSync(saltRounds); + var hash = bcrypt.hashSync(req.body.password, salt); + user.password = hash; + } + user.name = req.body.name || user.name + user.email = req.body.email || user.email + user.save((err, editedUser) => { + if(err) { + res.send(err) + } else { + res.send(editedUser) + } + }) + } + }) +} + +var remove = function(req, res) { + User.findOneAndRemove({_id: req.params.id}, (err, user) => { + if(err) res.send(err) + res.send(user) + }) +} + +module.exports = { + create, get, getOne, update, remove +}; \ No newline at end of file diff --git a/server/models/response.js b/server/models/response.js new file mode 100644 index 0000000..dd8a17a --- /dev/null +++ b/server/models/response.js @@ -0,0 +1,19 @@ +var mongoose = require('mongoose'); +var Schema = mongoose.Schema; + +var responseSchema = mongoose.Schema({ + responseContent: { + type: String, + required: [true, 'Please enter thread\'s title'] + }, + parent: { type: Schema.Types.ObjectId, ref: 'Thread' }, + creator: { type: Schema.Types.ObjectId, ref: 'User' }, + upvotes: [{ type: Schema.Types.ObjectId, ref: 'User' }], + downvotes: [{ type: Schema.Types.ObjectId, ref: 'User' }], + createdAt: Date, + updatedAt: Date +}); + +var Response = mongoose.model('Response', responseSchema); + +module.exports = Response; \ No newline at end of file diff --git a/server/models/thread.js b/server/models/thread.js new file mode 100644 index 0000000..1b4da52 --- /dev/null +++ b/server/models/thread.js @@ -0,0 +1,22 @@ +var mongoose = require('mongoose'); +var Schema = mongoose.Schema; + +var threadSchema = mongoose.Schema({ + title: { + type: String, + required: [true, 'Please enter thread\'s title'] + }, + threadContent: { + type: String, + required: [true, 'Please enter thread\'s content'] + }, + creator: { type: Schema.Types.ObjectId, ref: 'User' }, + upvotes: [{ type: Schema.Types.ObjectId, ref: 'User' }], + downvotes: [{ type: Schema.Types.ObjectId, ref: 'User' }], + createdAt: Date, + updatedAt: Date +}); + +var Thread = mongoose.model('Thread', threadSchema); + +module.exports = Thread; \ No newline at end of file diff --git a/server/models/user.js b/server/models/user.js new file mode 100644 index 0000000..de8c035 --- /dev/null +++ b/server/models/user.js @@ -0,0 +1,24 @@ +var mongoose = require('mongoose'); +var validator = require('validator'); + +var userSchema = mongoose.Schema({ + name: { + type: String, + required: [true, 'Mohon masukkan nama anda'] + }, + password: { + type: String, + required: [true, 'Mohon masukkan kata sandi anda'] + }, + email: { + type: String, + required: true, + validate: function(v) { + return validator.isEmail(v); + } + } +}); + +var User = mongoose.model('User', userSchema); + +module.exports = User; \ No newline at end of file diff --git a/server/package.json b/server/package.json new file mode 100644 index 0000000..e368739 --- /dev/null +++ b/server/package.json @@ -0,0 +1,33 @@ +{ + "name": "hacktivoverflow", + "version": "1.0.0", + "description": "server for hacktivoverflow q&a app", + "main": "app.js", + "scripts": { + "start": "node app.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/hakiemaul/hacktivoverflow.git" + }, + "keywords": [ + "vue", + "component" + ], + "author": "hakiemaul", + "license": "ISC", + "bugs": { + "url": "https://github.com/hakiemaul/hacktivoverflow/issues" + }, + "homepage": "https://github.com/hakiemaul/hacktivoverflow#readme", + "dependencies": { + "bcrypt": "^1.0.2", + "body-parser": "^1.17.2", + "cors": "^2.8.3", + "dotenv": "^4.0.0", + "express": "^4.15.3", + "jsonwebtoken": "^7.4.1", + "mongoose": "^4.10.4", + "validator": "^7.0.0" + } +} diff --git a/server/routes/index.js b/server/routes/index.js new file mode 100644 index 0000000..cbff35e --- /dev/null +++ b/server/routes/index.js @@ -0,0 +1,10 @@ +var express = require('express'); +var router = express.Router(); + +var auth = require('../controllers/auth'); + +router.post('/signup', auth.signup) + +router.post('/login', auth.login) + +module.exports = router; \ No newline at end of file diff --git a/server/routes/threads.js b/server/routes/threads.js new file mode 100644 index 0000000..5543d32 --- /dev/null +++ b/server/routes/threads.js @@ -0,0 +1,31 @@ +var express = require('express'); +var router = express.Router(); +var threadctrl = require('../controllers/threadctrl'); +var responsectrl = require('../controllers/responsectrl'); +var auth = require('../controllers/auth') + +router.get('/', threadctrl.get) + +router.get('/:id/replies', threadctrl.get) + +router.post('/', auth.userInfo, threadctrl.create) + +router.post('/:id/reply', auth.userInfo, responsectrl.create) + +router.put('/:id', auth.userInfo, threadctrl.update) + +router.put('/:id/reply/:repid', auth.userInfo, responsectrl.update) + +router.put('/:id/upvote', auth.userInfo, threadctrl.upvote) + +router.put('/:id/reply/:repid/upvote', auth.userInfo, responsectrl.upvote) + +router.put('/:id/downvote', auth.userInfo, threadctrl.downvote) + +router.put('/:id/reply/:repid/downvote', auth.userInfo, responsectrl.downvote) + +router.delete('/:id', auth.userInfo, threadctrl.remove) + +router.delete('/:id/reply/:repid', auth.userInfo, responsectrl.remove) + +module.exports = router; \ No newline at end of file diff --git a/server/routes/users.js b/server/routes/users.js new file mode 100644 index 0000000..94f7005 --- /dev/null +++ b/server/routes/users.js @@ -0,0 +1,14 @@ +var express = require('express'); +var router = express.Router(); +var userctrl = require('../controllers/userctrl'); +var auth = require('../controllers/auth') + +router.get('/', userctrl.get) + +router.post('/', userctrl.create) + +router.put('/:id', auth.authUser, userctrl.update) + +router.delete('/:id', auth.authUser, userctrl.remove) + +module.exports = router; \ No newline at end of file From a3cc4bfefe643d1c185389caaf0848c7088f6143 Mon Sep 17 00:00:00 2001 From: hakiemaul Date: Wed, 7 Jun 2017 23:15:07 +0700 Subject: [PATCH 2/5] authentication page done --- client/package.json | 3 + client/src/App.vue | 34 ++++++++- client/src/components/Auth.vue | 109 +++++++++++++++++++++++++++ client/src/components/Jumbotron.vue | 15 ++++ client/src/components/MainPage.vue | 0 client/src/components/NavBar.vue | 53 +++++++++++++ client/src/components/Thread.vue | 40 ++++++++++ client/src/components/ThreadList.vue | 15 ++++ client/src/router/index.js | 13 +++- server/app.js | 3 +- server/controllers/auth.js | 19 ++++- server/models/thread.js | 1 + server/routes/index.js | 2 + 13 files changed, 299 insertions(+), 8 deletions(-) create mode 100644 client/src/components/Auth.vue create mode 100644 client/src/components/Jumbotron.vue create mode 100644 client/src/components/MainPage.vue create mode 100644 client/src/components/NavBar.vue create mode 100644 client/src/components/Thread.vue create mode 100644 client/src/components/ThreadList.vue diff --git a/client/package.json b/client/package.json index dbd1963..b44d805 100644 --- a/client/package.json +++ b/client/package.json @@ -11,7 +11,10 @@ "lint": "eslint --ext .js,.vue src" }, "dependencies": { + "axios": "^0.16.2", + "bootstrap-vue": "^0.16.1", "vue": "^2.3.3", + "vue-axios": "^2.0.2", "vue-router": "^2.3.1" }, "devDependencies": { diff --git a/client/src/App.vue b/client/src/App.vue index 97c2c84..b97e403 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -1,13 +1,41 @@ @@ -16,8 +44,6 @@ export default { font-family: 'Avenir', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - text-align: center; color: #2c3e50; - margin-top: 60px; } diff --git a/client/src/components/Auth.vue b/client/src/components/Auth.vue new file mode 100644 index 0000000..8b9ea34 --- /dev/null +++ b/client/src/components/Auth.vue @@ -0,0 +1,109 @@ + + + + + + diff --git a/client/src/components/Jumbotron.vue b/client/src/components/Jumbotron.vue new file mode 100644 index 0000000..ba76457 --- /dev/null +++ b/client/src/components/Jumbotron.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/client/src/components/MainPage.vue b/client/src/components/MainPage.vue new file mode 100644 index 0000000..e69de29 diff --git a/client/src/components/NavBar.vue b/client/src/components/NavBar.vue new file mode 100644 index 0000000..a34f7a4 --- /dev/null +++ b/client/src/components/NavBar.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/client/src/components/Thread.vue b/client/src/components/Thread.vue new file mode 100644 index 0000000..37be8ef --- /dev/null +++ b/client/src/components/Thread.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/client/src/components/ThreadList.vue b/client/src/components/ThreadList.vue new file mode 100644 index 0000000..cb011c1 --- /dev/null +++ b/client/src/components/ThreadList.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/client/src/router/index.js b/client/src/router/index.js index 5bf9ea6..e0e28a7 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -1,15 +1,26 @@ import Vue from 'vue' import Router from 'vue-router' import Hello from '@/components/Hello' +import Auth from '@/components/Auth' +import BootstrapVue from 'bootstrap-vue' +import axios from 'axios' +import VueAxios from 'vue-axios' +import 'bootstrap/dist/css/bootstrap.css' +import 'bootstrap-vue/dist/bootstrap-vue.css' +Vue.use(BootstrapVue) +Vue.use(VueAxios, axios) Vue.use(Router) export default new Router({ routes: [ { path: '/', - name: 'Hello', component: Hello + }, + { + path: '/registration', + component: Auth } ] }) diff --git a/server/app.js b/server/app.js index 3de9326..dfd6ae3 100644 --- a/server/app.js +++ b/server/app.js @@ -1,5 +1,6 @@ const express = require('express'); const bodyParser = require('body-parser'); +var cors = require('cors'); var app = express() var mongoose = require('mongoose'); var users = require('./routes/users'); @@ -15,7 +16,7 @@ var current_env = app.settings.env mongoose.connect(db_config[current_env]) - +app.use(cors()); app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: false })); diff --git a/server/controllers/auth.js b/server/controllers/auth.js index 31066bf..a031611 100644 --- a/server/controllers/auth.js +++ b/server/controllers/auth.js @@ -33,7 +33,6 @@ var signup = function(req, res, next) { var newUser = new User({ name: req.body.name, - username: req.body.username, email: req.body.email, password: hash }) @@ -61,6 +60,22 @@ var userInfo = function(req, res, next) { } } +var userData = function(req, res, next) { + let token = req.body.token + + if(token) { + jwt.verify(token, sec, (err, decoded) => { + if(!err) { + res.send(decoded) + } else { + res.send(err) + } + }) + } else { + res.send({msg: 'Not logged in'}) + } +} + var authUser = function(req, res, next) { let token = req.body.token @@ -78,5 +93,5 @@ var authUser = function(req, res, next) { } module.exports = { - login, signup, userInfo, authUser + login, signup, userInfo, authUser, userData }; diff --git a/server/models/thread.js b/server/models/thread.js index 1b4da52..e878b19 100644 --- a/server/models/thread.js +++ b/server/models/thread.js @@ -11,6 +11,7 @@ var threadSchema = mongoose.Schema({ required: [true, 'Please enter thread\'s content'] }, creator: { type: Schema.Types.ObjectId, ref: 'User' }, + replies: [{type: Schema.Types.ObjectId, ref: 'Response' }] upvotes: [{ type: Schema.Types.ObjectId, ref: 'User' }], downvotes: [{ type: Schema.Types.ObjectId, ref: 'User' }], createdAt: Date, diff --git a/server/routes/index.js b/server/routes/index.js index cbff35e..00c9fd0 100644 --- a/server/routes/index.js +++ b/server/routes/index.js @@ -7,4 +7,6 @@ router.post('/signup', auth.signup) router.post('/login', auth.login) +router.post('/getdata', auth.userData) + module.exports = router; \ No newline at end of file From 78fc3a525c5316b096a49b801a37d85fb2f416b6 Mon Sep 17 00:00:00 2001 From: hakiemaul Date: Sat, 10 Jun 2017 15:12:14 +0700 Subject: [PATCH 3/5] thread vote mechanism, delete, and thread detail done --- client/index.html | 1 + client/src/App.vue | 7 +- client/src/components/Jumbotron.vue | 15 --- client/src/components/MainPage.vue | 54 ++++++++++ client/src/components/NewReply.vue | 0 client/src/components/NewThread.vue | 47 ++++++++ client/src/components/Reply.vue | 0 client/src/components/Thread.vue | 68 +++++++++--- client/src/components/ThreadDetail.vue | 143 +++++++++++++++++++++++++ client/src/components/ThreadList.vue | 26 ++++- client/src/router/index.js | 9 +- server/controllers/auth.js | 4 +- server/controllers/responsectrl.js | 9 +- server/controllers/threadctrl.js | 47 ++++---- server/models/thread.js | 2 +- server/routes/threads.js | 6 +- 16 files changed, 376 insertions(+), 62 deletions(-) delete mode 100644 client/src/components/Jumbotron.vue create mode 100644 client/src/components/NewReply.vue create mode 100644 client/src/components/NewThread.vue create mode 100644 client/src/components/Reply.vue create mode 100644 client/src/components/ThreadDetail.vue diff --git a/client/index.html b/client/index.html index fd5afb3..8c816d6 100644 --- a/client/index.html +++ b/client/index.html @@ -3,6 +3,7 @@ hacktivoverflow +
diff --git a/client/src/App.vue b/client/src/App.vue index b97e403..6af237e 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -15,7 +15,10 @@ export default { data () { return { token: null, - user: null + user: { + id: '', + name: '' + } } }, methods: { @@ -34,7 +37,7 @@ export default { }, created () { this.getToken() - this.getUserData() + setTimeout(this.getUserData(), 3000) } } diff --git a/client/src/components/Jumbotron.vue b/client/src/components/Jumbotron.vue deleted file mode 100644 index ba76457..0000000 --- a/client/src/components/Jumbotron.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/client/src/components/MainPage.vue b/client/src/components/MainPage.vue index e69de29..a05d0d8 100644 --- a/client/src/components/MainPage.vue +++ b/client/src/components/MainPage.vue @@ -0,0 +1,54 @@ + + + + + diff --git a/client/src/components/NewReply.vue b/client/src/components/NewReply.vue new file mode 100644 index 0000000..e69de29 diff --git a/client/src/components/NewThread.vue b/client/src/components/NewThread.vue new file mode 100644 index 0000000..f6d145f --- /dev/null +++ b/client/src/components/NewThread.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/client/src/components/Reply.vue b/client/src/components/Reply.vue new file mode 100644 index 0000000..e69de29 diff --git a/client/src/components/Thread.vue b/client/src/components/Thread.vue index 37be8ef..bb65ae7 100644 --- a/client/src/components/Thread.vue +++ b/client/src/components/Thread.vue @@ -1,40 +1,84 @@ - diff --git a/client/src/components/ThreadDetail.vue b/client/src/components/ThreadDetail.vue new file mode 100644 index 0000000..8735610 --- /dev/null +++ b/client/src/components/ThreadDetail.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/client/src/components/ThreadList.vue b/client/src/components/ThreadList.vue index cb011c1..9d6d811 100644 --- a/client/src/components/ThreadList.vue +++ b/client/src/components/ThreadList.vue @@ -1,5 +1,10 @@ diff --git a/client/src/router/index.js b/client/src/router/index.js index e0e28a7..7e445e9 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -1,7 +1,8 @@ import Vue from 'vue' import Router from 'vue-router' -import Hello from '@/components/Hello' +import MainPage from '@/components/MainPage' import Auth from '@/components/Auth' +import ThreadDetail from '@/components/ThreadDetail' import BootstrapVue from 'bootstrap-vue' import axios from 'axios' import VueAxios from 'vue-axios' @@ -16,11 +17,15 @@ export default new Router({ routes: [ { path: '/', - component: Hello + component: MainPage }, { path: '/registration', component: Auth + }, + { + path: '/thread', + component: ThreadDetail } ] }) diff --git a/server/controllers/auth.js b/server/controllers/auth.js index a031611..41d25e6 100644 --- a/server/controllers/auth.js +++ b/server/controllers/auth.js @@ -45,11 +45,11 @@ var signup = function(req, res, next) { var userInfo = function(req, res, next) { let token = req.body.token - + console.log(token) if(token) { jwt.verify(token, sec, (err, decoded) => { if(!err) { - req.body.user = decoded._id; + req.body.creator = decoded.id; next() } else { res.send(err) diff --git a/server/controllers/responsectrl.js b/server/controllers/responsectrl.js index 5bfec8c..3f681f8 100644 --- a/server/controllers/responsectrl.js +++ b/server/controllers/responsectrl.js @@ -1,8 +1,8 @@ var Response = require('../models/response'); +var Thread = require('../models/thread'); var create = function(req, res) { let newResponse = new Response({ - title: req.body.title, responseContent: req.body.responseContent, creator: req.body.user, parent: req.params.id, @@ -12,7 +12,12 @@ var create = function(req, res) { if(err) { res.send(err) } else { - res.send(createdResponse) + Thread.findById(req.params.id, (err, thread) => { + thread.replies.push(createdResponse) + thread.save((err, updatedThread) => { + res.send(err ? err : updatedThread) + }) + }) } }) } diff --git a/server/controllers/threadctrl.js b/server/controllers/threadctrl.js index 94e0789..20598e0 100644 --- a/server/controllers/threadctrl.js +++ b/server/controllers/threadctrl.js @@ -3,34 +3,41 @@ var Thread = require('../models/thread'); var create = function(req, res) { let newThread = new Thread({ title: req.body.title, - threadContent: req.body.content, - creator: req.body.user, + threadContent: req.body.threadContent, + creator: req.body.creator, createdAt: new Date() }) newThread.save((err, createdThread) => { if(err) { + console.log('masuk error'); res.send(err) } else { + console.log('yeay'); res.send(createdThread) } }) } var get = function(req, res) { - Thread.find(function (err, threads) { + Thread.find({}) + .populate('creator') + .exec(function (err, threads) { res.send(err ? err : threads) - }); + }) } var getOne = function(req, res) { - Thread.findById(req.params.id, (err, thread) => { - res.send(err ? err: thread) + Thread.findById(req.params.id) + .populate('creator') + .populate('replies') + .exec(function (err, thread) { + res.send(err ? err : thread) }) } var update = function(req, res) { Thread.findById(req.params.id, (err, thread) => { - if(thread.creator == req.body.user) { + if(thread.creator == req.body.creator) { thread.title = req.body.title || thread.title thread.threadContent = req.body.threadContent || thread.threadContent thread.updatedAt = new Date() @@ -49,11 +56,11 @@ var update = function(req, res) { var upvote = function(req, res) { Thread.findById(req.params.id, (err, thread) => { - if(thread.creator == req.body.user) { - var idxUp = thread.upvotes.indexOf(req.body.user); - var idxDown = thread.downvotes.indexOf(req.body.user); + if(req.body.creator) { + var idxUp = thread.upvotes.indexOf(req.body.creator); + var idxDown = thread.downvotes.indexOf(req.body.creator); if(idxUp == -1 && idxDown == -1) { - thread.upvotes.push(req.body.user) + thread.upvotes.push(req.body.creator) } else if (idxDown !== -1) { thread.downvotes.splice(idxDown, 1) } @@ -72,9 +79,11 @@ var upvote = function(req, res) { var downvote = function(req, res) { Thread.findById(req.params.id, (err, thread) => { - if(thread.creator == req.body.user) { + if(req.body.creator) { + var idxUp = thread.upvotes.indexOf(req.body.creator); + var idxDown = thread.downvotes.indexOf(req.body.creator); if(idxUp == -1 && idxDown == -1) { - thread.downvotes.push(req.body.user) + thread.downvotes.push(req.body.creator) } else if (idxUp !== -1) { thread.upvotes.splice(idxDown, 1) } @@ -92,15 +101,9 @@ var downvote = function(req, res) { } var remove = function(req, res) { - Thread.findById(req.params.id, (err, thread) => { - if(thread.creator == req.body.user) { - Thread.findOneAndRemove({_id: req.params.id}, (err, thread) => { - if(err) res.send(err) - res.send(thread) - }) - } else { - res.send('Not authorized') - } + Thread.findOneAndRemove({_id: req.params.id}, (err, thread) => { + if(err) res.send(err) + res.send(thread) }) } diff --git a/server/models/thread.js b/server/models/thread.js index e878b19..c9b5749 100644 --- a/server/models/thread.js +++ b/server/models/thread.js @@ -11,7 +11,7 @@ var threadSchema = mongoose.Schema({ required: [true, 'Please enter thread\'s content'] }, creator: { type: Schema.Types.ObjectId, ref: 'User' }, - replies: [{type: Schema.Types.ObjectId, ref: 'Response' }] + replies: [{type: Schema.Types.ObjectId, ref: 'Response' }], upvotes: [{ type: Schema.Types.ObjectId, ref: 'User' }], downvotes: [{ type: Schema.Types.ObjectId, ref: 'User' }], createdAt: Date, diff --git a/server/routes/threads.js b/server/routes/threads.js index 5543d32..03c52fd 100644 --- a/server/routes/threads.js +++ b/server/routes/threads.js @@ -6,7 +6,7 @@ var auth = require('../controllers/auth') router.get('/', threadctrl.get) -router.get('/:id/replies', threadctrl.get) +router.get('/:id/replies', threadctrl.getOne) router.post('/', auth.userInfo, threadctrl.create) @@ -24,8 +24,8 @@ router.put('/:id/downvote', auth.userInfo, threadctrl.downvote) router.put('/:id/reply/:repid/downvote', auth.userInfo, responsectrl.downvote) -router.delete('/:id', auth.userInfo, threadctrl.remove) +router.delete('/:id', threadctrl.remove) -router.delete('/:id/reply/:repid', auth.userInfo, responsectrl.remove) +router.delete('/:id/reply/:repid', responsectrl.remove) module.exports = router; \ No newline at end of file From 25bcbc829e2f20fc008d67577111e3611d21505f Mon Sep 17 00:00:00 2001 From: hakiemaul Date: Sun, 11 Jun 2017 01:09:23 +0700 Subject: [PATCH 4/5] basic function done --- client/src/components/MainPage.vue | 2 +- client/src/components/NavBar.vue | 1 + client/src/components/NewReply.vue | 47 +++++++++++ client/src/components/Reply.vue | 111 +++++++++++++++++++++++++ client/src/components/ThreadDetail.vue | 46 +++++++--- server/controllers/auth.js | 1 - server/controllers/responsectrl.js | 48 ++++++----- server/controllers/threadctrl.js | 2 - server/routes/threads.js | 4 + 9 files changed, 225 insertions(+), 37 deletions(-) diff --git a/client/src/components/MainPage.vue b/client/src/components/MainPage.vue index a05d0d8..d68428d 100644 --- a/client/src/components/MainPage.vue +++ b/client/src/components/MainPage.vue @@ -4,7 +4,7 @@
-
+
diff --git a/client/src/components/NavBar.vue b/client/src/components/NavBar.vue index a34f7a4..abd4d14 100644 --- a/client/src/components/NavBar.vue +++ b/client/src/components/NavBar.vue @@ -39,6 +39,7 @@ export default { methods: { signOut () { localStorage.removeItem('token') + localStorage.removeItem('user') window.location.reload() } } diff --git a/client/src/components/NewReply.vue b/client/src/components/NewReply.vue index e69de29..c056ef2 100644 --- a/client/src/components/NewReply.vue +++ b/client/src/components/NewReply.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/client/src/components/Reply.vue b/client/src/components/Reply.vue index e69de29..cc15ba4 100644 --- a/client/src/components/Reply.vue +++ b/client/src/components/Reply.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/client/src/components/ThreadDetail.vue b/client/src/components/ThreadDetail.vue index 8735610..2f583ec 100644 --- a/client/src/components/ThreadDetail.vue +++ b/client/src/components/ThreadDetail.vue @@ -11,18 +11,20 @@
- - + + +
{{ thread.upvotes.length - thread.downvotes.length }}
- - + + +
-
+

{{ content }}

asked by: {{ thread.creator.name }}

@@ -39,21 +41,26 @@
- + + diff --git a/client/src/components/EditThread.vue b/client/src/components/EditThread.vue new file mode 100644 index 0000000..ee365c4 --- /dev/null +++ b/client/src/components/EditThread.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/client/src/components/Thread.vue b/client/src/components/Thread.vue index bb65ae7..d65f379 100644 --- a/client/src/components/Thread.vue +++ b/client/src/components/Thread.vue @@ -43,7 +43,7 @@ export default { methods: { threadDetail (event) { event.preventDefault() - this.$router.push(`/thread?id=${this.article._id}`) + this.$router.push({path: 'thread', query: { id: this.article._id }}) } } } diff --git a/client/src/components/ThreadDetail.vue b/client/src/components/ThreadDetail.vue index 2f583ec..3e069a7 100644 --- a/client/src/components/ThreadDetail.vue +++ b/client/src/components/ThreadDetail.vue @@ -29,18 +29,21 @@

asked by: {{ thread.creator.name }}

-
-
-
{{ thread.replies.length }} replies
-
{{ thread.replies.length }} reply
-
+
+
- +
+
+
+
{{ thread.replies.length }} replies
+
{{ thread.replies.length }} reply
+
+
@@ -134,10 +137,6 @@ export default { }) } }, - editThread () { - let self = this - console.log(self.thread) - }, updateValue (tes) { this.value.push(tes) }, @@ -153,7 +152,7 @@ export default { } -