Merge branch 'dev'

Kredeum · May 17, 2024 · 6668ccc · 6668ccc
2 parents 4e1c694 + 636dbcd
commit 6668ccc
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 23 deletions.
diff --git a/.github/workflows/deploy-wp-plugin.yml b/.github/workflows/deploy-wp-plugin.yml
@@ -23,23 +23,26 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install pnpm
         uses: pnpm/[email protected]
         with:
-          version: 8.5.1
+          version: 8.15.8
 
       - name: Build wp 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 }}
 

diff --git 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
@@ -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
@@ -8,14 +8,14 @@
     "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": "",
   "license": "ISC",
   "dependencies": {
     "@kredeum/config": "workspace:^"
   }
-}
+}
diff --git a/wordpress/scripts/build.ts → wordpress/scripts/config.ts b/wordpress/scripts/build.ts → wordpress/scripts/config.ts
diff --git 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/**"
       ]
     }
   }