Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: 💄 Merge CSS rules.
Browse files Browse the repository at this point in the history
Jisu-Woniu committed Nov 16, 2023
1 parent 5b1a100 commit b9c159b
Showing 11 changed files with 338 additions and 205 deletions.
8 changes: 6 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
{
"cSpell.words": [
"fontsource",
"iconsets",
"roboto",
"smallvec",
"Subpacket",
"subpacket",
"subpackets",
"thiserror",
"unhashed",
"vuetify",
"zeroize",
"Zeroizing"
"zeroizing"
]
}
27 changes: 26 additions & 1 deletion README.adoc
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ https://github.com/Jisu-Woniu/digital-signature/actions/workflows/tauri.yml[

Vue 是一款用于构建用户界面的渐进式框架,基于标准的 Web 技术栈开发,同时提供了一套声明式、组件化的编程模型。同时,Vue 在编译期间会对模板进行诸多优化,大大提升了其运行时的性能。

Vite 是一款基于 ES Modules 的构建工具,使用 esbuild 和 Rollup 作为底层构建引擎。Vite 通过使用浏览器原生的 ES Modules 特性,实现了快速的冷启动和热更新,同时也提供了一些开发时的工具,如 HMR、代码分割等。
Vite 是一款基于 ES Modules 的构建工具,使用 esbuild 和 Rollup 作为底层构建引擎。Vite 通过使用浏览器原生的 ES Modules 特性,实现了快速的冷启动和热更新,同时也提供了一些开发时的辅助功能,如高速的模块热替换(HMR、代码分割等。

用户界面主题使用了 Vuetify,这是一款基于 Vue 3 的 Material Design 组件库。

@@ -65,3 +65,28 @@ RustCrypto 是一个 Rust 的密码学库,其提供了对称加密算法、非
*** 建议启用 https://cn.vuejs.org/guide/typescript/overview.html#volar-takeover-mode[Volar Takeover 模式]
** https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode[Tauri]
** https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer[rust-analyzer]

=== 构建流程

安装前端依赖及 `tauri-cli`:

[,bash]
----
pnpm install # 或 pnpm i
----

构建(会自动获取后端依赖):

[,bash]
----
pnpm tauri build
----

启动开发服务器:

[,bash]
----
pnpm tauri dev
----

更多内容可通过 `pnpm vite --help` 或 `pnpm tauri --help` 查看。
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -11,21 +11,22 @@
"format": "prettier --write .",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
"preview": "vite preview",
"tauri": "tauri"
"tauri": "tauri",
"tauri:dev": "tauri dev"
},
"dependencies": {
"@fontsource/noto-sans-sc": "^5.0.16",
"@fontsource/roboto": "^5.0.8",
"@material-design-icons/svg": "^0.14.13",
"@tauri-apps/api": "^1.5.1",
"vue": "^3.3.8",
"vuetify": "^3.4.0"
"vuetify": "^3.4.1"
},
"devDependencies": {
"@mdi/js": "^7.3.67",
"@tauri-apps/cli": "^1.5.6",
"@types/node": "^20.9.0",
"@vitejs/plugin-vue": "^4.4.1",
"@vitejs/plugin-vue": "^4.5.0",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/tsconfig": "^0.4.0",
@@ -36,12 +37,12 @@
"npm-run-all2": "^6.1.1",
"postcss": "^8.4.31",
"postcss-preset-env": "^9.3.0",
"prettier": "^3.0.3",
"prettier": "^3.1.0",
"stylelint": "^15.11.0",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard": "^34.0.0",
"typescript": "^5.2.2",
"vite": "^4.5.0",
"vite": "^5.0.0",
"vite-plugin-vuetify": "^1.0.2",
"vite-svg-loader": "^4.0.0",
"vue-tsc": "^1.8.22"
426 changes: 263 additions & 163 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions src-tauri/Cargo.lock
5 changes: 4 additions & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -23,10 +23,13 @@ tauri-build = { version = "1.5.0", features = [] }

[dependencies]
anyhow = { version = "1.0.75", features = ["backtrace"] }
digital-signature-crypto = { version = "0.1.0", path = "crypto" }
serde = { version = "1.0.192", features = ["derive"] }
serde_json = "1.0.108"

[dependencies.digital-signature-crypto]
version = "0.1.0"
path = "crypto"

[dependencies.tauri]
version = "1.5.2"
features = [
2 changes: 1 addition & 1 deletion src-tauri/crypto/Cargo.toml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ hex = "0.4.3"
pgp = "0.10.2"
smallvec = "1.11.2"
thiserror = "1.0.50"
zeroize = "1.6.0"
zeroize = "1.6.1"

[dependencies.tokio]
version = "1.34.0"
8 changes: 8 additions & 0 deletions src/styles.css
Original file line number Diff line number Diff line change
@@ -5,3 +5,11 @@
text-size-adjust: 100%;
font-family: Roboto, "Noto Sans SC", sans-serif;
}

h1 {
font-size: 6rem;
font-weight: 300;
line-height: 6rem;
letter-spacing: -0.0156em;
text-transform: none;
}
12 changes: 2 additions & 10 deletions src/views/KeygenView.vue
Original file line number Diff line number Diff line change
@@ -2,24 +2,16 @@
import { ref } from "vue";
import FileSelector from "@/components/FileSelector.vue";
import { VContainer } from "vuetify/components";
const file = ref<string>();
</script>

<template>
<VContainer fluid>
<h1 class="h1 pa-2">密钥管理</h1>
<h1 class="pa-2">密钥管理</h1>
<FileSelector v-model="file" />
<div v-if="file">
{{ file }}
</div>
</VContainer>
</template>
<style scoped>
.h1 {
font-size: 6rem;
font-weight: 300;
line-height: 6rem;
letter-spacing: -0.0156em;
text-transform: none;
}
</style>
2 changes: 1 addition & 1 deletion src/views/SignView.vue
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ const file = ref<string>();

<template>
<VContainer fluid>
<h1 class="text-h1 pa-2">签名</h1>
<h1 class="pa-2">签名</h1>
<FileSelector v-model="file" />
<div v-if="file">
{{ file }}
2 changes: 1 addition & 1 deletion src/views/ValidateView.vue
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ const file = ref<string>();

<template>
<VContainer fluid>
<h1 class="text-h1 pa-2">校验</h1>
<h1 class="pa-2">校验</h1>
<FileSelector v-model="file" />
<div v-if="file">
{{ file }}

0 comments on commit b9c159b

Please sign in to comment.