chore: change mail ui route to /mail

frappe · Nov 20, 2024 · 38c95c9 · 38c95c9
1 parent 7cce407
commit 38c95c9
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,5 +6,5 @@ tags
 node_modules
 __pycache__
 mail_client/public/frontend
-mail_client/www/client.html
+mail_client/www/mail.html
 .vscode
diff --git a/frontend/index.html b/frontend/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Frappe Mail Client</title>
+    <title>Frappe Mail</title>
   </head>
   <body>
     <div id="app"></div>

diff --git a/frontend/package.json b/frontend/package.json
@@ -6,7 +6,7 @@
     "dev": "vite",
     "serve": "vite preview",
     "build": "vite build --base=/assets/mail_client/frontend/ && yarn copy-html-entry",
-    "copy-html-entry": "cp ../mail_client/public/frontend/index.html ../mail_client/www/client.html"
+    "copy-html-entry": "cp ../mail_client/public/frontend/index.html ../mail_client/www/mail.html"
   },
   "dependencies": {
     "@vueuse/core": "^10.4.1",

diff --git a/frontend/src/components/Controls/MultiselectInput.vue b/frontend/src/components/Controls/MultiselectInput.vue
@@ -137,7 +137,7 @@ watchDebounced(
 )
 
 const filterOptions = createResource({
-	url: 'mail_client.api.client.get_mail_contacts',
+	url: 'mail_client.api.mail.get_mail_contacts',
 	makeParams(values) {
 		return {
 			txt: values.txt,

diff --git a/frontend/src/components/MailDetails.vue b/frontend/src/components/MailDetails.vue
@@ -115,7 +115,7 @@ const replyDetails = reactive({
 })
 
 const mailThread = createResource({
-	url: 'mail_client.api.client.get_mail_thread',
+	url: 'mail_client.api.mail.get_mail_thread',
 	makeParams(values) {
 		return {
 			name: values?.mailID || props.mailID,

diff --git a/frontend/src/pages/Inbox.vue b/frontend/src/pages/Inbox.vue
@@ -77,7 +77,7 @@ const setCurrentMail = (mail) => {
 }
 
 const incomingMails = createListResource({
-	url: 'mail_client.api.client.get_incoming_mails',
+	url: 'mail_client.api.mail.get_incoming_mails',
 	doctype: 'Incoming Mail',
 	auto: true,
 	start: mailStart.value,

diff --git a/frontend/src/pages/Sent.vue b/frontend/src/pages/Sent.vue
@@ -73,7 +73,7 @@ onMounted(() => {
 })
 
 const outgoingMails = createListResource({
-	url: 'mail_client.api.client.get_outgoing_mails',
+	url: 'mail_client.api.mail.get_outgoing_mails',
 	doctype: 'Outgoing Mail',
 	auto: true,
 	start: mailStart.value,

diff --git a/frontend/src/router.js b/frontend/src/router.js
@@ -22,7 +22,7 @@ const routes = [
 ]
 
 let router = createRouter({
-	history: createWebHistory('/client'),
+	history: createWebHistory('/mail'),
 	routes,
 })
 

diff --git a/frontend/src/stores/session.js b/frontend/src/stores/session.js
@@ -44,7 +44,7 @@ export const sessionStore = defineStore('mail-session', () => {
 	})
 
 	const branding = createResource({
-		url: 'mail_client.api.client.get_branding',
+		url: 'mail_client.api.mail.get_branding',
 		cache: 'brand',
 		auto: true,
 		onSuccess(data) {

diff --git a/frontend/src/stores/user.js b/frontend/src/stores/user.js
@@ -4,7 +4,7 @@ import { createResource } from 'frappe-ui'
 
 export const userStore = defineStore('mail-users', () => {
 	let userResource = createResource({
-		url: 'mail_client.api.client.get_user_info',
+		url: 'mail_client.api.mail.get_user_info',
 		onError(error) {
 			if (error && error.exc_type === 'AuthenticationError') {
 				router.push('/login')

diff --git a/frontend/src/translation.js b/frontend/src/translation.js
@@ -25,7 +25,7 @@ function translate(message) {
 
 function fetchTranslations(lang) {
 	createResource({
-		url: 'mail_client.api.client.get_translations',
+		url: 'mail_client.api.mail.get_translations',
 		cache: 'translations',
 		auto: true,
 		transform: (data) => {

diff --git a/frontend/yarn-error.log b/frontend/yarn-error.log
@@ -35,7 +35,7 @@ npm manifest:
       "dev": "vite",
       "serve": "vite preview",
       "build": "vite build --base=/assets/mail_client/frontend/ && yarn copy-html-entry",
-      "copy-html-entry": "cp ../mail_client/public/frontend/index.html ../mail_client/www/client.html"
+      "copy-html-entry": "cp ../mail_client/public/frontend/index.html ../mail_client/www/mail.html"
     },
     "dependencies": {
       "feather-icons": "^4.28.0",

diff --git a/mail_client/api/client.py → mail_client/api/mail.py b/mail_client/api/client.py → mail_client/api/mail.py
diff --git a/mail_client/hooks.py b/mail_client/hooks.py
@@ -148,7 +148,7 @@
 }
 
 website_route_rules = [
-	{"from_route": "/client/<path:app_path>", "to_route": "client"},
+	{"from_route": "/mail/<path:app_path>", "to_route": "mail"},
 ]
 
 # DocType Class
@@ -290,7 +290,7 @@
 		"name": "mail_client",
 		"logo": "/assets/mail_client/images/logo.svg",
 		"title": "Mail Client",
-		"route": "/client",
-		"has_permission": "mail_client.api.client.check_app_permission",
+		"route": "/mail",
+		"has_permission": "mail_client.api.mail.check_app_permission",
 	}
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ const routes = [ @@
     ]
     let router = createRouter({
-    	history: createWebHistory('/client'),
+    	history: createWebHistory('/mail'),
     	routes,
     })
@@ Expand Down @@