Merge pull request #707 from signum-network/develop

Sync with current develop branch
signum-network · Dec 13, 2022 · 9c02733 · 9c02733
2 parents 93f0ae2 + 226f923
commit 9c02733
Show file tree

Hide file tree

Showing 238 changed files with 167 additions and 69,884 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,10 +16,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Update Phoenix Wallet
+      - name: Update Wallets
         run: |
           cd ./ci
           ./updatePhoenix.sh
+          ./updateClassic.sh
       - name: Setup NodeJS
         uses: actions/setup-node@v2
         with:

diff --git a/ci/updateClassic.sh b/ci/updateClassic.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+echo "========================================"
+echo "🛰 Updating to latest Classic Version..."
+echo "----------------------------------------"
+BASE_CI_DIR=$(pwd)
+
+# prepare tmp folder
+TMPDIR=$(mktemp -d)
+cd $TMPDIR > /dev/null
+
+# download
+echo
+echo "======================================="
+echo "⬇️ Cloning Classic wallet main branch..."
+echo "---------------------------------------"
+git clone https://github.com/signum-network/signum-classic-wallet.git
+cd signum-classic-wallet/src > /dev/null
+
+# cleanup old version
+rm -rf ${BASE_CI_DIR}/../html/ui/classic/*
+cp -R * ${BASE_CI_DIR}/../html/ui/classic/
+echo "✅ Copied wallet sources"
+
+echo
+echo "======================================="
+echo "🛀 Cleaning up..."
+echo "---------------------------------------"
+cd ${BASE_CI_DIR}
+rm -rf ${TMPDIR}
+echo "✅ Removed temp data"
+echo
+echo "🎉 Yay. Successfully updated Classic Wallet"
diff --git a/html/api-doc/signum-api.json b/html/api-doc/signum-api.json
diff --git a/html/ui/LICENSES b/html/ui/LICENSES
diff --git a/html/ui/fonts/Montserrat-Regular.ttf → html/ui/assets/Montserrat-Regular.ttf b/html/ui/fonts/Montserrat-Regular.ttf → html/ui/assets/Montserrat-Regular.ttf
diff --git a/html/ui/js/anim.js → html/ui/assets/anim.js b/html/ui/js/anim.js → html/ui/assets/anim.js
diff --git a/html/ui/img/selector/blockchain.jpg → html/ui/assets/blockchain.jpg b/html/ui/img/selector/blockchain.jpg → html/ui/assets/blockchain.jpg
diff --git a/html/ui/js/selector/index.js → html/ui/assets/index.js b/html/ui/js/selector/index.js → html/ui/assets/index.js
diff --git a/html/ui/css/selector/main.css → html/ui/assets/main.css b/html/ui/css/selector/main.css → html/ui/assets/main.css
@@ -3,7 +3,7 @@
 
 @font-face {
   font-family: Montserrat;
-  src: url('../../fonts/Montserrat-Regular.ttf');
+  src: url('../assets/Montserrat-Regular.ttf');
 }
 
 
@@ -20,7 +20,7 @@ canvas {
 }
 
 .bg {
-  background-image: url("../../img/selector/blockchain.jpg");
+  background-image: url("../assets/blockchain.jpg");
   background-size: cover;
   height: 100%;
   width: 100%;

diff --git a/html/ui/css/normalize.css → html/ui/assets/normalize.css b/html/ui/css/normalize.css → html/ui/assets/normalize.css
diff --git a/html/ui/img/selector/phoenix_v.svg → html/ui/assets/phoenix_v.svg b/html/ui/img/selector/phoenix_v.svg → html/ui/assets/phoenix_v.svg
diff --git a/...ui/img/selector/signum-logomark-white.svg → html/ui/assets/signum-logomark-white.svg b/...ui/img/selector/signum-logomark-white.svg → html/ui/assets/signum-logomark-white.svg
diff --git a/...ui/img/selector/signum-wordmark-white.svg → html/ui/assets/signum-wordmark-white.svg b/...ui/img/selector/signum-wordmark-white.svg → html/ui/assets/signum-wordmark-white.svg
diff --git a/html/ui/css/selector/vars.css → html/ui/assets/vars.css b/html/ui/css/selector/vars.css → html/ui/assets/vars.css
diff --git a/html/ui/classic.html b/html/ui/classic.html
diff --git a/html/ui/classic/README.md b/html/ui/classic/README.md
@@ -0,0 +1,5 @@
+## Signum Classic Wallet moved to another repository!
+
+In this folder it will be copied the files of the folder `src/` from the repository (signum-classic-wallet)[https://github.com/signum-network/signum-classic-wallet/].
+
+The process is automated during a release creation. For more info check the `release.yml` workflow.