From 2e133349cb3d9fc4d673a1ee0d9855fabc6ecd6a Mon Sep 17 00:00:00 2001 From: akidon0000 Date: Sat, 16 Mar 2024 11:11:55 +0900 Subject: [PATCH 1/3] [179] update homePage url to notion --- univIP/Common/Url.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/univIP/Common/Url.swift b/univIP/Common/Url.swift index ae927f01..557c647f 100644 --- a/univIP/Common/Url.swift +++ b/univIP/Common/Url.swift @@ -98,7 +98,7 @@ enum Url: String, CaseIterable, UrlProtocol { /// TwitterのURL case officialSNS = "https://twitter.com/tokumemo0000" /// ホームページのURL - case homePage = "https://lit.link/developers" + case homePage = "https://tokumemo.notion.site/6e750dcdc6d544a9a23460503d88ca5d" /// トクメモ＋のプライバシーポリシーURL[GitHub] case privacyPolicy = "https://tokudai0000.github.io/tokumemo_resource/document/privacy_policy.txt" /// トクメモ＋の利用規約URL[GitHub] From b7971914ea93595a47a6e4f0d27848adaf3c11bd Mon Sep 17 00:00:00 2001 From: akidon0000 Date: Sat, 16 Mar 2024 11:13:00 +0900 Subject: [PATCH 2/3] [179] added debug code --- univIP/Module/Web/WebViewModel.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/univIP/Module/Web/WebViewModel.swift b/univIP/Module/Web/WebViewModel.swift index be91a84f..c9c03a20 100644 --- a/univIP/Module/Web/WebViewModel.swift +++ b/univIP/Module/Web/WebViewModel.swift @@ -9,6 +9,7 @@ import Foundation import RxRelay import RxSwift import Entity +import AkidonComponents protocol WebViewModelInterface: AnyObject { var input: WebViewModel.Input { get } @@ -114,6 +115,7 @@ final class WebViewModel: BaseViewModel, WebViewModelInterface { let host = url.host else { return } + AKLog(level: .DEBUG, message: "URL: \(url)") urlLabel.accept(host.description) if URLCheckers.isUniversityServiceTimeoutURL(at: url.absoluteString) { From 262bebb78e926b746a70d3400bf81cf299476fdc Mon Sep 17 00:00:00 2001 From: akidon0000 Date: Sun, 17 Mar 2024 17:53:43 +0900 Subject: [PATCH 3/3] [179] modify display urlLabel --- univIP/Module/Web/WebViewModel.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/univIP/Module/Web/WebViewModel.swift b/univIP/Module/Web/WebViewModel.swift index c9c03a20..d8ec0cbb 100644 --- a/univIP/Module/Web/WebViewModel.swift +++ b/univIP/Module/Web/WebViewModel.swift @@ -111,12 +111,9 @@ final class WebViewModel: BaseViewModel, WebViewModelInterface { input.urlPendingLoad .subscribe { url in - guard let url = url.element, - let host = url.host else { + guard let url = url.element else { return } - AKLog(level: .DEBUG, message: "URL: \(url)") - urlLabel.accept(host.description) if URLCheckers.isUniversityServiceTimeoutURL(at: url.absoluteString) { reloadLoginURLInWebView.accept(Void()) @@ -127,9 +124,12 @@ final class WebViewModel: BaseViewModel, WebViewModelInterface { input.urlDidLoad .subscribe { url in guard let url = url.element, + let host = url.host, let canExecuteJavascript = state.canExecuteJavascript.value else { return } + urlLabel.accept(host.description) + AKLog(level: .DEBUG, message: "urlDidLoad: \(url)") if URLCheckers.isSkipReminderURL(at: url.absoluteString) { skipReminderJavaScriptInjection.accept(Void())