Skip to content

Commit

Permalink
我的上帝,修这个 PWA 弹窗老难了
Browse files Browse the repository at this point in the history
  • Loading branch information
Big-Cake-jpg committed Aug 13, 2023
1 parent 6647ea2 commit 23e64b1
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 56 deletions.
4 changes: 2 additions & 2 deletions docs/.vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ export default withPwa(
text: "崩溃提交",
link: "/contribute/crash-report",
},
{ text: "贡献者列表", link: "/contribute/contributors" },
],
},
{ text: "关于我们", link: "/about" },
{ text: "捐赠支持", link: "https://afdian.net/a/Pigeon0v0" },
],

Expand Down Expand Up @@ -151,9 +151,9 @@ export default withPwa(
text: "崩溃提交",
link: "/contribute/crash-report",
},
{ text: "贡献者名单", link: "/contribute/contributors.html" },
],
},
{ text: "关于我们", link: "/about" },
],

socialLinks: [{ icon: "github", link: "https://github.com/GlobeMC" }],
Expand Down
6 changes: 3 additions & 3 deletions docs/.vitepress/theme/components/Analyzer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ const ROOT_URL = CUR_URL.substring(
CUR_URL.indexOf(window.document.location.pathname),
) // 根网址
const SYSTEM_URL = ROOT_URL + "/system.html" // 系统问题
const VANILLA_URL = ROOT_URL + "/vanilla.html" // 原版问题
const MODS_URL = ROOT_URL + "/mods.html" // Mod 问题
const SYSTEM_URL = ROOT_URL + "/client/system.html" // 系统问题
const VANILLA_URL = ROOT_URL + "/client/vanilla.html" // 原版问题
const MODS_URL = ROOT_URL + "/client/mods.html" // Mod 问题
// 阻止浏览器默认拖拽行为
function handleDragEnter(e) {
Expand Down
54 changes: 9 additions & 45 deletions docs/.vitepress/theme/components/ReloadPrompt.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { onBeforeMount, ref } from "vue"
import { onBeforeMount, ref } from 'vue'
const needRefresh = ref(false)
Expand All @@ -13,7 +13,7 @@ async function close() {
}
onBeforeMount(async () => {
const { registerSW } = await import("virtual:pwa-register")
const { registerSW } = await import('virtual:pwa-register')
updateServiceWorker = registerSW({
immediate: true,
onNeedRefresh,
Expand All @@ -26,61 +26,25 @@ onBeforeMount(async () => {
<div
class="pwa-toast z-100 bg-$vp-c-bg border border-$pwa-divider fixed right-0 bottom-0 m-6 px-6 py-4 rounded shadow-xl"
role="alertdialog"
aria-labelledby="pwa-message">
aria-labelledby="pwa-message"
>
<div id="pwa-message" class="mb-3">
发现新内容可用,点击“刷新”按钮来更新文档
</div>
<button
type="button"
class="pwa-refresh mr-2 px-3 py-1 rounded"
@click="updateServiceWorker?.()">
@click="updateServiceWorker?.()"
>
刷新
</button>
<button
type="button"
class="pwa-cancel border border-$pwa-divider mr-2 px-3 py-1 rounded"
@click="close">
@click="close"
>
取消
</button>
</div>
</template>
</template>
<style>
.pwa-toast {
--c-divider: var(--vp-c-divider-light);
}
.pwa-toast .pwa-refresh {
border-color: var(--vp-button-brand-border);
color: var(--vp-button-brand-text);
background-color: var(--vp-button-brand-bg);
}
.pwa-toast .pwa-refresh:hover {
border-color: var(--vp-button-brand-hover-border);
color: var(--vp-button-brand-hover-text);
background-color: var(--vp-button-brand-hover-bg);
}
.pwa-toast .pwa-refresh:active {
border-color: var(--vp-button-brand-active-border);
color: var(--vp-button-brand-active-text);
background-color: var(--vp-button-brand-active-bg);
}
.pwa-toast .pwa-cancel {
border-color: var(--vp-button-alt-border);
color: var(--vp-button-alt-text);
background-color: var(--vp-button-alt-bg);
}
.pwa-toast .pwa-cancel:hover {
border-color: var(--vp-button-alt-hover-border);
color: var(--vp-button-alt-hover-text);
background-color: var(--vp-button-alt-hover-bg);
}
.pwa-toast .pwa-cancel:active {
border-color: var(--vp-button-alt-active-border);
color: var(--vp-button-alt-active-text);
background-color: var(--vp-button-alt-active-bg);
}
.dark .pwa-toast {
--pwa-divider: var(--vp-c-divider-dark-1);
}
</style>
</template>
43 changes: 42 additions & 1 deletion docs/.vitepress/theme/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
--vp-c-brand-lightest: #f7d596;
--vp-c-brand-dark: #d7910e;
--vp-c-brand-darker: #d08700;
--vp-c-brand-dimm: rgba(100, 108, 255, 0.08);
--vp-c-brand-dimm: rgba(255, 208, 100, 0.08);
}

/**
Expand Down Expand Up @@ -104,3 +104,44 @@
--vp-badge-pcl-text: #ffffff;
--vp-badge-pcl-bg: #0069df;
}

.pwa-toast {
--c-divider: var(--vp-c-divider-light);
}
.pwa-toast .pwa-refresh {
border-color: var(--vp-button-brand-border);
color: var(--vp-button-brand-text);
background-color: var(--vp-button-brand-bg);
}
.pwa-toast .pwa-refresh:hover {
border-color: var(--vp-button-brand-hover-border);
color: var(--vp-button-brand-hover-text);
background-color: var(--vp-button-brand-hover-bg);
}
.pwa-toast .pwa-refresh:active {
border-color: var(--vp-button-brand-active-border);
color: var(--vp-button-brand-active-text);
background-color: var(--vp-button-brand-active-bg);
}
.pwa-toast .pwa-cancel {
border-color: var(--vp-button-alt-border);
color: var(--vp-button-alt-text);
background-color: var(--vp-button-alt-bg);
}
.pwa-toast .pwa-cancel:hover {
border-color: var(--vp-button-alt-hover-border);
color: var(--vp-button-alt-hover-text);
background-color: var(--vp-button-alt-hover-bg);
}
.pwa-toast .pwa-cancel:active {
border-color: var(--vp-button-alt-active-border);
color: var(--vp-button-alt-active-text);
background-color: var(--vp-button-alt-active-bg);
}
.dark .pwa-toast {
--pwa-divider: var(--vp-c-divider-dark-1);
}

.vp-doc :not(pre) > code {
padding: 1px 6px;
}
6 changes: 4 additions & 2 deletions docs/analyzer.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ import Analyzer from './.vitepress/theme/components/Analyzer.vue'

# 崩溃分析工具

:::warning 警告 ⚠
施工中 请绕行
:::tip 提示
崩溃分析工具目前处于测试阶段,可能不稳定。

如果你愿意帮助我们,就请试用一下,我们期待你的贡献!
:::

---
Expand Down
8 changes: 5 additions & 3 deletions docs/about.md → docs/contribute/contributors.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<script setup>
import { VPTeamMembers } from 'vitepress/theme'
import members from "./.vitepress/data/members"
import members from "../.vitepress/data/members"
</script>

# 关于我们
# 贡献者

<!--
---
GlobeMC 河豚分析是一个 2023 年 7 月底成立的崩溃日志分析组织,以方便 / 开放 / 专业为目标
---
-->

此处列出了 GlobeMC 团队的所有成员,没有他们就不会有项目的诞生
此处列出了本文档的所有贡献者,感谢他们为文档作出的贡献

<VPTeamMembers size="small" :members="members" />

0 comments on commit 23e64b1

Please sign in to comment.