diff --git a/src/App.vue b/src/App.vue
index ebc87e0..b99eff7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1 +1,51 @@
-<template>
  <div id="app">
    <div class="container">
      <HeaderComponent @loggedOut="loggedOut" :auth="isAuth" :user="user" />
      <router-view @checkAuth="checkAuth" :user="user"></router-view>
    </div>
  </div>
</template>

<script>
import HeaderComponent from '@/components/HeaderComponent'

export default {
  components: { HeaderComponent },
  data() {
    return {
      isAuth: null,
      user: '',
    }
  },
  methods: {
    loggedOut() {
      localStorage.removeItem('jwt')
      localStorage.removeItem('user')
      if (localStorage.getItem('jwt') == null) {
        this.checkAuth()
        this.$router.push('login')
      }
    },
    async checkAuth() {
      this.isAuth = localStorage.getItem('jwt') != null
      if (this.isAuth) {
        await this.$http
          .get('me', {
            headers: { Authorization: `Bearer ${localStorage.getItem('jwt')}` },
          })
          .then((response) => {
            localStorage.setItem('user', JSON.stringify(response.data.user))
            this.user = response.data.user
          })
          .catch(function (error) {
            console.error(error.response)
          })
      }
    },
  },
  async mounted() {
    await this.checkAuth()
  },
}
</script>
\ No newline at end of file
+<template>
+  <div id="app">
+    <div class="container">
+      <HeaderComponent @loggedOut="loggedOut" :auth="isAuth" :user="user" />
+      <router-view @checkAuth="checkAuth" :user="user"></router-view>
+    </div>
+  </div>
+</template>
+
+<script>
+import HeaderComponent from '@/components/HeaderComponent'
+
+export default {
+  components: { HeaderComponent },
+  data() {
+    return {
+      isAuth: null,
+      user: '',
+    }
+  },
+  methods: {
+    loggedOut() {
+      localStorage.removeItem('jwt')
+      localStorage.removeItem('user')
+      if (localStorage.getItem('jwt') == null) {
+        this.checkAuth()
+        this.$router.push('login')
+      }
+    },
+    async checkAuth() {
+      this.isAuth = localStorage.getItem('jwt') != null
+      if (this.isAuth) {
+        await this.$http
+          .get('me', {
+            headers: { Authorization: `Bearer ${localStorage.getItem('jwt')}` },
+          })
+          .then((response) => {
+            localStorage.setItem('user', JSON.stringify(response.data.user))
+            this.user = response.data.user
+          })
+          .catch(function (error) {
+            console.error(error.response)
+          })
+      }
+    },
+  },
+  async mounted() {
+    await this.checkAuth()
+  },
+}
+</script>
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 67acf2d..a077965 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -1 +1,105 @@
-<template>
  <div class="columns is-centered">
    <div class="column is-two-fifths">
      <div class="hero is-fullheight-with-navbar">
        <div class="hero-body">
          <form
            class="content"
            style="width: 100%; transform: translateY(-50%)"
          >
            <p v-if="!isValid" class="has-text-danger has-text-centered">
              Incorrect username or password! Please try again!
            </p>
            <b-field
              label-position="on-border"
              :type="{ 'is-danger': !isValid }"
            >
              <template #label>
                <span class="has-text-grey">Username</span>
              </template>
              <b-input
                v-model="username"
                rounded
                icon="account"
                placeholder="username"
                @focus="isValid = true"
              ></b-input>
            </b-field>
            <b-field
              label-position="on-border"
              :type="{ 'is-danger': !isValid }"
            >
              <template #label>
                <span class="has-text-grey">Password</span>
              </template>
              <b-input
                v-model="password"
                rounded
                icon="lock"
                type="password"
                placeholder="password"
                @focus="isValid = true"
              ></b-input>
            </b-field>
            <div class="buttons is-right">
              <b-button
                class="m-0"
                rounded
                onclick="this.blur()"
                type="submit"
                :disabled="password.length < 1 || username.length < 1"
                @click.prevent="handleSubmit"
              >
                Log in
              </b-button>
            </div>
          </form>
        </div>
      </div>
    </div>
  </div>
</template>

<script>
export default {
  name: 'LoginView',
  data() {
    return {
      isValid: true,
      username: '',
      password: '',
    }
  },
  methods: {
    async handleSubmit() {
      let vm = this
      if (this.password.length > 0 && this.username.length > 0) {
        await this.$http
          .post('login', {
            username: this.username,
            password: this.password,
          })
          .then((response) => {
            localStorage.setItem('jwt', response.data.jwt_token)
            if (localStorage.getItem('jwt') != null) {
              this.$emit('checkAuth')
              if (this.$route.query.nextUrl != null) {
                this.$router.push({ path: `${this.$route.query.nextUrl}` })
              } else {
                this.$router.push({ name: 'home' })
              }
            }
          })
          .catch(function (error) {
            vm.isValid = false
            console.error(error.response)
          })
      } else {
        this.isValid = false
      }
    },
  },
}
</script>

<style scoped lang="scss"></style>
\ No newline at end of file
+<template>
+  <div class="columns is-centered">
+    <div class="column is-two-fifths">
+      <div class="hero is-fullheight-with-navbar">
+        <div class="hero-body">
+          <form
+            class="content"
+            style="width: 100%; transform: translateY(-50%)"
+          >
+            <p v-if="!isValid" class="has-text-danger has-text-centered">
+              Incorrect username or password! Please try again!
+            </p>
+            <b-field
+              label-position="on-border"
+              :type="{ 'is-danger': !isValid }"
+            >
+              <template #label>
+                <span class="has-text-grey">Username</span>
+              </template>
+              <b-input
+                v-model="username"
+                rounded
+                icon="account"
+                placeholder="username"
+                @focus="isValid = true"
+              ></b-input>
+            </b-field>
+            <b-field
+              label-position="on-border"
+              :type="{ 'is-danger': !isValid }"
+            >
+              <template #label>
+                <span class="has-text-grey">Password</span>
+              </template>
+              <b-input
+                v-model="password"
+                rounded
+                icon="lock"
+                type="password"
+                placeholder="password"
+                @focus="isValid = true"
+              ></b-input>
+            </b-field>
+            <div class="buttons is-right">
+              <b-button
+                class="m-0"
+                rounded
+                onclick="this.blur()"
+                type="submit"
+                :disabled="password.length < 1 || username.length < 1"
+                @click.prevent="handleSubmit"
+              >
+                Log in
+              </b-button>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'LoginView',
+  data() {
+    return {
+      isValid: true,
+      username: '',
+      password: '',
+    }
+  },
+  methods: {
+    async handleSubmit() {
+      let vm = this
+      if (this.password.length > 0 && this.username.length > 0) {
+        await this.$http
+          .post('login', {
+            username: this.username,
+            password: this.password,
+          })
+          .then((response) => {
+            localStorage.setItem('jwt', response.data.jwt_token)
+            if (localStorage.getItem('jwt') != null) {
+              this.$emit('checkAuth')
+              if (this.$route.query.nextUrl != null) {
+                this.$router.push({ path: `${this.$route.query.nextUrl}` })
+              } else {
+                this.$router.push({ name: 'home' })
+              }
+            }
+          })
+          .catch(function (error) {
+            vm.isValid = false
+            console.error(error.response)
+          })
+      } else {
+        this.isValid = false
+      }
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss"></style>