github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-04 19:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 首页兼容暗黑模式及文案和查询优化

Browse Source
This commit is contained in:
韦荣超 2022-03-10 18:57:53 +08:00
parent 43c51d48d9
commit 67bb821a0e
4 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Api/ProjectController.php
View File

@ -964,13 +964,13 @@ class ProjectController extends AbstractController
//
if ($complete === 'yes') {
$builder->whereNotNull('project_tasks.complete_at');
} elseif ($complete === 'no') {
} elseif ($complete === 'no' && $deleted == 'no') {
$builder->whereNull('project_tasks.complete_at');
}
//
if ($archived == 'yes') {
$builder->whereNotNull('project_tasks.archived_at');
} elseif ($archived == 'no') {
} elseif ($archived == 'no' && $deleted == 'no') {
$builder->whereNull('project_tasks.archived_at');
}
//
@ -979,7 +979,7 @@ class ProjectController extends AbstractController
}
//
foreach ($sorts as $column => $direction) {
if (!in_array($column, ['complete_at', 'archived_at', 'end_at'])) continue;
if (!in_array($column, ['complete_at', 'archived_at', 'end_at', 'deleted_at'])) continue;
if (!in_array($direction, ['asc', 'desc'])) continue;
$builder->orderBy('project_tasks.' . $column, $direction);
}

2
app/Http/Controllers/Api/UsersController.php
View File

@ -92,7 +92,7 @@ class UsersController extends AbstractController
Cache::forget("code::" . $email);
if ($isRegVerify && $user->is_email_verity === 0) {
UserEmailVerification::userEmailSend($user);
return $retError('请验证邮箱后再登录');
return $retError('您还没有验证邮箱，请先登录邮箱通过验证邮件验证邮箱');
}
}
//

22
resources/assets/js/pages/index.vue
View File

@ -4,13 +4,13 @@
<div class="page-header">
<div class="header-nav">
<div class="header-nav-box">
<div class="logo"></div>
<div class="logo no-dark-mode"></div>
</div>
<div class="header-nav-box">
<div class="header-right-one">
<Dropdown trigger="click" @on-click="setLanguage">
<Icon
class="header-right-one-language"
class="header-right-one-language no-dark-mode"
type="md-globe"/>
<a
href="javascript:void(0)"
@ -33,7 +33,7 @@
<div class="header-right-two" @click="register">
{{ $L("注册账号") }}
</div>
<div class="header-right-three" @click="login">
<div class="header-right-three no-dark-mode" @click="login">
{{ $L("登录") }}
</div>
</div>
@ -48,13 +48,13 @@
$L("DooTask是一款轻量级的开源在线项目任务管理工具，提供各类文档协作工具、在线思维导图、在线流程图、项目管理、任务分发、即时IM，文件管理等工具。")
}}
</div>
<div class="login-buttom" @click="login">
<div class="login-buttom no-dark-mode" @click="login">
{{ $L("登录") }}
</div>
</div>
<div class="header-bg"></div>
<div class="header-pic"></div>
<div class="header-pic no-dark-mode"></div>
</div>
<div class="page-main">
<div class="main-box-one">
@ -62,7 +62,7 @@
<div class="box-pic" v-if="windowWidth<1920">
<img class="box-img" :src="$A.originUrl('images/index/box-pic1.png')"/>
</div>
<div class="box-one-pic1" v-else>
<div class="box-one-pic1 no-dark-mode" v-else>
</div>
<div class="box-one-tips">
@ -90,7 +90,7 @@
</div>
</div>
<div class="box-two-square"></div>
<div class="box-two-pic2"></div>
<div class="box-two-pic2 no-dark-mode"></div>
</div>
<div class="main-box-two" v-else>
<div class="box-two-tips">
@ -113,7 +113,7 @@
<div class="box-pic" v-if="windowWidth<1920">
<img class="box-img" :src="$A.originUrl('images/index/box-pic3.png')"/>
</div>
<div class="box-one-pic3" v-else></div>
<div class="box-one-pic3 no-dark-mode" v-else></div>
<div class="box-one-tips">
<div class="box-square"></div>
<div class="box-title">
@ -139,11 +139,11 @@
</div>
</div>
<div class="box-two-square"></div>
<div class="box-two-pic4"></div>
<div class="box-two-pic4 no-dark-mode"></div>
</div>
<div class="main-box-two" v-else>
<div class="box-two-tips">
<div class="box-pic">
<div class="box-pic no-dark-mode">
<img class="box-img" :src="$A.originUrl('images/index/box-pic4.png')"/>
</div>
<div class="box-square"></div>
@ -159,7 +159,7 @@
</div>
</div>
<div class="page-footer">
<div class="footer-service">
<div class="footer-service no-dark-mode">
<div class="footer-bg-box">
<div class="box-title">
{{ $L("开启您的 Dootask 团队协作") }}

24
resources/assets/sass/dark.scss vendored
View File

@ -306,4 +306,28 @@ body.dark-mode-reverse {
}
}
}
.page-warp {
.page-header {
.header-nav {
.header-nav-box {
.header-right-one {
.header-right-one-dropdown {
color: #000000;
}
}
.header-right-two {
color: #000000;
}
}
}
.header-content {
.header-title, .header-tips {
color: #000000;
}
}
}
}
}