From 874689c6bf01e3a257993d276112dda17363b2f7 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 6 Jun 2021 22:05:58 +0800
Subject: [PATCH] no message

---
 resources/assets/js/components/UserAvatar.vue |  5 +++
 resources/assets/js/pages/login.vue           | 12 +++----
 resources/assets/js/pages/manage/calendar.vue | 35 +++++++++++++++++--
 .../pages/manage/components/DialogWrapper.vue |  2 +-
 .../pages/manage/components/ProjectList.vue   |  2 ++
 .../assets/js/pages/manage/dashboard.vue      | 35 +++++++++++++++++--
 .../assets/js/pages/manage/setting/index.vue  | 22 ++++++++++--
 7 files changed, 100 insertions(+), 13 deletions(-)

diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue
index ad05a9e8..0db64bcc 100755
--- a/resources/assets/js/components/UserAvatar.vue
+++ b/resources/assets/js/components/UserAvatar.vue
@@ -2,6 +2,7 @@
     <Tooltip v-if="user"
              class="common-avatar"
              :delay="600"
+             :disabled="tooltipDisabled"
              :transfer="transfer">
         <div slot="content">
             <p>{{$L('昵称')}}: {{user.nickname}}</p>
@@ -40,6 +41,10 @@
                 type: Boolean,
                 default: true
             },
