Pull from main to staging

README.md

@@ -1,5 +1,3 @@
-# STAGING BRANCH
-
 # Torrust
 ![Test](https://github.com/torrust/torrust/actions/workflows/test.yml/badge.svg)
 ![Build](https://github.com/torrust/torrust/actions/workflows/build.yml/badge.svg)

backend/src/handlers/user.rs

@@ -45,7 +45,7 @@ pub struct Login {
     pub password: String,
 }
 
-    pub async fn register(req: HttpRequest, mut payload: web::Json<Register>, app_data: WebAppData) -> ServiceResult<impl Responder> {
+pub async fn register(req: HttpRequest, mut payload: web::Json<Register>, app_data: WebAppData) -> ServiceResult<impl Responder> {
     let settings = app_data.cfg.settings.read().await;
 
     match settings.auth.email_on_signup {
@@ -122,7 +122,7 @@ pub struct Login {
 
     let conn_info = req.connection_info();
 
-    if settings.mail.email_verification_enabled && payload.email.is_some() {
+     if settings.mail.email_verification_enabled && payload.email.is_some() {
         let mail_res = app_data.mailer.send_verification_mail(
             &payload.email.as_ref().unwrap(),
             &payload.username,

frontend/src/App.vue

@@ -21,6 +21,7 @@ export default {
   },
   watch:{
     $route (to, from){
+      this.$store.dispatch('getPublicSettings');
       this.$store.dispatch('getCategories');
       this.$store.dispatch('getSiteName');
     }

frontend/src/components/Footer.vue

@@ -5,7 +5,8 @@
 <!--        <a class="hover:text-slate-400" href="">Terms of Service</a>-->
 <!--        <p class="sm:ml-4 sm:pl-4 sm:border-l sm:border-slate-200/5"><a class="hover:text-slate-400" href="">Privacy Policy</a></p>-->
 <!--      </div>-->
-      <a class="hover:text-white transition duration-200" href="https://status.rpdl.net">Platform Status</a>
+      <a class="hover:text-white transition duration-200" <a href = "https://rpdl.net/discord" > <img src="https://discordapp.com/api/guilds/911568616758050817/widget.png?style=shield" > </a>
+      <a class="ml-2 pl-2 border-l border-slate-600 hover:text-white transition duration-200" href="https://status.rpdl.net" target="_blank">Platform Status</a>
       <a class="ml-2 pl-2 border-l border-slate-600 hover:text-white transition duration-200" href="https://github.com/torrust/torrust">Powered by Torrust</a>
     </div>
   </div>

frontend/src/store/auth.js

@@ -55,13 +55,11 @@ export default {
         }
     },
     actions: {
-        async login({dispatch, state, commit, getters}, data) {
-            await HttpService.post('/user/login', data, async (res) => {
-
+         async login({dispatch, state, commit, getters}, data) {
+             await HttpService.post('/user/login', data, async (res) => {
                 const data = res.data.data;
 
-                await commit('authSuccess', data);
-
+                 await commit('authSuccess', data);
             });
 
             if (getters.isAdministrator) {

frontend/src/views/Torrents.vue

@@ -8,7 +8,8 @@
       <FilterCategory />
       <ChangePageSize :update-page-size="updatePageSize" />
     </div>
-    <TorrentList id="tList" class="mt-4" v-if="torrents.results.length > 0" :torrents="torrents.results" :sorting="sorting" :update-sorting="updateSorting"/>
+
+    <TorrentList id="TorrentList" class="mt-4" v-if="torrents.results.length > 0" :torrents="torrents.results" :sorting="sorting" :update-sorting="updateSorting"/>
     <Pagination v-if="torrents.results.length > 0" :current-page.sync="currentPage" :total-pages="totalPages" :total-results="torrents.total" :page-size="pageSize" />
     <div v-else class="py-6 text-slate-400">This category has no results.</div>
   </div>
@@ -69,6 +70,7 @@ export default {
       this.$router.replace({ query: {...this.$route.query, search: ''}})
     },
     updateSorting(sorting) {
+      this.currentPage = Math.floor((this.currentPage - 1) * this.pageSize / pageSize) + 1;
       this.sorting = sorting;
       this.loadTorrents(this.currentPage);
     },
@@ -99,7 +101,7 @@ export default {
     },
     currentPage(newPage) {
       this.loadTorrents(newPage, this.sorting);
-      document.getElementById("tList").scrollIntoView({behavior: "smooth"});
+      document.getElementById("TorrentList").scrollIntoView({behavior: "smooth"});
     },
     categoryFilters() {
       this.currentPage = 1;

licensing/contributor_agreement_v01.md

@@ -0,0 +1,103 @@
+# The Nautilus Cyberneering Contributor Agreement
+
+<!-- markdownlint-disable MD013 -->
+
+[Version 2021-11-10]
+
+## Goal
+
+We require that contributors to Nautilus (as defined below) agree to this Nautilus Cyberneering Contributor Agreement (NCCA) to ensure that contributions to Nautilus have acceptable licensing terms.
+
+## Non-Goals
+
+The NCCA is _not_ a copyright assignment agreement.
+
+The NCCA does _not_ somehow supersede the existing licensing terms that apply to Nautilus contributions. There are two important subpoints here. First, the NCCA does not apply to upstream code (or other material) that you didn't write; indeed, it would be preposterous for it to attempt to do so. Note the narrow way in which we have defined capital-c "Contribution".
+
+Second, the main provision of the NCCA specifies that a default license will apply to code that you wrote, but only to the extent that you have not bothered to put an explicit license on it. Therefore, the NCCA is _not_ some sort of special permissive license granted to any party, despite the explicit choice of a more restrictive license by you or by upstream developers.
+
+## Terms
+
+### Section 1 – Definitions
+
+__"Acceptable License For Nautilus"__ means a license selected from the appropriate categorical sublist of the full list of acceptable licenses for Nautilus, currently located at <https://github.com/Nautilus-Cyberneering/nautilus-librarian/tree/main/licensing>, as that list may be revised from time to time by Nautilus Cyberneering GmbH. "Acceptable Licenses For Nautilus" means that full list.
+
+__"AGPLv3"__ means the license identified as "Affero General Public License 3.0", as published at <https://www.gnu.org/licenses/agpl-3.0.en.html>.
+
+__"CC-0"__ means the Creative Commons 1.0 Universal license, as published at <https://creativecommons.org/publicdomain/zero/1.0/legalcode>.
+
+__"CC-BY-SA"__ means the Creative Commons Attribution-ShareAlike 4.0 International license, as published at <https://creativecommons.org/licenses/by-sa/4.0/legalcode>.
+
+__"Code"__ means (i) software code, (ii) any other functional material whose principal purpose is to control or facilitate the building of packages, such as an RPM spec file, (iii) font files, and (iv) other kinds of copyrightable material that the Nautilus Cyberneering GmbH has classified as "code" rather than "content".
+
+__"Content"__ means any copyrightable material that is not Code, such as, without limitation, (i) non-functional data sets, (ii) documentation, (iii) wiki edits, (iv) music files, (v) graphic image files, (vi) help files, and (vii) other kinds of copyrightable material that the Nautilus Council has classified as "content" rather than "code".
+
+__"Contribution"__ means a Work that You created, excluding any portion that was created by someone else. (For example, if You Submit a package to Nautilus, the spec file You write may be a Contribution, but all the upstream code in the associated Package that You did not write is not a Contribution for purposes of this NCCA.) A Contribution consists either of Code or of Content.
+
+__"Current Default License"__, with respect to a Contribution, means (i) if the Contribution is Code, the AGPLv3 License, and (ii) if the Contribution is Content, CC-BY-SA.
+
+__"Future Public Domain License"__, with respect to a Contribution, means (i) if the Contribution is Code, the MIT-0 License, and (ii) if the Contribution is Content, CC-0.
+
+__"Licensed"__ means covered by explicit licensing terms that are conspicuous and readily discernible to recipients.
+"Submit" means to use some mode of digital communication (for example, without limitation, mailing lists, bug tracking systems, and source code version control systems administered by Nautilus) to voluntarily provide a Contribution to Nautilus.
+"Unlicensed" means not Licensed.
+
+__"MIT-0"__ means the license identified as "MIT No Attribution", as published at <https://opensource.org/licenses/MIT-0>.
+
+__"Nautilus"__ means the community project led by the Nautilus Cyberneering GmbH <https://nautilus-cyberneering.de/>.
+"Nautilus Community" means (i) all Nautilus participants, and (ii) all persons receiving Contributions directly or indirectly from or through Nautilus.
+
+__"Work"__ means a copyrightable work of authorship. A Work may be a portion of a larger Work, and a Work may be a modification of or addition to another Work.  "You" means the individual accepting this instance of the NCCA.
+
+### Section 2 – List of Acceptable Licenses for Nautilus
+
+- CC-BY-SA
+- CC-0
+- AGPLv3
+- MIT-0
+
+### Section 3 – Copyright Permission Required for All Contributions
+
+If You are not the copyright holder of a given Contribution that You wish to Submit to Nautilus (for example, if Your employer or university holds copyright in it), it is Your responsibility to first obtain authorization from the copyright holder to Submit the Contribution under the terms of this NCCA on behalf of, or otherwise with the permission of, that copyright holder. One form of such authorization is for the copyright holder to place, or permit You to place, an Acceptable License For Nautilus on the Contribution.
+
+### Section 4 – Licensed Contributions
+
+If Your Contribution is Licensed, Your Contribution will be governed by the terms under which it has been licensed.
+
+### Section 5 – Default Licensing of Unlicensed Contributions
+
+If You Submit an Unlicensed Contribution to Nautilus, the license to the Nautilus Community for that Contribution shall be the Current Default License.
+
+The Nautilus Cyberneering GmbH may, by public announcement, subsequently designate an additional or alternative default license for a given category of Contribution (a "Later Default License"). A Later Default License shall be chosen from the appropriate categorical sublist of Acceptable Licenses For Nautilus.
+Once a Later Default License has been designated, Your Unlicensed Contribution shall also be licensed to the Nautilus Community under that Later Default License. Such designation shall not affect the continuing applicability of the Current Default License to Your Contribution.
+
+You consent to having Nautilus provide reasonable notice of Your licensing of Your Contribution under the Current Default License (and, if applicable, a Later Default License) in a manner determined by Nautilus.
+
+### Section 6 – Automatic Future Public Domain License
+
+You consent that your contribution under the Current Default License is granted the Future Public Domain License __automatically__ after 5 years of submission.
+
+### Section 7 – Public Domain United States Government Works
+
+Sections 3 through 6 of this NCCA do not apply to any Contribution to the extent that it is a work of the United States Government for which copyright is unavailable under 17 U.S.C. 105.
+
+### Section 8 – Acceptance
+
+You must signify Your assent to the terms of this NCCA through specific electronic means established by Nautilus.
+
+You may also, at Your option, and without eliminating the requirement set forth in the preceding paragraph, send a copy of this NCCA, bearing Your written signature indicating Your acceptance of its terms, by email to [email protected], or by postal mail to:
+
+    Nautilus Legal
+    c/o Nautilus Cyberneering GmbH
+    Oberhachingerstr. 46B
+    2031 Grünwald
+    Germany
+
+### Section 9 – Notes
+
+This document is based upon:
+
+[The Fedora Project Contributor Agreement](https://fedoraproject.org/w/index.php?title=Legal:Fedora_Project_Contributor_Agreement&oldid=629385).  
+[Version 2021-05-04]
+
+<!-- markdownlint-enable MD013 -->

licensing/file_header_agplv3.txt

@@ -0,0 +1,25 @@
+    Nautilus Librarian
+
+    Project owner: Nautilus Cyberneering GmbH.
+    Github repository: https://github.com/Nautilus-Cyberneering/nautilus-librarian  
+        Project description:   
+    It is a repository group for a POC project to create a continuous
+    integration workflow for artwork by Ethical Software Ltd. (ESL).
+    Such a workflow is meant to help ESL in the automation of contributions
+    and quality control, in addition to doing some image processing steps
+    to hereafter populate a website with images.
+
+    Copyright (C) 2021  Nautilus Cyberneering GmbH
+
+    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 <https://www.gnu.org/licenses/>.

licensing/old_commits/cc0.md

@@ -0,0 +1,45 @@
+# Creative Commons CC0 1.0 Universal
+
+<!-- markdownlint-disable MD013 -->
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER.
+
+## Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. __Copyright and Related Rights.__ A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+
+    i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+
+    ii. moral rights retained by the original author(s) and/or performer(s);
+
+    iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
+
+    iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
+
+    v. rights protecting the extraction, dissemination, use and reuse of data in a Work;
+
+    vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+
+    vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+
+2. __Waiver.__ To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. __Public License Fallback.__ Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
+
+4. __Limitations and Disclaimers.__
+
+    a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+
+    b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+
+    c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+
+    d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
+
+<!-- markdownlint-enable MD013 -->