From 455c6963a8fdd8de0fa9f2754724a2e88ed4fa33 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 13 Aug 2024 11:51:31 +0530
Subject: [PATCH 1/4] fix: minor style changes in Apps.vue

---
 frontend/src/components/Apps.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Apps.vue b/frontend/src/components/Apps.vue
index 97e96a76..225f2517 100644
--- a/frontend/src/components/Apps.vue
+++ b/frontend/src/components/Apps.vue
@@ -20,13 +20,13 @@
       <div
         class="grid grid-cols-3 justify-between mx-3 p-2 rounded-lg border border-gray-100 bg-white shadow-xl"
       >
-        <div v-for="app in apps.data" key="name">
+        <div v-for="app in apps.data" :key="app.name">
           <a
             :href="app.route"
-            class="flex flex-col gap-1.5 rounded justify-center items-center py-2 px-3 hover:bg-gray-100"
+            class="flex flex-col gap-1.5 rounded justify-center items-center py-2 px-1 hover:bg-gray-100"
           >
             <img class="size-8" :src="app.logo" />
-            <div class="text-sm" @click="app.onClick">
+            <div class="text-sm text-gray-700" @click="app.onClick">
               {{ app.title }}
             </div>
           </a>

From 1cafab1fda2c0e747ab136af2c1b42ba186050ac Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 13 Aug 2024 12:42:34 +0530
Subject: [PATCH 2/4] fix: removed login page and redirect to frappe's login
 page

---
 frontend/src/pages/Login.vue   | 104 ---------------------------------
 frontend/src/router.js         |  10 +---
 frontend/src/stores/session.js |   1 -
 3 files changed, 3 insertions(+), 112 deletions(-)
 delete mode 100644 frontend/src/pages/Login.vue

diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
deleted file mode 100644
index b8d3ea68..00000000
--- a/frontend/src/pages/Login.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <div class="flex h-screen w-screen justify-center bg-gray-100">
-    <div class="mt-32 w-full px-4">
-      <CRMLogo class="mx-auto h-10" />
-      <div class="mt-6 flex items-center justify-center space-x-1.5">
-        <span class="text-3xl font-semibold text-gray-900">Login to CRM</span>
-      </div>
-      <div class="mx-auto mt-6 w-full px-4 sm:w-96">
-        <form
-          v-if="showEmailLogin"
-          method="POST"
-          action="/api/method/login"
-          @submit.prevent="submit"
-        >
-          <div>
-            <FormControl
-              variant="outline"
-              size="md"
-              :type="
-                (email || '').toLowerCase() === 'administrator'
-                  ? 'text'
-                  : 'email'
-              "
-              label="Email"
-              v-model="email"
-              placeholder="jane@example.com"
-              :disabled="session.login.loading"
-            />
-          </div>
-          <div class="mt-4">
-            <FormControl
-              variant="outline"
-              size="md"
-              label="Password"
-              v-model="password"
-              placeholder="••••••"
-              :disabled="session.login.loading"
-              type="password"
-            />
-          </div>
-          <ErrorMessage class="mt-2" :message="session.login.error" />
-          <Button
-            variant="solid"
-            class="mt-6 w-full"
-            :loading="session.login.loading"
-          >
-            Login
-          </Button>
-          <button
-            v-if="authProviders.data.length"
-            class="mt-2 w-full py-2 text-base text-gray-600"
-            @click="showEmailLogin = false"
-          >
-            Login using other methods
-          </button>
-        </form>
-        <div
-          class="mx-auto space-y-2"
-          v-if="authProviders.data && !showEmailLogin"
-        >
-          <Button @click="showEmailLogin = true" variant="solid" class="w-full">
-            Login via email
-          </Button>
-          <a
-            class="flex justify-center items-center gap-2 w-full rounded border bg-gray-900 px-3 py-1 text-center text-base h-7 focus:outline-none focus:ring-2 focus:ring-gray-400 text-white transition-colors hover:bg-gray-700"
-            v-for="provider in authProviders.data"
-            :key="provider.name"
-            :href="provider.auth_url"
-          >
-            <div v-if="provider.icon" v-html="provider.icon" />
-            Login via {{ provider.provider_name }}
-          </a>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script setup>
-import CRMLogo from '@/components/Icons/CRMLogo.vue';
-import { sessionStore } from '@/stores/session'
-import { createResource } from 'frappe-ui'
-import { ref } from 'vue'
-
-const session = sessionStore()
-let showEmailLogin = ref(false)
-let email = ref('')
-let password = ref('')
-
-let authProviders = createResource({
-  url: 'crm.api.auth.oauth_providers',
-  auto: true,
-  onSuccess(data) {
-    showEmailLogin.value = data.length === 0
-  },
-})
-authProviders.fetch()
-
-function submit() {
-  session.login.submit({
-    usr: email.value,
-    pwd: password.value,
-  })
-}
-</script>
diff --git a/frontend/src/router.js b/frontend/src/router.js
index dff911ec..aa254224 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -102,11 +102,6 @@ const routes = [
     name: 'Invalid Page',
     component: () => import('@/pages/InvalidPage.vue'),
   },
