From 6bb6fa8298454ad792408fdc54e81b7d17924c34 Mon Sep 17 00:00:00 2001
From: Dream Hunter <dreamhunter2333@gmail.com>
Date: Tue, 14 May 2024 14:44:47 +0800
Subject: [PATCH] feat: remove mailV1Alert && fix mobile showSideMargin (#236)

---
 frontend/src/App.vue                     | 8 ++++----
 frontend/src/api/index.js                | 1 -
 frontend/src/store/index.js              | 1 -
 frontend/src/views/common/Appearance.vue | 6 ++++--
 frontend/src/views/index/AddressBar.vue  | 9 ---------
 worker/src/mails_api/index.js            | 7 +------
 6 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 4268290f..b86ef4d4 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -12,7 +12,7 @@ const { localeCache, isDark, loading, useSideMargin } = useGlobalState()
 const theme = computed(() => isDark.value ? darkTheme : null)
 const localeConfig = computed(() => localeCache.value == 'zh' ? zhCN : null)
 const isMobile = useIsMobile()
-const showSideMargin = computed(() => !isMobile.value && !useSideMargin.value);
+const showSideMargin = computed(() => !isMobile.value && useSideMargin.value);
 
 const { locale } = useI18n({
   useScope: 'global',
@@ -40,8 +40,8 @@ onMounted(async () => {
     <n-spin description="loading..." :show="loading">
       <n-message-provider>
         <n-grid x-gap="12" :cols="12">
-          <n-gi v-if="!showSideMargin" span="1"></n-gi>
-          <n-gi :span="showSideMargin ? 12 : 10">
+          <n-gi v-if="showSideMargin" span="1"></n-gi>
+          <n-gi :span="!showSideMargin ? 12 : 10">
             <div class="main">
               <n-space vertical>
                 <n-layout style="min-height: 80vh;">
@@ -52,7 +52,7 @@ onMounted(async () => {
               </n-space>
             </div>
           </n-gi>
-          <n-gi v-if="!showSideMargin" span="1"></n-gi>
+          <n-gi v-if="showSideMargin" span="1"></n-gi>
         </n-grid>
         <n-back-top />
       </n-message-provider>
diff --git a/frontend/src/api/index.js b/frontend/src/api/index.js
index 292972f8..2e1ce7d0 100644
--- a/frontend/src/api/index.js
+++ b/frontend/src/api/index.js
@@ -87,7 +87,6 @@ const getSettings = async () => {
         settings.value = {
             address: res["address"],
             auto_reply: res["auto_reply"],
-            has_v1_mails: res["has_v1_mails"],
             send_balance: res["send_balance"],
         };
     } finally {
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index ded2d723..1d95e649 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -20,7 +20,6 @@ export const useGlobalState = createGlobalState(
         })
         const settings = ref({
             fetched: false,
-            has_v1_mails: false,
             send_balance: 0,
             address: '',
             auto_reply: {
diff --git a/frontend/src/views/common/Appearance.vue b/frontend/src/views/common/Appearance.vue
index ea5f7ef4..174de2a3 100644
--- a/frontend/src/views/common/Appearance.vue
+++ b/frontend/src/views/common/Appearance.vue
@@ -1,12 +1,14 @@
 <script setup>
 import { useI18n } from 'vue-i18n'
 
+import { useIsMobile } from '../../utils/composables'
 import { useGlobalState } from '../../store'
 
 const {
     localeCache, mailboxSplitSize, useIframeShowMail, preferShowTextMail,
     globalTabplacement, useSideMargin
 } = useGlobalState()
+const isMobile = useIsMobile()
 
 const { t } = useI18n({
     locale: localeCache.value || 'zh',
@@ -40,7 +42,7 @@ const { t } = useI18n({
 <template>
     <div class="center">
         <n-card>
-            <n-form-item-row :label="t('mailboxSplitSize')">
+            <n-form-item-row v-if="!isMobile" :label="t('mailboxSplitSize')">
                 <n-slider v-model:value="mailboxSplitSize" :min="0.25" :max="0.75" :step="0.01" :marks="{
                     0.25: '0.25',
                     0.5: '0.5',
@@ -53,7 +55,7 @@ const { t } = useI18n({
             <n-form-item-row :label="t('useIframeShowMail')">
                 <n-switch v-model:value="useIframeShowMail" :round="false" />
             </n-form-item-row>
-            <n-form-item-row :label="t('useSideMargin')">
+            <n-form-item-row v-if="!isMobile" :label="t('useSideMargin')">
                 <n-switch v-model:value="useSideMargin" :round="false" />
             </n-form-item-row>
             <n-form-item-row :label="t('globalTabplacement')">
diff --git a/frontend/src/views/index/AddressBar.vue b/frontend/src/views/index/AddressBar.vue
index 853b1f29..bf0c3baf 100644
--- a/frontend/src/views/index/AddressBar.vue
+++ b/frontend/src/views/index/AddressBar.vue
@@ -26,7 +26,6 @@ const { t } = useI18n({
             copy: 'Copy',
             copied: 'Copied',
             fetchAddressError: 'Mail address credential is invalid or account not exist, it may be network connection issue, please try again later.',
-            mailV1Alert: 'You have some mails in v1, please click here to login and visit your history mails.',
             addressCredential: 'Mail Address Credential',
             addressCredentialTip: 'Please copy the Mail Address Credential and you can use it to login to your email account.',
             userLogin: 'User Login',
@@ -37,7 +36,6 @@ const { t } = useI18n({
             copy: '复制',
             copied: '已复制',
             fetchAddressError: '邮箱地址凭证无效或邮箱地址不存在，也可能是网络连接异常，请稍后再尝试。',
-            mailV1Alert: '你有一些 v1 版本的邮件，请点击此处登录查看。',
             addressCredential: '邮箱地址凭证',
             addressCredentialTip: '请复制邮箱地址凭证，你可以使用它登录你的邮箱。',
             userLogin: '用户登录',
@@ -65,13 +63,6 @@ onMounted(async () => {
             <n-skeleton style="height: 50vh" />
         </n-card>
         <div v-else-if="settings.address">
-            <n-alert v-if="settings.has_v1_mails" type="warning" :show-icon="false" closable>
-                <span>
-                    <n-button tag="a" target="_blank" tertiary type="info" size="small" href="https://mail-v1.awsl.uk">
-                        <b>{{ t('mailV1Alert') }} </b>
-                    </n-button>
-                </span>
-            </n-alert>
             <n-alert type="info" :show-icon="false">
                 <span>
                     <b>{{ t('yourAddress') }} <b>{{ settings.address }}</b></b>
diff --git a/worker/src/mails_api/index.js b/worker/src/mails_api/index.js
index f8a41c06..2c33d894 100644
--- a/worker/src/mails_api/index.js
+++ b/worker/src/mails_api/index.js
@@ -72,16 +72,11 @@ api.get('/api/settings', async (c) => {
     } catch (e) {
         console.warn("Failed to update address")
     }
-    const { count: mailCountV1 } = await c.env.DB.prepare(
-        `SELECT count(*) as count FROM mails where address = ?`
-    ).bind(address).first();
     const balance = await c.env.DB.prepare(
-        `SELECT balance FROM address_sender
-            where address = ? and enabled = 1`
+        `SELECT balance FROM address_sender where address = ? and enabled = 1`
     ).bind(address).first("balance");
     return c.json({
         address: address,
-        has_v1_mails: mailCountV1 && mailCountV1 > 0,
         send_balance: balance || 0,
     });
 })