+            tooltipDisabled: {
+                type: Boolean,
+                default: false
+            },
         },
         data() {
             return {
diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue
index cde71315..947ba1d3 100644
--- a/resources/assets/js/pages/login.vue
+++ b/resources/assets/js/pages/login.vue
@@ -5,18 +5,18 @@
             <div class="login-logo"></div>
             <div class="login-box">
                 <div class="login-title">Welcome Dootask</div>
-                <div class="login-subtitle">Enter your credentials to access your account.</div>
+                <div class="login-subtitle">{{$L('输入您的凭证以访问您的帐户。')}}</div>
                 <div class="login-input">
-                    <Input v-model="email" prefix="ios-mail-outline" placeholder="Enter your email" size="large" @on-enter="onLogin" @on-blur="onBlur" />
-                    <Input v-model="password" prefix="ios-lock-outline" placeholder="Enter your password" type="password" size="large" @on-enter="onLogin" />
-                    <Input v-if="codeNeed" v-model="code" class="login-code" placeholder="Verification Code" size="large" @on-enter="onLogin">
+                    <Input v-model="email" prefix="ios-mail-outline" :placeholder="$L('输入您的电子邮件')" size="large" @on-enter="onLogin" @on-blur="onBlur" />
+                    <Input v-model="password" prefix="ios-lock-outline" :placeholder="$L('输入您的密码')" type="password" size="large" @on-enter="onLogin" />
+                    <Input v-if="codeNeed" v-model="code" class="login-code" :placeholder="$L('输入图形验证码')" size="large" @on-enter="onLogin">
                         <Icon type="ios-checkmark-circle-outline" class="login-icon" slot="prepend"></Icon>
                         <div slot="append" class="login-code-end" @click="reCode"><img :src="codeUrl"/></div>
                     </Input>
-                    <Button type="primary" :loading="loadIng > 0" size="large" long @click="onLogin">Sign In</Button>
+                    <Button type="primary" :loading="loadIng > 0" size="large" long @click="onLogin">{{$L('登录')}}</Button>
                 </div>
             </div>
-            <div class="login-forgot">Forgot your password? <a href="#">Reset Password</a></div>
+            <div class="login-forgot">{{$L('忘记密码了？')}}<a href="#">{{$L('重置密码')}}</a></div>
         </div>
     </div>
 </template>
diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index 8f9db4a6..b57278ab 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -1,10 +1,41 @@
 <template>
     <div class="calendar">
-        <PageTitle>{{$L('Calendar')}}</PageTitle>
-
+        <PageTitle>{{$L('日历')}}</PageTitle>
+        <div class="nopage">
+            <div class="nopage-icon"><Icon type="md-calendar" /></div>
+            <div class="nopage-text">{{$L('日历')}}</div>
+        </div>
     </div>
 </template>
 
+<style lang="scss" scoped>
+:global {
+    .nopage {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        .nopage-icon {
+            background-color: #f4f5f7;
+            padding: 20px;
+            border-radius: 50%;
+            .ivu-icon {
+                color: #d1d8dd;
+                font-size: 46px;
+            }
+        }
+        .nopage-text {
+            margin-top: 16px;
+            color: #bec6cc;
+            background-color: #f4f5f7;
+            padding: 4px 15px;
+            border-radius: 14px;
+        }
+    }
+}
+</style>
 <script>
 export default {
     data() {
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 2c741004..9303c1d1 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -17,7 +17,7 @@
                     <li v-else-if="dialogMsgList.length === 0" class="nothing">{{$L('暂无消息')}}</li>
                     <li v-for="(item, key) in dialogMsgList" :key="key" :class="{self:item.userid == userId}">
                         <div class="dialog-avatar">
-                            <UserAvatar :userid="item.userid" :size="30"/>
+                            <UserAvatar :userid="item.userid" :tooltip-disabled="item.userid == userId" :size="30"/>
                         </div>
                         <DialogView :msg-data="item" dialog-type="group"/>
                     </li>
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 8a5e76d7..48a4b25b 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -555,6 +555,8 @@
                                         margin: 0;
                                         padding: 0;
                                         line-height: 1.5;
+                                        white-space: pre-wrap;
+                                        word-wrap: break-word;
                                     }
                                 }
                                 .ivu-icon {
diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue
index b747fd5b..c13e4a60 100644
--- a/resources/assets/js/pages/manage/dashboard.vue
+++ b/resources/assets/js/pages/manage/dashboard.vue
@@ -1,10 +1,41 @@
 <template>
     <div class="dashboard">
-        <PageTitle>{{$L('Dashboard')}}</PageTitle>
-
+        <PageTitle>{{$L('仪表板')}}</PageTitle>
+        <div class="nopage">
+            <div class="nopage-icon"><Icon type="ios-speedometer" /></div>
+            <div class="nopage-text">{{$L('仪表板')}}</div>
+        </div>
     </div>
 </template>
 
+<style lang="scss" scoped>
+:global {
+    .nopage {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        .nopage-icon {
+            background-color: #f4f5f7;
+            padding: 20px;
+            border-radius: 50%;
+            .ivu-icon {
+                color: #d1d8dd;
+                font-size: 46px;
+            }
+        }
+        .nopage-text {
+            margin-top: 16px;
+            color: #bec6cc;
+            background-color: #f4f5f7;
+            padding: 4px 15px;
+            border-radius: 14px;
+        }
+    }
+}
+</style>
 <script>
 export default {
     data() {
diff --git a/resources/assets/js/pages/manage/setting/index.vue b/resources/assets/js/pages/manage/setting/index.vue
index 3d2e37a5..38a57fd0 100644
--- a/resources/assets/js/pages/manage/setting/index.vue
+++ b/resources/assets/js/pages/manage/setting/index.vue
@@ -11,7 +11,11 @@
         <div class="setting-box">
             <div class="setting-menu">
                 <ul>
-                    <li v-for="(item, key) in menu" :key="key" @click="toggleRoute(item.path)" :class="classNameRoute(item.path)">{{$L(item.name)}}</li>
+                    <li
+                        v-for="(item, key) in menu"
+                        :key="key"
+                        :class="classNameRoute(item.path)"
+                        @click="toggleRoute(item.path)">{{$L(item.name)}}</li>
                 </ul>
             </div>
             <div class="setting-content">
@@ -119,7 +123,11 @@ export default {
                 },
                 {
                     path: 'priority',
-                    name: '任务优先级'
+                    name: '任务等级'
+                },
+                {
+                    path: 'signout',
+                    name: '退出登录'
                 }
             ]
         }
@@ -149,6 +157,16 @@ export default {
     },
     methods: {
         toggleRoute(path) {
+            if (path === 'signout') {
+                $A.modalConfirm({
+                    title: '退出登录',
+                    content: '你确定要登出系统？',
+                    onOk: () => {
+                        $A.logout()
+                    }
+                });
+                return;
+            }
             this.goForward({path: '/manage/setting/' + path});
         },