-  {
-    path: '/login',
-    name: 'Login',
-    component: () => import('@/pages/Login.vue'),
-  },
 ]
 
 const handleMobileView = (componentName) => {
@@ -150,8 +145,9 @@ router.beforeEach(async (to, from, next) => {
 
   if (to.name === 'Login' && isLoggedIn) {
     next({ name: 'Leads' })
-  } else if (to.name !== 'Login' && !isLoggedIn) {
-    next({ name: 'Login' })
+  } else if (!isLoggedIn) {
+    users?.reset?.()
+    window.location.href = "/login?redirect-to=/crm";
   } else if (to.matched.length === 0) {
     next({ name: 'Invalid Page' })
   } else {
diff --git a/frontend/src/stores/session.js b/frontend/src/stores/session.js
index 3a5c2b80..6c4f7d1b 100644
--- a/frontend/src/stores/session.js
+++ b/frontend/src/stores/session.js
@@ -35,7 +35,6 @@ export const sessionStore = defineStore('crm-session', () => {
   const logout = createResource({
     url: 'logout',
     onSuccess() {
-      users.reset()
       user.value = null
       router.replace({ name: 'Login' })
     },

From 4466669a2b8e0c6e602265e1f66e970c3b35077c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 14 Aug 2024 10:49:17 +0530
Subject: [PATCH 3/4] fix: style changes & use framework icon from frappe

---
 frontend/src/components/Apps.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Apps.vue b/frontend/src/components/Apps.vue
index 225f2517..aea4c002 100644
--- a/frontend/src/components/Apps.vue
+++ b/frontend/src/components/Apps.vue
@@ -3,7 +3,8 @@
     <template #target="{ togglePopover }">
       <button
         :class="[
-          'group w-full flex h-7 items-center justify-between rounded px-2 text-base text-gray-800 hover:bg-gray-100',
+          active ? 'bg-gray-100' : 'text-gray-800',
+          'group w-full flex h-7 items-center justify-between rounded px-2 text-base hover:bg-gray-100',
         ]"
         @click.prevent="togglePopover()"
       >
@@ -39,6 +40,10 @@
 import AppsIcon from '@/components/Icons/AppsIcon.vue'
 import { Popover, createResource } from 'frappe-ui'
 
+const props = defineProps({
+  active: Boolean,
+})
+
 const apps = createResource({
   url: 'frappe.apps.get_apps',
   cache: 'apps',
@@ -47,7 +52,7 @@ const apps = createResource({
     let _apps = [
       {
         name: 'frappe',
-        logo: '/assets/crm/images/desk.png',
+        logo: '/assets/frappe/images/framework.png',
         title: __('Desk'),
         route: '/app',
       },

From da64ccbd7f8f6673ed2ff5302f01b5ac6c0d6993 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 14 Aug 2024 10:52:15 +0530
Subject: [PATCH 4/4] refactor: get logged in user instead of all users after
 login and before each route change

---
 frontend/src/App.vue           |  3 +--
 frontend/src/router.js         |  8 +++-----
 frontend/src/stores/session.js |  9 ++++-----
 frontend/src/stores/user.js    | 12 ++++++++++++
 4 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 frontend/src/stores/user.js

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 9b8693a2..61e774c9 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,6 +1,5 @@
 <template>
-  <router-view v-if="$route.name == 'Login'" />
-  <Layout v-else-if="session().isLoggedIn">
+  <Layout v-if="session().isLoggedIn">
     <router-view />
   </Layout>
   <Dialogs />
diff --git a/frontend/src/router.js b/frontend/src/router.js
index aa254224..ba678927 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -1,5 +1,5 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import { usersStore } from '@/stores/users'
+import { userResource } from '@/stores/user'
 import { sessionStore } from '@/stores/session'
 
 const routes = [
@@ -134,19 +134,17 @@ let router = createRouter({
 })
 
 router.beforeEach(async (to, from, next) => {
-  const { users } = usersStore()
   const { isLoggedIn } = sessionStore()
 
-  isLoggedIn && (await users.promise)
+  isLoggedIn && (await userResource.promise)
 
   if (from.meta?.scrollPos) {
     from.meta.scrollPos.top = document.querySelector('#list-rows')?.scrollTop
   }
 
-  if (to.name === 'Login' && isLoggedIn) {
+  if (to.name === 'Home' && isLoggedIn) {
     next({ name: 'Leads' })
   } else if (!isLoggedIn) {
-    users?.reset?.()
     window.location.href = "/login?redirect-to=/crm";
   } else if (to.matched.length === 0) {
     next({ name: 'Invalid Page' })
diff --git a/frontend/src/stores/session.js b/frontend/src/stores/session.js
index 6c4f7d1b..9a5139ab 100644
--- a/frontend/src/stores/session.js
+++ b/frontend/src/stores/session.js
@@ -1,12 +1,10 @@
 import { defineStore } from 'pinia'
 import { createResource } from 'frappe-ui'
-import { usersStore } from './users'
+import { userResource } from './user'
 import router from '@/router'
 import { ref, computed } from 'vue'
 
 export const sessionStore = defineStore('crm-session', () => {
-  const { users } = usersStore()
-
   function sessionUser() {
     let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
     let _sessionUser = cookies.get('user_id')
@@ -25,7 +23,7 @@ export const sessionStore = defineStore('crm-session', () => {
       throw new Error('Invalid email or password')
     },
     onSuccess() {
-      users.reload()
+      userResource.reload()
       user.value = sessionUser()
       login.reset()
       router.replace({ path: '/' })
@@ -35,8 +33,9 @@ export const sessionStore = defineStore('crm-session', () => {
   const logout = createResource({
     url: 'logout',
     onSuccess() {
+      userResource.reset()
       user.value = null
-      router.replace({ name: 'Login' })
+      router.replace({ name: 'Home' })
     },
   })
 
diff --git a/frontend/src/stores/user.js b/frontend/src/stores/user.js
new file mode 100644
index 00000000..b78997e0
--- /dev/null
+++ b/frontend/src/stores/user.js
@@ -0,0 +1,12 @@
+import router from '@/router'
+import { createResource } from 'frappe-ui'
+
+export const userResource = createResource({
+  url: 'frappe.auth.get_logged_user',
+  cache: 'User',
+  onError(error) {
+    if (error && error.exc_type === 'AuthenticationError') {
+      router.push({ name: 'Home' })
+    }
+  },
+})