Compare commits

...

9 commits

Author SHA1 Message Date
Couteau Arthur
657a9de55b
Merge ffa8aad019 into 778363a948 2024-11-11 10:08:57 +00:00
Dorence Deng
778363a948
fix(notification): #5323 fix EditMonitor.vue useToast error (#5333)
Some checks failed
Auto Test / e2e-test (push) Has been cancelled
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / check-linters (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
validate / json-yaml-validate (push) Has been cancelled
validate / validate (push) Has been cancelled
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
2024-11-11 11:08:43 +01:00
Logorrheique
ffa8aad019 fix warning The watch property should be above the mounted 2024-11-04 13:32:40 +01:00
Logorrheique
49a5272573 fix 2024-11-04 13:29:39 +01:00
Logorrheique
c62f0d7bd6 Revert "fix double quote"
This reverts commit c2f7747695.
2024-11-04 13:25:12 +01:00
Logorrheique
c2f7747695 fix double quote 2024-11-04 13:24:06 +01:00
Logorrheique
856ab558b9 fix package.lock 2024-11-04 11:20:41 +01:00
Logorrheique
04943c8553 Revert "redirect to /dashboard when shrinking on computer from /list on mobile size"
This reverts commit bb14bc18ca.
2024-11-04 11:15:18 +01:00
Logorrheique
bb14bc18ca redirect to /dashboard when shrinking on computer from /list on mobile size 2024-11-04 10:59:29 +01:00
2 changed files with 14 additions and 1 deletions

View file

@ -1065,7 +1065,7 @@ import { hostNameRegexPattern } from "../util-frontend";
import HiddenInput from "../components/HiddenInput.vue"; import HiddenInput from "../components/HiddenInput.vue";
import EditMonitorConditions from "../components/EditMonitorConditions.vue"; import EditMonitorConditions from "../components/EditMonitorConditions.vue";
const toast = useToast; const toast = useToast();
const pushTokenLength = 32; const pushTokenLength = 32;

View file

@ -11,6 +11,19 @@ export default {
components: { components: {
MonitorList, MonitorList,
}, },
watch: {
"$root.isMobile"(newVal) {
if (!newVal && this.$route.path === "/list") {
this.$router.push("/dashboard");
}
}
},
mounted() {
if (!this.$root.isMobile && this.$route.path === "/list") {
this.$router.push("/dashboard");
}
},
}; };
</script> </script>