Skip to content

Commit 424adb1

Browse files
author
reco_luan
committed
fix: ssr & formatDate in utils.js
1 parent dc65e62 commit 424adb1

File tree

11 files changed

+59
-59
lines changed

11 files changed

+59
-59
lines changed

‎components/Common.vue‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,7 @@
44
:class="pageClasses"
55
@touchstart="onTouchStart"
66
@touchend="onTouchEnd">
7-
<div v-if="absoluteEncryption">
8-
<transition name="fade">
9-
<LoadingPage v-if="firstLoad" />
10-
<Password v-else-if="!isHasKey" />
11-
<div v-else>
12-
<Navbar
13-
v-if="shouldShowNavbar"
14-
@toggle-sidebar="toggleSidebar"/>
15-
16-
<div
17-
class="sidebar-mask"
18-
@click="toggleSidebar(false)"></div>
19-
20-
<Sidebar
21-
:items="sidebarItems"
22-
@toggle-sidebar="toggleSidebar">
23-
<slot
24-
name="sidebar-top"
25-
slot="top"/>
26-
<slot
27-
name="sidebar-bottom"
28-
slot="bottom"/>
29-
</Sidebar>
30-
31-
<Password v-if="!isHasPageKey" :isPage="true"></Password>
32-
<div v-else>
33-
<slot></slot>
34-
<Comments :isShowComments="shouldShowComments"/>
35-
</div>
36-
</div>
37-
</transition>
38-
</div>
39-
<div v-else>
7+
<div v-if="!absoluteEncryption">
408
<transition name="fade">
419
<LoadingPage v-show="firstLoad" class="loading-wrapper" />
4210
</transition>
@@ -70,6 +38,38 @@
7038
</div>
7139
</div>
7240
</div>
41+
<div v-else>
42+
<transition name="fade">
43+
<LoadingPage v-if="firstLoad" />
44+
<Password v-else-if="!isHasKey" />
45+
<div v-else>
46+
<Navbar
47+
v-if="shouldShowNavbar"
48+
@toggle-sidebar="toggleSidebar"/>
49+
50+
<div
51+
class="sidebar-mask"
52+
@click="toggleSidebar(false)"></div>
53+
54+
<Sidebar
55+
:items="sidebarItems"
56+
@toggle-sidebar="toggleSidebar">
57+
<slot
58+
name="sidebar-top"
59+
slot="top"/>
60+
<slot
61+
name="sidebar-bottom"
62+
slot="bottom"/>
63+
</Sidebar>
64+
65+
<Password v-if="!isHasPageKey" :isPage="true"></Password>
66+
<div v-else>
67+
<slot></slot>
68+
<Comments :isShowComments="shouldShowComments"/>
69+
</div>
70+
</div>
71+
</transition>
72+
</div>
7373
</div>
7474
</template>
7575

‎components/Home.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<h1 v-if="recoShowModule && $frontmatter.isShowTitleInHome !== false">{{ $frontmatter.heroText || $title || '午后南杂' }}</h1>
1313
</ModuleTransition>
1414
<ModuleTransition delay="0.08">
15-
<p v-if="recoShowModule" class="description">{{ $description || 'Welcome to your vuePress-theme-reco site' }}</p>
15+
<p v-show="recoShowModule" class="description">{{ $description || 'Welcome to your vuePress-theme-reco site' }}</p>
1616
</ModuleTransition>
1717
<ModuleTransition delay="0.16">
1818
<p class="huawei" v-if="recoShowModule && $themeConfig.huawei === true">
@@ -36,7 +36,7 @@
3636
</div>
3737
</ModuleTransition>
3838
<ModuleTransition delay="0.4">
39-
<Content class="home-center" v-if="recoShowModule" custom/>
39+
<Content class="home-center" v-show="recoShowModule" custom/>
4040
</ModuleTransition>
4141
</div>
4242
</template>

‎components/HomeBlog.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ModuleTransition>
1818

