diff --git a/frappe-ui b/frappe-ui index 8762f85e..167ff453 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 8762f85ef72c01c2dbf9fbe2bd7417911d347ac3 +Subproject commit 167ff453cb525674f976d53b126900b80b9a80a2 diff --git a/frontend/.gitignore b/frontend/.gitignore index 2d3d435a..53f7466a 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -2,10 +2,4 @@ node_modules .DS_Store dist dist-ssr -*.local -*.pyc -*.egg-info -*.swp -tags -crm/public/frontend -__pycache__ \ No newline at end of file +*.local \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index 3f278a78..c21d40e6 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -16,7 +16,7 @@ "@vueuse/integrations": "^10.3.0", "autoprefixer": "^10.4.14", "feather-icons": "^4.28.0", - "frappe-ui": "^0.1.5", + "frappe-ui": "^0.1.6", "pinia": "^2.0.33", "postcss": "^8.4.5", "socket.io-client": "^4.7.2", diff --git a/frontend/src/components/Breadcrumbs.vue b/frontend/src/components/Breadcrumbs.vue deleted file mode 100644 index 51b11f4c..00000000 --- a/frontend/src/components/Breadcrumbs.vue +++ /dev/null @@ -1,27 +0,0 @@ - - diff --git a/frontend/src/components/NewDeal.vue b/frontend/src/components/NewDeal.vue index 587fc674..91d94abb 100644 --- a/frontend/src/components/NewDeal.vue +++ b/frontend/src/components/NewDeal.vue @@ -67,7 +67,7 @@ import IndicatorIcon from '@/components/Icons/IndicatorIcon.vue' import UserAvatar from '@/components/UserAvatar.vue' import { usersStore } from '@/stores/users' -import { dealStatuses, statusDropdownOptions } from '@/utils' +import { dealStatuses, statusDropdownOptions, activeAgents } from '@/utils' import { FormControl, Button, @@ -153,18 +153,4 @@ const allFields = [ ], }, ] - -const activeAgents = computed(() => { - const nonAgents = ['Administrator', 'Guest'] - return users.data - .filter((user) => !nonAgents.includes(user.name)) - .sort((a, b) => a.full_name - b.full_name) - .map((user) => { - return { - label: user.full_name, - value: user.email, - ...user, - } - }) -}) diff --git a/frontend/src/components/NewLead.vue b/frontend/src/components/NewLead.vue index cd0a1a48..1a2ceea2 100644 --- a/frontend/src/components/NewLead.vue +++ b/frontend/src/components/NewLead.vue @@ -3,7 +3,7 @@
-
{{ field.label }}
+
{{ field.label }}
- -
- - - - - - - + + +
{ return items }) +const tabIndex = ref(0) const tabs = [ { label: 'Activity', @@ -469,21 +436,6 @@ function validateFile(file) { } } -const tabRef = ref([]) -const indicator = ref(null) - -let indicatorLeft = ref(20) -const indicatorLeftValue = useTransition(indicatorLeft, { - duration: 250, - ease: TransitionPresets.easeOutCubic, -}) - -function onTabChange(index) { - const selectedTab = tabRef.value[index].el - indicator.value.style.width = `${selectedTab.offsetWidth}px` - indicatorLeft.value = selectedTab.offsetLeft -} - const detailSections = computed(() => { return [ { @@ -572,20 +524,6 @@ const detailSections = computed(() => { ] }) -const activeAgents = computed(() => { - const nonAgents = ['Administrator', 'Guest'] - return users.data - .filter((user) => !nonAgents.includes(user.name)) - .sort((a, b) => a.full_name - b.full_name) - .map((user) => { - return { - label: user.full_name, - value: user.email, - ...user, - } - }) -}) - function updateAssignedAgent(email) { deal.data.lead_owner = email updateDeal('lead_owner', email) diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue index 41989a63..f9d6049a 100644 --- a/frontend/src/pages/Deals.vue +++ b/frontend/src/pages/Deals.vue @@ -1,7 +1,7 @@