diff --git a/app/css/master.css b/app/css/master.css index 0f80f059..ab55606f 100644 --- a/app/css/master.css +++ b/app/css/master.css @@ -220,6 +220,17 @@ blockquote:before, right: 0; top: 0; } +#start { + display: none; + position: fixed; + width: 100vw; + height: calc(100vh - 40px); + background-color: var(--bg); + color: var(--color); + z-index: 99999; + justify-content: center; + align-items: center; +} #drag { display: none; position: fixed; diff --git a/app/css/tl.css b/app/css/tl.css index 58797b11..1c8894af 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -24,6 +24,10 @@ z-index: 500; box-shadow: 10px 0 10px 10px rgba(0, 0, 0, 0.2); } +#demobottom { + width: 500px; + display: flex; +} #bottom.reverse { padding-left: 0; padding-right: 40px; @@ -41,7 +45,7 @@ #bottom .trendtag { height: 40px; } -#bottom #group { +#bottom #group, #demogroup { margin-right: 40px; } #bottom .leftside { @@ -54,7 +58,7 @@ #bottom #tips img { vertical-align: -3px; } -#bottom a { +#bottom a, #demogroup a { color: var(--color); } #bottom i { @@ -66,7 +70,7 @@ .exc-chb { padding-left: 24px !important; } -#bottom .btnsgroup { +.btnsgroup { border: 1px solid; padding-top: 1px; padding-left: 5px; diff --git a/app/js/common/version.js b/app/js/common/version.js index aa996b06..fe2b25c2 100644 --- a/app/js/common/version.js +++ b/app/js/common/version.js @@ -1,5 +1,6 @@ //バージョンチェッカー function verck(ver) { + localStorage.setItem("ver", ver); console.log("%c Welcome😊", "color: red;font-size:200%;") var date = new Date(); var show = false @@ -15,11 +16,12 @@ function verck(ver) { } } //ちょっと削除とリンク解析の都合上アレ(e) - localStorage.setItem("ver", ver); show = true console.log("%c Thank you for your update🎉", "color: red;font-size:200%;"); $(document).ready(function () { - $('#releasenote').modal('open'); + if (localStorage.getItem("winstore")) { + $('#releasenote').modal('open'); + } verp = ver.replace('(', ''); verp = verp.replace('.', '-'); verp = verp.replace('.', '-'); @@ -59,7 +61,7 @@ function verck(ver) { var platform = localStorage.getItem("platform"); console.log("Your platform:" + platform) if (!localStorage.getItem("winstore")) { - storeDialog(platform, ver) + $("#start").css('display', 'flex'); } if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") { var winstore = true; @@ -116,7 +118,6 @@ function verck(ver) { } var start = "https://thedesk.top/notice?since_id=" + localStorage.getItem("last-notice-id"); fetch(start, { - mode: 'no-cors', method: 'GET' }).then(function (response) { return response.json(); @@ -310,4 +311,10 @@ function storeDialog(platform, ver) { } }); }) +} +function closeStart() { + $("#start").css('display', 'none'); + var platform = localStorage.getItem("platform"); + var ver = localStorage.getItem("ver"); + storeDialog(platform, ver) } \ No newline at end of file diff --git a/app/js/login/login.js b/app/js/login/login.js index e575aba6..127fc3d1 100644 --- a/app/js/login/login.js +++ b/app/js/login/login.js @@ -516,18 +516,16 @@ function ticker() { var start = "https://toot.app/toot/"; fetch(start, { method: 'GET', - mode: 'no-cors', headers: { 'content-type': 'application/json' }, }).then(function (response) { + return response.json(); }).catch(function (error) { console.error(error); }).then(function (json) { - if (json.error) { - return; - } + console.log(json) if (json) { localStorage.setItem("ticker", JSON.stringify(json)); } diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 150966df..ed8784c3 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -28,9 +28,7 @@ var ver = "@@versionLetter@@"; var gitHash = "@@gitHash@@" //betaを入れるとバージョンチェックしない - //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //var ver="beta"; - //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除 var acct_id = 0; var tlid = 0; @@ -38,11 +36,46 @@
+ +
+

@@demoBottomBtns@@

+ @@lookAtBottom@@ +
+ + +

