diff --git a/.history/api/auth_20191020154551.js b/.history/api/auth_20191020154551.js new file mode 100644 index 0000000..de1361b --- /dev/null +++ b/.history/api/auth_20191020154551.js @@ -0,0 +1,11 @@ +export default function (req, res, next) { + // req 是 Node.js http request 对象 + +// res.json({code:200}) + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112003911.js b/.history/api/auth_20191112003911.js new file mode 100644 index 0000000..2e4e736 --- /dev/null +++ b/.history/api/auth_20191112003911.js @@ -0,0 +1,11 @@ +export default function (req, res, next) { + // req 是 Node.js http request 对象 + +res.json({code:200}) + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112003916.js b/.history/api/auth_20191112003916.js new file mode 100644 index 0000000..471bb6b --- /dev/null +++ b/.history/api/auth_20191112003916.js @@ -0,0 +1,11 @@ +export default function (req, res, next) { + // req 是 Node.js http request 对象 + + res.json({code:200}) + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112003952.js b/.history/api/auth_20191112003952.js new file mode 100644 index 0000000..6f735bf --- /dev/null +++ b/.history/api/auth_20191112003952.js @@ -0,0 +1,11 @@ +export default function (req, res, next) { + // req 是 Node.js http request 对象 + + res.send({code:200}) + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112004027.js b/.history/api/auth_20191112004027.js new file mode 100644 index 0000000..228d791 --- /dev/null +++ b/.history/api/auth_20191112004027.js @@ -0,0 +1,11 @@ +export default function (req, res, next) { + // req 是 Node.js http request 对象 + + // res.send({code:200}) + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112004056.js b/.history/api/auth_20191112004056.js new file mode 100644 index 0000000..dc4dfc2 --- /dev/null +++ b/.history/api/auth_20191112004056.js @@ -0,0 +1,11 @@ +export default function (req, res, next) { + // req 是 Node.js http request 对象 + console.log(req,res) + // res.send({code:200}) + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112004141.js b/.history/api/auth_20191112004141.js new file mode 100644 index 0000000..27dde47 --- /dev/null +++ b/.history/api/auth_20191112004141.js @@ -0,0 +1,11 @@ +export default function (ctx, next) { + // req 是 Node.js http request 对象 + console.log(ctx,next) + // res.send({code:200}) + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112004209.js b/.history/api/auth_20191112004209.js new file mode 100644 index 0000000..dc4dfc2 --- /dev/null +++ b/.history/api/auth_20191112004209.js @@ -0,0 +1,11 @@ +export default function (req, res, next) { + // req 是 Node.js http request 对象 + console.log(req,res) + // res.send({code:200}) + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112004212.js b/.history/api/auth_20191112004212.js new file mode 100644 index 0000000..1d77f6d --- /dev/null +++ b/.history/api/auth_20191112004212.js @@ -0,0 +1,11 @@ +export default function (req, res, next) { + // req 是 Node.js http request 对象 + // console.log(req,res) + // res.send({code:200}) + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112004222.js b/.history/api/auth_20191112004222.js new file mode 100644 index 0000000..1421f5a --- /dev/null +++ b/.history/api/auth_20191112004222.js @@ -0,0 +1,11 @@ +export default function (req, res, next) { + // req 是 Node.js http request 对象 + // console.log(req,res) + // res.send({code:200}) + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + // next() +} + + diff --git a/.history/api/auth_20191112004446.js b/.history/api/auth_20191112004446.js new file mode 100644 index 0000000..fd484a7 --- /dev/null +++ b/.history/api/auth_20191112004446.js @@ -0,0 +1,11 @@ +export default function (req, res, next) { + // req 是 Node.js http request 对象 + // console.log(req,res) + res.status(200).send('

12355

') + // res 是 Node.js http response 对象 + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + // next() +} + + diff --git a/.history/api/auth_20191112004908.js b/.history/api/auth_20191112004908.js new file mode 100644 index 0000000..0546f7b --- /dev/null +++ b/.history/api/auth_20191112004908.js @@ -0,0 +1,12 @@ +export default function (ctx) { + // req 是 Node.js http request 对象 + // console.log(req,res) + ctx.body={ + code:200 + } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + // next() +} + + diff --git a/.history/api/auth_20191112005004.js b/.history/api/auth_20191112005004.js new file mode 100644 index 0000000..4d38844 --- /dev/null +++ b/.history/api/auth_20191112005004.js @@ -0,0 +1,12 @@ +export default function (req,res) { + // req 是 Node.js http request 对象 + console.log(req,res) + ctx.body={ + code:200 + } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + // next() +} + + diff --git a/.history/api/auth_20191112005102.js b/.history/api/auth_20191112005102.js new file mode 100644 index 0000000..f68e508 --- /dev/null +++ b/.history/api/auth_20191112005102.js @@ -0,0 +1,12 @@ +export default function (req,res) { + // req 是 Node.js http request 对象 + console.log(req,res) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + // next() +} + + diff --git a/.history/api/auth_20191112005109.js b/.history/api/auth_20191112005109.js new file mode 100644 index 0000000..0d9eb1d --- /dev/null +++ b/.history/api/auth_20191112005109.js @@ -0,0 +1,12 @@ +export default function (req,res) { + // req 是 Node.js http request 对象 + console.log(req) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + // next() +} + + diff --git a/.history/api/auth_20191112005201.js b/.history/api/auth_20191112005201.js new file mode 100644 index 0000000..18e490f --- /dev/null +++ b/.history/api/auth_20191112005201.js @@ -0,0 +1,12 @@ +export default function (req,res) { + // req 是 Node.js http request 对象 + console.log(res) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + // next() +} + + diff --git a/.history/api/auth_20191112005552.js b/.history/api/auth_20191112005552.js new file mode 100644 index 0000000..650c70b --- /dev/null +++ b/.history/api/auth_20191112005552.js @@ -0,0 +1,12 @@ +export default function (req,res) { + // req 是 Node.js http request 对象 + console.log(req.btx) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + // next() +} + + diff --git a/.history/api/auth_20191112005557.js b/.history/api/auth_20191112005557.js new file mode 100644 index 0000000..f3d392c --- /dev/null +++ b/.history/api/auth_20191112005557.js @@ -0,0 +1,12 @@ +export default function (req,res) { + // req 是 Node.js http request 对象 + console.log(req.ctx) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + // next() +} + + diff --git a/.history/api/auth_20191112005636.js b/.history/api/auth_20191112005636.js new file mode 100644 index 0000000..447b7e5 --- /dev/null +++ b/.history/api/auth_20191112005636.js @@ -0,0 +1,12 @@ +export default function (req,res) { + // req 是 Node.js http request 对象 + console.log(req.ctx.body={code:200}) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + // next() +} + + diff --git a/.history/api/auth_20191112005657.js b/.history/api/auth_20191112005657.js new file mode 100644 index 0000000..45b2924 --- /dev/null +++ b/.history/api/auth_20191112005657.js @@ -0,0 +1,12 @@ +export default function (req,res) { + // req 是 Node.js http request 对象 + console.log(req.ctx.body={code:200}) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112005702.js b/.history/api/auth_20191112005702.js new file mode 100644 index 0000000..4532d92 --- /dev/null +++ b/.history/api/auth_20191112005702.js @@ -0,0 +1,12 @@ +export default function (req,res,next) { + // req 是 Node.js http request 对象 + console.log(req.ctx.body={code:200}) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112005839.js b/.history/api/auth_20191112005839.js new file mode 100644 index 0000000..493f823 --- /dev/null +++ b/.history/api/auth_20191112005839.js @@ -0,0 +1,13 @@ +export default function (req,res,next) { + // req 是 Node.js http request 对象 + console.log(req.ctx.body={code:200}) + console.log(req.ctx.body={code:200}) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112005843.js b/.history/api/auth_20191112005843.js new file mode 100644 index 0000000..8c8f80e --- /dev/null +++ b/.history/api/auth_20191112005843.js @@ -0,0 +1,13 @@ +export default function (req,res,next) { + // req 是 Node.js http request 对象 + console.log(req.ctx.body={code:200}) + console.log(res.ctx.body={code:200}) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112005910.js b/.history/api/auth_20191112005910.js new file mode 100644 index 0000000..42027b5 --- /dev/null +++ b/.history/api/auth_20191112005910.js @@ -0,0 +1,13 @@ +export default function (req,res,next) { + // req 是 Node.js http request 对象 + console.log(req.ctx.body={code:200}) + console.log(res) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/api/auth_20191112010248.js b/.history/api/auth_20191112010248.js new file mode 100644 index 0000000..1be8452 --- /dev/null +++ b/.history/api/auth_20191112010248.js @@ -0,0 +1,13 @@ +export default function (req,res,next) { + // req 是 Node.js http request 对象 + // console.log(req.ctx.body={code:200}) + // console.log(res) + // ctx.body={ + // code:200 + // } + //next是一个调用下一个中间件的函数 + // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ + next() +} + + diff --git a/.history/assets/style/_global_20191020151711.scss b/.history/assets/style/_global_20191020151711.scss new file mode 100644 index 0000000..bbae598 --- /dev/null +++ b/.history/assets/style/_global_20191020151711.scss @@ -0,0 +1,4 @@ + + +@import "./common.scss"; + diff --git a/.history/assets/style/_global_20191112000401.scss b/.history/assets/style/_global_20191112000401.scss new file mode 100644 index 0000000..240e143 --- /dev/null +++ b/.history/assets/style/_global_20191112000401.scss @@ -0,0 +1,7 @@ + + +@import "./common.scss"; + +html{ + +} \ No newline at end of file diff --git a/.history/assets/style/_global_20191112000415.scss b/.history/assets/style/_global_20191112000415.scss new file mode 100644 index 0000000..5b3a982 --- /dev/null +++ b/.history/assets/style/_global_20191112000415.scss @@ -0,0 +1,8 @@ + + +@import "./common.scss"; + +html{ + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/.history/assets/style/_global_20191112000639.scss b/.history/assets/style/_global_20191112000639.scss new file mode 100644 index 0000000..fc717e2 --- /dev/null +++ b/.history/assets/style/_global_20191112000639.scss @@ -0,0 +1,8 @@ + + +@import "./common.scss"; + +html{ + width: 100vw; + height: 100vh; +} \ No newline at end of file diff --git a/.history/layouts/default_20191020150838.vue b/.history/layouts/default_20191020150838.vue new file mode 100644 index 0000000..714f739 --- /dev/null +++ b/.history/layouts/default_20191020150838.vue @@ -0,0 +1,19 @@ + + + diff --git a/.history/layouts/default_20191112000247.vue b/.history/layouts/default_20191112000247.vue new file mode 100644 index 0000000..f638dc3 --- /dev/null +++ b/.history/layouts/default_20191112000247.vue @@ -0,0 +1,19 @@ + + + diff --git a/.history/layouts/default_20191112000827.vue b/.history/layouts/default_20191112000827.vue new file mode 100644 index 0000000..417888b --- /dev/null +++ b/.history/layouts/default_20191112000827.vue @@ -0,0 +1,19 @@ + + + diff --git a/.history/layouts/default_20191112001330.vue b/.history/layouts/default_20191112001330.vue new file mode 100644 index 0000000..b988fdf --- /dev/null +++ b/.history/layouts/default_20191112001330.vue @@ -0,0 +1,17 @@ + + + diff --git a/.history/layouts/default_20191112001421.vue b/.history/layouts/default_20191112001421.vue new file mode 100644 index 0000000..450b067 --- /dev/null +++ b/.history/layouts/default_20191112001421.vue @@ -0,0 +1,20 @@ + + + diff --git a/.history/layouts/default_20191112001426.vue b/.history/layouts/default_20191112001426.vue new file mode 100644 index 0000000..b7d5c15 --- /dev/null +++ b/.history/layouts/default_20191112001426.vue @@ -0,0 +1,20 @@ + + + diff --git a/.history/nuxt.config_20191021223707.js b/.history/nuxt.config_20191021223707.js new file mode 100644 index 0000000..404b5f9 --- /dev/null +++ b/.history/nuxt.config_20191021223707.js @@ -0,0 +1,80 @@ +const path = require('path'); +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + title: process.env.npm_package_name || '', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3} + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + '~/api/auth' + ] +} diff --git a/.history/nuxt.config_20191112000218.js b/.history/nuxt.config_20191112000218.js new file mode 100644 index 0000000..3a02b88 --- /dev/null +++ b/.history/nuxt.config_20191112000218.js @@ -0,0 +1,80 @@ +const path = require('path'); +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + title: process.env.npm_package_name || '', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3} + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + '~/api/auth' + ] +} diff --git a/.history/nuxt.config_20191112002343.js b/.history/nuxt.config_20191112002343.js new file mode 100644 index 0000000..6cc8a89 --- /dev/null +++ b/.history/nuxt.config_20191112002343.js @@ -0,0 +1,81 @@ +const path = require('path'); +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + title: process.env.npm_package_name || '', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + npm_package_name:'Beer', + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3} + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + '~/api/auth' + ] +} diff --git a/.history/nuxt.config_20191112002421.js b/.history/nuxt.config_20191112002421.js new file mode 100644 index 0000000..5231102 --- /dev/null +++ b/.history/nuxt.config_20191112002421.js @@ -0,0 +1,82 @@ +const path = require('path'); +console.log(process) +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + title: process.env.npm_package_name || '', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + npm_package_name:'Beer', + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3} + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + '~/api/auth' + ] +} diff --git a/.history/nuxt.config_20191112002503.js b/.history/nuxt.config_20191112002503.js new file mode 100644 index 0000000..f4503bc --- /dev/null +++ b/.history/nuxt.config_20191112002503.js @@ -0,0 +1,82 @@ +const path = require('path'); +console.log(process.env) +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + title: process.env.npm_package_name || '', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + npm_package_name:'Beer', + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3} + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + '~/api/auth' + ] +} diff --git a/.history/nuxt.config_20191112002723.js b/.history/nuxt.config_20191112002723.js new file mode 100644 index 0000000..40b25b1 --- /dev/null +++ b/.history/nuxt.config_20191112002723.js @@ -0,0 +1,82 @@ +const path = require('path'); +console.log(process.env.npm_package_name) +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + title: process.env.npm_package_name || '', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + npm_package_name:'Beer', + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3} + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + '~/api/auth' + ] +} diff --git a/.history/nuxt.config_20191112003237.js b/.history/nuxt.config_20191112003237.js new file mode 100644 index 0000000..861de94 --- /dev/null +++ b/.history/nuxt.config_20191112003237.js @@ -0,0 +1,82 @@ +const path = require('path'); +console.log(process.env.npm_package_name) +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + // process.env.npm_package_name || + title: 'Beer', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3} + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + '~/api/auth' + ] +} diff --git a/.history/nuxt.config_20191112003249.js b/.history/nuxt.config_20191112003249.js new file mode 100644 index 0000000..fedf79b --- /dev/null +++ b/.history/nuxt.config_20191112003249.js @@ -0,0 +1,81 @@ +const path = require('path'); +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + // process.env.npm_package_name || + title: 'Beer', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3} + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + '~/api/auth' + ] +} diff --git a/.history/nuxt.config_20191112003735.js b/.history/nuxt.config_20191112003735.js new file mode 100644 index 0000000..0478f3c --- /dev/null +++ b/.history/nuxt.config_20191112003735.js @@ -0,0 +1,82 @@ +const path = require('path'); +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + // process.env.npm_package_name || + title: 'Beer', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3}, + proxy: true + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + '~/api/auth' + ] +} diff --git a/.history/nuxt.config_20191112003835.js b/.history/nuxt.config_20191112003835.js new file mode 100644 index 0000000..c2afe8d --- /dev/null +++ b/.history/nuxt.config_20191112003835.js @@ -0,0 +1,85 @@ +const path = require('path'); +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + // process.env.npm_package_name || + title: 'Beer', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3}, + proxy: true + }, + proxy: { + '/api/': 'http://api.example.com' + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + '~/api/auth' + ] +} diff --git a/.history/nuxt.config_20191112004619.js b/.history/nuxt.config_20191112004619.js new file mode 100644 index 0000000..88b3198 --- /dev/null +++ b/.history/nuxt.config_20191112004619.js @@ -0,0 +1,85 @@ +const path = require('path'); +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + // process.env.npm_package_name || + title: 'Beer', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3}, + proxy: true + }, + proxy: { + '/api/': 'http://api.example.com' + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + {path:'/api/auth', handler:'~/api/auth'} + ] +} diff --git a/.history/nuxt.config_20191112005741.js b/.history/nuxt.config_20191112005741.js new file mode 100644 index 0000000..647b787 --- /dev/null +++ b/.history/nuxt.config_20191112005741.js @@ -0,0 +1,85 @@ +const path = require('path'); +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + // process.env.npm_package_name || + title: 'Beer', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3}, + proxy: true + }, + proxy: { + // '/api/': 'http://api.example.com' + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + {path:'/api/auth', handler:'~/api/auth'} + ] +} diff --git a/.history/nuxt.config_20191112005802.js b/.history/nuxt.config_20191112005802.js new file mode 100644 index 0000000..1fbcb61 --- /dev/null +++ b/.history/nuxt.config_20191112005802.js @@ -0,0 +1,86 @@ +const path = require('path'); +module.exports = { + mode: 'universal', + /* + ** Headers of the page + */ + head: { + // process.env.npm_package_name || + title: 'Beer', + meta: [ + {charset: 'utf-8'}, + {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, + {hid: 'description', name: 'description', content: process.env.npm_package_description || ''} + ], + link: [ + {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'} + ] + }, + env: { + baseUrl: process.env.BASE_URL || 'http://localhost:3000' + }, + /* + ** Customize the progress-bar color + */ + loading: {color: '#fff'}, + /* + ** Global CSS + */ + css: [ + 'reset-css/reset.css', + ], + /* + ** Plugins to load before mounting the App + */ + plugins: [ + '~/plugins/axios', + '~/plugins/global-components' + ], + /* + ** Nuxt.js dev-modules + */ + devModules: [], + /* + ** Nuxt.js modules + */ + modules: [ + '@nuxtjs/style-resources', + // 使用bootstrap-vue + // 'bootstrap-vue/nuxt', + '@nuxtjs/axios' + ], + //https://axios.nuxtjs.org/setup + axios: { + // proxyHeaders: false + retry: {retries: 3}, + proxy: true + }, + proxy: { + // 跟下面的冲突了 + // '/api/': 'http://api.example.com' + }, + styleResources: { + // your settings here + sass: [], + scss: ['./assets/style/_global.scss'], + less: [], + stylus: [] + }, + /* + ** Build configuration + */ + build: { + /* + ** You can extend webpack config here + */ + extend(config, ctx) { + config.resolve.alias['@pages'] = path.resolve(__dirname, 'pages'); + config.resolve.alias['@assets'] = path.resolve(__dirname, 'assets'); + config.resolve.alias['@components'] = path.resolve(__dirname, 'components'); + config.resolve.alias['@images'] = path.resolve(__dirname, 'assets', 'images'); + } + }, + serverMiddleware: [ + {path:'/api/auth', handler:'~/api/auth'} + ] +} diff --git a/.history/pages/index_20191020124535.vue b/.history/pages/index_20191020124535.vue new file mode 100644 index 0000000..89974a8 --- /dev/null +++ b/.history/pages/index_20191020124535.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/.history/pages/index_20191111235953.vue b/.history/pages/index_20191111235953.vue new file mode 100644 index 0000000..c809643 --- /dev/null +++ b/.history/pages/index_20191111235953.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/.history/pages/index_20191112000014.vue b/.history/pages/index_20191112000014.vue new file mode 100644 index 0000000..044f796 --- /dev/null +++ b/.history/pages/index_20191112000014.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/.history/pages/index_20191112000231.vue b/.history/pages/index_20191112000231.vue new file mode 100644 index 0000000..cccc67a --- /dev/null +++ b/.history/pages/index_20191112000231.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/api/auth.js b/api/auth.js index de1361b..1be8452 100644 --- a/api/auth.js +++ b/api/auth.js @@ -1,8 +1,10 @@ -export default function (req, res, next) { +export default function (req,res,next) { // req 是 Node.js http request 对象 - -// res.json({code:200}) - // res 是 Node.js http response 对象 + // console.log(req.ctx.body={code:200}) + // console.log(res) + // ctx.body={ + // code:200 + // } //next是一个调用下一个中间件的函数 // 如果您的中间件不是最终执行，请不要忘记在最后调用next！ next() diff --git a/assets/images/bluedialog.png b/assets/images/bluedialog.png deleted file mode 100644 index fe6afc3..0000000 Binary files a/assets/images/bluedialog.png and /dev/null differ diff --git a/assets/style/_global.scss b/assets/style/_global.scss index bbae598..fc717e2 100644 --- a/assets/style/_global.scss +++ b/assets/style/_global.scss @@ -2,3 +2,7 @@ @import "./common.scss"; +html{ + width: 100vw; + height: 100vh; +} \ No newline at end of file diff --git a/layouts/default.vue b/layouts/default.vue index 714f739..b7d5c15 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -5,15 +5,16 @@ diff --git a/nuxt.config.js b/nuxt.config.js index 404b5f9..1fbcb61 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -5,7 +5,8 @@ module.exports = { ** Headers of the page */ head: { - title: process.env.npm_package_name || '', + // process.env.npm_package_name || + title: 'Beer', meta: [ {charset: 'utf-8'}, {name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no'}, @@ -45,13 +46,18 @@ module.exports = { modules: [ '@nuxtjs/style-resources', // 使用bootstrap-vue - 'bootstrap-vue/nuxt', + // 'bootstrap-vue/nuxt', '@nuxtjs/axios' ], //https://axios.nuxtjs.org/setup axios: { // proxyHeaders: false - retry: {retries: 3} + retry: {retries: 3}, + proxy: true + }, + proxy: { + // 跟下面的冲突了 + // '/api/': 'http://api.example.com' }, styleResources: { // your settings here @@ -75,6 +81,6 @@ module.exports = { } }, serverMiddleware: [ - '~/api/auth' + {path:'/api/auth', handler:'~/api/auth'} ] } diff --git a/pages/index.vue b/pages/index.vue index 89974a8..cccc67a 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,47 +1,31 @@ diff --git a/pages/login.vue b/pages/login.vue deleted file mode 100644 index 98b6d12..0000000 --- a/pages/login.vue +++ /dev/null @@ -1,85 +0,0 @@ - - - - - diff --git a/pages/style.scss b/pages/style.scss deleted file mode 100644 index e69de29..0000000