1919
<ModuleTransition delay="0.08">
20-
<p v-if="recoShowModule" class="description">
20+
<p v-show="recoShowModule" class="description">
2121
{{ $description || 'Welcome to your vuePress-theme-reco site' }}
2222
</p>
2323
</ModuleTransition>
@@ -32,7 +32,7 @@
3232
</div>
3333

3434
<ModuleTransition delay="0.24">
35-
<div v-if="recoShowModule" class="home-blog-wrapper">
35+
<div v-show="recoShowModule" class="home-blog-wrapper">
3636
<div class="blog-list">
3737
<!-- 博客列表 -->
3838
<note-abstract
@@ -79,7 +79,7 @@
7979
</ModuleTransition>
8080

8181
<ModuleTransition delay="0.36">
82-
<Content v-if="recoShowModule" class="home-center" custom/>
82+
<Content v-show="recoShowModule" class="home-center" custom/>
8383
</ModuleTransition>
8484
</div>
8585
</template>

‎components/Page.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<template>
22
<main class="page">
33
<ModuleTransition>
4-
<slot v-if="recoShowModule" name="top"/>
4+
<slot v-show="recoShowModule" name="top"/>
55
</ModuleTransition>
66

77
<ModuleTransition delay="0.08">
8-
<div v-if="recoShowModule" class="page-title">
8+
<div v-show="recoShowModule" class="page-title">
99
<h1>{{$page.title}}</h1>
1010
<hr>
1111
<PageInfo :pageInfo="$page" :hideAccessNumber="hideAccessNumber"></PageInfo>
1212
</div>
1313
</ModuleTransition>
1414

1515
<ModuleTransition delay="0.16">
16-
<Content v-if="recoShowModule" class="theme-reco-content" />
16+
<Content v-show="recoShowModule" class="theme-reco-content" />
1717
</ModuleTransition>
1818

1919
<ModuleTransition delay="0.24">
20-
<footer v-if="recoShowModule" class="page-edit">
20+
<footer v-show="recoShowModule" class="page-edit">
2121
<div
2222
class="edit-link"
2323
v-if="editLink"
@@ -74,7 +74,7 @@
7474
</ModuleTransition>
7575

7676
<ModuleTransition delay="0.40">
77-
<slot v-if="recoShowModule" name="bottom"/>
77+
<slot v-show="recoShowModule" name="bottom"/>
7878
</ModuleTransition>
7979
</main>
8080
</template>

‎components/Password.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<template>
22
<div class="password-shadow">
33
<ModuleTransition>
4-
<h3 v-if="recoShowModule" class="title">{{isPage ? $frontmatter.title : $site.title || $localeConfig.title}}</h3>
4+
<h3 v-show="recoShowModule" class="title">{{isPage ? $frontmatter.title : $site.title || $localeConfig.title}}</h3>
55
</ModuleTransition>
66

77
<ModuleTransition delay="0.08">
88
<p class="description" v-if="recoShowModule && !isPage">{{$site.description || $localeConfig.description}}</p>
99
</ModuleTransition>
1010

1111
<ModuleTransition delay="0.16">
12-
<label v-if="recoShowModule" class="inputBox" id="box">
12+
<label v-show="recoShowModule" class="inputBox" id="box">
1313
<input
1414
v-model="key"
1515
type="password"
@@ -22,7 +22,7 @@
2222
</ModuleTransition>
2323

2424
<ModuleTransition delay="0.24">
25-
<div v-if="recoShowModule" class="footer">
25+
<div v-show="recoShowModule" class="footer">
2626
<span>
2727
<i class="iconfont reco-theme"></i>
2828
<a target="blank" href="https://vuepress-theme-reco.recoluan.com">vuePress-theme-reco</a>

