Use new "package" template variable name

center-key · Jun 15, 2024 · 9409845 · 9409845
1 parent 8b1c7f2
commit 9409845
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 50 deletions.
diff --git a/package.json b/package.json
@@ -64,8 +64,8 @@
          "cd build/4-rev && bestzip paradise.zip gallery/*"
       ],
       "release": [
-         "copy-file build/4-rev/paradise.zip releases/previous/paradise-v{{pkg.version}}.zip",
-         "copy-file build/4-rev/paradise.zip releases/paradise-v{{pkg.version}}.zip"
+         "copy-file build/4-rev/paradise.zip releases/previous/paradise-v{{package.version}}.zip",
+         "copy-file build/4-rev/paradise.zip releases/paradise-v{{package.version}}.zip"
       ]
    },
    "scripts": {
@@ -76,22 +76,22 @@
       "@fortawesome/fontawesome-free": "~6.5",
       "add-dist-header": "~1.4",
       "bestzip": "~2.2",
-      "copy-file-util": "~1.1",
+      "copy-file-util": "~1.2",
       "copy-folder-util": "~1.1",
       "csso-cli": "~4.0",
-      "dna-engine": "~3.1",
+      "dna-engine": "~3.2",
       "dropzone": "6.0.0-beta.2",
       "fetch-json": "~3.3",
       "jshint": "~2.13",
       "less": "~4.2",
-      "magnific-popup": "~1.1",
-      "make-dir-cli": "~3.1",
-      "replacer-util": "~1.2",
+      "magnific-popup": "~1.2",
+      "make-dir-cli": "~4.0",
+      "replacer-util": "~1.3",
       "rev-web-assets": "~1.3",
       "rimraf": "~5.0",
       "run-scripts-util": "~1.2",
-      "uglify-js": "~3.17",
-      "w3c-html-validator": "~1.6",
-      "web-ignition": "~2.1"
+      "uglify-js": "~3.18",
+      "w3c-html-validator": "~1.8",
+      "web-ignition": "~2.2"
    }
 }
diff --git a/src/gallery/console/admin-server/library.php b/src/gallery/console/admin-server/library.php
@@ -10,7 +10,7 @@
 require "polyfills.php";
 require "font-options.php";
 
-$version =       "{{pkg.version}}";
+$version =       "{{package.version}}";
 $dbCacheStore =  null;
 $galleryFolder = realpath(__DIR__ . "/../..");
 $dataFolder =    "{$galleryFolder}/~data~";

diff --git a/src/gallery/console/fonts.php b/src/gallery/console/fonts.php
@@ -16,9 +16,9 @@
    <link rel=apple-touch-icon href=https://centerkey.com/paradise/graphics/mobile-home-screen.png>
    <link rel=preconnect       href=https://fonts.googleapis.com>
    <link rel=preconnect       href=https://fonts.gstatic.com crossorigin>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{pkg.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/reset.min.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{package.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/reset.min.css>
    <link rel=stylesheet       href=../paradise.min.css>
    <link rel=stylesheet       href=../~data~/custom-style.css>
    <style>
