Redsign qortal-ui repo

README.md

@@ -17,7 +17,6 @@ Installation
 Packages required:
  - Node.js
  - npm
- - yarn
 
 Easiest way to install the lastest required packages on Linux is via nvm. 
 
@@ -28,10 +27,7 @@ Easiest way to install the lastest required packages on Linux is via nvm.
 ``` source ~/.bashrc ``` (For Fedora / CentOS) <br/>
 ``` nvm ls-remote ``` (Fetch list of available versions) <br/>
 ``` nvm install v18.14.0 ```  (LTS: Hydrogen supported by Electron) <br/>
-``` npm --location=global install [email protected] ``` <br/>
+``` npm --location=global install [email protected] ``` <br/>
-``` npm --location=global install [email protected] ``` <br/>
-
-On BSD do a ``` pkg_add node followed by npm install -g yarn ```
 
 Adding via binary package mirror will only work if you have set the package path. You can do a node or java build via ports instead by downloading ports with portsnap fetch method.
 
@@ -41,29 +37,29 @@ Verify your installtion with node --version <br/>
 Clone the main UI repo
  - ``` git clone https://github.com/Qortal/qortal-ui.git ```
 
-Installation and linking
+Installation
 ------------------------
- In `qortal-ui/` install_link:all
+ In `qortal-ui/` npm install
 
 
 Build UI server and files
 -------------------------
 In `qortal-ui` directory, run:
 ```
-yarn run build
+npm run build
 ```
 
 Start UI Server ( preferred way )
 ---------------
 ```
-yarn run server &
+npm run server &
 ```
 The "&" at the end puts the UI server in the background.
 
 Run UI using electron
 ---------------------
 ```
-yarn run start-electron
+npm run start-electron
 ```
 
 Build script (unix-like systems only)
@@ -72,7 +68,7 @@ To automate the above process, run ./build.sh, optionally specifying the followi
 
 `-s`: run UI server after completing the build<br />
 `-e`: run electron server after completing the build<br />
-`-f`: force relink and reinstall dependencies<br />
+`-w`: use 'npm run watch' instead of 'npm run build', to enable hot swapping<br />
 `-h`: show help<br />
 
 Example command to build and run the UI server:

build.js

@@ -1,12 +1,12 @@
 const path = require('path')
-const uiCore = require('qortal-ui-core')
+const uiCore = require('./core/ui-core.js')
 
 const generateBuildConfig = uiCore('generate_build_config')
 const build = uiCore('build')
 
 const config = require('./config/config.js')
 
-const pluginsController = require('qortal-ui-plugins')
+const pluginsController = require('./plugins/default-plugins.js')
 const buildDefalutPlugins = pluginsController('build')
 
 

build.sh

@@ -1,11 +1,7 @@
 #!/usr/bin/env bash
 
-declare -a YARN_PACKAGE_DEPS=("qortal-ui-core" "qortal-ui-plugins" "qortal-ui-crypto")
-YARN_LINK_DIR="${HOME}/.config/yarn/link"
-
 SHOW_HELP=0
-FORCE_LINK=0
+NPM_WATCH=0
-YARN_WATCH=0
 RUN_SERVER=0
 RUN_ELECTRON=0
 
@@ -16,22 +12,17 @@ while [ -n "$*" ]; do
 			SHOW_HELP=1
 			;;
 
-    	-f)
-            # Force relink and reinstall dependencies
-			FORCE_LINK=1
-			;;
-
     	-w)
-            # Use "yarn watch" instead of "yarn build", to enable hot swapping
+            # Use "npm run watch" instead of "npm run build", to enable hot swapping
-			YARN_WATCH=1
+			NPM_WATCH=1
 			;;
 
-		-s)
+	-s)
             # Run server after building
 			RUN_SERVER=1
 			;;
 
-		-e)
+	-e)
             # Run electron after building
 			RUN_ELECTRON=1
 			;;
@@ -42,34 +33,16 @@ done
 if [ "${SHOW_HELP}" -eq 1 ]; then
     echo
     echo "Usage:"
-    echo "build.sh [-h] [-f] [-s] [-e]"
+    echo "build.sh [-h] [-w] [-s] [-e]"
     echo
     echo "-h: show help"
-    echo "-f: force relink and reinstall dependencies"
+    echo "-w: use 'npm run watch' instead of 'npm run build', to enable hot swapping"
-    echo "-w: use 'yarn watch' instead of 'yarn build', to enable hot swapping"
     echo "-s: run UI server after completing the build"
     echo "-e: run electron server after completing the build"
     echo
     exit
 fi
 
-echo "Checking dependencies..."
-for PACKAGE in "${YARN_PACKAGE_DEPS[@]}"; do
-    if [ "${FORCE_LINK}" -eq 1 ]; then
-        echo "Unlinking ${PACKAGE}..."
-        yarn --cwd "${PACKAGE}" unlink "${PACKAGE}"
-        yarn --cwd "${PACKAGE}" unlink
-    fi
-    if [ ! -d "${YARN_LINK_DIR}/${PACKAGE}" ]; then
-        echo "Installing and linking ${PACKAGE}..."
-        yarn --cwd "${PACKAGE}" install
-        yarn --cwd "${PACKAGE}" link
-        yarn link "${PACKAGE}"
-    else
-        echo "${PACKAGE} is already linked."
-    fi
-done
-
 WATCH_PID=$(cat "watch.pid" || echo "")
 if [ ! -z "${WATCH_PID}" ]; then
     echo "Stopping existing watch process..."
@@ -77,22 +50,22 @@ if [ ! -z "${WATCH_PID}" ]; then
     rm -f "watch.pid"
 fi
 
-if [ "${YARN_WATCH}" -eq 1 ]; then
+if [ "${NPM_WATCH}" -eq 1 ]; then
     echo "Building qortal-ui in watch mode..."
-    yarn run watch &
+    npm run watch &
     echo "$!" > "watch.pid";
 else
-    yarn run build
+    npm run build
 fi
 
 if [ "${RUN_SERVER}" -eq 1 ]; then
     echo "Running UI server..."
     trap : INT
-    yarn run server
+    npm run server
 elif [ "${RUN_ELECTRON}" -eq 1 ]; then
     echo "Starting electron..."
     trap : INT
-    yarn run start-electron
+    npm run start-electron
 fi
 
 WATCH_PID=$(cat "watch.pid" || echo "")

config/build.config.js

@@ -7,7 +7,7 @@ const build = {
         imgDir: path.join(__dirname, '../img')
     },
     aliases: {
-        'qortal-ui-crypto': path.join(__dirname, '../node_modules/qortal-ui-crypto/api.js')
+        'qortal-ui-crypto': path.join(__dirname, '../crypto/api.js')
     }
 }
 

config/default.config.js

@@ -1,4 +1,4 @@
-const uiCore = require('qortal-ui-core')
+const uiCore = require('../core/ui-core.js')
 const defaultConfig = uiCore('default_config')