From 8f3e05424574d5f905eb744aca9171fb559cef15 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 19 Feb 2025 14:21:36 +0530
Subject: [PATCH 1/8] fix: added login to fc link in dropdown

---
 crm/hooks.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/crm/hooks.py b/crm/hooks.py
index a1996f4b..e652e3e1 100644
--- a/crm/hooks.py
+++ b/crm/hooks.py
@@ -293,7 +293,14 @@ standard_dropdown_items = [
 		"label": "Settings",
 		"type": "Route",
 		"icon": "settings",
-  		"route": "#",
+		"route": "#",
+		"is_standard": 1,
+	},
+	{
+		"name1": "login_to_fc",
+		"label": "Login to Frappe Cloud",
+		"type": "Route",
+		"route": "#",
 		"is_standard": 1,
 	},
 	{
@@ -307,7 +314,7 @@ standard_dropdown_items = [
 		"label": "Log out",
 		"type": "Route",
 		"icon": "log-out",
-  		"route": "#",
+		"route": "#",
 		"is_standard": 1,
 	},
 ]

From a3b880e95bd2f21febad186ee9c440f268a55289 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 19 Feb 2025 14:22:18 +0530
Subject: [PATCH 2/8] fix: added is_fc_site in boot

---
 crm/www/crm.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crm/www/crm.py b/crm/www/crm.py
index f980091e..c630506f 100644
--- a/crm/www/crm.py
+++ b/crm/www/crm.py
@@ -3,6 +3,7 @@
 
 
 import frappe
+from frappe.integrations.frappe_providers.frappecloud_billing import is_fc_site
 from frappe.utils import cint, get_system_timezone
 from frappe.utils.telemetry import capture
 
@@ -36,6 +37,7 @@ def get_boot():
 			"setup_complete": cint(frappe.get_system_settings("setup_complete")),
 			"sysdefaults": frappe.defaults.get_defaults(),
 			"is_demo_site": frappe.conf.get("is_demo_site"),
