fix bugs

.github/workflows/cd-render.yml

@@ -0,0 +1,19 @@
+name: Trigger Deployment
+
+
+name: CI
+
+on:
+  workflow_call:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      # - name: Trigger Deployment via GET Request
+      #   run: |
+      #     curl -X GET https://laravel.com/docs/11.x/starter-kits

.github/workflows/ci.yml → .github/workflows/ci-test.yml

@@ -1,13 +1,7 @@
 name: CI
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-  workflow_dispatch:
+  workflow_call:
 
 jobs:
   build:

src/components/__tests__/CreateIncomeOrExpenseForm.spec.ts

@@ -13,7 +13,7 @@ describe('CreateIncomeOrExpenseForm', () => {
 
 
     const form = mount(CreateIncomeOrExpenseForm, {
-      props: { loading: false },
+      props: { loading: false ,userAccountStatus: 'active'},
       global: {
         plugins: [createPinia()]
       }

src/helper/auth.ts

@@ -17,7 +17,7 @@ export type LoginResponseType = {
     accessToken: string
     refreshToken: string
   }
- userAccount:{
+ userAccount?:{
   leftDays:string
   account_status:userAccountStatusType
  }

src/http/App.ts

@@ -1,4 +1,10 @@
+// export const APP = {
+//   baseURL: 'http://127.0.0.1:8000',
+//   apiBaseURL: 'http://127.0.0.1:8000/api'
+// }
+
 export const APP = {
-  baseURL: 'http://127.0.0.1:8000',
-  apiBaseURL: 'http://127.0.0.1:8000/api'
+  baseURL: 'http://143.244.157.28',
+  apiBaseURL: 'http://143.244.157.28/api'
 }
+

src/http/makeHttpReq.ts

@@ -36,7 +36,7 @@ export function makeHttpReq<TInput, TResponse>(
         }),
         httpTimeOut('Server Error')
       ])
-
+ 
       const data: TResponse = await (res as Response).json()
 
       if (!(res as Response).ok) {

src/views/pages/auth/LoginPage.vue

@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import { onMounted } from 'vue';
 import LoginButton from './components/LoginButton.vue'
 import { APP } from '@/http/App'
 
@@ -9,15 +8,7 @@ function loginOrSignUpUser() {
 
 
 
-onMounted(()=>{
 
-  setTimeout(()=>{
-        window.Echo.channel("countProject")
-  .listen("NewProjectCreated",(e) => {
-        console.log(e)
-   });
-       },200)
-})
 </script>
 <template>
   <div class="row">

src/views/pages/auth/TokenPage.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { getUserData, setUserData, UserRole, type userAccountStatusType } from '@/helper/auth'
 import { showError } from '@/helper/toastnotification'
+import { APP } from '@/http/App'
 import { makeHttpReq, makeHttpReq2 } from '@/http/makeHttpReq'
 import { onMounted } from 'vue'
 import { useRoute } from 'vue-router'
@@ -23,16 +24,13 @@ type OauthTokenResponseType = {
   access_token: string
 }
 
-
 type userResponseType = {
   id: string
   name: string
   email: string
   role: UserRole
 }
 
-
-
 async function getAccessTokenAndRefreshToken() {
   const userData = getUserData()
 
@@ -44,57 +42,54 @@ async function getAccessTokenAndRefreshToken() {
       code_verifier: codeVerifier,
       code: userData?.authorizationCode as string
     }
-    const [token,{user,userAccount}] = await Promise.all([
-    makeHttpReq2<OauthTokenInputType, OauthTokenResponseType>(
-      'oauth/token',
-      'POST',
-      input
-    ),
-    makeHttpReq<OauthTokenInputType, {user:userResponseType,userAccount:{
-      leftDays:string,
-      account_status:userAccountStatusType
-    }}>(
-    'user_data',
-      'POST',
-      input
-    )
+    const [token, { user, userAccount }] = await Promise.all([
+      makeHttpReq2<OauthTokenInputType, OauthTokenResponseType>('oauth/token', 'POST', input),
+      makeHttpReq<
+        OauthTokenInputType,
+        {
+          user: userResponseType
+          userAccount: {
+            leftDays: string
+            account_status: userAccountStatusType
+          }
+        }
+      >('user_data', 'POST', input)
     ])
 
-    if(userAccount?.account_status==='Active'){
+    if (userAccount?.account_status === 'Active') {
       setUserData({
-      user: {
-        name:user?.name,
-        email: user?.email,
-        userId: user?.id,
-        role:user?.role
-      },
-
-      userAccount:{
-        leftDays:userAccount?.leftDays,
-        account_status:userAccount?.account_status
-      },
-   
-      token: {
-        accessToken: token?.access_token,
-        refreshToken: token?.refresh_token
-      }
-    })
-
-    window.location.href = '/dashboard'
-    }else{
+        user: {
+          name: user?.name,
+          email: user?.email,
+          userId: user?.id,
+          role: user?.role
+        },
+
+        userAccount: {
+          leftDays: userAccount?.leftDays,
+          account_status: userAccount?.account_status
+        },
+
+        token: {
+          accessToken: token?.access_token,
+          refreshToken: token?.refresh_token
+        }
+      })
+
+      window.location.href = '/dashboard'
+    } else {
       window.location.href = '/user_blocked'
     }
-      
-   
- 
-
-    
   } catch (error) {
-    showError((error as Error).message)
+    if ((error as Error).message === 'Unexpected end of JSON input') {
+      showError('Failed Login ..., please try again...')
+      setTimeout(() => (window.location.href = APP.baseURL + '/auth/redirect'), 1500)
+    } else {
+      showError((error as Error).message)
+    }
   }
 }
 
-
 onMounted(async () => {
   await getAccessTokenAndRefreshToken()
 })

src/views/pages/auth/UserBlockedPage.vue

@@ -1,3 +1,10 @@
+<script lang="ts" setup>
+
+import { onMounted } from 'vue'
+onMounted(()=>{
+    localStorage.clear();
+})
+</script>
 <template>
      <br>
     <br>