From 9959539e5037b5654e67a553e0c2fdbc8c89d35d Mon Sep 17 00:00:00 2001 From: Genbu Hase Date: Thu, 25 Jan 2018 18:49:45 +0900 Subject: [PATCH 1/5] =?UTF-8?q?SimpleThread-Debug=E3=81=AE=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AB=E7=BD=AE=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 404.html | 12 +- DBConstuction.txt | 54 ++ Dialog.css | 42 ++ Dialog.js | 254 ++++--- Error/401/index.html | 12 +- Error/403.10/index.html | 12 +- Error/406/index.html | 12 +- Error/Main.js | 2 +- LICENSE | 674 ------------------ Main.js | 62 +- Profile/Profile.js | 6 +- Profile/index.html | 10 +- ServerInfo/index.html | 12 +- Thread/Thread.css | 13 +- Thread/Thread.js | 70 +- Thread/Viewer/Auth/Auth.js | 2 - Thread/Viewer/Auth/index.html | 8 +- Thread/Viewer/Viewer.css | 9 + Thread/Viewer/Viewer.js | 44 +- Thread/Viewer/index.html | 16 +- Thread/index.html | 10 +- Top/index.html | 12 +- assets/classes/DBLoader.js | 7 +- assets/classes/LangLoader.js | 10 +- assets/firebase.json | 10 +- .../images/{favicon0002.png => Icon-Info.png} | Bin assets/images/favicon0001.png | Bin 146955 -> 0 bytes assets/includes/Component.html | 28 +- assets/includes/Component.js | 58 +- assets/includes/Core.css | 4 +- assets/includes/Core.js | 3 +- assets/locales/en_US.json | 22 +- assets/locales/ja_JP.json | 22 +- index.html | 146 +++- 34 files changed, 725 insertions(+), 933 deletions(-) create mode 100644 DBConstuction.txt delete mode 100644 LICENSE rename assets/images/{favicon0002.png => Icon-Info.png} (100%) delete mode 100644 assets/images/favicon0001.png diff --git a/404.html b/404.html index 7f85db5..7c3b2de 100644 --- a/404.html +++ b/404.html @@ -3,20 +3,20 @@ - - + + 404 Not Found - - + +
- 404 Not Found + 404 Not Found
@@ -24,7 +24,7 @@ お探しのページが見つかりませんでした。