@@ -29,7 +29,7 @@
       table.font-sampler tbody tr td h1 { margin-bottom: 0px; }
    </style>
    <script defer src=https://ajax.googleapis.com/ajax/libs/webfont/1.6/webfont.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
    <script>globalThis.clientData = <?=appClientData()?>;</script>
    <script data-on-load=startup>
       const startup = () => {

diff --git a/src/gallery/console/index.php b/src/gallery/console/index.php
@@ -16,16 +16,16 @@
    <link rel=apple-touch-icon href=https://centerkey.com/paradise/graphics/mobile-home-screen.png>
    <link rel=preconnect       href=https://fonts.googleapis.com>
    <link rel=preconnect       href=https://fonts.gstatic.com crossorigin>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{pkg.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dropzone@{{pkg.devDependencies.dropzone}}/dist/dropzone.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/reset.min.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/layouts/color-blocks.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{package.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dropzone@{{package.devDependencies.dropzone}}/dist/dropzone.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/reset.min.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/layouts/color-blocks.css>
    <link rel=stylesheet       href=paradise-console.min.css>
-   <script defer src=https://cdn.jsdelivr.net/npm/fetch-json@{{pkg.devDependencies.fetch-json|version}}/dist/fetch-json.min.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/dropzone@{{pkg.devDependencies.dropzone}}/dist/dropzone-min.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/lib-x.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/fetch-json@{{package.devDependencies.fetch-json|version}}/dist/fetch-json.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/dropzone@{{package.devDependencies.dropzone}}/dist/dropzone-min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/lib-x.min.js></script>
    <script defer src=paradise-console.min.js></script>
    <script>globalThis.clientData = <?=appClientData()?>;</script>
 </head>

diff --git a/src/gallery/console/sign-in/index.php b/src/gallery/console/sign-in/index.php
@@ -16,14 +16,14 @@
    <link rel=apple-touch-icon href=https://centerkey.com/paradise/graphics/mobile-home-screen.png>
    <link rel=preconnect       href=https://fonts.googleapis.com>
    <link rel=preconnect       href=https://fonts.gstatic.com crossorigin>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{pkg.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/reset.min.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/layouts/color-blocks.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{package.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/reset.min.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/layouts/color-blocks.css>
    <link rel=stylesheet       href=../paradise-console.min.css>
-   <script defer src=https://cdn.jsdelivr.net/npm/fetch-json@{{pkg.devDependencies.fetch-json|version}}/dist/fetch-json.min.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/lib-x.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/fetch-json@{{package.devDependencies.fetch-json|version}}/dist/fetch-json.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/lib-x.min.js></script>
    <script defer src=../paradise-console.min.js></script>
    <script>globalThis.clientData = <?=appClientData()?>;</script>
 </head>
@@ -75,7 +75,7 @@
                <input type=checkbox>Remember me
             </label>
             <nav>
-               <button data-on-click=admin.login.submit>Sign in</button>
+               <button data-on-click=admin.login.submit>Sign In</button>
             </nav>
             <p class=external-site>
                <a href=https://github.com/center-key/paradise/wiki/faq#7-how-do-i-reset-my-password>

diff --git a/src/gallery/image/fallback/one.php b/src/gallery/image/fallback/one.php
@@ -26,10 +26,10 @@
    <link rel=preconnect       href=https://fonts.googleapis.com>
    <link rel=preconnect       href=https://fonts.gstatic.com crossorigin>
    <link rel=stylesheet       href="<?=$values->titleFontUrl?>">
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{pkg.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/magnific-popup@{{pkg.devDependencies.magnific-popup|version}}/dist/magnific-popup.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/reset.min.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{package.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/magnific-popup@{{package.devDependencies.magnific-popup|version}}/dist/magnific-popup.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/reset.min.css>
    <link rel=stylesheet       href=../../paradise.min.css>
    <link rel=stylesheet       href=../../~data~/custom-style.css>
    <style>
@@ -38,9 +38,9 @@
          font-size: <?=$settings->titleSize?>;
          }
    </style>
-   <script defer src=https://cdn.jsdelivr.net/npm/fetch-json@{{pkg.devDependencies.fetch-json|version}}/dist/fetch-json.min.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/lib-x.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/fetch-json@{{package.devDependencies.fetch-json|version}}/dist/fetch-json.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/lib-x.min.js></script>
    <script defer src=../../paradise.min.js></script>
 </head>
 <body class="<?=$values->styleClasses?>" itemscope itemtype=https://schema.org/ImageObject>

diff --git a/src/gallery/index.php b/src/gallery/index.php
@@ -28,10 +28,10 @@
    <link rel=preconnect       href=https://fonts.googleapis.com>
    <link rel=preconnect       href=https://fonts.gstatic.com crossorigin>
    <link rel=stylesheet       href="<?=$values->titleFontUrl?>">
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{pkg.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/magnific-popup@{{pkg.devDependencies.magnific-popup|version}}/dist/magnific-popup.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.css>
-   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/reset.min.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@{{package.devDependencies.-fortawesome-fontawesome-free|version}}/css/all.min.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/magnific-popup@{{package.devDependencies.magnific-popup|version}}/dist/magnific-popup.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.css>
+   <link rel=stylesheet       href=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/reset.min.css>
    <link rel=stylesheet       href=paradise.min.css>
    <link rel=stylesheet       href=~data~/custom-style.css>
    <style>
@@ -40,11 +40,11 @@
          font-size: <?=$settings->titleSize?>;
          }
    </style>
-   <script defer src=https://cdn.jsdelivr.net/npm/fetch-json@{{pkg.devDependencies.fetch-json|version}}/dist/fetch-json.min.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{pkg.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/web-ignition@{{pkg.devDependencies.web-ignition|version}}/dist/lib-x.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/fetch-json@{{package.devDependencies.fetch-json|version}}/dist/fetch-json.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/dna-engine@{{package.devDependencies.dna-engine|version}}/dist/dna-engine.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/web-ignition@{{package.devDependencies.web-ignition|version}}/dist/lib-x.min.js></script>
    <script defer src=https://cdn.jsdelivr.net/npm/jquery@3/dist/jquery.slim.min.js></script>
-   <script defer src=https://cdn.jsdelivr.net/npm/magnific-popup@{{pkg.devDependencies.magnific-popup|version}}/dist/jquery.magnific-popup.min.js></script>
+   <script defer src=https://cdn.jsdelivr.net/npm/magnific-popup@{{package.devDependencies.magnific-popup|version}}/dist/jquery.magnific-popup.min.js></script>
    <script defer src=paradise.min.js></script>
 </head>
 <body class="<?=$values->styleClasses?>" itemscope itemtype=https://schema.org/ImageGallery>
@@ -87,9 +87,9 @@
                <span>Email:</span>
                <input name=email type=email placeholder="Enter your email address">
             </label>
-            <p>
-               <button type=submit>Send message</button>
-            </p>
+            <nav>
+               <button type=submit>Send</button>
+            </nav>
          </form>
          <nav>Gallery powered by <a href=https://centerkey.com/paradise>Paradise</a></nav>
       </section>