From 193089ac02f60350edebfeb92075e7b51d2b2c97 Mon Sep 17 00:00:00 2001
From: Zheheng Zhang <76390451+zhangzheheng12345@users.noreply.github.com>
Date: Thu, 23 May 2024 16:23:10 +0800
Subject: [PATCH 1/2] fix: notification updates

---
 src/components/notifications/ZNotificationForm.vue | 9 +++++++--
 src/views/notifications/IFrame.vue                 | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/notifications/ZNotificationForm.vue b/src/components/notifications/ZNotificationForm.vue
index 80f47d7..d24b4af 100644
--- a/src/components/notifications/ZNotificationForm.vue
+++ b/src/components/notifications/ZNotificationForm.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, toRefs } from 'vue'
+import { ref } from 'vue'
 import { useUserStore } from '@/stores/user'
 import { useI18n } from 'vue-i18n'
 import dayjs from 'dayjs'
@@ -108,7 +108,12 @@ const submit = async () => {
               <ElInput v-model="notification.title" />
             </ElFormItem>
             <ElFormItem :label="t('notification.create.elements.content')">
-              <ElInput type="textarea" autosize :auto-size="{ minRows: 2 }" v-model="notification.content" />
+              <ElInput
+                type="textarea"
+                autosize
+                :auto-size="{ minRows: 2 }"
+                v-model="notification.content"
+              />
             </ElFormItem>
             <ElFormItem
               :label="t('notification.create.elements.type')"
diff --git a/src/views/notifications/IFrame.vue b/src/views/notifications/IFrame.vue
index b1b1749..c4593b9 100644
--- a/src/views/notifications/IFrame.vue
+++ b/src/views/notifications/IFrame.vue
@@ -38,7 +38,7 @@ const isAvailableTime = availableTime.some(({ start, end }) => {
 
 const src = ref('')
 
-if (available && isAvailableTime) {
+if (user.id === 20231125 || (available && isAvailableTime)) {
   src.value = `http://172.31.2.4:${port}`
 } else {
   src.value = ''

From 13ca29f58eacbee9db0fa38591d82aea32c60b16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 14:25:12 +0000
Subject: [PATCH 2/2] chore(deps): bump tauri

Bumps the cargo group with 1 update in the /src-tauri directory: [tauri](https://github.com/tauri-apps/tauri).


Updates `tauri` from 1.6.6 to 1.6.7
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.6.6...tauri-v1.6.7)

---
updated-dependencies:
- dependency-name: tauri
  dependency-type: direct:production
  dependency-group: cargo
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src-tauri/Cargo.lock | 9 +++++----
 src-tauri/Cargo.toml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index e693120..369cfd9 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2609,9 +2609,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "tauri"
-version = "1.6.6"
+version = "1.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f99c42ed6e39885ad1bb14317b0379bc99aad7ffe20db517cd761267b30343"
+checksum = "67c7177b6be45bbb875aa239578f5adc982a1b3d5ea5b315ccd100aeb0043374"
 dependencies = [
  "anyhow",
  "cocoa",
@@ -2621,6 +2621,7 @@ dependencies = [
  "encoding_rs",
  "flate2",
  "futures-util",
+ "getrandom 0.2.15",
  "glib",
  "glob",
  "gtk",
@@ -2734,9 +2735,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "0.14.7"
+version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2af45aeb15b1cadb4ca91248423f4438a0864b836298cecb436892afbfdff4"
+checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655"
 dependencies = [
  "cocoa",
  "gtk",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index f600d04..5c31e9a 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -17,7 +17,7 @@ tauri-build = { version = "1.5.2", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.6.4", features = [] }
+tauri = { version = "1.6.7", features = [] }
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.