Compare commits

...

9 commits

Author SHA1 Message Date
NihadBadalov
a6ddd5f993
Merge cfd20f086c into d2f71d11d6 2024-10-22 08:49:03 +00:00
Easy
d2f71d11d6
Update API URL to compatible with the latest version of ServerChan (#5227)
Some checks are pending
Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions
Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run
Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run
Auto Test / check-linters (push) Waiting to run
Auto Test / e2e-test (push) Waiting to run
CodeQL / Analyze (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
json-yaml-validate / json-yaml-validate (push) Waiting to run
2024-10-22 10:48:51 +02:00
NihadBadalov
cfd20f086c Feat: Move redirect logic to onResize 2024-02-17 19:01:43 +01:00
NihadBadalov
2aebf316a4 Style: Remove unused variable 2024-02-15 09:12:39 +01:00
NihadBadalov
8389f7c054 Fix: Correct mobile checking 2024-02-15 09:10:29 +01:00
NihadBadalov
d64eefd70e Revert: Undo isMobile method changes 2024-02-15 09:04:49 +01:00
NihadBadalov
d4c7ebfafe Fix: Correct redirect usage 2024-02-15 09:03:09 +01:00
NihadBadalov
aae0673a3d Feat: Redirect /link to /dashboard for non-mobile users 2024-02-14 10:34:06 +01:00
NihadBadalov
45c03c2b40 Feat: Add optional width parameter to isMobile() method 2024-02-14 10:31:31 +01:00
2 changed files with 13 additions and 2 deletions

View file

@ -12,8 +12,9 @@ class ServerChan extends NotificationProvider {
const okMsg = "Sent Successfully."; const okMsg = "Sent Successfully.";
// serverchan3 requires sending via ft07.com // serverchan3 requires sending via ft07.com
const url = String(notification.serverChanSendKey).startsWith("sctp") const matchResult = String(notification.serverChanSendKey).match(/^sctp(\d+)t/i);
? `https://${notification.serverChanSendKey}.push.ft07.com/send` const url = matchResult && matchResult[1]
? `https://${matchResult[1]}.push.ft07.com/send/${notification.serverChanSendKey}.send`
: `https://sctapi.ftqq.com/${notification.serverChanSendKey}.send`; : `https://sctapi.ftqq.com/${notification.serverChanSendKey}.send`;
try { try {

View file

@ -19,6 +19,16 @@ export default {
onResize() { onResize() {
this.windowWidth = window.innerWidth; this.windowWidth = window.innerWidth;
this.updateBody(); this.updateBody();
if (this.$router.currentRoute.value.path === "/dashboard"
|| this.$router.currentRoute.value.path === "/list") {
this.$router.push({
path: this.isMobile
? "/list"
: "/dashboard",
query: this.$router.currentRoute.value?.query,
});
}
}, },
/** /**