diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 0e6b88a2..00000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,9 +0,0 @@ -# These are supported funding model platforms - -github: -patreon: # Replace with a single Patreon username -open_collective: hatsh -ko_fi: shdvapps -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -custom: # Replace with a single custom sponsorship URL diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..fe493bfa --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,13 @@ +version: 2 +updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + + # Maintain dependencies for npm + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2a707a80..754bc3e3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,11 +39,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -54,7 +54,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -68,4 +68,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 1c5a9eca..39d919bd 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -19,9 +19,9 @@ jobs: node-version: [12.x, 14.x, 16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} cache: 'npm' diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e19d3ac..91248d2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,23 @@ # [CHANGELOG](#changelog) --- +### v2.3.7 +- Update packages +- Delete about.js (Removed about page) +- Removed Centralized Payments +- Added NGINX CONF EXAMPLE +- Update Footer.js +- Update AppBar.js +- Update Constants.js +- Update Language.js +- Update config.js +- update title +- Update Dockerfile +- Cleanup the code for users to self-host easily with docker +- Build the source with dockerfile to make changes incase the hat.sh maintain owner or myself doesn't feel like doing it do to laziness +- Update LICENSE.md to GNU Affero General Public License v3.0 +- Changed the Repo name from hat.sh to hat.sh-reworked + ## v2.3.6 - Update packages @@ -153,4 +170,4 @@ ## V2.0.0 -- The birth of hat.sh v2 beta where it introduced in-browser memory efficient large file chunked encryption using streams with libsodium.js and switching algorithms to xchacha20poly1305 and argon2id. \ No newline at end of file +- The birth of hat.sh v2 beta where it introduced in-browser memory efficient large file chunked encryption using streams with libsodium.js and switching algorithms to xchacha20poly1305 and argon2id. diff --git a/Dockerfile b/Dockerfile index bee12c58..43fe231c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,14 @@ -FROM node:alpine as builder +#https://hub.docker.com/_/node +#https://hub.docker.com/_/nginx +FROM node:latest as builder WORKDIR /app - COPY package*.json ./ - RUN npm install - COPY . ./ - ENV NEXT_TELEMETRY_DISABLED 1 - RUN npm run build - - -FROM nginx:stable-alpine - +FROM nginx:latest COPY --from=builder /app/out /usr/share/nginx/html - EXPOSE 3991 - -ENTRYPOINT ["nginx", "-g", "daemon off;"] \ No newline at end of file +ENTRYPOINT ["nginx", "-g", "daemon off;"] diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9a2320a6..00000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021 sh-dv - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..0ad25db4 --- /dev/null +++ b/LICENSE.md @@ -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 +. diff --git a/README.md b/README.md deleted file mode 100644 index f795c0fe..00000000 --- a/README.md +++ /dev/null @@ -1,171 +0,0 @@ -

- - -

- -

hat.sh