- 5秒後にメインページへ移動します… + 5秒後にメインページへ移動します…
\ No newline at end of file diff --git a/DBConstuction.txt b/DBConstuction.txt new file mode 100644 index 0000000..d15099f --- /dev/null +++ b/DBConstuction.txt @@ -0,0 +1,54 @@ +Root +> threads + > 0: "!SYSTEM" + + > 1 + > title: String + > overview: String + > detail: String + > jobs + > Owner: Object //UIDをキーとして格納 + > xxxxxxxx: "" + > ... + + > createdAt: DateString + + > data + > 0 + > uid: "!SYSTEM" + > content: $self.title + > createdAt: $self.createdAt + + > 1 + > uid: UID + > content: String + > createdAt: DateString + + > ... + + > password: "" || HashString + + > ... + +> users + > !SYSTEM: "" + + > !SYSTEM_INFO + > gplusName: "" + > gplusPhoto: "" + > userName: "" + > detail: "" + + > xxxxxxxx + > gplusName: String + > gplusPhoto: URLString + > userName: String + > detail: String + > links: Array + > [0] + > name: String + > url: URLString + + > ... + + > ... \ No newline at end of file diff --git a/Dialog.css b/Dialog.css index 34cd854..30941ce 100644 --- a/Dialog.css +++ b/Dialog.css @@ -6,6 +6,10 @@ Dialog[ID^="Dialogs"] Div.mdl-textfield { Width: 100%; } +Dialog[ID^="Dialogs"] Button.mdl-button--disabled { + Pointer-Events: None; +} + *.mdl-switch__child-hide { Display: None; } @@ -54,6 +58,12 @@ Img[Data-Component="Dialogs_Profile_InfoViewer_Content_Info_Links_Link_Icon"] { +#Dialogs_Thread_InfoInputter_Btns > Button[Disabled] { + Display: None; +} + + + #Dialogs_Thread_InfoViewer_Content_Overview { Padding: 1em 0 4em 0; } @@ -66,6 +76,38 @@ Img[Data-Component="Dialogs_Profile_InfoViewer_Content_Info_Links_Link_Icon"] { +#Dialogs_Thread_Poster_Header { + Display: Flex; + + Padding-Bottom: 0; +} + +#Dialogs_Thread_Poster_Header > * { + Display: Flex; + Flex-Direction: Row; + Align-Items: Center; + + Font-Size: Medium; +} + +#Dialogs_Thread_Poster_Header > Div.mdl-menu__container { + Width: 1000px; +} + +#Dialogs_Thread_Poster_Header_Actor { + Align-Self: Auto; + + Margin-Left: 0.5em; +} + +#Dialogs_Thread_Poster_Menu > Li > * { + Vertical-Align: Middle; +} + +#Dialogs_Thread_Poster_Content { + Padding-Top: 0; +} + #Dialogs_Thread_Poster_Content_Text-Input { Resize: None; } \ No newline at end of file diff --git a/Dialog.js b/Dialog.js index b36215c..702ba2d 100644 --- a/Dialog.js +++ b/Dialog.js @@ -47,12 +47,10 @@ window.addEventListener("DOMContentLoaded", () => { }); new DOM("#Dialogs_Profile_DeleteConfirmer_Btns_Yes").addEventListener("click", (event) => { - if (!event.currentTarget.classList.contains("mdl-button--disabled")) { - if (new DOM("#Dialogs_Profile_DeleteConfirmer_Content_Email-Input").value == base.user.email) { - base.delete(); - } else { - new DOM("#Dialogs_Profile_DeleteConfirmer_Content_Email").classList.add("is-invalid"); - } + if (new DOM("#Dialogs_Profile_DeleteConfirmer_Content_Email-Input").value == base.user.email) { + base.delete(); + } else { + new DOM("#Dialogs_Profile_DeleteConfirmer_Content_Email").classList.add("is-invalid"); } }); @@ -86,16 +84,25 @@ window.addEventListener("DOMContentLoaded", () => { - new DOM("@#Dialogs_Thread_InfoInputer *[Required]").forEach((input) => { + new DOM("#Dialogs_Thread_DeleteConfirmer_Btns_Yes").addEventListener("click", () => { + base.Database.delete(`threads/${new DOM("#Dialogs_Thread_DeleteConfirmer_TID").value}/`); + parent.document.querySelector("IFrame.mdl-layout__content").contentWindow.postMessage({ code: "Code-Refresh" }, "*"); + + new DOM("#Dialogs_Thread_EditNotify").showModal(); + }); + + + + new DOM("@#Dialogs_Thread_InfoInputter *[Required]").forEach((input) => { input.addEventListener("input", () => { let result = true; let list = [ - new DOM("#Dialogs_Thread_InfoInputer_Content_Name-Input"), - new DOM("#Dialogs_Thread_InfoInputer_Content_Overview-Input") + new DOM("#Dialogs_Thread_InfoInputter_Content_Name-Input"), + new DOM("#Dialogs_Thread_InfoInputter_Content_Overview-Input") ]; - if (new DOM("#Dialogs_Thread_InfoInputer_Content_Secured-Input").checked) list.push(new DOM("#Dialogs_Thread_InfoInputer_Content_Password-Input")); + if (new DOM("#Dialogs_Thread_InfoInputter_Content_Secured-Input").checked) list.push(new DOM("#Dialogs_Thread_InfoInputter_Content_Password-Input")); list.forEach(requiredField => { if (requiredField.value.replace(/\s/g, "").length == 0) { @@ -105,113 +112,123 @@ window.addEventListener("DOMContentLoaded", () => { }); if (result) { - new DOM("#Dialogs_Thread_InfoInputer").querySelector('Button[Data-Action="Dialog_Submit"]').classList.remove("mdl-button--disabled"); + new DOM("#Dialogs_Thread_InfoInputter").querySelectorAll('Button[Data-Action="Dialog_Submit"]').forEach(btn => { + btn.classList.remove("mdl-button--disabled"); + }); } else { - new DOM("#Dialogs_Thread_InfoInputer").querySelector('Button[Data-Action="Dialog_Submit"]').classList.add("mdl-button--disabled"); + new DOM("#Dialogs_Thread_InfoInputter").querySelectorAll('Button[Data-Action="Dialog_Submit"]').forEach(btn => { + btn.classList.add("mdl-button--disabled"); + }); } }); }); - new DOM("#Dialogs_Thread_InfoInputer_Content_Secured-Input").addEventListener("change", (event) => { + new DOM("#Dialogs_Thread_InfoInputter_Content_Secured-Input").addEventListener("change", (event) => { let result = true; switch (event.target.checked) { case true: - new DOM("#Dialogs_Thread_InfoInputer_Content_Password").classList.remove("mdl-switch__child-hide"); + new DOM("#Dialogs_Thread_InfoInputter_Content_Password").classList.remove("mdl-switch__child-hide"); - [new DOM("#Dialogs_Thread_InfoInputer_Content_Name-Input"), new DOM("#Dialogs_Thread_InfoInputer_Content_Overview-Input"), new DOM("#Dialogs_Thread_InfoInputer_Content_Password-Input")].forEach(requiredField => { + [new DOM("#Dialogs_Thread_InfoInputter_Content_Name-Input"), new DOM("#Dialogs_Thread_InfoInputter_Content_Overview-Input"), new DOM("#Dialogs_Thread_InfoInputter_Content_Password-Input")].forEach(requiredField => { if (requiredField.value.replace(/\s/g, "").length == 0) { result = false; return; } }); - if (result) { - new DOM("#Dialogs_Thread_InfoInputer").querySelector('Button[Data-Action="Dialog_Submit"]').classList.remove("mdl-button--disabled"); - } else { - new DOM("#Dialogs_Thread_InfoInputer").querySelector('Button[Data-Action="Dialog_Submit"]').classList.add("mdl-button--disabled"); - } - break; case false: - new DOM("#Dialogs_Thread_InfoInputer_Content_Password").classList.add("mdl-switch__child-hide"); + new DOM("#Dialogs_Thread_InfoInputter_Content_Password").classList.add("mdl-switch__child-hide"); - [new DOM("#Dialogs_Thread_InfoInputer_Content_Name-Input"), new DOM("#Dialogs_Thread_InfoInputer_Content_Overview-Input")].forEach(requiredField => { + [new DOM("#Dialogs_Thread_InfoInputter_Content_Name-Input"), new DOM("#Dialogs_Thread_InfoInputter_Content_Overview-Input")].forEach(requiredField => { if (requiredField.value.replace(/\s/g, "").length == 0) { result = false; return; } }); - if (result) { - new DOM("#Dialogs_Thread_InfoInputer").querySelector('Button[Data-Action="Dialog_Submit"]').classList.remove("mdl-button--disabled"); - } else { - new DOM("#Dialogs_Thread_InfoInputer").querySelector('Button[Data-Action="Dialog_Submit"]').classList.add("mdl-button--disabled"); - } - break; } + + if (result) { + new DOM("#Dialogs_Thread_InfoInputter").querySelectorAll('Button[Data-Action="Dialog_Submit"]').forEach(btn => { + btn.classList.remove("mdl-button--disabled"); + }); + } else { + new DOM("#Dialogs_Thread_InfoInputter").querySelectorAll('Button[Data-Action="Dialog_Submit"]').forEach(btn => { + btn.classList.add("mdl-button--disabled"); + }); + } }); - new DOM("#Dialogs_Thread_InfoInputer_Btns_OK").addEventListener("click", (event) => { - if (!event.currentTarget.classList.contains("mdl-button--disabled")) { - base.Database.transaction("threads", (res) => { - let now = new Date().getTime(); - - base.Database.set("threads/" + res.length, { - title: new DOM("#Dialogs_Thread_InfoInputer_Content_Name-Input").value, - overview: new DOM("#Dialogs_Thread_InfoInputer_Content_Overview-Input").value, - detail: new DOM("#Dialogs_Thread_InfoInputer_Content_Detail-Input").value, - - jobs: { - Owner: (() => { - let owner = {}; owner[base.user.uid] = ""; - return owner; - })(), - - Admin: { - - } - }, - - createdAt: now, - - data: [ - { - uid: "!SYSTEM", - content: new DOM("#Dialogs_Thread_InfoInputer_Content_Name-Input").value, - createdAt: now - } - ], - - password: new DOM("#Dialogs_Thread_InfoInputer_Content_Secured-Input").checked ? Encrypter.encrypt(new DOM("#Dialogs_Thread_InfoInputer_Content_Password-Input").value) : "" - }); + new DOM("#Dialogs_Thread_InfoInputter_Btns_Create").addEventListener("click", (event) => { + base.Database.transaction("threads", (res) => { + let now = new Date().getTime(); + + base.Database.set("threads/" + res.length, { + title: new DOM("#Dialogs_Thread_InfoInputter_Content_Name-Input").value, + overview: new DOM("#Dialogs_Thread_InfoInputter_Content_Overview-Input").value, + detail: new DOM("#Dialogs_Thread_InfoInputter_Content_Detail-Input").value, + + jobs: { + Owner: (() => { + let owner = {}; owner[base.user.uid] = ""; + return owner; + })(), + + Admin: { + + } + }, + + createdAt: now, - new DOM("#Dialogs_Thread_InfoInputer").close(); - parent.document.querySelector("IFrame.mdl-layout__content").src = "Thread/Viewer/?tid=" + res.length; + data: [ + { + uid: "!SYSTEM_INFO", + content: new DOM("#Dialogs_Thread_InfoInputter_Content_Name-Input").value, + createdAt: now + } + ], + + password: new DOM("#Dialogs_Thread_InfoInputter_Content_Secured-Input").checked ? Encrypter.encrypt(new DOM("#Dialogs_Thread_InfoInputter_Content_Password-Input").value) : "" }); - } + + new DOM("#Dialogs_Thread_InfoInputter").close(); + parent.document.querySelector("IFrame.mdl-layout__content").src = "Thread/Viewer/?tid=" + res.length; + }); + }); + + new DOM("#Dialogs_Thread_InfoInputter_Btns_Edit").addEventListener("click", (event) => { + base.Database.update(`threads/${new DOM("#Dialogs_Thread_InfoInputter_TID").value}/`, { + title: new DOM("#Dialogs_Thread_InfoInputter_Content_Name-Input").value, + overview: new DOM("#Dialogs_Thread_InfoInputter_Content_Overview-Input").value, + detail: new DOM("#Dialogs_Thread_InfoInputter_Content_Detail-Input").value, + password: new DOM("#Dialogs_Thread_InfoInputter_Content_Secured-Input").checked ? Encrypter.encrypt(new DOM("#Dialogs_Thread_InfoInputter_Content_Password-Input").value) : "" + }); + + new DOM("#Dialogs_Thread_InfoInputter").close(); + new DOM("#Dialogs_Thread_EditNotify").showModal(); }); new DOM("#Dialogs_Thread_PasswordConfirmer_Btns_OK").addEventListener("click", (event) => { - if (!event.currentTarget.classList.contains("mdl-button--disabled")) { - if (Encrypter.encrypt(new DOM("#Dialogs_Thread_PasswordConfirmer_Content_Password-Input").value) == new DOM("#Dialogs_Thread_PasswordConfirmer_Password").value) { - sessionStorage.setItem("com.GenbuProject.SimpleThread.currentPassword", new DOM("#Dialogs_Thread_PasswordConfirmer_Content_Password-Input").value); - new DOM("$IFrame.mdl-layout__content").src = new DOM("#Dialogs_Thread_PasswordConfirmer_Link").value; + if (Encrypter.encrypt(new DOM("#Dialogs_Thread_PasswordConfirmer_Content_Password-Input").value) == new DOM("#Dialogs_Thread_PasswordConfirmer_Password").value) { + sessionStorage.setItem("com.GenbuProject.SimpleThread.currentPassword", new DOM("#Dialogs_Thread_PasswordConfirmer_Content_Password-Input").value); + new DOM("$IFrame.mdl-layout__content").src = new DOM("#Dialogs_Thread_PasswordConfirmer_Link").value; - new DOM("#Dialogs_Thread_PasswordConfirmer_Link").value = "", - new DOM("#Dialogs_Thread_PasswordConfirmer_Password").value = ""; - } else { - new DOM("#Dialogs_Thread_PasswordConfirmer_Content_Password").classList.add("is-invalid"); - } + new DOM("#Dialogs_Thread_PasswordConfirmer_Link").value = "", + new DOM("#Dialogs_Thread_PasswordConfirmer_Password").value = ""; + } else { + new DOM("#Dialogs_Thread_PasswordConfirmer_Content_Password").classList.add("is-invalid"); } }); new DOM("#Dialogs_Thread_PasswordConfirmer_Btns_Cancel").addEventListener("click", (event) => { - new DOM("$IFrame.mdl-layout__content").src = "/SimpleThread/Thread/"; + new DOM("$IFrame.mdl-layout__content").src = "/SimpleThread-Debug/Thread/"; }); @@ -242,26 +259,81 @@ window.addEventListener("DOMContentLoaded", () => { - new DOM("#Dialogs_Thread_Poster_Btns_OK").addEventListener("click", (event) => { - if (!event.currentTarget.classList.contains("mdl-button--disabled")) { - base.Database.transaction("threads/" + new DOM("#Dialogs_Thread_Poster_TID").value + "/data", (res) => { - base.Database.set("threads/" + new DOM("#Dialogs_Thread_Poster_TID").value + "/data/" + res.length, { - uid: base.user.uid, - content: new DOM("#Dialogs_Thread_Poster_Content_Text-Input").value, - createdAt: new Date().getTime() - }); + new DOM("#Dialogs_Thread_Poster_Menu_MenuItem-EmbedLink").addEventListener("click", () => { + new DOM("#Dialogs_Thread_Poster_LinkEmbedder").showModal(); + }); - new DOM("#Dialogs_Thread_Poster_Btns_OK").classList.add("mdl-button--disabled"), - new DOM("#Dialogs_Thread_Poster_Content_Text").classList.remove("is-dirty"), - new DOM("#Dialogs_Thread_Poster_Content_Text-Input").value = ""; - - new DOM("#Page").contentDocument.querySelector("#FlowPanel_Btns_CreatePost").removeAttribute("Disabled"); - - new DOM("#Dialogs_Thread_Poster").close(); - }); + new DOM("#Dialogs_Thread_Poster_Menu_MenuItem-EmbedImage").addEventListener("click", () => { + new DOM("#Dialogs_Thread_Poster").close(); + + let picker = new Picker.PhotoPicker(data => { + console.log(data); + + switch (data[google.picker.Response.ACTION]) { + case google.picker.Action.CANCEL: + case google.picker.Action.PICKED: + new DOM("#Dialogs_Thread_Poster").showModal(); + break; + } + }); + + picker.show(); + }); + + new DOM("#Dialogs_Thread_Poster_Menu_MenuItem-EmbedFile").addEventListener("click", () => { + new DOM("#Dialogs_Thread_Poster").close(); + + let picker = new Picker.FilePicker(data => { + console.log(data); + + switch (data[google.picker.Response.ACTION]) { + case google.picker.Action.CANCEL: + case google.picker.Action.PICKED: + new DOM("#Dialogs_Thread_Poster").showModal(); + break; + } + }); + + picker.show(); + }); + + new DOM("#Dialogs_Thread_Poster_Content_Text-Input").addEventListener("keydown", (event) => { + let inputter = event.target; + + let selectionStart = inputter.selectionStart, + selectionEnd = inputter.selectionEnd; + + switch (event.keyCode) { + case 9: + event.preventDefault(); + + inputter.value = `${inputter.value.slice(0, selectionStart)}\t${inputter.value.slice(selectionEnd)}`; + inputter.setSelectionRange(selectionStart + 1, selectionStart + 1); + + new DOM("#Dialogs_Thread_Poster_Content_Text").classList.add("is-dirty"); + + break; } }); + new DOM("#Dialogs_Thread_Poster_Btns_OK").addEventListener("click", (event) => { + base.Database.transaction("threads/" + new DOM("#Dialogs_Thread_Poster_TID").value + "/data", (res) => { + base.Database.set("threads/" + new DOM("#Dialogs_Thread_Poster_TID").value + "/data/" + res.length, { + uid: base.user.uid, + content: new DOM("#Dialogs_Thread_Poster_Content_Text-Input").value, + createdAt: new Date().getTime() + }); + + new DOM("#Dialogs_Thread_Poster_Btns_OK").classList.add("mdl-button--disabled"), + new DOM("#Dialogs_Thread_Poster_Content_Text").classList.remove("is-dirty"), + new DOM("#Dialogs_Thread_Poster_Content_Text-Input").value = ""; + + new DOM("#Page").contentDocument.querySelector("#FlowPanel_Btns_CreatePost").removeAttribute("Disabled"); + + new DOM("#Dialogs_Thread_Poster").close(); + }); + }); + new DOM("#Dialogs_Thread_Poster_Btns_Cancel").addEventListener("click", () => { new DOM("#Dialogs_Thread_Poster_Btns_OK").classList.add("mdl-button--disabled"), new DOM("#Dialogs_Thread_Poster_Content_Text").classList.remove("is-dirty"), diff --git a/Error/401/index.html b/Error/401/index.html index 4e3e0d2..854ec37 100644 --- a/Error/401/index.html +++ b/Error/401/index.html @@ -3,20 +3,20 @@ - - + + 401 Required Authorization - - + +
- 401 Required Authorization + 401 Required Authorization
@@ -25,7 +25,7 @@ ログインしてからご利用ください。

