Merge branch 'main' into low-code-nft-marketplace

Concordium · Aug 21, 2023 · b1125d1 · b1125d1
2 parents 3f5ec34 + 6463fe7
commit b1125d1
Show file tree

Hide file tree

Showing 37 changed files with 4,408 additions and 946 deletions.
diff --git a/.github/workflows/rust-fmt-lint.yaml b/.github/workflows/rust-fmt-lint.yaml
@@ -13,7 +13,7 @@ on:
 
 env:
   RUST_FMT: nightly-2022-06-09-x86_64-unknown-linux-gnu
-  RUST_CLIPPY: 1.64
+  RUST_CLIPPY: 1.65
 
 jobs:
   "lint_fmt":

diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@ node_modules
 /coverage
 
 # production
-build
+/**/build
 
 # misc
 .idea

diff --git a/deps/concordium-rust-sdk b/deps/concordium-rust-sdk
diff --git a/gallery/CHANGELOG.md b/gallery/CHANGELOG.md
@@ -0,0 +1,9 @@
+## Unreleased changes
+
+## 0.1.2
+
+- Add link to tutorial
+
+## 0.1.1
+
+- Initial gallery front end
diff --git a/gallery/Dockerfile b/gallery/Dockerfile
@@ -29,7 +29,7 @@ WORKDIR /build
 ENV PORT=8100
 ENV NODE=http://172.17.0.1:20000
 ENV LOG_LEVEL=info
-ENV STATEMENT='[{"type":"AttributeInSet","attributeTag":"countryOfResidence","set":["AT","BE","BG","CY","CZ","DK","EE","FI","FR","DE","GR","HU","IE","IT","LV","LT","LU","MT","NL","PL","PT","RO","SK","SI","ES","SE","HR"]},{"type":"AttributeInRange","attributeTag":"dob","lower":"18000101","upper":"20091212"}]'
+ENV STATEMENT='[{"type":"AttributeInSet","attributeTag":"idDocIssuer","set":["AT","BE","BG","CY","CZ","DK","EE","FI","FR","DE","GR","HU","IE","IT","LV","LT","LU","MT","NL","PL","PT","RO","SK","SI","ES","SE","HR"]},{"type":"AttributeInRange","attributeTag":"dob","lower":"18000101","upper":"20070627"}]'
 ENV NAMES='["I Scream", "Starry Night", "Tranquility", "Quiet", "Storm", "Timeless", "Endless Rain"]'
 
 COPY --from=rust_build ./verifier/target/release/gallery-verifier ./main

diff --git a/gallery/Jenkinsfile b/gallery/Jenkinsfile
@@ -0,0 +1,36 @@
+// Expected parameters:
+// - image_tag: Tag that will be used for the new image.
+// - build_image: Base image that the image being built extends.
+pipeline {
+    agent any
+    environment {
+        image_repo = "concordium/dapp-gallery"
+        image_name = "${image_repo}:${image_tag}"
+    }
+    stages {
+        stage('dockerhub-login') {
+            environment {
+                // Defines 'CRED_USR' and 'CRED_PSW'
+                // (see 'https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#handling-credentials').
+                CRED = credentials('jenkins-dockerhub')
+            }
+            steps {
+                sh 'docker login --username "${CRED_USR}" --password "${CRED_PSW}"'
+            }
+        }
+        stage('build-push') {
+            steps {
+                sh '''\
+                    docker build \
+                      --build-arg build_image="${build_image}" \
+                      --label build_image="${build_image}" \
+                      --tag="${image_name}" \
+                      -f ./gallery/Dockerfile \
+                      .
+                    docker push "${image_name}"
+                '''.stripIndent()
+            }
+        }
+    }
+}
+
diff --git a/gallery/README.md b/gallery/README.md
@@ -20,7 +20,8 @@ The backend for this demo can be found in the [verifier](./verifier/) folder:
 -   Run `yarn build` in a terminal
 -   Run `yarn build-verifier` (This builds the [backend](./verifier/) using cargo/rustc)
 
--   Run `yarn start --statement "$(<verifier/config/statement.json)" --names "$(<verifier/config/names.json)"` (This will run the backend, which also host the front-end, check its [README](./verifier/README.md) for more information)
+-   Run `yarn start --statement "$(<verifier/config/statement.json)" --names "$(<verifier/config/names.json)" --node http://node.testnet.concordium.com:20000` (This will run the backend, which also host the front-end, check its [README](./verifier/README.md) for more information)
+
 -   Open URL logged in console (on default http://127.0.0.1:8100)
 
 To have hot-reload on the front-end (useful for development), run `yarn watch` in a separate terminal instead of `yarn build` in the first step.

diff --git a/gallery/package.json b/gallery/package.json
@@ -1,8 +1,8 @@
 {
     "name": "gallery",
     "license": "Apache-2.0",
-    "version": "0.1.1",
-    "packageManager": "yarn@3.2.0",
+    "version": "0.1.2",
+    "packageManager": "yarn@1.22.0",
     "dependencies": {
         "@concordium/browser-wallet-api-helpers": "^2.0.0",
         "@concordium/web-sdk": "^3.1.0-beta",

diff --git a/gallery/src/Root.tsx b/gallery/src/Root.tsx
@@ -4,6 +4,7 @@ import React, { useEffect, useState, useCallback } from 'react';
 import { detectConcordiumProvider } from '@concordium/browser-wallet-api-helpers';
 import Connection from './Connection';
 import { getNames } from './util';
+import { version } from '../package.json';
 
 const VERIFIER_URL = '/api';
 
@@ -83,6 +84,19 @@ export default function Gallery() {
                     <Item location={location} name={name} authToken={authToken} onError={handleErrorOnLoad} />
                 ))}
             </div>
+            <div>
+                <br />
+                Version: {version} |{' '}
+                <a
+                    style={{ color: 'white' }}
+                    href="https://developer.concordium.software/en/mainnet/net/guides/gallery/index.html"
+                    target="_blank"
+                    rel="noreferrer"
+                >
+                    Explore the gallery tutorial here.
+                </a>
+                <br />
+            </div>
         </main>
     );
 }