+			"is_fc_site": is_fc_site(),
 			"timezone": {
 				"system": get_system_timezone(),
 				"user": frappe.db.get_value("User", frappe.session.user, "time_zone")

From 37e535a28e4360678b9ea14cad10ea14e1517d4d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 19 Feb 2025 15:04:17 +0530
Subject: [PATCH 3/8] fix: added login to fc button in dropdown

---
 .../src/components/Icons/FrappeCloudIcon.vue  | 23 ++++++++++
 frontend/src/components/UserDropdown.vue      |  9 ++++
 frontend/src/composables/frappecloud.js       | 42 +++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 frontend/src/components/Icons/FrappeCloudIcon.vue
 create mode 100644 frontend/src/composables/frappecloud.js

diff --git a/frontend/src/components/Icons/FrappeCloudIcon.vue b/frontend/src/components/Icons/FrappeCloudIcon.vue
new file mode 100644
index 00000000..2126bb92
--- /dev/null
+++ b/frontend/src/components/Icons/FrappeCloudIcon.vue
@@ -0,0 +1,23 @@
+<template>
+  <svg
+    width="32"
+    height="32"
+    viewBox="0 0 32 32"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <rect
+      x="0.75"
+      y="0.75"
+      width="30.5"
+      height="30.5"
+      rx="6.25"
+      stroke="currentColor"
+      stroke-width="1.5"
+    />
+    <path
+      d="M24.5011 14.1124C23.3954 12.4873 21.532 11.5477 19.594 11.6747C18.7616 10.1384 17.2211 9.12267 15.4198 9.0084C14.1651 8.93222 12.8979 9.3766 11.9165 10.24C11.2456 10.8367 10.7611 11.5223 10.463 12.2968C10.289 12.7539 9.89151 13.0459 9.46912 13.0459H6.5V15.5852H9.46912C10.9226 15.5852 12.2271 14.6584 12.7737 13.2237C12.9227 12.8301 13.1712 12.4873 13.5439 12.1571C14.0284 11.7255 14.662 11.4969 15.2583 11.535C16.1528 11.5985 16.7863 12.0175 17.1839 12.538C17.6063 13.0205 17.8423 13.7696 17.979 14.5187C18.774 14.2902 19.6437 14.0997 20.476 14.2394C21.1593 14.3536 21.7929 14.7218 22.2525 15.2678C22.327 15.3567 22.4016 15.4456 22.4637 15.5471C23.06 16.4232 23.1718 17.5024 22.7743 18.5689C22.414 19.5592 21.0847 20.4607 19.9791 20.4607H11.3326C10.1524 20.4607 9.18339 19.5592 9.03432 18.4038H6.54969C6.71119 20.9686 8.78585 23 11.3326 23H19.9915C22.1283 23 24.3769 21.451 25.1098 19.4704C25.7931 17.6167 25.5695 15.6614 24.5135 14.0997L24.5011 14.1124Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index b76d63ab..a183ef4e 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -50,11 +50,13 @@
 
 <script setup>
 import BrandLogo from '@/components/BrandLogo.vue'
+import FrappeCloudIcon from '@/components/Icons/FrappeCloudIcon.vue'
 import Apps from '@/components/Apps.vue'
 import { sessionStore } from '@/stores/session'
 import { usersStore } from '@/stores/users'
 import { getSettings } from '@/stores/settings'
 import { showSettings, isMobileView } from '@/composables/settings'
+import { confirmLoginToFrappeCloud } from '@/composables/frappecloud'
 import { Dropdown } from 'frappe-ui'
 import { theme, toggleTheme } from '@/stores/theme'
 import { computed, h, markRaw } from 'vue'
@@ -156,6 +158,13 @@ function getStandardItem(item) {
         onClick: () => (showSettings.value = true),
         condition: () => !isMobileView.value,
       }
+    case 'login_to_fc':
+      return {
+        icon: h(FrappeCloudIcon),
+        label: __(item.label),
+        onClick: () => confirmLoginToFrappeCloud(),
+        condition: () => !isMobileView.value && window.is_fc_site,
+      }
     case 'logout':
       return {
         icon: item.icon,
diff --git a/frontend/src/composables/frappecloud.js b/frontend/src/composables/frappecloud.js
new file mode 100644
index 00000000..1ee6bc5e
--- /dev/null
+++ b/frontend/src/composables/frappecloud.js
@@ -0,0 +1,42 @@
+import { globalStore } from '@/stores/global'
+import { call } from 'frappe-ui'
+
+const frappeCloudBaseEndpoint = 'https://frappecloud.com'
+
+export const confirmLoginToFrappeCloud = () => {
+  const { $dialog } = globalStore()
+  $dialog({
+    title: __('Login to Frappe Cloud?'),
+    message: __(
+      'Are you sure you want to login to your Frappe Cloud dashboard?',
+    ),
+    actions: [
+      {
+        label: __('Confirm'),
+        variant: 'solid',
+        onClick(close) {
+          loginToFrappeCloud()
+          close()
+        },
+      },
+    ],
+  })
+}
+
+const loginToFrappeCloud = () => {
+  call(
+    'frappe.integrations.frappe_providers.frappecloud_billing.current_site_info',
+  ).then((response) => {
+    if (!response) return
+
+    let redirectRoute = ''
+
+    if (response.is_payment_method_added) {
+      redirectRoute = '/dashboard'
+    } else {
+      redirectRoute = '/dashboard/welcome'
+    }
+
+    window.open(`${frappeCloudBaseEndpoint}${redirectRoute}`, '_blank')
+  })
+}

From 65abf1131bef5c2e9cc99b4a745895dea00c3200 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 19 Feb 2025 15:19:58 +0530
Subject: [PATCH 4/8] fix: added TrialBanner in sidebar

---
 .../src/components/Layouts/AppSidebar.vue     |  7 ++--
 frontend/src/composables/frappecloud.js       | 35 +++++++++++--------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index e44ae5ca..cf9ea854 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -73,6 +73,7 @@
     </div>
     <div class="m-2 flex flex-col gap-1">
       <SignupBanner :isSidebarCollapsed="isSidebarCollapsed" />
+      <TrialBanner v-if="isFCSite" />
       <SidebarLink
         :label="isSidebarCollapsed ? __('Expand') : __('Collapse')"
         :isCollapsed="isSidebarCollapsed"
@@ -117,15 +118,17 @@ import {
   unreadNotificationsCount,
   notificationsStore,
 } from '@/stores/notifications'
-import { FeatherIcon } from 'frappe-ui'
+import { FeatherIcon, TrialBanner } from 'frappe-ui'
 import { useStorage } from '@vueuse/core'
-import { computed, h } from 'vue'
+import { ref, computed, h } from 'vue'
 
 const { getPinnedViews, getPublicViews } = viewsStore()
 const { toggle: toggleNotificationPanel } = notificationsStore()
 
 const isSidebarCollapsed = useStorage('isSidebarCollapsed', false)
 
+const isFCSite = ref(window.is_fc_site)
+
 const links = [
   {
     label: 'Leads',
diff --git a/frontend/src/composables/frappecloud.js b/frontend/src/composables/frappecloud.js
index 1ee6bc5e..81763ba8 100644
--- a/frontend/src/composables/frappecloud.js
+++ b/frontend/src/composables/frappecloud.js
@@ -1,10 +1,23 @@
 import { globalStore } from '@/stores/global'
-import { call } from 'frappe-ui'
+import { createResource } from 'frappe-ui'
+import { ref } from 'vue'
 
 const frappeCloudBaseEndpoint = 'https://frappecloud.com'
+const isPaymentModeAdded = ref(false)
+
+export const currentSiteInfo = createResource({
+  url: 'frappe.integrations.frappe_providers.frappecloud_billing.current_site_info',
+  cache: 'currentSiteInfo',
+  onSuccess: (data) => {
+    isPaymentModeAdded.value = data.is_payment_method_added
+  },
+})
 
 export const confirmLoginToFrappeCloud = () => {
+  currentSiteInfo.fetch()
+
   const { $dialog } = globalStore()
+
   $dialog({
     title: __('Login to Frappe Cloud?'),
     message: __(
@@ -24,19 +37,13 @@ export const confirmLoginToFrappeCloud = () => {
 }
 
 const loginToFrappeCloud = () => {
-  call(
-    'frappe.integrations.frappe_providers.frappecloud_billing.current_site_info',
-  ).then((response) => {
-    if (!response) return
+  let redirectRoute = ''
 
-    let redirectRoute = ''
+  if (isPaymentModeAdded.value) {
+    redirectRoute = '/dashboard'
+  } else {
+    redirectRoute = '/dashboard/welcome'
+  }
 
-    if (response.is_payment_method_added) {
-      redirectRoute = '/dashboard'
-    } else {
-      redirectRoute = '/dashboard/welcome'
-    }
-
-    window.open(`${frappeCloudBaseEndpoint}${redirectRoute}`, '_blank')
-  })
+  window.open(`${frappeCloudBaseEndpoint}${redirectRoute}`, '_blank')
 }

From 54b2bd7e1518f7016f09cc770048b531f8ca7a99 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 19 Feb 2025 15:46:52 +0530
Subject: [PATCH 5/8] fix: redirect to leads if default view is not set

---
 frontend/src/router.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 4a0dde5f..e6af1562 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -116,7 +116,14 @@ router.beforeEach(async (to, from, next) => {
     const { getDefaultView, defaultView } = viewsStore()
     await defaultView.promise
 
-    let { name, type, view } = getDefaultView(true)
+    let _defaultView = getDefaultView(true)
+
+    if (!_defaultView) {
+      next({ name: 'Leads' })
+      return
+    }
+
+    let { name, type, view } = _defaultView
     name = name || 'Leads'
 
     if (view) {

From 7ba2a9c929ce05d4595d5ca2704ed5af7dab52c9 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 19 Feb 2025 17:37:57 +0530
Subject: [PATCH 6/8] fix: get base_url from current_site_info api

---
 frontend/src/composables/frappecloud.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/composables/frappecloud.js b/frontend/src/composables/frappecloud.js
index 81763ba8..3e77e7af 100644
--- a/frontend/src/composables/frappecloud.js
+++ b/frontend/src/composables/frappecloud.js
@@ -2,7 +2,7 @@ import { globalStore } from '@/stores/global'
 import { createResource } from 'frappe-ui'
 import { ref } from 'vue'
 
-const frappeCloudBaseEndpoint = 'https://frappecloud.com'
+const baseEndpoint = ref('https://frappecloud.com')
 const isPaymentModeAdded = ref(false)
 
 export const currentSiteInfo = createResource({
@@ -10,6 +10,7 @@ export const currentSiteInfo = createResource({
   cache: 'currentSiteInfo',
   onSuccess: (data) => {
     isPaymentModeAdded.value = data.is_payment_method_added
+    baseEndpoint.value = data.base_url
   },
 })
 
@@ -45,5 +46,5 @@ const loginToFrappeCloud = () => {
     redirectRoute = '/dashboard/welcome'
   }
 
-  window.open(`${frappeCloudBaseEndpoint}${redirectRoute}`, '_blank')
+  window.open(`${baseEndpoint.value}${redirectRoute}`, '_blank')
 }

From 9c49b28070029950ef44e8952da8d94407134976 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 21 Feb 2025 17:34:38 +0530
Subject: [PATCH 7/8] fix: removed welcome page redirect code

---
 frontend/src/composables/frappecloud.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/frontend/src/composables/frappecloud.js b/frontend/src/composables/frappecloud.js
index 3e77e7af..f36fcdc4 100644
--- a/frontend/src/composables/frappecloud.js
+++ b/frontend/src/composables/frappecloud.js
@@ -3,14 +3,14 @@ import { createResource } from 'frappe-ui'
 import { ref } from 'vue'
 
 const baseEndpoint = ref('https://frappecloud.com')
-const isPaymentModeAdded = ref(false)
+const siteName = ref('')
 
 export const currentSiteInfo = createResource({
   url: 'frappe.integrations.frappe_providers.frappecloud_billing.current_site_info',
   cache: 'currentSiteInfo',
   onSuccess: (data) => {
-    isPaymentModeAdded.value = data.is_payment_method_added
     baseEndpoint.value = data.base_url
+    siteName.value = data.site_name
   },
 })
 
@@ -38,13 +38,8 @@ export const confirmLoginToFrappeCloud = () => {
 }
 
 const loginToFrappeCloud = () => {
-  let redirectRoute = ''
-
-  if (isPaymentModeAdded.value) {
-    redirectRoute = '/dashboard'
-  } else {
-    redirectRoute = '/dashboard/welcome'
-  }
-
-  window.open(`${baseEndpoint.value}${redirectRoute}`, '_blank')
+  window.open(
+    `${baseEndpoint.value}/dashboard/sites/${siteName.value}`,
+    '_blank',
+  )
 }

From 3bb962c1b501f0e69d6874cee723278c32d84304 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 21 Feb 2025 18:18:12 +0530
Subject: [PATCH 8/8] build(deps): bump frappeui to 0.1.111

---
 frappe-ui             | 2 +-
 frontend/package.json | 2 +-
 yarn.lock             | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe-ui b/frappe-ui
index e01b1ee3..33c9907a 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit e01b1ee305a0207413cd67ed7345578440c503db
+Subproject commit 33c9907aa9163d8d3b84f23dc2a2c829e4d8c6f1
diff --git a/frontend/package.json b/frontend/package.json
index 88fa0c76..bb53389b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -14,7 +14,7 @@
     "@vueuse/core": "^10.3.0",
     "@vueuse/integrations": "^10.3.0",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.110",
+    "frappe-ui": "^0.1.111",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index 25bbca56..77758d1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2388,10 +2388,10 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-frappe-ui@^0.1.110:
-  version "0.1.110"
-  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.110.tgz#dbe02d294cb0aeb0a4c1b3000682093c309450ae"
-  integrity sha512-kFah6SoPauULXaeSbljNUq595/82VmY4k4+KA8zi4sXxpn4sXYi12qUl/1I8GOBhsCQQizmoh46DO7e/uU2M1A==
+frappe-ui@^0.1.111:
+  version "0.1.111"
+  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.111.tgz#c7615aa8f02da9af0596074352150d813d0f4b3d"
+  integrity sha512-JCh/SQwcbsQQxTZIFFzEULPgp2QAQZe+vwrM2jqekIx4dBgYW2H1KgXSlf+uO2ng2vqk4Q1MiStA3svHQEXsLQ==
   dependencies:
     "@headlessui/vue" "^1.7.14"
     "@popperjs/core" "^2.11.2"