From 78860df04f4271eae3a1ea214b066a876e27ada0 Mon Sep 17 00:00:00 2001
From: "zapaz.eth" <alain@kredeum.com>
Date: Fri, 17 May 2024 15:43:43 +0200
Subject: [PATCH] test workflow

---
 .github/workflows/deploy-wp-plugin.yml        | 37 ++++++++++++-------
 .github/workflows/test-forge.yml              |  5 ++-
 config/src/config.handlebars.json             |  4 +-
 package.json                                  |  2 +-
 .../Collection/CollectionTemplates.svelte     | 15 +++++---
 wordpress/kredeum-nfts.handlebars.php         |  4 --
 wordpress/package.json                        |  6 +--
 wordpress/readme.handlebars.txt               |  2 +-
 wordpress/scripts/{build.ts => config.ts}     |  0
 wordpress/turbo.json                          | 27 ++++++++++----
 10 files changed, 63 insertions(+), 39 deletions(-)
 rename wordpress/scripts/{build.ts => config.ts} (100%)

diff --git a/.github/workflows/deploy-wp-plugin.yml b/.github/workflows/deploy-wp-plugin.yml
index a9e83d663..81870675b 100644
--- a/.github/workflows/deploy-wp-plugin.yml
+++ b/.github/workflows/deploy-wp-plugin.yml
@@ -1,8 +1,10 @@
 name: DEPLOY wp plugin
 on:
   push:
-    tags:
-      - "v*"
+    branches:
+      - dev
+  #   tags:
+  #     - "v*"
 
 jobs:
   deploy:
@@ -20,34 +22,43 @@ jobs:
         with:
           version: nightly
 
+      - name: Print forge location
+        run: which forge
+
+      - name: Print $HOME
+        run: echo $HOME
+
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install pnpm
         uses: pnpm/action-setup@v2.2.4
         with:
-          version: 8.5.1
+          version: 8.15.8
 
       - name: Build wp plugin
-        run: pnpm deploy-plugin
+        run: pnpm deploy:plugin
         env:
           ENVIR: PROD
           NODE_DEBUG: false
+          GIT_BRANCH: main
           INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
           ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
           ALCHEMY_API_KEY_POLYGON: ${{ secrets.ALCHEMY_API_KEY_POLYGON }}
           ALCHEMY_API_KEY_ARBITRUM: ${{ secrets.ALCHEMY_API_KEY_ARBITRUM }}
           ALCHEMY_API_KEY_OPTIMISM: ${{ secrets.ALCHEMY_API_KEY_OPTIMISM }}
+          ALCHEMY_API_KEY_BASE: ${{ secrets.ALCHEMY_API_KEY_BASE }}
+          ANKR_API_KEY: ${{ secrets.ANKR_API_KEY }}
           COVALENT_API_KEY: ${{ secrets.COVALENT_API_KEY }}
           NFT_STORAGE_KEY: ${{ secrets.NFT_STORAGE_KEY }}
 
-      - name: Deploy
-        uses: nk-o/action-wordpress-plugin-deploy@master
-        env:
-          SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
-          SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
-          SOURCE_DIR: wordpress/plugins/kredeum-nfts/
-          ASSETS_DIR: wordpress/assets
-          SLUG: kredeum-nfts
+      # - name: Deploy
+      #   uses: nk-o/action-wordpress-plugin-deploy@master
+      #   env:
+      #     SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+      #     SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+      #     SOURCE_DIR: wordpress/plugins/kredeum-nfts/
+      #     ASSETS_DIR: wordpress/assets
+      #     SLUG: kredeum-nfts
diff --git a/.github/workflows/test-forge.yml b/.github/workflows/test-forge.yml
index 977c5d74b..8412761fa 100644
--- a/.github/workflows/test-forge.yml
+++ b/.github/workflows/test-forge.yml
@@ -1,6 +1,9 @@
 name: TEST forge
 
-on: push
+on:
+  push:
+    branches:
+      - deployWithGitHubAction
 
 jobs:
   check:
diff --git a/config/src/config.handlebars.json b/config/src/config.handlebars.json
index 2c99e7bdc..78f690609 100644
--- a/config/src/config.handlebars.json
+++ b/config/src/config.handlebars.json
@@ -1,7 +1,7 @@
 {
   "version": {
-    "latest": "1.6.0",
-    "stable": "1.6.0",
+    "latest": "1.6.2",
+    "stable": "1.6.2",
     "branch": "{{GIT_BRANCH}}",
     "commit": "{{GIT_COMMIT}}"
   },
diff --git a/package.json b/package.json
index ec25f3890..fd81bcd88 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kredeum",
-  "version": "1.4.0",
+  "version": "1.6.2",
   "main": "index.js",
   "scripts": {
     "clean": "pnpm -r clean && rm -rf node_modules .turbo web/dapp",
diff --git a/svelte/src/components/Collection/CollectionTemplates.svelte b/svelte/src/components/Collection/CollectionTemplates.svelte
index 01545d0ef..29d6223fa 100644
--- a/svelte/src/components/Collection/CollectionTemplates.svelte
+++ b/svelte/src/components/Collection/CollectionTemplates.svelte
@@ -8,17 +8,19 @@
     [
       "OpenNFTsV4/generic",
       {
-        name: "OpenNFTs Generic",
+        name: "OpenNFTs",
         description: "OpenNFTs generic Collection: anyone can Mint NFTs in this collection!",
-        icon: "building"
+        icon: "building",
+        network: "all"
       }
     ],
     [
       "OpenNFTsV4Skale/generic",
       {
-        name: "Skale OpenNFTs Generic",
+        name: "Skale OpenNFTs",
         description: "OpenNFTs generic Skale Collection: anyone can Mint NFTs in this collection!",
-        icon: "building"
+        icon: "building",
+        network: "skale"
       }
     ],
     [
@@ -27,7 +29,8 @@
         name: "AutoMarket",
         description:
           "AutoMarket ownable OpenNFTs Collection: own your collection, mint and sell your NFTs with royalties",
-        icon: "dollar-sign"
+        icon: "dollar-sign",
+        network: "all"
       }
     ]
   ]);
