diff --git a/nuxt.config.js b/nuxt.config.js index a771fc37bf34a27fcffb799dbf4785a946cc695a..5b6d483071b431be10e328de62d16a9cce6e5734 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -60,25 +60,39 @@ export default { }, axios: { - baseURL: 'http://127.0.0.1:3001/' + // baseURL: 'http://localhost:3001/' + proxy: true + }, + + proxy: { + '/api/': { + target: 'http://localhost:3001/', + pathRewrite: { '^/api/': '' } + } }, auth: { strategies: { cookie: { + // cookie: { + // name: 'connect.sid' + // }, endpoints: { login: { - url: 'user/login', + url: 'api/auth/login', method: 'post' }, logout: { - url: 'user/logout', + url: 'api/auth/logout', method: 'post' }, user: { - url: 'user/me', + url: 'api/user/me', method: 'get' } + }, + user: { + property: false } } } diff --git a/package.json b/package.json index 5e635d5169088b1c65f90b5865777491564ea7f2..158f1fbae747fb0d94894955ae5c8fedf26abe03 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "dependencies": { "@nuxtjs/auth-next": "5.0.0-1624817847.21691f1", "@nuxtjs/axios": "^5.13.6", + "@nuxtjs/proxy": "^2.1.0", "@nuxtjs/pwa": "^3.3.5", "core-js": "^3.9.1", "nuxt": "^2.15.3" diff --git a/pages/Login.vue b/pages/Login.vue index b4bd7eb72bb26453d0e3d955f47e05fb35c1b6ef..9d46d78ffff4b6864ff0f88b2756fe593adfa9da 100644 --- a/pages/Login.vue +++ b/pages/Login.vue @@ -96,7 +96,10 @@ </svg> <h1><span>Log in</span> to access</h1> <h2>your hydrominder</h2> - <p>{{ $auth.loggedIn }}</p> + <p v-if="loginError" class="error"> + Something went wrong logging you in. + Check your username and password and try again. + </p> <form class="login-form" @submit.prevent="userLogin"> <label for="username">Username</label> <input id="username" v-model="login.username" type="text"> @@ -114,16 +117,17 @@ export default { login: { username: '', password: '' - } + }, + loginError: false } }, methods: { async userLogin () { try { - const response = await this.$auth.loginWith('cookie', { data: this.login }) - console.log(response) + await this.$auth.loginWith('cookie', { data: this.login }) + this.loginError = false } catch (err) { - console.log(err) + this.loginError = true } } }, @@ -194,6 +198,12 @@ export default { text-shadow: -1px 3px 4px #444; } + .error { + color: darkred; + text-shadow: none; + font-size: .7em; + } + .watermark { position: absolute; top: 3%; diff --git a/store/index.js b/store/index.js new file mode 100644 index 0000000000000000000000000000000000000000..6d8485fe59853a623514a14258fc23f446477547 --- /dev/null +++ b/store/index.js @@ -0,0 +1,2 @@ +export const state = () => ({ +})