Ignore:
Timestamp:
01/26/25 00:32:02 (3 months ago)
Author:
Ljubomir Ilievski <ilievski.ljubomir@…>
Branches:
master
Children:
231918f
Parents:
9bcad23
Message:

Celosno funkcionalna logika na login/register/logout

Location:
ReserveNGo-frontend/src/components/Project
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue

    r9bcad23 r2a2614e  
    33
    44import { userStore } from '@/PiniaStores/UserStore.js'
     5import logout_ from '@/components/Project/logout_.vue'
     6
    57
    68export default {
     
    911      userStore_: userStore()
    1012    }
     13  },
     14  components: {
     15    logout_
    1116  }
     17
    1218}
    1319
     
    7884          <li class="nav-item ms-2 d-none d-md-inline">
    7985            <router-link to="/login" >
    80             <a class="btn btn-dark">Login</a>
     86            <a v-if="userStore_.data.role==='UN_AUTHENTICATED'" class="btn btn-dark">Login</a>
    8187            </router-link>
    8288            <router-link to="/register">
    83             <a class="btn btn-dark ms-2">Register</a>
     89            <a v-if="userStore_.data.role==='UN_AUTHENTICATED'" class="btn btn-dark ms-2">Register</a>
    8490            </router-link>
     91            <logout_></logout_>
    8592          </li>
    8693
  • ReserveNGo-frontend/src/components/Project/login_.vue

    r9bcad23 r2a2614e  
    33
    44import { userStore } from '@/PiniaStores/UserStore.js'
     5
     6import {useRouter} from 'vue-router'
     7import router from '@/router/index.js'
    58
    69export default {
     
    1619      userStore_: userStore(),
    1720
     21      router: useRouter()
     22
    1823    }
    1924  },
    2025  methods: {
    21    /*async makeLogin() {
     26   async makeLogin() {
    2227
    2328      await fetch(this.url, {
     
    2934        })
    3035      }).then((response) => response.json())
    31         .then(json => )
     36        .then(json => {this.userStore_.setLocalStorage(json);
     37                        router.push('/')})
    3238
    33     }*/
     39    }
    3440  }
    3541}
     
    4349
    4450    <div class="row justify-content-center  ">
    45 
     51<!--      <form  v-on:submit.prevent="makeLogin">-->
    4652<!--      <form action="http://localhost:8080/api/auth/login" method="POST">-->
    4753      <div class="col-3">
  • ReserveNGo-frontend/src/components/Project/register_.vue

    r9bcad23 r2a2614e  
    33
    44import { userStore } from '@/PiniaStores/UserStore.js'
     5import {useRouter} from 'vue-router'
     6import router from '@/router/index.js'
    57
    68export default {
     
    2830      },*/
    2931      userStore_: userStore(),
    30 
    31       //NE ZABORAVAJ TREBA DA SREDIS VCITUVANJE NA data od userStore na pocetok na stranicata
     32      router: useRouter()
    3233
    3334    }
     
    4647          phoneNumber: this.form_info.phoneNumber})
    4748      }).then((response) => response.json())
    48         .then((json) => {this.userStore_.setLocalStorage(json)})
     49        .then((json) => {this.userStore_.setLocalStorage(json);
     50                        router.push('/')})
    4951          //console.log("Data received:", this.data);
    5052          //this.userStore_.setLocalStorage(json)
Note: See TracChangeset for help on using the changeset viewer.