@@ -41,7 +44,7 @@
   <div class="titre">Choose your Collection type</div>
   <div class="box-fields">
     {#each [...templates] as [templateKey, templateValue]}
-      {#if templateConfig(templateKey) === "ownable"}
+      {#if templateValue.network === "all"}
         <input
           class="box-field collection-type"
           id="collection-type-{templateKey}"
diff --git a/wordpress/kredeum-nfts.handlebars.php b/wordpress/kredeum-nfts.handlebars.php
index 227850c17..ae50f6901 100644
--- a/wordpress/kredeum-nfts.handlebars.php
+++ b/wordpress/kredeum-nfts.handlebars.php
@@ -48,10 +48,6 @@
 	require_once KREDEUM_NFTS_PLUGIN_PATH . 'admin/media-list/actions.php';
 	require_once KREDEUM_NFTS_PLUGIN_PATH . 'admin/media-list/column.php';
 
-	// require_once KREDEUM_NFTS_PLUGIN_PATH . 'admin/post-list/actions.php';
-	// require_once KREDEUM_NFTS_PLUGIN_PATH . 'admin/post-list/column.php';
-	// require_once KREDEUM_NFTS_PLUGIN_PATH . 'admin/post-list/article-content.php';
-
 	require_once KREDEUM_NFTS_PLUGIN_PATH . 'admin/settings/class-settings.php';
 	require_once KREDEUM_NFTS_PLUGIN_PATH . 'admin/settings/fields.php';
 
diff --git a/wordpress/package.json b/wordpress/package.json
index 23223b01a..d61ab15d1 100644
--- a/wordpress/package.json
+++ b/wordpress/package.json
@@ -8,9 +8,9 @@
     "install:composer": "composer install --prefer-dist --no-progress",
     "install:vendor": "cd plugins/kredeum-nfts && composer install --prefer-dist --no-progress",
     "plusinstall": "pnpm install:composer && pnpm install:vendor",
+    "config": "ts-node scripts/config.ts",
     "check": "vendor/bin/phpcbf plugins/kredeum-nfts --ignore=vendor --extensions=php --standard=WordPress",
-    "format": "vendor/bin/phpcs plugins/kredeum-nfts -n --ignore=vendor --extensions=php --standard=WordPress",
-    "build": "ts-node scripts/build.ts"
+    "format": "vendor/bin/phpcs plugins/kredeum-nfts -n --ignore=vendor --extensions=php --standard=WordPress"
   },
   "keywords": [],
   "author": "",
@@ -18,4 +18,4 @@
   "dependencies": {
     "@kredeum/config": "workspace:^"
   }
-}
+}
\ No newline at end of file
diff --git a/wordpress/readme.handlebars.txt b/wordpress/readme.handlebars.txt
index f5e6720b3..a213d6ecc 100644
--- a/wordpress/readme.handlebars.txt
+++ b/wordpress/readme.handlebars.txt
@@ -71,7 +71,7 @@ You can even add your NFTs in any websites you want by using Kredeum "Buy snippe
 
 
 == Changelog ==
-= 1.6.0 (stable & latest) =
+= 1.6.2 (stable & latest) =
 * New features :
 * Many new deployments, mainly EVM L2s. Available mainnets:
 *   ethereum, arbitrum, optimism, scroll, base, mantle, mode, blast, polygon-zkevm
diff --git a/wordpress/scripts/build.ts b/wordpress/scripts/config.ts
similarity index 100%
rename from wordpress/scripts/build.ts
rename to wordpress/scripts/config.ts
diff --git a/wordpress/turbo.json b/wordpress/turbo.json
index 8a96da650..050257bef 100644
--- a/wordpress/turbo.json
+++ b/wordpress/turbo.json
@@ -9,9 +9,25 @@
       ],
       "outputMode": "new-only"
     },
+    "config": {
+      "dependsOn": [
+        "plusinstall",
+        "@kredeum/config#build"
+      ],
+      "inputs": [
+        "readme.handlebars.txt",
+        "kredeum-nfts.handlebars.php",
+        "!plugins/kredeum-nfts/readme.txt",
+        "!plugins/kredeum-nfts/kredeum-nfts.php"
+      ],
+      "outputs": [
+        "plugins/kredeum-nfts/readme.txt",
+        "plugins/kredeum-nfts/kredeum-nfts.php"
+      ]
+    },
     "format": {
       "dependsOn": [
-        "plusinstall"
+        "config"
       ],
       "inputs": [
         "plugins/kredeum-nfts/**"
@@ -31,15 +47,10 @@
         "@kredeum/svelte#build"
       ],
       "inputs": [
-        "plugins/kredeum-nfts/**",
-        "readme.handlebars.txt",
-        "kredeum-nfts.handlebars.php",
-        "!plugins/kredeum-nfts/readme.txt",
-        "!plugins/kredeum-nfts/kredeum-nfts.php"
+        "plugins/kredeum-nfts/**"
       ],
       "outputs": [
-        "plugins/kredeum-nfts/readme.txt",
-        "plugins/kredeum-nfts/kredeum-nfts.php"
+        "plugins/kredeum-nfts/assets/**"
       ]
     }
   }