From 8f2102d174481b03088b8e42350b449dd6d5de7b Mon Sep 17 00:00:00 2001 From: totono Date: Sun, 2 Apr 2023 23:50:45 +0900 Subject: [PATCH 1/2] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b931f5..c2b4887 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - TAURI_KEY_PASSWORD: "" + TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} with: tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version releaseName: 'App v__VERSION__' From 90cfddf23024b0eb9b40976a945b40e4bc7f550d Mon Sep 17 00:00:00 2001 From: totono Date: Fri, 7 Apr 2023 20:16:13 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix-=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E6=99=82=E9=96=93=E3=82=92=E5=86=8D=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 62 +++++++++---------- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- .../elements/Input/DateTime/TimeForm.tsx | 7 ++- 5 files changed, 38 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index e9ca529..afac6f6 100644 --- a/package.json +++ b/package.json @@ -1,31 +1,31 @@ -{ - "name": "todo3", - "private": true, - "version": "0.0.0", - "type": "module", - "scripts": { - "dev": "vite", - "build": "tsc && vite build", - "preview": "vite preview", - "tauri": "tauri" - }, - "dependencies": { - "@ant-design/icons": "^5.0.1", - "@emotion/react": "^11.10.6", - "@tauri-apps/api": "^1.2.0", - "antd": "^5.3.0", - "dayjs": "^1.11.7", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-icons": "^4.8.0" - }, - "devDependencies": { - "@tauri-apps/cli": "^1.2.2", - "@types/node": "^18.7.10", - "@types/react": "^18.0.15", - "@types/react-dom": "^18.0.6", - "@vitejs/plugin-react": "^3.0.0", - "typescript": "^4.6.4", - "vite": "^4.0.0" - } -} +{ + "name": "todo3", + "private": true, + "version": "0.4.3", + "type": "module", + "scripts": { + "dev": "vite", + "build": "tsc && vite build", + "preview": "vite preview", + "tauri": "tauri" + }, + "dependencies": { + "@ant-design/icons": "^5.0.1", + "@emotion/react": "^11.10.6", + "@tauri-apps/api": "^1.2.0", + "antd": "^5.3.0", + "dayjs": "^1.11.7", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-icons": "^4.8.0" + }, + "devDependencies": { + "@tauri-apps/cli": "^1.2.2", + "@types/node": "^18.7.10", + "@types/react": "^18.0.15", + "@types/react-dom": "^18.0.6", + "@vitejs/plugin-react": "^3.0.0", + "typescript": "^4.6.4", + "vite": "^4.0.0" + } +} diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 6fcc52a..30cba66 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -4577,7 +4577,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "todo" -version = "0.4.0" +version = "0.4.3" dependencies = [ "chrono", "dotenv", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index e9d0ec7..842ac60 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "todo" -version = "0.4.2" +version = "0.4.3" description = "todo" authors = ["totono"] license = "" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index ab0468b..085e577 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "todo", - "version": "0.4.2" + "version": "0.4.3" }, "tauri": { "systemTray": { diff --git a/src/components/elements/Input/DateTime/TimeForm.tsx b/src/components/elements/Input/DateTime/TimeForm.tsx index ad88825..b1b196a 100644 --- a/src/components/elements/Input/DateTime/TimeForm.tsx +++ b/src/components/elements/Input/DateTime/TimeForm.tsx @@ -12,9 +12,9 @@ dayjs.extend(objectSupport); const timeFormat = "HH:mm"; -//const disabledTime = () => { -// return { disabledHours: () => [0, 1, 2, 3, 4, 5, 6, 7] } -//}; +const disabledTime = () => { + return { disabledHours: () => [0, 1, 2, 3, 4, 5, 6, 7] } +}; type TimeFormProps = { task: InputState; @@ -48,6 +48,7 @@ export const TimeForm = ({task,setTask,value}:TimeFormProps) => { onSelect={handleTimeInput} onChange={handleTimeInput} hideDisabledOptions={true} + disabledTime={disabledTime} minuteStep={5} format={timeFormat} />