Merge pull request #75 from pkrll/dev/0.3.1

Dev/0.3.1

Makefile

@@ -1,23 +1,29 @@
-.PHONY: all install build start stop server devserver client devclient updater major minor patch clean
+.PHONY: all install install_client install_server build start stop server devserver client devclient updater major minor patch clean
 
 ENV = production
 SERVICE = null
 
 all: install build start
 
 install:
-ifeq ($(SERVICE), bootstrapper)
-	npm run install:bootstrapper
+ifeq ($(SERVICE), client)
+	make install_client
+else ifeq ($(SERVICE), server)
+	make install_server
 else
-	npm run install:server
+	make install_client
+	make install_server
 endif
 
+install_client:
+	cd raspbot/web && npm install
+
+install_server:
+	cd raspbot && npm install
+	cd raspbot && npm run setup
+
 build:
-ifeq ($(SERVICE), bootstrapper)
-	npm run build:bootstrapper
-else
-	npm run build
-endif
+	cd raspbot && npm run build
 
 start:
 	pm2 start process.json --only Raspbot --watch
@@ -28,27 +34,21 @@ restart:
 stop:
 	pm2 stop process.json --only Raspbot --watch 0
 
-start_bootstrapper:
-	pm2 start process.json --only Bootstrapper --watch
-
-stop_bootstrapper:
-	pm2 stop process.json --only Bootstrapper --watch 0
-
 server:
 ifeq ($(ENV), dev)
-	NODE_ENV=development npm run server
+	cd raspbot && NODE_ENV=development npm run dev
 else
-	NODE_ENV=production npm run server
+	cd raspbot && NODE_ENV=production npm run dev
 endif
 
 devserver:
 	make ENV=dev server
 
 client:
 ifeq ($(ENV), dev)
-	npm run client
+	cd raspbot && npm run dev:client
 else
-	npm run build
+	cd raspbot && npm run build
 endif
 
 devclient:
@@ -58,27 +58,27 @@ update:
 	git pull
 
 major:
-ifeq ($(SERVICE), $(filter $(SERVICE),raspbot bootstrapper))
-	npm run major -- --file=$(SERVICE)/package.json
+ifeq ($(SERVICE), $(filter $(SERVICE),raspbot))
+	node .scripts/increment-version.js --version=major --skip-build --reset-minor --reset-patch --file=$(SERVICE)/package.json
 else
 	@echo "ERROR:\tCould not increment major version."
-	@echo "USAGE:\tmake SERVICE=[raspbot|bootstrapper] major"
+	@echo "USAGE:\tmake SERVICE=[raspbot] major"
 endif
 
 minor:
-ifeq ($(SERVICE), $(filter $(SERVICE),raspbot bootstrapper))
-	npm run minor -- --file=$(SERVICE)/package.json
+ifeq ($(SERVICE), $(filter $(SERVICE),raspbot))
+	node .scripts/increment-version.js --version=minor --skip-build --reset-patch --file=$(SERVICE)/package.json
 else
 	@echo "ERROR:\tCould not increment minor version."
-	@echo "USAGE:\tmake SERVICE=[raspbot|bootstrapper] minor"
+	@echo "USAGE:\tmake SERVICE=[raspbot] minor"
 endif
 
 patch:
-ifeq ($(SERVICE), $(filter $(SERVICE),raspbot bootstrapper))
-	npm run patch -- --file=$(SERVICE)/package.json
+ifeq ($(SERVICE), $(filter $(SERVICE),raspbot))
+	node .scripts/increment-version.js --version=patch --skip-build --file=$(SERVICE)/package.json
 else
 	@echo "ERROR:\tCould not increment patch version."
-	@echo "USAGE:\tmake SERVICE=[raspbot|bootstrapper] patch"
+	@echo "USAGE:\tmake SERVICE=[raspbot] patch"
 endif
 
 clean:

README.md

@@ -10,22 +10,22 @@
 
 <img src="docs/screenshot.png" data-canonical-src="docs/screenshot.png" align="right" width="350px"/>
 
-``Raspbot`` is a lightweight REST API server,esigned for the **Raspberry Pi**, as well as a client web application that let's you control your device with ease.
+Raspbot is a lightweight REST API server, designed for the **Raspberry Pi**, as well as a client web application that let's you control your device with ease.
 
 Built with NodeJS & Express 4 and Vue 2 & Webpack.
 
-**``Raspbot`` is still a work in progress**.
+**Raspbot is still a work in progress**.
 
 **Features:**
 
-- [ ] Reboot and shutdown
-- [x] Browse file system
-- [x] Download files
-- [ ] Upload files
-- [x] Delete files
-- [x] Create folders
-- [x] Check temperature, CPU, memory and disk usage.
-- [x] Interface to update Raspbot remotely
+- [x] 📂 Browse file system
+- [x] ⬇️ Download files
+- [ ] ⬆️ <s>Upload files</s>
+- [x] 🗑️ Delete files
+- [x] 📁 Create folders
+- [x] 🔌 Reboot & shutdown system
+- [x] 🌡️ Check temperature, CPU, memory and disk usage.
+- [x] 🎛️ Update, restart & stop Raspbot remotely
 
 ## Table of Contents
 
@@ -48,7 +48,7 @@ Built with NodeJS & Express 4 and Vue 2 & Webpack.
 * NodeJS (__recommended version 10.4.1+__)
 * Python (__developed for version 2.7.10__)
   * psutil library (__developed using version 5.4.3__)
-* PM2 (__required to use the Bootstrapper app__)
+* PM2 (__required to update, restart or stop Raspbot remotely__)
 
 ## Installation
 
@@ -135,7 +135,7 @@ For more information on how to use PM2, check out **[the official documentation]
 
 ## Usage
 
-By default, ``Raspbot`` runs on port 5000 and can be accessed by ``http://ip-to-your-pi:5000``.
+By default, Raspbot runs on port 5000 and can be accessed by ``http://ip-to-your-pi:5000``. The default username is ``admin`` with the password ``secret``. Be sure to change this.
 
 ## Configurations
 
@@ -187,4 +187,4 @@ Restart the server.
 
 ## Author
 
-Raspbot was created by **Ardalan Samimi**.
+Raspbot was created by [**Ardalan Samimi**](https://github.com/pkrll). The robot icon was created by [FontAwesome](https://fontawesome.com/license) and is licensed under the [CC by 4.0 license](https://creativecommons.org/licenses/by/4.0/).