a

src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts

@@ -1,10 +1,13 @@
 import { type Ref, computed, defineComponent, inject, ref } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import type LoginService from '@/account/login.service';
 import type AccountService from '@/account/account.service';
 import EntitiesMenu from '@/entities/entities-menu.vue';
 
 import { useStore } from '@/store';
+import UserAccountService from '@/entities/user-account/user-account.service';
+import { useAlertService } from '@/shared/alert/alert.service';
+import type { IUserAccount } from '@/shared/model/user-account.model';
 
 export default defineComponent({
   compatConfig: { MODE: 3 },
@@ -27,6 +30,21 @@ export default defineComponent({
     const inProduction = computed(() => store.activeProfiles.indexOf('prod') > -1);
     const authenticated = computed(() => store.authenticated);
 
+    const userAccountService = inject('userAccountService', () => new UserAccountService());
+    const userAccount: Ref<IUserAccount> = ref({});
+
+    const retrieveUserAccount = async () => {
+      try {
+        const res = await userAccountService().getCurrentUser();
+        userAccount.value = res;
+      } catch (error) {
+        userAccount.value = {};
+      }
+    };
+    console.log('Asdf');
+    retrieveUserAccount();
+    console.log('Asdf2');
+
     const openLogin = () => {
       loginService.login();
     };
@@ -53,12 +71,14 @@ export default defineComponent({
       subIsActive,
       accountService,
       openLogin,
+      userAccount,
       version,
       currentLanguage,
       hasAnyAuthorityValues,
       openAPIEnabled,
       inProduction,
       authenticated,
+      retrieveUserAccount,
     };
   },
   methods: {

src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue

@@ -1,8 +1,19 @@
 <template>
   <b-navbar data-cy="navbar" toggleable="md" type="dark" class="jh-navbar">
     <b-navbar-brand class="logo" b-link to="/">
-      <span class="logo-img"></span>
-      <span class="navbar-title">Sasiedzi</span> <span class="navbar-version">{{ version }}</span>
+      <!--      <span class="logo-img"></span>-->
+      <!--      <span class="navbar-title">Sasiedzi</span>-->
+      <!--      <span class="navbar-version">{{ // version }}</span>-->
+      <!--      <span class="navbar-version"><span class="bold">PLN {{ userAccount.name}}</span></span>-->
+
+      <router-link :to="{ name: 'MyTransaction', params: { userAccountId: userAccount.id } }">
+        <!--         <router-link :to="{ name: 'TransactionView' }">-->
+        <span class="navbar-title"> Saldo: {{ userAccount.balance }} PLN </span>
+      </router-link>
+
+      <button class="btn" @click="retrieveUserAccount">
+        <font-awesome-icon :icon="['fas', 'sync']" />
+      </button>
     </b-navbar-brand>
     <b-navbar-toggle
       right
@@ -94,7 +105,8 @@
           <template #button-content>
             <span class="navbar-dropdown-menu">
               <font-awesome-icon icon="user" />
-              <span class="no-bold">Account</span>
+              <!--              <span class="no-bold">Stan konta {{userAccount.balance}} PLN</span>-->
+              <span class="no-bold">{{ userAccount.name }}</span>
             </span>
           </template>
           <b-dropdown-item data-cy="logout" v-if="authenticated" @click="logout()" id="logout" active-class="active">

src/main/webapp/app/entities/transaction/transaction.component.ts

@@ -7,6 +7,13 @@ import { useAlertService } from '@/shared/alert/alert.service';
 export default defineComponent({
   compatConfig: { MODE: 3 },
   name: 'Transaction',
+  props: {
+    userAccountId: {
+      type: [Number, String],
+      required: false,
+      default: null,
+    },
+  },
   setup() {
     const transactionService = inject('transactionService', () => new TransactionService());
     const alertService = inject('alertService', () => useAlertService(), true);

src/main/webapp/app/entities/user-account/user-account.service.ts

@@ -18,6 +18,19 @@ export default class UserAccountService {
     });
   }
 
+  public getCurrentUser(): Promise<IUserAccount> {
+    return new Promise<IUserAccount>((resolve, reject) => {
+      axios
+        .get(`${baseApiUrl}/currentUser`)
+        .then(res => {
+          resolve(res.data);
+        })
+        .catch(err => {
+          reject(err);
+        });
+    });
+  }
+
   public retrieve(): Promise<any> {
     return new Promise<any>((resolve, reject) => {
       axios

src/main/webapp/app/router/entities.ts

@@ -108,6 +108,12 @@ export default {
       component: Transaction,
       meta: { authorities: [Authority.USER] },
     },
+    {
+      path: 'my-transaction/:userAccountId?',
+      name: 'MyTransaction',
+      component: Transaction,
+      meta: { authorities: [Authority.USER] },
+    },
     {
       path: 'transaction/new',
       name: 'TransactionCreate',

src/main/webapp/app/shared/model/user-account.model.ts

@@ -4,6 +4,7 @@ export interface IUserAccount {
   id?: number;
   name?: string | null;
   users?: IUser[] | null;
+  balance?: number | 0;
 }
 
 export class UserAccount implements IUserAccount {
@@ -11,5 +12,6 @@ export class UserAccount implements IUserAccount {
     public id?: number,
     public name?: string | null,
     public users?: IUser[] | null,
+    public balance?: number | 0,
   ) {}
 }