+ account_circle: @@acctMan@@
　　@@acctManDesc@@
+ settings: @@setting@@
　　@@settingDesc@@
+ remove_from_queue: TheDesk Nano @@nanoDes@@
　　@@nanoDescPlus@@
+ apps: @@menu@@
　　@@menuDesc@@
+
+ +
+
-
@@draghere@@ +
@@draghere@@
- +
@@ -1010,8 +1043,8 @@ remove_from_queue - - apps + + apps @@hereAddColumns@@
diff --git a/app/view/make/language/bg/index.json b/app/view/make/language/bg/index.json index c2d56a0a..2f52893c 100644 --- a/app/view/make/language/bg/index.json +++ b/app/view/make/language/bg/index.json @@ -168,5 +168,11 @@ "directory": "Directory", "active": "Recently active", "newcomer": "New arrivals", - "local_only": "Local only" + "local_only": "Local only", + "demoBottomBtns": "Welcome guide", + "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", + "acctManDesc": "Add more accounts and logout them.", + "settingDesc": "Many and many preferences here. You will couldn't check it all!", + "nanoDescPlus": "Mini window client(experimental)", + "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." } \ No newline at end of file diff --git a/app/view/make/language/cs/index.json b/app/view/make/language/cs/index.json index 58ccbaf5..87a3d991 100644 --- a/app/view/make/language/cs/index.json +++ b/app/view/make/language/cs/index.json @@ -168,5 +168,11 @@ "directory": "Directory", "active": "Recently active", "newcomer": "New arrivals", - "local_only": "Local only" + "local_only": "Local only", + "demoBottomBtns": "Welcome guide", + "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", + "acctManDesc": "Add more accounts and logout them.", + "settingDesc": "Many and many preferences here. You will couldn't check it all!", + "nanoDescPlus": "Mini window client(experimental)", + "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." } \ No newline at end of file diff --git a/app/view/make/language/de/index.json b/app/view/make/language/de/index.json index a354af9c..b7c44385 100644 --- a/app/view/make/language/de/index.json +++ b/app/view/make/language/de/index.json @@ -168,5 +168,11 @@ "directory": "Directory", "active": "Recently active", "newcomer": "New arrivals", - "local_only": "Local only" + "local_only": "Local only", + "demoBottomBtns": "Welcome guide", + "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", + "acctManDesc": "Add more accounts and logout them.", + "settingDesc": "Many and many preferences here. You will couldn't check it all!", + "nanoDescPlus": "Mini window client(experimental)", + "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." } \ No newline at end of file diff --git a/app/view/make/language/en/index.json b/app/view/make/language/en/index.json index 1678e68b..9d5518a4 100644 --- a/app/view/make/language/en/index.json +++ b/app/view/make/language/en/index.json @@ -8,7 +8,6 @@ "nsfwDes":"Mark media as sensitive", "cwDes":"Hide text behind warning", "selfile":"Attach..", - "insertEmoji":"Emojis", "NPSpotify":"NowPlaying(Spotify)", "NPiTunes":"NowPlaying(macOS)", @@ -169,5 +168,11 @@ "directory": "Directory", "active": "Recently active", "newcomer": "New arrivals", - "local_only": "Local only" + "local_only": "Local only", + "demoBottomBtns": "Welcome guide", + "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", + "acctManDesc": "Add more accounts and logout them.", + "settingDesc": "Many and many preferences here. You will couldn't check it all!", + "nanoDescPlus": "Mini window client(experimental)", + "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." } \ No newline at end of file diff --git a/app/view/make/language/ja/index.json b/app/view/make/language/ja/index.json index bc64b09a..7c0f10b4 100644 --- a/app/view/make/language/ja/index.json +++ b/app/view/make/language/ja/index.json @@ -168,5 +168,12 @@ "directory": "ディレクトリ", "active": "最新活動順", "newcomer": "新規順", - "local_only": "ローカルのみ" + "local_only": "ローカルのみ", + "menu": "メニュー", + "demoBottomBtns": "チュートリアル", + "lookAtBottom": "画面下のアイコン群を見てください。簡単な説明をします。次のようなものがあると思います。", + "acctManDesc": "アカウントに関する全てのことはここでできます。例えば複数アカウントの管理やログアウトなどです。各アカウントに独自のカラーを設定できます。", + "settingDesc": "数えきれないほどの設定項目がここにあります。(フィルターの管理などMastodon本体の設定はここにはありません)", + "nanoDescPlus": "小さなMastodonクライアントです。(実験的)", + "menuDesc": "カラム追加や並び変え、リストやフィルター、検索などがコンパクトにまとまっています。全てはここから始まると言っても過言ではありません。" } \ No newline at end of file