‎helpers/utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export function formatDate (time, fmt = 'yyyy-MM-dd hh:mm:ss') {
211211

212212
const o = {
213213
'M+': date.getMonth() + 1,
214-
'd+': date.getDay(),
214+
'd+': date.getDate(),
215215
'h+': date.getHours(),
216216
'm+': date.getMinutes(),
217217
's+': date.getSeconds()

‎layouts/Category.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Common :sidebar="false" :isComment="false">
55
<!-- 分类集合 -->
66
<ModuleTransition>
7-
<ul v-if="recoShowModule" class="category-wrapper">
7+
<ul v-show="recoShowModule" class="category-wrapper">
88
<li
99
class="category-item"
1010
:class="title == item.name ? 'active': ''"
@@ -21,7 +21,7 @@
2121
<!-- 博客列表 -->
2222
<ModuleTransition delay="0.08">
2323
<note-abstract
24-
v-if="recoShowModule"
24+
v-show="recoShowModule"
2525
class="list"
2626
:data="posts"
2727
:currentPage="currentPage"
@@ -31,7 +31,7 @@
3131
<!-- 分页 -->
3232
<ModuleTransition delay="0.16">
3333
<pagation
34-
v-if="recoShowModule"
34+
v-show="recoShowModule"
3535
class="pagation"
3636
:total="posts.length"
3737
:currentPage="currentPage"

‎layouts/Tag.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- 标签集合 -->
66
<ModuleTransition>
77
<TagList
8-
v-if="recoShowModule"
8+
v-show="recoShowModule"
99
class="tags"
1010
:currentTag="$currentTags.key"
1111
@getCurrentTag="tagClick"></TagList>
@@ -14,7 +14,7 @@
1414
<!-- 博客列表 -->
1515
<ModuleTransition delay="0.08">
1616
<note-abstract
17-
v-if="recoShowModule"
17+
v-show="recoShowModule"
1818
class="list"
1919
:data="posts"
2020
:currentPage="currentPage"
@@ -24,7 +24,7 @@
2424
<!-- 分页 -->
2525
<ModuleTransition delay="0.16">
2626
<pagation
27-
v-if="recoShowModule"
27+
v-show="recoShowModule"
2828
class="pagation"
2929
:total="posts.length"
3030
:currentPage="currentPage"

‎layouts/Tags.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<!-- 标签集合 -->
55
<ModuleTransition>
66
<TagList
7-
v-if="recoShowModule"
7+
v-show="recoShowModule"
88
:currentTag="currentTag"
99
@getCurrentTag="tagClick"></TagList>
1010
</ModuleTransition>
1111

1212
<!-- 博客列表 -->
1313
<ModuleTransition delay="0.08">
1414
<note-abstract
15-
v-if="recoShowModule"
15+
v-show="recoShowModule"
1616
class="list"
1717
:data="$recoPosts"
1818
:currentPage="currentPage"
@@ -23,7 +23,7 @@
2323
<!-- 分页 -->
2424
<ModuleTransition delay="0.16">
2525
<pagation
26-
v-if="recoShowModule"
26+
v-show="recoShowModule"
2727
class="pagation"
2828
:total="$recoPosts.length"
2929
:currentPage="currentPage"

‎layouts/TimeLines.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<Common :sidebar="false" :isComment="false">
44
<ul class="timeline-wrapper">
55
<ModuleTransition >
6-
<li v-if="recoShowModule" class="desc">Yesterday Once More!</li>
6+
<li v-show="recoShowModule" class="desc">Yesterday Once More!</li>
77
</ModuleTransition>
88
<ModuleTransition
99
:delay="String(0.08 * (index + 1))"
1010
v-for="(item, index) in $recoPostsForTimeline"
1111
:key="index">
12-
<li v-if="recoShowModule">
12+
<li v-show="recoShowModule">
1313
<h3 class="year">{{item.year}}</h3>
1414
<ul class="year-wrapper">
1515
<li v-for="(subItem, subIndex) in item.data" :key="subIndex">

0 commit comments

Comments
 (0)
⚡