From 8d4670d8d9bd7a102761764cc48b226c0f22d8cf Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 16 Mar 2019 14:08:38 +0900 Subject: [PATCH 1/4] PR --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 216bdd21..5f5bc8ee 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,11 @@ Contact me(bug report...):GitHub Issues, mention to [Cutls@kirishima.cloud](http バグレポートなど:GitHub Issuesや[Cutls@kirishima.cloud](https://kirishima.cloud/@Cutls)へのリプ,または#Deskでトゥートして下さい. +### Contribute/コントリビュート + +Please make a pull request to ***WIP(before CI)*** brunch +***WIP(before CI)*** ブランチにプルリクエストをお願いします。 + ## License/ライセンス [GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE) From bacac4486bc4c788eba5e0f29f4ebb52cb45ebdc Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 16 Mar 2019 19:06:03 +0900 Subject: [PATCH 2/4] DM TL improved --- app/css/tl.css | 4 -- app/js/lang/lang.en.js | 1 + app/js/lang/lang.ja.js | 1 + app/js/tl/datails.js | 24 +++++++- app/js/tl/dm.js | 103 +++++++++++++------------------- app/js/tl/mix.js | 15 +++-- app/js/tl/parse.js | 19 +++++- app/js/tl/tl.js | 19 ++++-- app/view/en/index.html | 16 ++--- app/view/ja/index.html | 16 ++--- app/view/make/index.sample.html | 16 ++--- app/view/ps/index.html | 16 ++--- 12 files changed, 141 insertions(+), 109 deletions(-) diff --git a/app/css/tl.css b/app/css/tl.css index 891fe985..23298bad 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -419,10 +419,6 @@ p:not(:last-child){ max-height: 190px; overflow-y: scroll; } -.u-url { - color: var(--color); - cursor: text; -} .type-b{ display:none; } diff --git a/app/js/lang/lang.en.js b/app/js/lang/lang.en.js index 858c5c28..3565c150 100644 --- a/app/js/lang/lang.en.js +++ b/app/js/lang/lang.en.js @@ -184,6 +184,7 @@ var lang={ "lang_parse_vote":"Voted", "lang_parse_unvoted":"Show the result without voting", "lang_parse_endedvote":"Expired", + "lang_parse_thread":"Show thread", //misskey "lang_misskeyparse_renote":"Repost", "lang_misskeyparse_renoteqt":"Renote", diff --git a/app/js/lang/lang.ja.js b/app/js/lang/lang.ja.js index 8065833c..222928c2 100644 --- a/app/js/lang/lang.ja.js +++ b/app/js/lang/lang.ja.js @@ -184,6 +184,7 @@ var lang={ "lang_parse_vote":"投票", "lang_parse_unvoted":"結果だけ見る", "lang_parse_endedvote":"終了済み", + "lang_parse_thread":"会話を表示", //misskey "lang_misskeyparse_renote":"再投稿", "lang_misskeyparse_renoteqt":"引用", diff --git a/app/js/tl/datails.js b/app/js/tl/datails.js index 1252348c..623e41d5 100644 --- a/app/js/tl/datails.js +++ b/app/js/tl/datails.js @@ -1,6 +1,11 @@ //トゥートの詳細 -function details(id, acct_id, tlid) { - $(".toot-reset").html(lang.lang_details_nodata); +function details(id, acct_id, tlid, mode) { + if(mode=="dm"){ + $(".dm-hide").hide(); + }else{ + $(".dm-hide").show(); + } + $(".toot-reset").html(''+lang.lang_details_nodata+''); var html = $("#timeline_"+tlid+" [toot-id=" + id + "]").html(); $("#toot-this").html(html); $('#tootmodal').modal('open'); @@ -149,6 +154,9 @@ function replyTL(id, acct_id) { } }else{ var templete = parse([json], '', acct_id,"","",mute); + if(templete!=""){ + $("#toot-reply .no-data").hide(); + } $("#toot-reply").prepend(templete); $("#toot-reply .hide").html(lang.lang_details_filtered); $("#toot-reply .by_filter").css("display","block"); @@ -211,6 +219,9 @@ function context(id, acct_id) { var mute=[]; } var templete = parse(json.descendants, '', acct_id,"","",mute); + if(templete!=""){ + $("#toot-after .no-data").hide(); + } $("#toot-after").html(templete); $("#toot-after .hide").html(lang.lang_details_filtered); $("#toot-after .by_filter").css("display","block"); @@ -262,6 +273,9 @@ function beforeToot(id, acct_id, domain) { console.error(error); }).then(function(json) { var templete = parse(json, 'noauth', acct_id); + if(templete!=""){ + $("#toot-before .no-data").hide(); + } $("#toot-before").html(templete); jQuery("time.timeago").timeago(); }); @@ -309,6 +323,9 @@ function userToot(id, acct_id, user) { console.error(error); }).then(function(json) { var templete = parse(json, '', acct_id); + if(templete!=""){ + $("#user-before .no-data").hide(); + } $("#user-before").html(templete); jQuery("time.timeago").timeago(); }); @@ -335,6 +352,9 @@ function faved(id, acct_id) { console.error(error); }).then(function(json) { var templete = userparse(json, '', acct_id); + if(templete!=""){ + $("#toot-fav .no-data").hide(); + } $("#toot-fav").html(templete); }); } diff --git a/app/js/tl/dm.js b/app/js/tl/dm.js index 8167bddd..6732860a 100644 --- a/app/js/tl/dm.js +++ b/app/js/tl/dm.js @@ -16,7 +16,7 @@ function dm(acct_id, tlid, type,delc,voice) { todo(error); console.error(error); }).then(function(json) { - var templete = dmParse(json, type, acct_id, tlid, "", mute); + var templete = '
'+dmListParse(json, type, acct_id, tlid, "", mute)+'
'; localStorage.setItem("lastobj_"+ tlid,json[0].id) $("#timeline_" + tlid).html(templete); additional(acct_id, tlid); @@ -27,9 +27,37 @@ function dm(acct_id, tlid, type,delc,voice) { }); } +function dmmore(tlid){ + var multi = localStorage.getItem("column"); + var obj = JSON.parse(multi); + var acct_id = obj[tlid].domain; + var domain = localStorage.getItem("domain_" + acct_id); + var at = localStorage.getItem("acct_"+ acct_id + "_at"); + var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id"); + var start = "https://" + domain + "/api/v1/conversations?max_id="+sid; + var type="dm"; + fetch(start, { + method: 'GET', + headers: { + 'content-type': 'application/json', + 'Authorization': 'Bearer ' + at + }, + }).then(function(response) { + return response.json(); + }).catch(function(error) { + todo(error); + console.error(error); + }).then(function(json) { + var templete = '
'+dmListParse(json, type, acct_id, tlid, "", mute)+'
'; + $("#timeline_" + tlid).append(templete); + additional(acct_id, tlid); + jQuery("time.timeago").timeago(); + moreloading=false; + }) +} //DMオブジェクトパーサー(トゥート) -function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) { - console.log(obj); +function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) { + console.log(obj); var templete = ''; if(obj[0]){ localStorage.setItem("lastunix_"+ tlid,date(obj[0].created_at, 'unix')); @@ -172,6 +200,7 @@ function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) { var local = []; var times=[]; Object.keys(obj).forEach(function(key) { + var conv_id=obj[key].id; var toot = obj[key].last_status; var dis_name=escapeHTML(toot.account.display_name); if(toot.account.emojis){ @@ -373,60 +402,6 @@ function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) { }); tags = '
' + tags + '
'; } - //リプ数 - if(toot.replies_count || toot.replies_count===0){ - var replyct=toot.replies_count; - }else{ - var replyct=""; - } - //公開範囲を取得 - var vis = ""; - var visen = toot.visibility; - if (visen == "public") { - var vis = - 'public'; - var can_rt = ""; - } else if (visen == "unlisted") { - var vis = - 'lock_open'; - var can_rt = ""; - } else if (visen == "private") { - var vis = - 'lock'; - var can_rt = "hide"; - } else if (visen == "direct") { - var vis = - 'mail'; - var can_rt = "hide"; - } - if (toot.account.acct == localStorage.getItem("user_" + acct_id)) { - var if_mine = ""; - var mine_via="type-b"; - } else { - var if_mine = "hide"; - var mine_via=""; - } - if (toot.favourited) { - var if_fav = " yellow-text"; - var fav_app = "faved"; - } else { - var if_fav = ""; - var fav_app = ""; - } - if (toot.reblogged) { - var if_rt = "teal-text"; - var rt_app = "rted"; - } else { - var if_rt = ""; - var rt_app = ""; - } - if (toot.pinned) { - var if_pin = "blue-text"; - var pin_app = "pinned"; - } else { - var if_pin = ""; - var pin_app = ""; - } //アニメ再生 if (gif == "yes") { var avatar = toot.account.avatar; @@ -467,6 +442,13 @@ function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) { }else{ var trans=""; } + if (toot.favourited) { + var if_fav = " yellow-text"; + var fav_app = "faved"; + } else { + var if_fav = ""; + var fav_app = ""; + } //Cards if (!card && toot.card) { var cards=toot.card; @@ -508,7 +490,7 @@ function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) { } } templete = templete + '
' + '
' + notice + home + @@ -532,9 +514,10 @@ function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) { '' + content + '' + '' + viewer + '' + - '
'+ + '
'+lang.lang_parse_thread+'
'+ '
'+ ''; }); return templete; -} \ No newline at end of file +} diff --git a/app/js/tl/mix.js b/app/js/tl/mix.js index 4fa11a27..b58167dd 100644 --- a/app/js/tl/mix.js +++ b/app/js/tl/mix.js @@ -54,13 +54,12 @@ function mixtl(acct_id, tlid, type,delc,voice) { var mute=[]; } if(type=="integrated"){ - templete = templete+parse([timeline[key]], '', acct_id, tlid, "", mute); + templete = templete+parse([timeline[key]], '', acct_id, tlid, "", mute, "mix"); }else if(type=="plus"){ if(timeline[key].account.acct==timeline[key].account.username){ - templete = templete+parse([timeline[key]], '', acct_id, tlid, "", mute); + templete = templete+parse([timeline[key]], '', acct_id, tlid, "", mute, "plus"); } } - } } @@ -124,7 +123,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { if(voice){ say(obj.content) } - var templete = parse([obj], type, acct_id, tlid,"",mute); + var templete = parse([obj], type, acct_id, tlid,"",mute, "mix"); var pool = localStorage.getItem("pool_" + tlid); if (pool) { pool = templete + pool; @@ -168,7 +167,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { var templete = parse([obj], '', acct_id, tlid); }else if(TLtype=="plus"){ if(obj.account.acct==obj.account.username){ - var templete = parse([obj], '', acct_id, tlid,"",mute); + var templete = parse([obj], '', acct_id, tlid,"",mute, "mix"); }else{ var templete=""; } @@ -177,7 +176,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { if(voice){ say(obj.content) } - var templete = parse([obj], type, acct_id, tlid,"",mute); + var templete = parse([obj], type, acct_id, tlid,"",mute,"mix"); var pool = localStorage.getItem("pool_" + tlid); if (pool) { pool = templete + pool; @@ -291,10 +290,10 @@ function mixmore(tlid,type) { var mute=[]; } if(type=="integrated"){ - templete = templete+parse([timeline[key]], '', acct_id, tlid,"",mute); + templete = templete+parse([timeline[key]], '', acct_id, tlid,"",mute,"mix"); }else if(type=="plus"){ if(timeline[key].account.acct==timeline[key].account.username){ - templete = templete+parse([timeline[key]], '', acct_id, tlid,"",mute); + templete = templete+parse([timeline[key]], '', acct_id, tlid,"",mute,"mix"); } } } diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index baab4ed7..0aff8314 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -1,5 +1,5 @@ //オブジェクトパーサー(トゥート) -function parse(obj, mix, acct_id, tlid, popup, mutefilter) { +function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { var templete = ''; if(obj[0]){ if(tlid===1){ @@ -145,6 +145,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) { var noauth=""; var antinoauth="hide"; } + //DMTL + if(type=="dm"){ + var dmHide="hide"; + var antidmHide=""; + }else{ + var dmHide=""; + var antidmHide="hide"; + } + + //マウスオーバーのみ var mouseover=localStorage.getItem("mouseover"); if(!mouseover){ @@ -163,6 +173,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) { var times=[]; Object.keys(obj).forEach(function(key) { var toot = obj[key]; + if(type=="dm"){ + var dmid=toot.id; + toot=toot.last_status; + } var dis_name=escapeHTML(toot.account.display_name); if(toot.account.emojis){ var actemojick = toot.account.emojis[0]; @@ -745,6 +759,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) { '
' + '
'+vis+'
'+ '
'+lang.lang_parse_det+'
' + + '
'+lang.lang_parse_thread+'
' + '
expand_more
' + '
more_vert
' + + ',\''+tlid+'\',\'normal\')" class="waves-effect waves-dark btn-flat details '+dmHide+'" style="padding:0">more_vert
' + '
' + ''; }); diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js index 7b47a478..b73709af 100644 --- a/app/js/tl/tl.js +++ b/app/js/tl/tl.js @@ -58,7 +58,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) { dm(acct_id, tlid, "plus",delc,voice); $("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem( "user_" + acct_id) + "@" + domain + ")"); - $("#notice_icon_" + tlid).text("notifications"); + $("#notice_icon_" + tlid).text("mail_outline"); return; }*/ localStorage.setItem("now", type); @@ -113,7 +113,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) { url=url+"local=true"; } } - var start = "https://" + domain + "/api/v1/timelines/" + url; + if(type=="dm"){ + var start = "https://" + domain + "/api/v1/conversations"; + }else{ + var start = "https://" + domain + "/api/v1/timelines/" + url; + } var method="GET"; var i={ method: method, @@ -138,7 +142,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) { if(misskey){ var templete = misskeyParse(json, type, acct_id, tlid, "", mute); }else{ - var templete = parse(json, type, acct_id, tlid, "", mute); + var templete = parse(json, type, acct_id, tlid, "", mute, type); localStorage.setItem("lastobj_"+ tlid,json[0].id) } $("#timeline_" + tlid).html(templete); @@ -288,7 +292,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) { if(voice){ say(obj.content) } - var templete = parse([obj], type, acct_id, tlid,"",mute); + var templete = parse([obj], type, acct_id, tlid,"",mute, type); if ($("timeline_box_"+tlid+"_box .tl-box").scrollTop() === 0) { $("#timeline_" + tlid).prepend(templete); }else{ @@ -427,6 +431,10 @@ function moreload(type, tlid) { var misskey=false; var start = "https://" + domain + "/api/v1/timelines/" + com(type,data) + "max_id=" + sid; + if(type=="dm"){ + var start = "https://" + domain + "/api/v1/conversations?" + + "max_id=" + sid; + } var method="GET"; var i={ method: method, @@ -441,10 +449,11 @@ function moreload(type, tlid) { todo(error); console.error(error); }).then(function(json) { + console.log(json); if(misskey){ var templete = misskeyParse(json, '', acct_id, tlid,"",mute); }else{ - var templete = parse(json, '', acct_id, tlid,"",mute); + var templete = parse(json, '', acct_id, tlid,"",mute, type); } $("#timeline_" + tlid).append(templete); additional(acct_id, tlid); diff --git a/app/view/en/index.html b/app/view/en/index.html index bf30c904..63a74fa0 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -307,14 +307,14 @@ var tlid=0;
-
  • +
  • people_outlineLocal TL before this toot
    • -
  • +
  • person_outlineUser TL before this toot
    @@ -328,7 +328,7 @@ var tlid=0;
    • -
  • +
  • People who boosted it
    @@ -336,6 +336,7 @@ var tlid=0;
    • +
    Use other account(/:unfav and unBT are disabled.)
    @@ -356,11 +357,12 @@ var tlid=0;
    +
    - Open in browser - Take a screenshot - Copy URL of this toot - Embed + Open in browser + Take a screenshot + Copy URL of this toot + Embed Close
    diff --git a/app/view/ja/index.html b/app/view/ja/index.html index 561fb53a..74ab1994 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -307,14 +307,14 @@ var tlid=0;
    -
  • +
  • people_outlineこれより前のLocal TL(エアリプソース確認)
    • -
  • +
  • person_outlineこれより前のユーザーTL(BTソース確認)
    @@ -328,7 +328,7 @@ var tlid=0;
    • -
  • +
  • このトゥートをブーストした人
    @@ -336,6 +336,7 @@ var tlid=0;
    • +
    他のアカウントを使用(/の解除はできません)
    @@ -356,11 +357,12 @@ var tlid=0;
    +
    - ブラウザで開く - スクリーンショット - URLをコピー - 埋め込む + ブラウザで開く + スクリーンショット + URLをコピー + 埋め込む Close
    diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 134b6f6f..c911d471 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -307,14 +307,14 @@ var tlid=0;
    -
  • +
  • people_outline{{beforeLTL}}
    • -
  • +
  • person_outline{{beforeUTL}}
    @@ -328,7 +328,7 @@ var tlid=0;
    • -
  • +
  • {{btedPeople}}
    @@ -336,6 +336,7 @@ var tlid=0;
    • +
    {{useOtherAcct1}}(/{{useOtherAcct2}})
    @@ -356,11 +357,12 @@ var tlid=0;
    +
    - {{openBrowser}} - {{screenshot}} - {{copyURL}} - {{embed}} + {{openBrowser}} + {{screenshot}} + {{copyURL}} + {{embed}} {{close}}
    diff --git a/app/view/ps/index.html b/app/view/ps/index.html index e3414f62..17cd0e54 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -307,14 +307,14 @@ var tlid=0;
    -
  • +
  • people_outlinecrwdns426:0crwdne426:0
    • -
  • +
  • person_outlinecrwdns427:0crwdne427:0
    @@ -328,7 +328,7 @@ var tlid=0;
    • -
  • +
  • crwdns429:0crwdne429:0
    @@ -336,6 +336,7 @@ var tlid=0;
    • +
    crwdns430:0crwdne430:0(/crwdns431:0crwdne431:0)
    @@ -356,11 +357,12 @@ var tlid=0;
    +
    - crwdns435:0crwdne435:0 - crwdns436:0crwdne436:0 - crwdns437:0crwdne437:0 - crwdns438:0crwdne438:0 + crwdns435:0crwdne435:0 + crwdns436:0crwdne436:0 + crwdns437:0crwdne437:0 + crwdns438:0crwdne438:0 crwdns385:0crwdne385:0
    From ef5dbcf0401160bc763448400170738d28802cd9 Mon Sep 17 00:00:00 2001 From: Cutls Date: Mon, 18 Mar 2019 23:01:45 +0900 Subject: [PATCH 3/4] fix some bugs --- app/js/ui/layout.js | 4 ++-- app/package.json | 9 ++++++++- app/thedesk.ico | Bin 12157 -> 0 bytes app/view/make/setting.sample.js | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 app/thedesk.ico diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index 408fc5ba..64bf2a2f 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -54,10 +54,10 @@ function parseColumn() { } var acctlist=obj; console.log(obj); - var xed=localStorage.getItem("xed"); + /*var xed=localStorage.getItem("xed"); if(xed){ xpand(); - } + }*/ var col = localStorage.getItem("column"); if (!col) { var obj = [{ diff --git a/app/package.json b/app/package.json index 7dc28694..c9b99960 100644 --- a/app/package.json +++ b/app/package.json @@ -53,13 +53,20 @@ "output": "../build" }, "win": { - "icon": "thedesk.ico", + "icon": "build/thedesk.ico", "target": [ "nsis", "portable", "appx" ] }, + "appx": { + "identityName":"53491Cutls.TheDesk", + "applicationId":"Cutls.TheDesk", + "publisherDisplayName":"Cutls", + "publisher":"CN=629757F5-A5EE-474F-9562-B304A89A9FD1", + "languages":["JA-JP","EN-US"] + }, "nsis": { "oneClick": false, "allowToChangeInstallationDirectory": true, diff --git a/app/thedesk.ico b/app/thedesk.ico deleted file mode 100644 index 40dedc0ff6c5b0198990d67ea0afe2c0ccdcdebb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12157 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 diff --git a/app/view/make/setting.sample.js b/app/view/make/setting.sample.js index 74780c31..9f50f729 100644 --- a/app/view/make/setting.sample.js +++ b/app/view/make/setting.sample.js @@ -17,7 +17,7 @@ var envConstruction=[ width:50, text:{ head:"@@popup@@", - desc:"@@popupwarn@@", + desc:'@@popupwarn@@', after:"@@s@@" } },{ From abee0bb9014ef6172c4d9b94125df7f5b8cb4424 Mon Sep 17 00:00:00 2001 From: Cutls Date: Mon, 18 Mar 2019 23:14:30 +0900 Subject: [PATCH 4/4] TheDesk Usamin (18.0.3) --- app/js/ui/layout.js | 3 ++- app/package.json | 2 +- app/view/en/index.html | 10 ++++------ app/view/en/setting.vue.js | 2 +- app/view/ja/index.html | 10 ++++------ app/view/ja/setting.vue.js | 2 +- app/view/make/index.sample.html | 8 +++----- app/view/ps/index.html | 10 ++++------ app/view/ps/setting.vue.js | 2 +- 9 files changed, 21 insertions(+), 28 deletions(-) diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index 64bf2a2f..3843d0a3 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -54,7 +54,8 @@ function parseColumn() { } var acctlist=obj; console.log(obj); - /*var xed=localStorage.getItem("xed"); + /* +var xed=localStorage.getItem("xed"); if(xed){ xpand(); }*/ diff --git a/app/package.json b/app/package.json index c9b99960..206f712c 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "18.0.2", + "version": "18.0.3", "description": "TheDesk is a Mastodon client for PC.", "main": "main.js", "scripts": { diff --git a/app/view/en/index.html b/app/view/en/index.html index 63a74fa0..b5a163c8 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -32,7 +32,7 @@