- -
- -[![Status](https://img.shields.io/badge/status-active-success.svg)](#) -[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](#) -[![CodeQL](https://github.com/sh-dv/hat.sh/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/sh-dv/hat.sh/actions/workflows/codeql-analysis.yml) -[![Node.js CI](https://github.com/sh-dv/hat.sh/actions/workflows/node.js.yml/badge.svg?branch=master)](https://github.com/sh-dv/hat.sh/actions/workflows/node.js.yml) -[![Snyk](https://github.com/sh-dv/hat.sh/actions/workflows/snyk.yml/badge.svg)](https://github.com/sh-dv/hat.sh/actions/workflows/snyk.yml) - -
- ---- - -[Hat.sh](https://hat.sh) is a web app that provides secure local file encryption in the browser. It's fast, secure, and uses modern cryptographic algorithms with chunked AEAD stream encryption/decryption. - -V2 of hat.sh introduced memory efficient in-browser large file chunked encryption using streams with libsodium. - -## Usage - -![how-to-use-gif](https://i.imgur.com/NbAZOgP.gif) - -
- -## Features - -### Security - -- XChaCha20-Poly1305 - for symmetric encryption. -- Argon2id - for password-based key derivation. -- X25519 - for key exchange. - -The libsodium library is used for all cryptographic algorithms. - -### Privacy - -- The app runs locally in your browser. -- No data is ever collected or sent to anyone.​ - -### Functionality - -- Secure multiple file encryption/decryption with passwords or keys. -- Secure random password generation. -- Asymmetric key pair generation. -- Authenticated key exchange. -- Password strength estimation. - -
- -## Offline Use - -The app can be easily self hosted, please follow the [installation](https://hat.sh/about/#installation) instructions. - -
- -## Browser Compatibility - -We officially support the last two versions of every major browser. Specifically, we test on the following - -- **Chrome** on Windows, macOS, and Linux , Android -- **Firefox** on Windows, macOS, and Linux -- **Safari** on iOS and macOS -- **Edge** on Windows - -Safari and Mobile browsers are limited to single 1GB files, due to lack of support with server-worker fetch api. - -
- -## Official running instances of the app - -| # | URL | -| --- | ----------------------------------------- | -| 1 | [hat.sh](https://hat.sh/) | -| 2 | [hat.now.sh](https://hat.now.sh/) | -| 2 | [hat.vercel.app](https://hat.vercel.app/) | - -
- -## Donations - -The project is maintained in my free time. Donations of any size are appreciated : - -
- -
- -Crypto - - - - - - - - - - - - - - - - - - - - - - -
CoinAddress
Monero - 84zQq4Xt7sq8cmGryuvWsXFMDvBvHjWjnMQXZWQQRXjB1TgoZWS9zBdNcYL7CRbQBqcDdxr4RtcvCgApmQcU6SemVXd7RuG -
Bitcoinbc1qlfnq8nu2k84h3jth7a27khaq0p2l2gvtyl2dv6
Ethereum0xF6F204B044CC73Fa90d7A7e4C5EC2947b83b917e
- -
- - Kofi - -[https://ko-fi.com/shdvapps](https://ko-fi.com/shdvapps) - -Open Collective - -[https://opencollective.com/hatsh](https://opencollective.com/hatsh) - -
- -
-
- -## Social - -- [Reddit](https://reddit.com/r/hatsh) - -
- -## Acknowledgements - -- Everyone who supported the project. -- [Samuel-lucas6](https://github.com/samuel-lucas6) from the [Kryptor](https://github.com/samuel-lucas6/Kryptor) project for being helpful and doing a lot of beta testing. -- [stophecom](https://github.com/stophecom) from the [Scrt.link](https://scrt.link/) project for translating to German. -- [bbouille](https://github.com/bbouille) for translating to French. -- [qaqland](https://github.com/qaqland) for translating to Chinese. -- [Ser-Bul](https://github.com/Ser-Bul) for translating to Russian. -- [matteotardito](https://github.com/matteotardito) for translating to Italian. -- [t0mzSK](https://github.com/t0mzSK) for translating to Slovak. -- [Xurdejl](https://github.com/Xurdejl) for translating to Spanish. -- [Franatrtur](https://github.com/Franatrtur) for translating to Czech. -- [darkao](https://github.com/darkao) for translating to Turkish. -- [Frank7sun](https://github.com/Frank7sun) for translating to Japanese. - -
- -## Credits - -[libsodium.js](https://github.com/jedisct1/libsodium.js) - -[next.js](https://nextjs.org/) - -[material-ui](https://material-ui.com/) - -
- -## License - -[Copyright (c) 2022 sh-dv](https://github.com/sh-dv/hat.sh/blob/master/LICENSE) diff --git a/SECURITY.md b/SECURITY.md index 984e7455..7697392f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,5 +2,4 @@ ## Reporting a Vulnerability -If you identify a valid security issue, please write an email to hatsh-security@pm.me -There is no bounty available at the moment, but your github account will be credited in the acknowledgements section in the app documentation. +If you identify a valid security issue, please make a pull request. diff --git a/TRANSLATION.md b/TRANSLATION.md index 670e232b..f09eac6c 100644 --- a/TRANSLATION.md +++ b/TRANSLATION.md @@ -1,4 +1,4 @@ -# Hat.sh Translation Guide +# Hat.sh-Reworked Translation Guide ### In order to add a translation to the app, please follow these steps: diff --git a/docker-compose.yml b/docker-compose.yml index 38ec428b..29fde604 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,21 @@ -version: "3" +version: "3.7" services: - web: - image: shdv/hat.sh + hat: build: - context: ./ + context: . dockerfile: Dockerfile + container_name: hat + hostname: hat + security_opt: + - no-new-privileges:true + cap_drop: + - ALL + cap_add: + - CHOWN + - SETGID + - SETUID ports: - - 3991:80 + - '127.0.0.1:3991:80' volumes: - - ./src:/usr/share/nginx/html/out \ No newline at end of file + - ./src:/usr/share/nginx/html/out diff --git a/locales/cs_CS/index.js b/locales/cs_CS/index.js index f9457633..045d2ee3 100644 --- a/locales/cs_CS/index.js +++ b/locales/cs_CS/index.js @@ -4,19 +4,6 @@ const cs_CS = { // Menu sub_title: "Jednoduché, rychlé, bezpečné šifrování souborů v prohlížeči", //client-side replaced by "in browser", other translations would sound extremely weird home: "Domů", - about: "Více", - - // About page menu - introduction: "Úvod", - features: "Vlastnosti", - installation: "Instalace", - usage: "Používání", - limitations: "Omezení", - best_practices: "Správné používání", - faq: "FAQ", - technical_details: "Technické detaily", - changelog: "Záznam změn", - donation_message: "Líbí se Vám hat.sh? Můžete projekt podpořit.", // Settings settings: "Nastvení", diff --git a/locales/de_DE/index.js b/locales/de_DE/index.js index fa0380f6..03647fe9 100644 --- a/locales/de_DE/index.js +++ b/locales/de_DE/index.js @@ -4,19 +4,6 @@ const de_DE = { // Menu sub_title: "Einfache, schnelle, sichere Client-seitige Dateiverschlüsselung", home: "Startseite", - about: "Über", - - // About page menu - introduction: "Einführung", - features: "Merkmale", - installation: "Installation", - usage: "Verwendung", - limitations: "Beschränkungen", - best_practices: "Best Practices", - faq: "FAQ", - technische_details: "Technische Details", - changelog: "Changelog", - donation_message: "Liebst du hat.sh? Unterstütze das Projekt mit einer Spende.", // Settings settings: "Einstellungen", diff --git a/locales/en_US/index.js b/locales/en_US/index.js index e01ff81c..9678fc07 100644 --- a/locales/en_US/index.js +++ b/locales/en_US/index.js @@ -2,21 +2,8 @@ const en_US = { language_name: "English", // Menu - sub_title: "Simple, fast, secure client-side file encryption", + sub_title: "Simple, Fast, & Secure Client-Side File Encryption In The Browser", home: "Home", - about: "About", - - // About page menu - introduction: "Introduction", - features: "Features", - installation: "Installation", - usage: "Usage", - limitations: "Limitations", - best_practices: "Best-Practices", - faq: "FAQ", - technical_details: "Technical-Details", - changelog: "Changelog", - donation_message: "Love hat.sh? You can donate to support the project.", // Settings settings: "Settings", @@ -182,4 +169,4 @@ const en_US = { }; -export default en_US; \ No newline at end of file +export default en_US; diff --git a/locales/es_ES/index.js b/locales/es_ES/index.js index ab35853a..86ca4fad 100644 --- a/locales/es_ES/index.js +++ b/locales/es_ES/index.js @@ -4,19 +4,6 @@ const es_ES = { // Menu sub_title: "Cifrado de archivos del lado del cliente sencillo, rápido y seguro", home: "Inicio", - about: "Acerca de", - - // About page menu - introduction: "Introducción", - features: "Características", - installation: "Instalación", - usage: "Uso", - limitations: "Limitaciones", - best_practices: "Mejores practicas", - faq: "FAQ", - technical_details: "Detalles técnicos", - changelog: "Registro de cambios", - donation_message: "¿Te encanta hat.sh? Puedes donar para apoyar el proyecto.", // Settings settings: "Ajustes", @@ -182,4 +169,4 @@ const es_ES = { }; -export default es_ES; \ No newline at end of file +export default es_ES; diff --git a/locales/fr_FR/index.js b/locales/fr_FR/index.js index 661f2dfc..030920d6 100644 --- a/locales/fr_FR/index.js +++ b/locales/fr_FR/index.js @@ -4,19 +4,6 @@ const fr_FR = { // Menu sub_title: "Chiffrement de fichier simple, rapide et sécurisé", home: "accueil", - about: "à propos", - - // About page menu - introduction: "Introduction", - features: "Fonctionnalités", - installation: "Installation", - usage: "Utilisation", - limitations: "Limitations", - best_practices: "Bonnes pratiques", - faq: "FAQ", - technical_details: "Détails techniques", - changelog: "Journaux", - donation_message: "Vous amez hat.sh? Vous pouvez donner pour supporter le projet.", // Settings settings: "Paramètre", diff --git a/locales/it_IT/index.js b/locales/it_IT/index.js index 5332f173..bd8a4629 100644 --- a/locales/it_IT/index.js +++ b/locales/it_IT/index.js @@ -4,19 +4,6 @@ const it_IT = { // Menu sub_title: "Una semplice, veloce e sicura crittografia di file in locale", home: "Home", - about: "Dettagli", - - // About page menu - introduction: "Introduzione", - features: "Caratteristiche", - installation: "Installazione", - usage: "Utilizzo", - limitations: "Limitazioni", - best_practices: "Consigli sull'utilizzo", - faq: "Domande frequenti", - technical_details: "Dettagli tecnici", - changelog: "Registro modifiche", - donation_message: "Ti piace hat.sh? Puoi donare per supportare il progetto.", // Settings settings: "Impostazioni", @@ -182,4 +169,4 @@ const it_IT = { }; -export default it_IT; \ No newline at end of file +export default it_IT; diff --git a/locales/ja_JP/index.js b/locales/ja_JP/index.js index be189550..e4926f55 100644 --- a/locales/ja_JP/index.js +++ b/locales/ja_JP/index.js @@ -4,19 +4,6 @@ const ja_JP = { // Menu sub_title: "シンプル、高速、セキュアなクライアントサイドでのファイル暗号化", home: "ホーム", - about: "私たちについて", - - // About page menu - introduction: "紹介", - features: "特徴", - installation: "インストール手順", - usage: "使用方法", - limitations: "制約", - best_practices: "ベストプラクティス", - faq: "FAQ", - technical_details: "技術的な詳細", - changelog: "変更履歴", - donation_message: "hat.shを気に入ってくれましたか? 寄付をすることでこのプロジェクトを支援できます。", // Settings settings: "設定", @@ -182,4 +169,4 @@ const ja_JP = { }; -export default ja_JP; \ No newline at end of file +export default ja_JP; diff --git a/locales/locales.js b/locales/locales.js index b54c8d41..444d39a5 100644 --- a/locales/locales.js +++ b/locales/locales.js @@ -9,6 +9,7 @@ import es_ES from "./es_ES"; import cs_CS from "./cs_CS"; import tr_TR from "./tr_TR"; import ja_JP from "./ja_JP"; +import nl_NL from "./nl_NL"; const locales = { en_US, @@ -21,7 +22,8 @@ const locales = { es_ES, cs_CS, tr_TR, - ja_JP + ja_JP, + nl_NL }; export default locales; diff --git a/locales/nl_NL/index.js b/locales/nl_NL/index.js new file mode 100644 index 00000000..bd44b38c --- /dev/null +++ b/locales/nl_NL/index.js @@ -0,0 +1,172 @@ +const nl_NL = { + language_name: "Nederlands", + + // Menu + sub_title: "Eenvoudige, snelle en veilige bestandsversleuteling aan de clientzijde", + home: "Home", + + // Instellingen + settings: "Instellingen", + language: "Taal", + change_language: "Weergavetaal wijzigen", + change_appearance: "Verander uiterlijk", + language_changed: "Taal veranderd! - De pagina moet ververst worden om de wijziging door te voeren.", + help_translate: "Kun je jou taal niet vinden? Je kunt helpen deze app te vertalen door de vertaalgids op GitHub te volgen.", + reload: "HERLADEN", + dark_mode: "Donkere Modus", + close: "Sluiten", + reset: "Resetten", + guide: "Gids", + multiple_tabs_alert: "Waarschuwing voor meerdere geopende tabbladen", + multiple_tabs_alert_notice_one: "Het lijkt erop dat hat.sh al geopend is in een ander venster/tabblad.", + multiple_tabs_alert_notice_two: "Vermijd het tegelijkertijd versleutelen/ontsleutelen van bestanden op verschillende vensters/tabbladen.", + understand: "BEGREPEN", + + // Standaard begrippen + file: "Bestand", + files: "Bestanden", + password: "Wachtwoord", + public_key: "Publieke sleutel", + private_key: "Privé sleutel", + drag_drop: "Drag & Drop een bestand of door bestanden bladeren", + drag_drop_files: "Drag & Drop of door bestanden bladeren", + browse_file: "Bestand zoeken", + browse_files: "Bestanden doorbladeren", + change_file: "Bestand wijzigen", + add_files: "Bestanden toevoegen", + next: "Volgende", + back: "Terug", + error: "Fout", + required: "Verplicht", + success: "Succes", + show_password: "Wachtwoord tonen", + copy_password: "Wachtwoord kopiëren", + password_copied: "Wachtwoord gekopieerd!", + show_private_key: "Privésleutel tonen", + load_public_key: "Openbare sleutel laden", + load_private_key: "Privésleutel laden", + short_password: "Voer een wachtwoord in met een minimale lengte van 12 tekens. Of genereer er een.", + wrong_public_key: "Verkeerde openbare sleutel", + wrong_private_key: "Verkeerde privésleutel", + invalid_keys_input: "Ongeldige invoer van sleutels.", + invalid_key_pair: "Dit sleutelpaar is ongeldig! Selecteer sleutels voor verschillende partijen.", + ready_to_download: "is succesvol geladen en klaar om te downloaden!", + files_ready_to_download: "bestanden zijn succesvol geladen en klaar om te downloaden!", + downloading_file: "Downloaden...", + checking_file: "Bestand controleren...", + page_close_alert: "Sluit de pagina niet terwijl de bestanden worden gedownload!", + offline_note: "Bestanden worden niet geüpload naar een server, alles gebeurt offline in uw browser.", + + // Controle van wachtwoordsterkte + very_weak: "Zeer zwak (raadbaar)", + weak: "Zwak", + moderate: "Gemiddeld", + good: "Goed", + strong: "Sterk", + crackTimeEstimation: "Geschatte kraaktijd:", + less_second: "minder dan een seconde", + seconds: "seconden", + minutes: "minuten", + hours: "uren", + days: "dagen", + months: "maanden", + years: "jaren", + centuries: "eeuwen", + + // Encryptie + encryption: "Encryptie", + drop_file_enc: "Bestanden neerzetten om te versleutelen", + choose_files_enc: "Kies bestanden om te versleutelen", + enter_password_enc: "Vul een wachtwoord in", + enter_keys_enc: "Voer de openbare sleutel van de ontvanger en jouw privésleutel in", + password_strength: "Wachtwoord sterkte", + choose_strong_password: "Kies een sterk wachtwoord", + generate_password: "Genereer wachtwoord", + recipient_public_key: "Publieke sleutel van de ontvanger", + enter_recipient_public_key: "Voer de openbare sleutel van de ontvanger in", + your_private_key_enc: "Jouw privésleutel", + enter_private_key_enc: "Voer je privésleutel in", + encrypted_files: "Versleutelde bestanden", + download_encrypted_files: "Versleutelde bestanden downloaden", + success_downloaded_files_enc: "Je hebt de versleutelde bestanden succesvol gedownload!", + encrypt_more_files: "Versleutel meer bestanden", + create_shareable_link: "Deelbare link maken", + create_shareable_link_tooltip: "Maak een link met uw openbare sleutel", + create_shareable_link_note: "Deze link is offline gegenereerd.", + create_shareable_link_copied: "Deelbare link gekopieerd!", + copy_link: "Kopieer link", + after_enc_note_one: "Je moet dit bestand samen met je openbare sleutel delen, zodat de ontvanger het kan decoderen.", + after_enc_note_two: "Je kunt een link maken met je openbare sleutel, zodat je niet je eigen openbare sleutel hoeft te versturen en dus niet bang hoeft te zijn dat de ontvanger jouw sleutel gebruikt.", + testing_password: "Wachtwoord testen...", + testing_keys: "Sleutels testen...", + + // Decodering + decryption: "Decodering", + drop_file_dec: "Zet bestanden neer om te decoderen", + choose_files_dec: "Kies bestanden om te decoderen", + sender_key_loaded: "De openbare sleutel van de afzender is geladen, selecteer het versleutelde bestand.", + recipient_key_loaded: "De openbare sleutel van de ontvanger is geladen, selecteer nu een bestand om te coderen.", + file_not_encrypted_corrupted: "Dit bestand is niet versleuteld met hat.sh of het bestand is mogelijk beschadigd!", + old_version: "Dit bestand is versleuteld met een oudere versie van hat.sh. Je kunt dit bestand ontsleutelen door naar de v1-app te gaan.", + file_mixup: "Bestanden die voor decodering zijn geselecteerd, moeten met dezelfde methode worden gecodeerd, hetzij met een wachtwoord of met een openbare sleutel. Kies bestanden die overeenkomen.", + enter_password_dec: "Voer het decoderingswachtwoord in", + enter_keys_dec: "Voer de openbare sleutel van de afzender en je eigen privésleutel in", + wrong_password: "Verkeerd wachtwoord", + file_has_wrong_password: "heeft een verkeerd wachtwoord, het testen van het wachtwoord is gestopt, zorg ervoor dat alle bestanden hetzelfde correcte decoderingswachtwoord hebben.", + file_has_wrong_keys: "heeft verkeerde sleutels, het testen van sleutels is gestopt, zorg ervoor dat alle bestanden dezelfde correcte decoderingssleutels hebben.", + sender_public_key: "Publieke sleutel van de afzender", + enter_sender_public_key: "Voer de openbare sleutel van de afzender in", + your_private_key_dec: "Jouw privésleutel", + enter_private_key_dec: "Voer je privésleutel in", + decrypted_files: "Gedecodeerde bestanden", + download_decrypted_files: "Gedecodeerde bestanden downloaden", + success_downloaded_files_dec: "Je hebt de gedecodeerde bestanden met succes gedownload!", + decrypt_other_files: "Andere bestanden decoderen", + + + // Limiet + choose_file_enc: "Kies een bestand om te versleutelen", + choose_file_dec: "Kies een bestand om te decoderen", + encrypted_file: "Versleuteld bestand", + decrypted_file: "Gedecodeerd bestand", + download_encrypted_file: "Versleuteld bestand downloaden", + download_decrypted_file: "Gedecodeerd bestand downloaden", + success_downloaded_file_enc: "Je hebt het versleutelde bestand succesvol gedownload!", + success_downloaded_file_dec: "Je hebt het gedecodeerde bestand succesvol gedownload!", + encrypt_another_file: "Een ander bestand versleutelen", + decrypt_another_file: "Een ander bestand decoderen", + limited_safari: "Safari-browsers hebben een beperkte ervaring (één bestand, 1 GB)", + limited_mobile: "Mobiele browsers hebben eeb beperkte ervaring (één bestand, 1GB)", + limited_private: "Je hebt een beperkte ervaring (één bestand, 1 GB) omdat je in een incognito venster browsed.", + file_too_big: "Bestand is te groot!", + choose_file_1gb: "Kies een bestand tot 1 GB.", + encrypt_file: "Bestand versleutelen", + encrypting_file: "Versleutelen...", + decrypting_file: "Decoderen...", + page_close_alert_enc: "Sluit de pagina niet terwijl het bestand aan het versleutelen is!", + success_encrypted: "Het bestand is succesvol versleuteld!", + page_close_alert_dec: "Sluit de pagina niet terwijl het bestand aan het decoderen is!", + success_decrypted: "Het bestand is succesvol gedecodeerd!", + download_file: "Download bestand", + + // Sleutelpaar genereer paneel + generate_now_button: "Genereer nu", + generate_key_pair_button: "Sleutelpaar genereren", + generate_another_key_pair_button: "Genereer nog een paar", + key_pair_question: "Heb je geen publieke-/privésleutels?", + key_pair_generation_title: "Genereren van een publieke-/privésleutel:", + download_public_key: "Openbare sleutel downloaden", + download_private_key: "Privésleutel downloaden", + generate_public_key: "Genereer openbare sleutel", + generate_private_key: "Genereer privésleutel", + show_private_key: "Privésleutel tonen", + why_need_private_key: "Waarom heb ik mijn privésleutel nodig?", + private_key_notice: "Deel je privésleutel nooit met iemand! Alleen de openbare sleutels mogen worden uitgewisseld.", + generate_qr_code: "Genereer QR-code", + qr_code_note_one: "Deze QR-code bevat jouw openbare sleutel. Na het scannen wordt het apparaat omgeleid naar de app en wordt de openbare sleutel automatisch ingevuld.", + qr_code_note_two: "Je kunt deze QR-code of koppeling met anderen delen, in plaats van dat zij jouw openbare sleutel handmatig moeten invoeren bij het versleutelen van bestanden.", + qr_code_note_three: "Deze QR-code is offline gegenereerd.", + +}; + +export default nl_NL; \ No newline at end of file diff --git a/locales/ru_RU/index.js b/locales/ru_RU/index.js index 4005e632..04455f62 100644 --- a/locales/ru_RU/index.js +++ b/locales/ru_RU/index.js @@ -4,19 +4,6 @@ const ru_RU = { // Menu sub_title: "Простое, быстрое, безопасное шифрование файлов на стороне клиента", home: "Домой", - about: "О проекте", - - // About page menu - introduction: "Вступление", - features: "Возможности", - installation: "Установка", - usage: "Использование", - limitations: "Ограничения", - best_practices: "Рекомендации", - faq: "ЧАВО", - technical_details: "Технические детали", - changelog: "История изменений", - donation_message: "Нравится hat.sh? Вы можете поддержать проект небольшим взносом.", // Settings settings: "Настройки", @@ -182,4 +169,4 @@ const ru_RU = { }; -export default ru_RU; \ No newline at end of file +export default ru_RU; diff --git a/locales/sk_SK/index.js b/locales/sk_SK/index.js index 5aa60da2..d3953ac8 100644 --- a/locales/sk_SK/index.js +++ b/locales/sk_SK/index.js @@ -4,19 +4,6 @@ const sk_SK = { // Menu sub_title: "Jednoduché, rýchle a bezpečné šifrovanie súborov na strane klienta", home: "Domov", - about: "O projekte", - - // About page menu - introduction: "Úvod", - features: "Funkcie", - installation: "Inštalácia", - usage: "Použitie", - limitations: "Obmedzenia", - best_practices: "Osvedčené postupy", - faq: "Často kladené otázky", - technical_details: "Technické detaily", - changelog: "Zoznam zmien", - donation_message: "Máte radi hat.sh? Na podporu projektu môžete prispieť.", // Settings settings: "Nastavenia", diff --git a/locales/tr_TR/index.js b/locales/tr_TR/index.js index cc5438d9..101f6033 100644 --- a/locales/tr_TR/index.js +++ b/locales/tr_TR/index.js @@ -4,19 +4,6 @@ const tr_TR = { // Menu sub_title: "Basit, hızlı, güvenli istemci taraflı dosya şifreleme", home: "Anasayfa", - about: "Hakkında", - - // About page menu - introduction: "Giriş", - features: "Özellikler", - installation: "Kurulum", - usage: "Kullanım", - limitations: "Sınırlandırmalar", - best_practices: "En İyi Uygulama", - faq: "SSS", - technical_details: "Teknik-Detaylar", - changelog: "Değişiklik Günlüğü", - donation_message: "Hat.sh'yi sevdin mi? Bu projeye bağış yaparak destekleyebilirsin.", // Settings settings: "Ayarlar", diff --git a/locales/zh_CN/index.js b/locales/zh_CN/index.js index bd271c01..036b011c 100644 --- a/locales/zh_CN/index.js +++ b/locales/zh_CN/index.js @@ -4,19 +4,6 @@ const zh_CN = { // Menu sub_title: "简洁、快速、安全的用户端文件加密", // simple, fast, secure client-side file encryption home: "主页", // home - about: "关于", - - // About page menu - introduction: "介绍", // Introduction - features: "特点", // Features - installation: "安装", // Installation - usage: "使用", // Usage - limitations: "限制", // Limitations - best_practices: "最佳实践", // Best-Practices - faq: "问与答", // FAQ - technical_details: "技术细节", // Technical-Details - changelog: "更新日志", // Changelog - donation_message: "喜欢 hat.sh 吗?您可以捐赠来支持本项目", // Love hat.sh? You can donate to support the project. // Settings settings: "设置", // Settings @@ -181,4 +168,4 @@ const zh_CN = { }; - export default zh_CN; // zh-CN \ No newline at end of file + export default zh_CN; // zh-CN diff --git a/package-lock.json b/package-lock.json index b40e7d63..98ea83a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "hat.sh", - "version": "2.3.6", + "name": "hat.sh-reworked", + "version": "2.3.7", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "hat.sh", - "version": "2.3.6", + "name": "hat.sh-reworked", + "version": "2.3.7", "dependencies": { "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", @@ -545,9 +545,9 @@ "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" }, "node_modules/@types/react": { - "version": "18.0.9", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.9.tgz", - "integrity": "sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==", + "version": "17.0.62", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.62.tgz", + "integrity": "sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -2991,9 +2991,9 @@ "dev": true }, "node_modules/json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, "dependencies": { "minimist": "^1.2.0" @@ -4791,9 +4791,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -5119,9 +5119,9 @@ "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" }, "@types/react": { - "version": "18.0.9", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.9.tgz", - "integrity": "sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==", + "version": "17.0.62", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.62.tgz", + "integrity": "sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -7048,9 +7048,9 @@ "dev": true }, "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, "requires": { "minimist": "^1.2.0" @@ -8449,9 +8449,9 @@ } }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true }, "wrappy": { diff --git a/package.json b/package.json index 178fb701..1c1f3295 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "hat.sh", - "version": "2.3.6", + "name": "hat.sh-reworked", + "version": "2.3.7", "private": true, "scripts": { "dev": "browserify service-worker/sw.js -o public/service-worker.js && next dev", diff --git a/pages/_app.js b/pages/_app.js index ff15f5b6..1b32693b 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -12,7 +12,7 @@ function MyApp({ Component, pageProps }) { <> - {"Hat.sh"} + {"Hat.sh-Reworked"} {" - "} {t("sub_title")} diff --git a/pages/about.js b/pages/about.js deleted file mode 100644 index df0028c9..00000000 --- a/pages/about.js +++ /dev/null @@ -1,456 +0,0 @@ -/* eslint-disable @next/next/no-html-link-for-pages */ -/* eslint-disable @next/next/no-img-element */ -import fs from "fs"; -import path from "path"; -import { marked } from "marked"; -import { useState, useEffect } from "react"; -import PropTypes from "prop-types"; -import AppBar from "@material-ui/core/AppBar"; -import CssBaseline from "@material-ui/core/CssBaseline"; -import Divider from "@material-ui/core/Divider"; -import Drawer from "@material-ui/core/Drawer"; -import Hidden from "@material-ui/core/Hidden"; -import IconButton from "@material-ui/core/IconButton"; -import List from "@material-ui/core/List"; -import ListItem from "@material-ui/core/ListItem"; -import ListItemIcon from "@material-ui/core/ListItemIcon"; -import ListItemText from "@material-ui/core/ListItemText"; -import MenuIcon from "@material-ui/icons/Menu"; -import Toolbar from "@material-ui/core/Toolbar"; -import Typography from "@material-ui/core/Typography"; -import { makeStyles, useTheme } from "@material-ui/core/styles"; -import Link from "next/link"; -import Container from "@material-ui/core/Container"; -import Button from "@material-ui/core/Button"; -import GitHubIcon from "@material-ui/icons/GitHub"; -import Footer from "../src/components/Footer"; -import BookmarkBorderIcon from "@material-ui/icons/BookmarkBorder"; -import StarsIcon from "@material-ui/icons/Stars"; -import GetAppIcon from "@material-ui/icons/GetApp"; -import EmojiObjectsIcon from "@material-ui/icons/EmojiObjects"; -import ErrorOutlineIcon from "@material-ui/icons/ErrorOutline"; -import VerifiedUserIcon from "@material-ui/icons/VerifiedUser"; -import MenuBookIcon from "@material-ui/icons/MenuBook"; -import LiveHelpIcon from "@material-ui/icons/LiveHelp"; -import HistoryIcon from "@material-ui/icons/History"; -import prism from "prismjs"; -import Settings from "../src/components/Settings"; -import { ThemeProvider } from "@material-ui/styles"; -import { Theme, checkTheme } from "../src/config/Theme"; -import locales from "../locales/locales"; -import { getTranslations as t } from "../locales"; -const drawerWidth = 240; - -marked.setOptions({ - highlight: function (code, lang) { - if (prism.languages[lang]) { - return prism.highlight(code, prism.languages[lang], lang); - } else { - return code; - } - }, -}); - -const useStyles = makeStyles((theme) => ({ - root: { - backgroundColor: Theme.palette.alabaster.main, - minHeight: "100vh", - }, - drawer: { - [theme.breakpoints.down("lg")]: { - display: "none", - }, - }, - appBar: { - backgroundColor: Theme.palette.alabaster.main, - [theme.breakpoints.up("sm")]: { - width: "100%", - marginLeft: drawerWidth, - zIndex: theme.zIndex.drawer - 1, - }, - }, - - logo: { - flexGrow: 1, - marginTop: 5, - }, - button: { - textTransform: "none", - color: Theme.palette.diamondBlack.main, - }, - - menuButton: { - marginRight: theme.spacing(2), - [theme.breakpoints.up("xl")]: { - display: "none", - }, - }, - // necessary for content to be below app bar - toolbar: theme.mixins.toolbar, - drawerPaper: { - width: drawerWidth, - }, - content: { - padding: theme.spacing(3), - marginTop: "20px", - - "& h1": { - marginTop: 20, - color: Theme.palette.mineShaft.main, - borderRadius: "8px", - paddingBottom: 15, - "& a": { - textDecoration: "none", - fontWeight: "bold", - fontSize: 40, - letterSpacing: "1px", - borderBottom: "1px solid #000", - }, - }, - - "& h2": { - color: Theme.palette.mineShaft.main, - fontSize: "26px", - paddingTop: 20, - paddingBottom: 20, - fontWeight: "700", - }, - - "& h3": { - color: Theme.palette.mineShaft.main, - fontSize: "24px", - paddingTop: 20, - paddingBottom: 20, - fontWeight: "700", - }, - - "& a": { - color: Theme.palette.mineShaft.main, - }, - - "& p": { - fontSize: "17px", - color: Theme.palette.mineShaft.main, - lineHeight: 2, - "& code": { - backgroundColor: "#f1f1f1", - wordWrap: "break-word", - fontFamily: "inherit", - paddingRight: 7, - paddingLeft: 7, - borderRadius: "3px", - }, - }, - - "& li": { - padding: 2.5, - fontSize: "18px", - color: Theme.palette.mineShaft.main, - "& a": { - textDecoration: "none", - letterSpacing: "0.5px", - borderBottom: "1px solid #000", - }, - }, - - "& hr": { - backgroundColor: Theme.palette.mercury.main, - border: "none", - height: "1.5px", - marginTop: 20, - marginBottom: 30, - }, - - "& ul": { - paddingLeft: 25, - paddingBottom: 15, - fontSize: "16px", - "& code": { - backgroundColor: "#f1f1f1", - wordWrap: "break-word", - fontFamily: "inherit", - paddingRight: 7, - paddingLeft: 7, - borderRadius: "3px", - }, - }, - - "& ol": { - paddingLeft: 25, - paddingBottom: 15, - fontSize: "16px", - "& code": { - backgroundColor: "#f1f1f1", - wordWrap: "break-word", - fontFamily: "inherit", - paddingRight: 7, - paddingLeft: 7, - borderRadius: "3px", - }, - }, - - "& pre": { - background: "rgb(235, 235, 235)", - padding: "13px", - marginTop: "-5px", - marginBottom: "20px", - lineHeight: "1.3", - fontSize: "14px", - borderRadius: "3px", - overflow: "auto", - "& code": { - color: Theme.palette.mineShaft.main, - }, - }, - - "& .codeBox": { - "& pre": { - background: "#2E3440", - "& code": { - color: "#f8f8f2", - }, - }, - }, - - "& blockquote": { - backgroundColor: "#f1f1f1", - marginTop: "15px", - color: "#535a60", - borderLeft: "5px solid #c8ccd0", - marginBottom: 20, - "& p": { - padding: 10, - }, - }, - }, -})); - -export default function About(props) { - const classes = useStyles(); - const theme = useTheme(); - const [mobileOpen, setMobileOpen] = useState(false); - const [docContent, setDocContent] = useState(""); - - useEffect(() => { - checkTheme(); - }, []); - - useEffect(() => { - const getLocale = () => { - if (typeof window !== "undefined") { - let language = window.localStorage.getItem("language"); - let userLanguage = navigator.language.replace("-", "_"); - return language ? language : locales[userLanguage] ? userLanguage : "en_US"; - } - }; - - let languages = props.docs; - let langFilter = { lang: getLocale() }; - let langResult; - - languages.forEach(function (obj) { - let matches = true; - for (let key in langFilter) { - if (langFilter[key] !== obj[key]) { - matches = false; - } - } - if (matches) { - langResult = obj; - } else { - //default en docs - setDocContent(languages[0].content); - } - }); - - const getContent = async () => { - for (const key in langResult) { - if (key == "content") { - setDocContent(langResult[key]); - } - } - }; - - getContent(); - }, [props.docs]); - - const handleDrawerToggle = () => { - setMobileOpen(!mobileOpen); - }; - - const handleClose = () => { - mobileOpen ? setMobileOpen(false) : null; - }; - - const drawer = ( -
-
- - - - - - - - - - {[ - { name: t("introduction"), icon: }, - { name: t("features"), icon: }, - { name: t("installation"), icon: }, - { name: t("usage"), icon: }, - { name: t("limitations"), icon: }, - { name: t("best_practices"), icon: }, - { name: t("faq"), icon: }, - { name: t("technical_details"), icon: }, - { name: t("changelog"), icon: }, - ].map((text, index) => ( -
- - - {text.icon} - - - -
- ))} -
-
- ); - - return ( - -
- - - - - - - - - - - - logo - - - - - - - - - - - - - - - -
- -
- -
-
- -
- -
-
-
- ); -} - -About.propTypes = { - /** - * Injected by the documentation to work in an iframe. - * You won't need it on your project. - */ - window: PropTypes.func, -}; - -export async function getStaticProps() { - // Get files from the posts dir - - let docs = []; - - { - Object.entries(locales).map(([code, name]) => { - let docFilePath = `locales/${code}/docs.md`; - let docFile; - try { - docFile = fs.readFileSync( - path.join(docFilePath), - "utf-8" - ); - } catch (error) { - docFile = fs.readFileSync( - path.join(`locales/en_US/docs.md`), - "utf-8" - ); - } - - let docStructure = { lang: code, content: docFile }; - docs.push(docStructure); - }); - } - - const changelog = fs.readFileSync("CHANGELOG.md", "utf-8"); - - return { - props: { - docs: docs, - changelog: changelog, - }, - }; -} diff --git a/service-worker/config.js b/service-worker/config.js index df6fca3b..97755b21 100644 --- a/service-worker/config.js +++ b/service-worker/config.js @@ -2,7 +2,7 @@ const APP_URL = self.location.origin + "/file"; const encoder = new TextEncoder(); const decoder = new TextDecoder(); const sigCodes = { - v1: "Encrypted Using Hat.sh", + v1: "Encrypted Using Client-side Encryption", v2_symmetric: "zDKO6XYXioc", v2_asymmetric: "hTWKbfoikeg", }; diff --git a/src/components/AppBar.js b/src/components/AppBar.js index 437a3dd9..6b511b90 100644 --- a/src/components/AppBar.js +++ b/src/components/AppBar.js @@ -39,12 +39,8 @@ export default function NavAppBar() { - - diff --git a/src/components/Footer.js b/src/components/Footer.js index f9925125..5597e53b 100644 --- a/src/components/Footer.js +++ b/src/components/Footer.js @@ -102,17 +102,17 @@ export default function Footer() { { type: "monero", alt: "xmr", - addr: "84zQq4Xt7sq8cmGryuvWsXFMDvBvHjWjnMQXZWQQRXjB1TgoZWS9zBdNcYL7CRbQBqcDdxr4RtcvCgApmQcU6SemVXd7RuG", + addr: "45K3QyhGGysAGDvFhGnYne3qcajeGmjRXXGZ8p3LeWBxFgiDkZ7XhLuNxDB5QsjS8ySQtHmjGaoWc6Vg5wtfaPmoCHRDmC4", }, { type: "bitcoin", alt: "btc", - addr: "bc1qlfnq8nu2k84h3jth7a27khaq0p2l2gvtyl2dv6", + addr: "", }, { type: "ethereum", alt: "eth", - addr: "0xF6F204B044CC73Fa90d7A7e4C5EC2947b83b917e", + addr: "", }, ]; @@ -157,12 +157,12 @@ export default function Footer() { Built and developed by{" "} - {"sh-dv"} + {"WhateverItWorks"} @@ -199,7 +199,7 @@ export default function Footer() { - Hat.sh is an open-source application. The project is + Hat.sh-Reworked is an open-source application. The project is maintained in my free time. Donations of any size are appreciated. @@ -271,17 +271,6 @@ export default function Footer() { ))} -