update chapril banner to v2

hardcode default dlimits to 100
add expiration time 2 days
2022-06-18 10:01:21 +02:00 · 2022-06-18 09:59:58 +02:00 · 2022-06-18 09:59:58 +02:00 · 2022-06-18 09:59:58 +02:00 · 2022-06-18 09:59:50 +02:00
4 changed files with 61 additions and 45 deletions
--- a/app/archive.js
+++ b/app/archive.js
@ -76,7 +76,7 @@ export default class Archive {

  clear() {
    this.files = [];
-    this.dlimit = 1;
+    this.dlimit = 100;
    this.timeLimit = this.defaultTimeLimit;
    this.password = null;
  }
--- a/app/ui/header.js
+++ b/app/ui/header.js
@ -23,49 +23,60 @@ class Header extends Component {
        class="main-header relative flex-none flex flex-row items-center justify-between px-6 md:px-8 z-20 bg-transparent"
      >
        <!-- Chapril banner code: starting… -->
-        <div id="chapril-banner">
-          <div id="chapril-banner-zone">
-            <div id="chapril-banner-logo">
-              <a href="https://www.chapril.org/"
-                ><img
-                  src="/Chapril-banner/v1/chapril-logo-small.png"
-                  alt="Logo Chapril"
-              /></a>
-            </div>
-            <div id="chapril-banner-menu">
-              <ul>
-                <li><a href="https://www.chapril.org/">Accueil Chapril</a></li>
-                <li>
-                  <a href="https://www.chapril.org/services.html"
-                    >Services libres</a
-                  >
-                </li>
-                <li>
-                  <a href="https://pouet.april.org/@aprilorg">Nous suivre</a>
-                </li>
-                <li><a href="https://www.chapril.org/cgu.html">CGU</a></li>
-                <li>
-                  <a href="https://www.chapril.org/a-propos.html"
-                    >Mentions légales</a
-                  >
-                </li>
-                <li>
-                  <a href="https://www.chapril.org/contact.html"
-                    >Nous contacter</a
-                  >
-                </li>
-              </ul>
-            </div>
-            <div id="chapril-banner-aprillogo">
-              <a href="https://www.april.org/"
-                ><img
-                  src="/Chapril-banner/v1/april-logo-small.png"
-                  class="chapril-banner-logo"
-                  alt="Logo April"
-              /></a>
-            </div>
+        <nav class="chapril-banniere-Nav">
+          <div class="chapril-banniere-Logo" aria-hidden="true">
+            <a href="https://www.chapril.org"
+              ><img alt="" src="/Chapril-banner/v2/chapril-banner-logo.png"
+            /></a>
          </div>
-        </div>
+          <div class="chapril-banniere-Menu" aria-hidden="true">
+            <details>
+              <summary>
+                <span></span>
+                <span></span>
+                <span></span>
+              </summary>
+              <div><a href="https://www.chapril.org/">Accueil Chapril</a></div>
+              <div>
+                <a href="https://www.chapril.org/services.html"
+                  >Services libres</a
+                >
+              </div>
+              <div>
+                <a href="https://pouet.april.org/@aprilorg">Nous suivre</a>
+              </div>
+              <div><a href="https://www.chapril.org/cgu.html">CGU</a></div>
+              <div>
+                <a href="https://www.chapril.org/a-propos.html"
+                  >Mentions légales</a
+                >
+              </div>
+              <div>
+                <a href="https://www.chapril.org/contact.html"
+                  >Nous contacter</a
+                >
+              </div>
+            </details>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://www.chapril.org/">Accueil Chapril</a>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://www.chapril.org/services.html">Services libres</a>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://pouet.april.org/@aprilorg">Nous suivre</a>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://www.chapril.org/cgu.html">CGU</a>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://www.chapril.org/a-propos.html">Mentions légales</a>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://www.chapril.org/contact.html">Nous contacter</a>
+          </div>
+        </nav>
        <!-- Chapril banner code: done. -->
      </header>
    `;
--- a/server/config.js
+++ b/server/config.js
@ -49,7 +49,7 @@ const conf = convict({
  },
  expire_times_seconds: {
    format: 'positive-int-array',
-    default: [300, 3600, 86400, 604800],
+    default: [300, 3600, 86400, 172800, 432000, 604800],
    env: 'EXPIRE_TIMES_SECONDS'
  },
  default_expire_seconds: {
@ -59,7 +59,7 @@ const conf = convict({
  },
  max_expire_seconds: {
    format: Number,
-    default: 86400 * 7,
+    default: 432000,
    env: 'MAX_EXPIRE_SECONDS'
  },
  download_counts: {
--- a/server/layout.js
+++ b/server/layout.js
@ -35,6 +35,11 @@ module.exports = function(state, body = '') {
            --color-primary-accent: ${state.ui.colors.accent};
          }
        </style>
+        <link
+          rel="stylesheet"
+          type="text/css"
+          href="/Chapril-banner/v2/chapril-banner.css"
+        />
        <link
          rel="stylesheet"
          type="text/css"
Author	SHA1	Message	Date
Romain H	4dc867fb28	update chapril banner to v2	2022-06-18 10:01:21 +02:00
Romain H	382f48d9ff	hardcode default dlimits to 100	2022-06-18 09:59:58 +02:00
Romain H	2dda357e82	add expiration time 2 days	2022-06-18 09:59:58 +02:00
Christian P. MOMON	400b7e8342	Extend max values (#4229 ).	2022-06-18 09:59:58 +02:00
Christian P. MOMON	fdcbdcabe3	Fixed chapril.css.	2022-06-18 09:59:50 +02:00