- 5秒後にメインページへ移動します… + 5秒後にメインページへ移動します…
\ No newline at end of file diff --git a/Error/403.10/index.html b/Error/403.10/index.html index 2320886..3263327 100644 --- a/Error/403.10/index.html +++ b/Error/403.10/index.html @@ -3,20 +3,20 @@ - - + + 403 Not Allowed - - + +
- 403 Not Allowed + 403 Not Allowed
@@ -24,7 +24,7 @@ 正規ルートでのアクセスが確認できませんでした。

- 5秒後にメインページへ移動します… + 5秒後にメインページへ移動します…
\ No newline at end of file diff --git a/Error/406/index.html b/Error/406/index.html index 2a5141a..b828100 100644 --- a/Error/406/index.html +++ b/Error/406/index.html @@ -3,20 +3,20 @@ - - + + 406 Not Acceptable - - + +
- 406 Not Acceptable + 406 Not Acceptable
@@ -25,7 +25,7 @@ 不正なリクエストが送信された可能性があります。

- 5秒後にメインページへ移動します… + 5秒後にメインページへ移動します…
\ No newline at end of file diff --git a/Error/Main.js b/Error/Main.js index 6ecc08a..9136307 100644 --- a/Error/Main.js +++ b/Error/Main.js @@ -1,3 +1,3 @@ setTimeout(() => { - window.open("/SimpleThread/", "_parent"); + window.open("/SimpleThread-Debug/", "_parent"); }, 5000); \ No newline at end of file diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9cecc1d..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/Main.js b/Main.js index 99023b1..e323dfe 100644 --- a/Main.js +++ b/Main.js @@ -1,14 +1,57 @@ window.base = new DBLoader("assets/firebase.json", (user) => { + window.gapi.load("picker", () => { + window.Picker = class Picker extends google.picker.PickerBuilder { + static get PhotoPicker () { + return class PhotoPicker extends window.Picker { + constructor (onSelect = (data) => {}) { + super(onSelect); + super.addView(google.picker.ViewId.PHOTOS); + } + } + } + + static get FilePicker () { + return class FilePicker extends window.Picker { + constructor (onSelect = (data) => {}) { + super(onSelect); + super.addView(google.picker.ViewId.DOCS); + } + } + } + + + + constructor (onSelect = (data) => {}) { + super(); + + super.setOAuthToken(base.accessToken), + super.setDeveloperKey(base.option.apiKey), + super.setCallback(onSelect); + } + + show () { + let picker = this.picker = this.build(); + picker.setVisible(true); + } + + dismiss () { + this.picker.setVisible(false); + } + } + }); + + + if (user) { new DOM("#Header_SignInOut").dataset.locales = "main.signOut"; - base.Database.getInfo(base.Database.ONCE, "users/" + user.uid, (res) => { + base.Database.getInfo(base.Database.ONCE, `users/${user.uid}`, (res) => { new DOM('@A[UUID="ProfilePhoto-Btn"]').forEach((btn) => { - btn.dataset.uid = base.user.uid; + btn.dataset.uid = user.uid; }); if (!res.exists()) { - base.Database.set("users/" + user.uid, { + base.Database.set(`users/${user.uid}`, { gplusName: user.providerData[0].displayName, gplusPhoto: user.photoURL, userName: user.providerData[0].displayName, @@ -18,12 +61,17 @@ window.base = new DBLoader("assets/firebase.json", (user) => { new DOM("#Dialogs_Account_CreateNotify").showModal(); } else { - base.Database.update("users/" + user.uid, { + base.Database.update(`users/${user.uid}`, { gplusName: user.providerData[0].displayName, gplusPhoto: user.photoURL }); } }); + + base.Database.get(base.Database.ONCE, `users/${base.user.uid}`, (res) => { + new DOM("#Dialogs_Thread_Poster_Header_ActorPhoto").dataset.uid = base.user.uid; + new DOM("#Dialogs_Thread_Poster_Header_Actor").textContent = res.userName; + }); } else { window.addEventListener("DOMContentLoaded", () => { new DOM('@*[UUID="ProfilePhoto-Btn"]').forEach((btn) => { @@ -47,7 +95,7 @@ window.base = new DBLoader("assets/firebase.json", (user) => { let querys = location.querySort(); if (querys.TID) { - new DOM("$IFrame.mdl-layout__content").src = "Thread/Viewer/?tid=" + querys.TID; + new DOM("$IFrame.mdl-layout__content").src = `Thread/Viewer/?tid=${querys.TID}`; } }); @@ -88,13 +136,13 @@ window.addEventListener("DOMContentLoaded", () => { !new DOM("$Div.mdl-layout__obfuscator") || new DOM("$Div.mdl-layout__obfuscator").classList.remove("is-visible"); } catch (error) {} - if (new DOM("$IFrame#Page").contentWindow.location.pathname != "/SimpleThread/Thread/Viewer/") locales.applyToElement(new DOM("#Header_Title")); + if (new DOM("$IFrame#Page").contentWindow.location.pathname != "/SimpleThread-Debug/Thread/Viewer/") locales.applyToElement(new DOM("#Header_Title")); }); new DOM("#Header_SignInOut").addEventListener("click", () => { switch (new DOM("#Header_SignInOut").dataset.locales) { case "main.signIn": - base.signInWithRedirect(base.SIGNINTYPE.GOOGLE, ["https://www.googleapis.com/auth/plus.login"]); + base.signInWithRedirect(base.SIGNINTYPE.GOOGLE, base.option.scope); break; case "main.signOut": diff --git a/Profile/Profile.js b/Profile/Profile.js index d5d101c..a794b47 100644 --- a/Profile/Profile.js +++ b/Profile/Profile.js @@ -5,7 +5,7 @@ terminal.addEventListener("message", (event) => { switch (message.code) { case "Code-SendHasLogined": - if (!message.data) location.href = "/SimpleThread/Error/401/"; + if (!message.data) location.href = "/SimpleThread-Debug/Error/401/"; break; } }); @@ -91,9 +91,7 @@ window.addEventListener("DOMContentLoaded", () => { }); - - let doc = parent.document; - + new DOM("#Profile_Info_Btns_Save").addEventListener("click", () => { doc.querySelector("#Dialogs_Profile_ChangeNotify").showModal(); }); diff --git a/Profile/index.html b/Profile/index.html index f62cea8..f99be86 100644 --- a/Profile/index.html +++ b/Profile/index.html @@ -14,12 +14,12 @@ - - + + - - - + + + diff --git a/ServerInfo/index.html b/ServerInfo/index.html index 852d721..6cec267 100644 --- a/ServerInfo/index.html +++ b/ServerInfo/index.html @@ -15,12 +15,12 @@ - - + + - - - + + + @@ -40,7 +40,7 @@
- +

Server Info

diff --git a/Thread/Thread.css b/Thread/Thread.css index 5672457..b2797ee 100644 --- a/Thread/Thread.css +++ b/Thread/Thread.css @@ -11,11 +11,20 @@ Display: None; } -#Threadlist A { +#Threadlist *[Data-Component^="Threadlist_Thread"] { Text-Decoration: None; Cursor: Pointer; } -#Threadlist A[Disabled] { +#Threadlist *[Data-Component^="Threadlist_Thread"][Disabled] { Display: None; +} + +#Threadlist *[Data-Component^="Threadlist_Thread"] A { + Color: Inherit; + Font-Weight: Inherit; +} + +#Threadlist *[Data-Component="Threadlist_Thread-Admin"] { + Position: Relative; } \ No newline at end of file diff --git a/Thread/Thread.js b/Thread/Thread.js index 72f2b1e..5803a37 100644 --- a/Thread/Thread.js +++ b/Thread/Thread.js @@ -9,15 +9,72 @@ class Util { }); for (let i = 0; i < res.length; i++) { - let thread = new Component.Threadlist.Thread(res[i].tid, res[i].title, res[i].password); + let thread; + if (!base.user) { + thread = new Component.Threadlist.Thread(res[i].tid, res[i].title, res[i].overview, false, res[i].password); + } else { + thread = new Component.Threadlist.Thread(res[i].tid, res[i].title, res[i].overview, res[i].jobs.Owner.hasOwnProperty(base.user.uid), res[i].password); + } + new DOM("#Threadlist_Search").appendChild(thread); - if (base.user) if (res[i].jobs.Owner.hasOwnProperty(base.user.uid)) new DOM("#Threadlist_Admin").appendChild(thread); + + if (base.user && res[i].jobs.Owner.hasOwnProperty(base.user.uid)) { + new DOM("#Threadlist_Admin").appendChild(thread); + + thread.querySelector(`*[Data-Component="${Component.Threadlist.Thread.UUIDS.ADMIN.MENU.EDIT}"]`).addEventListener("click", () => { + doc.querySelector("#Dialogs_Thread_InfoInputter_TID").value = res[i].tid; + + base.Database.get(base.Database.ONCE, `threads/${res[i].tid}/`, res => { + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Name-Input").value = res.title, + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Overview-Input").value = res.overview, + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Detail-Input").value = res.detail, + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Password-Input").value = res.password ? " " : ""; + + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Name").classList.remove("is-invalid"), + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Name").classList.add("is-dirty"), + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Overview").classList.remove("is-invalid"), + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Overview").classList.add("is-dirty"), + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Detail").classList.remove("is-invalid"), + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Detail").classList.add("is-dirty"), + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Password").classList.remove("is-invalid"), + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Password").classList.add("is-dirty"); + + if (res.password) { + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Secured").classList.add("is-checked"), + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Secured-Input").checked = true, + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Password").classList.remove("mdl-switch__child-hide"); + } else { + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Secured").classList.remove("is-checked"), + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Secured-Input").checked = false, + doc.querySelector("#Dialogs_Thread_InfoInputter_Content_Password").classList.add("mdl-switch__child-hide"); + } + }); + }); + + thread.querySelector(`*[Data-Component="${Component.Threadlist.Thread.UUIDS.ADMIN.MENU.DELETE}"]`).addEventListener("click", () => { + doc.querySelector("#Dialogs_Thread_DeleteConfirmer_TID").value = res[i].tid; + }); + } } + + componentHandler.upgradeDom(); }); } } +window.addEventListener("message", event => { + switch (event.data.code) { + case "Code-Refresh": + while (new DOM("#Threadlist_Search").children.length > 1) new DOM("#Threadlist_Search").children[1].remove(); + while (new DOM("#Threadlist_Admin").children.length > 1) new DOM("#Threadlist_Admin").children[1].remove(); + + Util.refreshThreadList(); + + break; + } +}); + window.addEventListener("DOMContentLoaded", () => { if (!base.user) { new DOM("$#Threadlist_Tab_Admin").setAttribute("Disabled", ""), @@ -46,11 +103,12 @@ window.addEventListener("DOMContentLoaded", () => { Util.refreshThreadList(); }); - - - let doc = parent.document; + new DOM("#Threadlist_Admin_Create").addEventListener("click", () => { - doc.querySelector("#Dialogs_Thread_InfoInputer").showModal(); + doc.querySelector("#Dialogs_Thread_InfoInputter_Btns_Create").removeAttribute("Disabled"), + doc.querySelector("#Dialogs_Thread_InfoInputter_Btns_Edit").setAttribute("Disabled", ""); + + doc.querySelector("#Dialogs_Thread_InfoInputter").showModal(); }); }); \ No newline at end of file diff --git a/Thread/Viewer/Auth/Auth.js b/Thread/Viewer/Auth/Auth.js index a680c09..09502fb 100644 --- a/Thread/Viewer/Auth/Auth.js +++ b/Thread/Viewer/Auth/Auth.js @@ -1,6 +1,4 @@ window.addEventListener("DOMContentLoaded", () => { - let doc = parent.document; - if (doc.querySelector("#Dialogs_Thread_PasswordConfirmer_Link").value) { doc.querySelector("#Dialogs_Thread_PasswordConfirmer").showModal(); } else { diff --git a/Thread/Viewer/Auth/index.html b/Thread/Viewer/Auth/index.html index 1e1550f..1536e57 100644 --- a/Thread/Viewer/Auth/index.html +++ b/Thread/Viewer/Auth/index.html @@ -8,10 +8,10 @@ - + - - + + @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/Thread/Viewer/Viewer.css b/Thread/Viewer/Viewer.css index 76beef8..78d8d5b 100644 --- a/Thread/Viewer/Viewer.css +++ b/Thread/Viewer/Viewer.css @@ -17,6 +17,11 @@ A[Data-Component="Thread_Post_Header_ActorPhoto"] { Background: Transparent Center / Cover; } +A[Data-Component="Thread_Post_Header_ActorPhoto"][Data-UID^="!SYSTEM"] + Span[Data-Component="Thread_Post_Header_Actor"] { + Color: OrangeRed; + Text-Decoration: Underline; +} + A[Data-Component="Thread_Post_Header_ActorPhoto"][Disabled] { Display: None; } @@ -36,6 +41,10 @@ Div[Data-Component="Thread_Post_Content"] { White-Space: Pre-Wrap; } +Div[Data-Component="Thread_Post_Content"] * { + Max-Width: 100%; +} + #FlowPanel_Btns { diff --git a/Thread/Viewer/Viewer.js b/Thread/Viewer/Viewer.js index a83ceda..e9e9a4d 100644 --- a/Thread/Viewer/Viewer.js +++ b/Thread/Viewer/Viewer.js @@ -1,8 +1,8 @@ -window.addEventListener("DOMContentLoaded", () => { - let querys = location.querySort(); +const TID = location.querySort().TID; - if (!querys.TID) { - location.href = "/SimpleThread/Error/406/"; +window.addEventListener("DOMContentLoaded", () => { + if (!TID) { + location.href = "/SimpleThread-Debug/Error/406/"; } if (!base.user) { @@ -11,17 +11,16 @@ window.addEventListener("DOMContentLoaded", () => { - let doc = parent.document; - doc.querySelector("#Dialogs_Thread_InfoViewer_TID").value = querys.TID; - doc.querySelector("#Dialogs_Thread_Poster_TID").value = querys.TID; + doc.querySelector("#Dialogs_Thread_InfoViewer_TID").value = TID; + doc.querySelector("#Dialogs_Thread_Poster_TID").value = TID; - base.Database.get(base.Database.ONCE, "threads/" + querys.TID, (res) => { + base.Database.get(base.Database.ONCE, "threads/" + TID, (res) => { doc.querySelector("#Header_Title").textContent = `${res.title}`; if (res.password && res.password != Encrypter.encrypt(sessionStorage.getItem("com.GenbuProject.SimpleThread.currentPassword") || "")) { doc.querySelector("#Dialogs_Thread_PasswordConfirmer_Link").value = location.href; - doc.querySelector("IFrame.mdl-layout__content").src = `Thread/Viewer/Auth/?tid=${querys.TID}`; + doc.querySelector("IFrame.mdl-layout__content").src = `Thread/Viewer/Auth/?tid=${TID}`; } }); @@ -29,7 +28,7 @@ window.addEventListener("DOMContentLoaded", () => { for (let uid in res) document.head.appendChild(new Component.Styles.ProfilePhotoManager(uid, res[uid].gplusPhoto)); }); - base.Database.get(base.Database.INTERVAL, "threads/" + querys.TID + "/data", (res) => { + base.Database.get(base.Database.INTERVAL, "threads/" + TID + "/data", (res) => { resForIncrease = res, resForDecrease = res; resForIncrease = resForIncrease.filter((post, index, parent) => { @@ -45,28 +44,19 @@ window.addEventListener("DOMContentLoaded", () => { if (new DOM("#Thread").children.length < resForIncrease.length) { for (let i = new DOM("#Thread").children.length; i < resForIncrease.length; i++) { - let post = new Component.Thread.Post(resForIncrease[i].pid, resForIncrease[i].uid, "", resForIncrease[i].content, new Date(resForIncrease[i].createdAt).toLocaleString(), base.user.uid == resForIncrease[i].uid && i !== 0); - post.querySelector('A[Data-Component="Thread_Post_Header_ActorPhoto"]').addEventListener("click", () => { - doc.querySelector("#Dialogs_Profile_InfoViewer_UID").value = post.uid; - doc.querySelector("#Dialogs_Profile_InfoViewer").showModal(); - }); - - if (post.querySelector(`UL[Data-Component="${Component.Thread.Post.UUIDS.MENU.ROOT}"]`)) { + let post = new Component.Thread.Post(resForIncrease[i].uid, TID, resForIncrease[i].pid, "", resForIncrease[i].content, new Date(resForIncrease[i].createdAt).toLocaleString(), base.user.uid == resForIncrease[i].uid && i !== 0); + if (post.querySelector(`*[Data-Component="${Component.Thread.Post.UUIDS.MENU.ROOT}"]`)) { setTimeout(() => { - componentHandler.upgradeElement(post.querySelector(`UL[Data-Component="${Component.Thread.Post.UUIDS.MENU.ROOT}"]`)); - }, 100); - - post.querySelector(`Li[Data-Component="${Component.Thread.Post.UUIDS.MENU.DELETE}"]`).addEventListener("click", () => { - base.Database.delete(`threads/${querys.TID}/data/${post.pid}/`); + componentHandler.upgradeElement(post.querySelector(`*[Data-Component="${Component.Thread.Post.UUIDS.MENU.ROOT}"]`)); }); } base.Database.get(base.Database.ONCE, "users/" + post.uid, (userRes) => { - post.querySelector('Span[Data-Component="Thread_Post_Header_Actor"]').textContent = userRes.userName; + post.querySelector('*[Data-Component="Thread_Post_Header_Actor"]').textContent = userRes.userName; }); - URL.filter(post.querySelector('Div[Data-Component="Thread_Post_Content"]').textContent).forEach((urlString) => { - post.querySelector('Div[Data-Component="Thread_Post_Content"]').innerHTML = post.querySelector('Div[Data-Component="Thread_Post_Content"]').innerHTML.replace(urlString, `${urlString}`); + URL.filter(post.querySelector('*[Data-Component="Thread_Post_Content"]').textContent).forEach((urlString) => { + post.querySelector('*[Data-Component="Thread_Post_Content"]').innerHTML = post.querySelector('*[Data-Component="Thread_Post_Content"]').innerHTML.replace(urlString, `${urlString}`); }); new DOM("#Thread").appendChild(post); @@ -90,6 +80,10 @@ window.addEventListener("DOMContentLoaded", () => { new DOM("#FlowPanel_Btns_CreatePost").setAttribute("Disabled", ""); }); + new DOM("#FlowPanel_Btns_Scroller").addEventListener("click", () => { + + }); + new DOM("#FlowPanel_Btns_ShowThreadInfo").addEventListener("click", () => { doc.querySelector("#Dialogs_Thread_InfoViewer").showModal(); }); diff --git a/Thread/Viewer/index.html b/Thread/Viewer/index.html index 762cd66..649593c 100644 --- a/Thread/Viewer/index.html +++ b/Thread/Viewer/index.html @@ -15,15 +15,15 @@ - - + + - + - - - + + + @@ -42,7 +42,7 @@ - +
@@ -52,7 +52,7 @@
+ + + +
+ + - person + subject ${1} + ${2} diff --git a/assets/includes/Component.js b/assets/includes/Component.js index 0f31456..4236f80 100644 --- a/assets/includes/Component.js +++ b/assets/includes/Component.js @@ -9,7 +9,7 @@ class Component { try { doc.innerHTML = DOM.xhr({ type: "GET", - url: "/SimpleThread/assets/includes/Component.html", + url: "/SimpleThread-Debug/assets/includes/Component.html", doesSync: false }).response; } catch (error) {} @@ -96,14 +96,40 @@ class Component { static get UUIDS () { return { ROOT: 'Threadlist_Thread', + + ADMIN: { + ROOT: 'Threadlist_Thread-Admin', + + MENU: { + ROOT: 'Threadlist_Thread-Admin_Menu', + + EDIT: 'Threadlist_Thread-Admin_Menu_MenuItem-Edit', + DELETE: 'Threadlist_Thread-Admin_Menu_MenuItem-Delete' + } + }, + SECURED: 'Threadlist_Thread-Secured' } } - constructor (tid = "", title = "", isSecured = false) { - return new Component(!isSecured ? Thread.UUIDS.ROOT : Thread.UUIDS.SECURED, tid, title); + constructor (tid = "", title = "", overview = "", isAdmin = false, isSecured = false) { + let self = new Component(isAdmin ? Thread.UUIDS.ADMIN.ROOT : isSecured ? Thread.UUIDS.SECURED : Thread.UUIDS.ROOT, tid, title, overview, new DOM.Randomizer().generate(16)); + if (self.querySelector(`*[Data-Component="${Thread.UUIDS.ADMIN.MENU.ROOT}"]`)) { + self.querySelector(`*[Data-Component="${Thread.UUIDS.ADMIN.MENU.EDIT}"]`).addEventListener("click", () => { + parent.document.querySelector("#Dialogs_Thread_InfoInputter_Btns_Edit").removeAttribute("Disabled"), + parent.document.querySelector("#Dialogs_Thread_InfoInputter_Btns_Create").setAttribute("Disabled", ""); + + parent.document.querySelector("#Dialogs_Thread_InfoInputter").showModal(); + }); + + self.querySelector(`*[Data-Component="${Thread.UUIDS.ADMIN.MENU.DELETE}"]`).addEventListener("click", () => { + parent.document.querySelector("#Dialogs_Thread_DeleteConfirmer").showModal(); + }); + } + + return self; } } } @@ -117,6 +143,14 @@ class Component { ROOT: 'Thread_Post', MINE: 'Thread_Post-Mine', + HEADER: { + ROOT: 'Thread_Post_Header', + + PHOTO: 'Thread_Post_Header_ActorPhoto', + NAME: 'Thread_Post_Header_Actor', + CREATED: 'Thread_Post_Header_CreatedAt' + }, + MENU: { ROOT: 'Thread_Post_Header_Menu', DELETE: 'Thread_Post_Header_Menu_MenuItem-Delete' @@ -126,10 +160,22 @@ class Component { - constructor (pid = "", uid = "", userName = "", content = "", createdAt = new Date().toLocaleString(), isMine = false) { + constructor (uid = "", tid = "", pid = "", userName = "", content = "", createdAt = new Date().toLocaleString(), isMine = false) { let self = new Component(!isMine ? Post.UUIDS.ROOT : Post.UUIDS.MINE, pid, uid, userName, content, createdAt, new DOM.Randomizer().generate(16)); - self.pid = pid, - self.uid = uid; + self.uid = uid, + self.tid = tid, + self.pid = pid; + + self.querySelector(`*[Data-Component="${Post.UUIDS.HEADER.PHOTO}"]`).addEventListener("click", () => { + parent.document.querySelector("#Dialogs_Profile_InfoViewer_UID").value = self.uid; + parent.document.querySelector("#Dialogs_Profile_InfoViewer").showModal(); + }); + + if (self.querySelector(`*[Data-Component="${Post.UUIDS.MENU.ROOT}"]`)) { + self.querySelector(`*[Data-Component="${Post.UUIDS.MENU.DELETE}"]`).addEventListener("click", () => { + base.Database.delete(`threads/${self.tid}/data/${self.pid}/`); + }); + } return self; } diff --git a/assets/includes/Core.css b/assets/includes/Core.css index 2aa3279..4fa5744 100644 --- a/assets/includes/Core.css +++ b/assets/includes/Core.css @@ -1,5 +1,5 @@ Body { - Background: URL("/SimpleThread/assets/images/Back.jpg"); + Background: URL("/SimpleThread-Debug/assets/images/Back.jpg"); } Main { @@ -11,7 +11,7 @@ A:Not([Href]) { } *[Data-Locales] { - White-Space: Pre-Line; + White-Space: Pre-Wrap; } diff --git a/assets/includes/Core.js b/assets/includes/Core.js index 357515a..689321a 100644 --- a/assets/includes/Core.js +++ b/assets/includes/Core.js @@ -1,6 +1,7 @@ window.base = parent.base || {}; window.terminal = parent.terminal || {}; window.locales = parent.locales; +window.doc = parent.document; @@ -8,7 +9,7 @@ try { terminal.postMessage({ code: "Code-Connected" }); terminal.postMessage({ code: "Code-RequestHasLogined" }); } catch (error) { - location.href = "/SimpleThread/Error/403.10/"; + location.href = "/SimpleThread-Debug/Error/403.10/"; } window.addEventListener("DOMContentLoaded", () => { diff --git a/assets/locales/en_US.json b/assets/locales/en_US.json index 7bca85d..3933606 100644 --- a/assets/locales/en_US.json +++ b/assets/locales/en_US.json @@ -12,19 +12,29 @@ "dialog.profile.deleteConfirmer.email": "E-mail...*", "dialog.profile.deleteConfirmer.email-error": "Invalid E-mail", "dialog.profile.infoViewer.link": "Link", - "dialog.thread.infoInputer.name": "Title...*", - "dialog.thread.infoInputer.overview": "Overview...*", - "dialog.thread.infoInputer.detail": "Detail...", - "dialog.thread.infoInputer.secured": "Secured", - "dialog.thread.infoInputer.password": "Password...", - "dialog.thread.infoInputer.submit": "Create", + "dialog.thread.editNotify": "Info of the thread has been changed.", + "dialog.thread.deleteNotify": "The thread has been deleted.", + "dialog.thread.deleteConfirmer": "Are you sure of deleting the thread?", + "dialog.thread.infoInputter.name": "Title...*", + "dialog.thread.infoInputter.overview": "Overview...*", + "dialog.thread.infoInputter.detail": "Detail...", + "dialog.thread.infoInputter.secured": "Secured", + "dialog.thread.infoInputter.password": "Password...", + "dialog.thread.infoInputter.create": "Create", + "dialog.thread.infoInputter.edit": "Edit", "dialog.thread.passwordConfirmer": ["The thread is secured with password.", "Enter password for the thread to view the contents."], "dialog.thread.passwordConfirmer.password": "Password...*", "dialog.thread.passwordConfirmer.password-error": "Incorrect password", "dialog.thread.passwordConfirmer.submit": "Confirm", "dialog.thread.infoViewer.detail": "Detail...", "dialog.thread.poster.text": "Post your feelings freely", + "dialog.thread.poster.menu.embedLink": "Embed links...", + "dialog.thread.poster.menu.embedImage": "Embed images...", + "dialog.thread.poster.menu.embedFile": "Embed files...", "dialog.thread.poster.submit": "Post", + "dialog.thread.poster.linkEmbedder": "URL...*", + "dialog.thread.poster.linkEmbedder-error": "Invalid URL", + "dialog.thread.poster.linkEmbedder.add": "Add", "main.top": "Top", "main.thread": "Thread", diff --git a/assets/locales/ja_JP.json b/assets/locales/ja_JP.json index cd12334..057982b 100644 --- a/assets/locales/ja_JP.json +++ b/assets/locales/ja_JP.json @@ -12,19 +12,29 @@ "dialog.profile.deleteConfirmer.email": "メールアドレス...*", "dialog.profile.deleteConfirmer.email-error": "無効なメールアドレスです", "dialog.profile.infoViewer.link": "リンク", - "dialog.thread.infoInputer.name": "スレッド名...*", - "dialog.thread.infoInputer.overview": "概要...*", - "dialog.thread.infoInputer.detail": "詳細...", - "dialog.thread.infoInputer.secured": "保護", - "dialog.thread.infoInputer.password": "パスワード...", - "dialog.thread.infoInputer.submit": "作成", + "dialog.thread.editNotify": "スレッド情報が編集されました。", + "dialog.thread.deleteNotify": "スレッドが削除されました。", + "dialog.thread.deleteConfirmer": "本当にこのスレッドを削除してもよろしいですか？", + "dialog.thread.infoInputter.name": "スレッド名...*", + "dialog.thread.infoInputter.overview": "概要...*", + "dialog.thread.infoInputter.detail": "詳細...", + "dialog.thread.infoInputter.secured": "保護", + "dialog.thread.infoInputter.password": "パスワード...", + "dialog.thread.infoInputter.create": "作成", + "dialog.thread.infoInputter.edit": "編集", "dialog.thread.passwordConfirmer": ["このスレッドはパスワードで保護されています。", "閲覧にはパスワードが必要です。"], "dialog.thread.passwordConfirmer.password": "パスワード...*", "dialog.thread.passwordConfirmer.password-error": "パスワードが間違っています", "dialog.thread.passwordConfirmer.submit": "確認", "dialog.thread.infoViewer.detail": "詳細...", "dialog.thread.poster.text": "最近の出来事を共有してみましょう", + "dialog.thread.poster.menu.embedLink": "リンク埋め込み...", + "dialog.thread.poster.menu.embedImage": "画像埋め込み...", + "dialog.thread.poster.menu.embedFile": "ファイル埋め込み...", "dialog.thread.poster.submit": "投稿", + "dialog.thread.poster.linkEmbedder": "URL...*", + "dialog.thread.poster.linkEmbedder-error": "無効なURL形式", + "dialog.thread.poster.linkEmbedder.add": "追加", "main.top": "Top", "main.thread": "Thread", diff --git a/index.html b/index.html index 317f024..25749dd 100644 --- a/index.html +++ b/index.html @@ -25,22 +25,23 @@ - + - - - + + + + - + - - + + @@ -174,40 +175,80 @@
- -
-
- - + +
+ スレッド情報が編集されました。 +
+ +
+ +
+ + + +
+ スレッドが削除されました。 +
+ +
+ +
+ + + + + +
+ 本当にこのスレッドを削除してもよろしいですか？ +
+ +
+ + +
+ + + + + + + +
+
+ +
-
- - +
+ +
-
- - +
+ +
-
@@ -236,11 +277,11 @@
- -
+ スレッド名 +
スレッドの概要
詳細... -
+
スレッドの詳細
@@ -251,9 +292,36 @@
+
+ + ユーザー +
+ + + +
    +
  • + link + リンク埋め込み... +
    • + +
  • + add_a_photo + 画像埋め込み... +
    • + +
  • + attachment + ファイル埋め込み... +
    • +
+
+
- +
@@ -265,6 +333,22 @@ + + +
+
+ + + + 無効なURL形式 +
+
+ +
+ + +
+
From 98c12c54cea0d4f9b3a47a1fe786620efec90906 Mon Sep 17 00:00:00 2001 From: Genbu Hase Date: Thu, 25 Jan 2018 19:11:36 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=84=E7=A8=AE=E3=83=AA=E3=83=B3?= =?UTF-8?q?=E3=82=AF=E3=82=92ST-Debug=E3=81=AE=E3=82=82=E3=81=AE=E3=81=8B?= =?UTF-8?q?=E3=82=89=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 404.html | 12 ++++++------ Dialog.js | 2 +- Error/401/index.html | 12 ++++++------ Error/403.10/index.html | 12 ++++++------ Error/406/index.html | 12 ++++++------ Error/Main.js | 2 +- Main.js | 2 +- Multi Replacer.cfg | 5 +++++ Profile/Profile.js | 2 +- Profile/index.html | 6 +++--- ServerInfo/index.html | 8 ++++---- Thread/Viewer/Auth/index.html | 8 ++++---- Thread/Viewer/Viewer.js | 2 +- Thread/Viewer/index.html | 10 +++++----- Thread/index.html | 6 +++--- Top/index.html | 8 ++++---- assets/classes/LangLoader.js | 2 +- assets/includes/Component.js | 2 +- assets/includes/Core.css | 2 +- assets/includes/Core.js | 2 +- index.html | 10 +++++----- 21 files changed, 66 insertions(+), 61 deletions(-) create mode 100644 Multi Replacer.cfg diff --git a/404.html b/404.html index 7c3b2de..7f85db5 100644 --- a/404.html +++ b/404.html @@ -3,20 +3,20 @@ - - + + 404 Not Found - - + +
- 404 Not Found + 404 Not Found
@@ -24,7 +24,7 @@ お探しのページが見つかりませんでした。

- 5秒後にメインページへ移動します… + 5秒後にメインページへ移動します…
\ No newline at end of file diff --git a/Dialog.js b/Dialog.js index 702ba2d..a94e12f 100644 --- a/Dialog.js +++ b/Dialog.js @@ -228,7 +228,7 @@ window.addEventListener("DOMContentLoaded", () => { }); new DOM("#Dialogs_Thread_PasswordConfirmer_Btns_Cancel").addEventListener("click", (event) => { - new DOM("$IFrame.mdl-layout__content").src = "/SimpleThread-Debug/Thread/"; + new DOM("$IFrame.mdl-layout__content").src = "/SimpleThread/Thread/"; }); diff --git a/Error/401/index.html b/Error/401/index.html index 854ec37..4e3e0d2 100644 --- a/Error/401/index.html +++ b/Error/401/index.html @@ -3,20 +3,20 @@ - - + + 401 Required Authorization - - + +
- 401 Required Authorization + 401 Required Authorization
@@ -25,7 +25,7 @@ ログインしてからご利用ください。

- 5秒後にメインページへ移動します… + 5秒後にメインページへ移動します…
\ No newline at end of file diff --git a/Error/403.10/index.html b/Error/403.10/index.html index 3263327..2320886 100644 --- a/Error/403.10/index.html +++ b/Error/403.10/index.html @@ -3,20 +3,20 @@ - - + + 403 Not Allowed - - + +
- 403 Not Allowed + 403 Not Allowed
@@ -24,7 +24,7 @@ 正規ルートでのアクセスが確認できませんでした。

- 5秒後にメインページへ移動します… + 5秒後にメインページへ移動します…
\ No newline at end of file diff --git a/Error/406/index.html b/Error/406/index.html index b828100..2a5141a 100644 --- a/Error/406/index.html +++ b/Error/406/index.html @@ -3,20 +3,20 @@ - - + + 406 Not Acceptable - - + +
- 406 Not Acceptable + 406 Not Acceptable
@@ -25,7 +25,7 @@ 不正なリクエストが送信された可能性があります。

- 5秒後にメインページへ移動します… + 5秒後にメインページへ移動します…
\ No newline at end of file diff --git a/Error/Main.js b/Error/Main.js index 9136307..6ecc08a 100644 --- a/Error/Main.js +++ b/Error/Main.js @@ -1,3 +1,3 @@ setTimeout(() => { - window.open("/SimpleThread-Debug/", "_parent"); + window.open("/SimpleThread/", "_parent"); }, 5000); \ No newline at end of file diff --git a/Main.js b/Main.js index e323dfe..3236e41 100644 --- a/Main.js +++ b/Main.js @@ -136,7 +136,7 @@ window.addEventListener("DOMContentLoaded", () => { !new DOM("$Div.mdl-layout__obfuscator") || new DOM("$Div.mdl-layout__obfuscator").classList.remove("is-visible"); } catch (error) {} - if (new DOM("$IFrame#Page").contentWindow.location.pathname != "/SimpleThread-Debug/Thread/Viewer/") locales.applyToElement(new DOM("#Header_Title")); + if (new DOM("$IFrame#Page").contentWindow.location.pathname != "/SimpleThread/Thread/Viewer/") locales.applyToElement(new DOM("#Header_Title")); }); new DOM("#Header_SignInOut").addEventListener("click", () => { diff --git a/Multi Replacer.cfg b/Multi Replacer.cfg new file mode 100644 index 0000000..f7c650d --- /dev/null +++ b/Multi Replacer.cfg @@ -0,0 +1,5 @@ +[Config] +Value1=SimpleThread-Debug +Value2=SimpleThread +Extensions=*.html;*.js;*.css;*.md +Recent=2 diff --git a/Profile/Profile.js b/Profile/Profile.js index a794b47..7c17b13 100644 --- a/Profile/Profile.js +++ b/Profile/Profile.js @@ -5,7 +5,7 @@ terminal.addEventListener("message", (event) => { switch (message.code) { case "Code-SendHasLogined": - if (!message.data) location.href = "/SimpleThread-Debug/Error/401/"; + if (!message.data) location.href = "/SimpleThread/Error/401/"; break; } }); diff --git a/Profile/index.html b/Profile/index.html index f99be86..0d75ab0 100644 --- a/Profile/index.html +++ b/Profile/index.html @@ -17,9 +17,9 @@ - - - + + + diff --git a/ServerInfo/index.html b/ServerInfo/index.html index 6cec267..22c063b 100644 --- a/ServerInfo/index.html +++ b/ServerInfo/index.html @@ -18,9 +18,9 @@ - - - + + + @@ -40,7 +40,7 @@
- +

Server Info

diff --git a/Thread/Viewer/Auth/index.html b/Thread/Viewer/Auth/index.html index 1536e57..1e1550f 100644 --- a/Thread/Viewer/Auth/index.html +++ b/Thread/Viewer/Auth/index.html @@ -8,10 +8,10 @@ - + - - + + @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/Thread/Viewer/Viewer.js b/Thread/Viewer/Viewer.js index e9e9a4d..57ec71e 100644 --- a/Thread/Viewer/Viewer.js +++ b/Thread/Viewer/Viewer.js @@ -2,7 +2,7 @@ const TID = location.querySort().TID; window.addEventListener("DOMContentLoaded", () => { if (!TID) { - location.href = "/SimpleThread-Debug/Error/406/"; + location.href = "/SimpleThread/Error/406/"; } if (!base.user) { diff --git a/Thread/Viewer/index.html b/Thread/Viewer/index.html index 649593c..611aada 100644 --- a/Thread/Viewer/index.html +++ b/Thread/Viewer/index.html @@ -19,11 +19,11 @@ - + - - - + + + @@ -42,7 +42,7 @@ - +
diff --git a/Thread/index.html b/Thread/index.html index 9ad9a78..c56eb2c 100644 --- a/Thread/index.html +++ b/Thread/index.html @@ -17,9 +17,9 @@ - - - + + + diff --git a/Top/index.html b/Top/index.html index 6a2d8cf..8e9ee35 100644 --- a/Top/index.html +++ b/Top/index.html @@ -17,9 +17,9 @@ - - - + + + @@ -39,7 +39,7 @@
- +

Simple Threadへようこそ！ diff --git a/assets/classes/LangLoader.js b/assets/classes/LangLoader.js index a56ae7b..63b323d 100644 --- a/assets/classes/LangLoader.js +++ b/assets/classes/LangLoader.js @@ -12,7 +12,7 @@ class LangLoader extends JSONLoader { * @param {String} lang */ load (lang) { - return super.load(`/SimpleThread-Debug/assets/locales/${lang}.json`); + return super.load(`/SimpleThread/assets/locales/${lang}.json`); } /** diff --git a/assets/includes/Component.js b/assets/includes/Component.js index 4236f80..d234825 100644 --- a/assets/includes/Component.js +++ b/assets/includes/Component.js @@ -9,7 +9,7 @@ class Component { try { doc.innerHTML = DOM.xhr({ type: "GET", - url: "/SimpleThread-Debug/assets/includes/Component.html", + url: "/SimpleThread/assets/includes/Component.html", doesSync: false }).response; } catch (error) {} diff --git a/assets/includes/Core.css b/assets/includes/Core.css index 4fa5744..96adadd 100644 --- a/assets/includes/Core.css +++ b/assets/includes/Core.css @@ -1,5 +1,5 @@ Body { - Background: URL("/SimpleThread-Debug/assets/images/Back.jpg"); + Background: URL("/SimpleThread/assets/images/Back.jpg"); } Main { diff --git a/assets/includes/Core.js b/assets/includes/Core.js index 689321a..4bd08df 100644 --- a/assets/includes/Core.js +++ b/assets/includes/Core.js @@ -9,7 +9,7 @@ try { terminal.postMessage({ code: "Code-Connected" }); terminal.postMessage({ code: "Code-RequestHasLogined" }); } catch (error) { - location.href = "/SimpleThread-Debug/Error/403.10/"; + location.href = "/SimpleThread/Error/403.10/"; } window.addEventListener("DOMContentLoaded", () => { diff --git a/index.html b/index.html index 25749dd..4e316ab 100644 --- a/index.html +++ b/index.html @@ -25,23 +25,23 @@ - + - + - + - - + + From 5a542bca521f7389c2c1b0fd025a0e38fc6ff9eb Mon Sep 17 00:00:00 2001 From: Genbu Hase Date: Thu, 25 Jan 2018 19:15:11 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=82=BB=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=82=92GPL3.0=E3=81=8B=E3=82=89AGPL3.0=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..dbbe355 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. From d83505eee1e68b83bd328c58de2ffb15df4af457 Mon Sep 17 00:00:00 2001 From: Genbu Hase Date: Thu, 25 Jan 2018 19:18:09 +0900 Subject: [PATCH 4/5] =?UTF-8?q?README=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 32ee446..0280d9b 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ ## 2. Simple Thread の歴史 > | Date | Detail | > | ---------- | ---------- | -> | 2017/01/01 | `v1`の構想を開始 | -> | 2017/08/24 | `v2`の構想を開始 | -> | 2017/08/30 | `v2`リリース | -> | 2017/09/05 | `v3`の構想を開始 | -> | 2017/12/01 | `v3_RC1`リリース | +> | 2017/01/01 | v0.1(旧v1)の構想を開始 | +> | 2017/08/24 | v1.0(旧v2)の構想を開始 | +> | 2017/08/30 | v1.0(旧v2)リリース | +> | 2017/09/05 | v1.1(旧v3)の構想を開始 | +> | 2017/12/01 | v1.1(旧v3_RC1)リリース | ## 3. 詳細情報 > * 最新バージョン -> * Stable ... `v2` -> * Latest ... `v3_RC1` \ No newline at end of file +> * Stable ... v1.0 +> * Latest ... v1.1 \ No newline at end of file From 25e8c2743493f0c3443774b608533ff1230fa875 Mon Sep 17 00:00:00 2001 From: Genbu Hase Date: Thu, 25 Jan 2018 19:27:39 +0900 Subject: [PATCH 5/5] =?UTF-8?q?README=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=92=E5=BC=B7=E8=AA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 0280d9b..69ceb3b 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ ## 2. Simple Thread の歴史 > | Date | Detail | > | ---------- | ---------- | -> | 2017/01/01 | v0.1(旧v1)の構想を開始 | -> | 2017/08/24 | v1.0(旧v2)の構想を開始 | -> | 2017/08/30 | v1.0(旧v2)リリース | -> | 2017/09/05 | v1.1(旧v3)の構想を開始 | -> | 2017/12/01 | v1.1(旧v3_RC1)リリース | +> | 2017/01/01 | `v0.1`(旧`v1`)の構想を開始 | +> | 2017/08/24 | `v1.0`(旧`v2`)の構想を開始 | +> | 2017/08/30 | `v1.0`(旧`v2`)リリース | +> | 2017/09/05 | `v1.1`(旧`v3`)の構想を開始 | +> | 2017/12/01 | `v1.1`(旧`v3_RC1`)リリース | ## 3. 詳細情報 > * 最新バージョン -> * Stable ... v1.0 -> * Latest ... v1.1 \ No newline at end of file +> * Stable ... `v1.0` +> * Latest ... `v1.1` \ No newline at end of file