diff --git a/Makefile b/Makefile index 3aa4ee6..5a50450 100644 --- a/Makefile +++ b/Makefile @@ -10,13 +10,9 @@ ## ------------------------------------------------------------------------ ## APP_NAME := cmdb-rtm - -REPO_HOST := https://bitbucket.org -REPO_USER := devopscrew -REPO_URL := $(shell git ls-remote --get-url) +APP_REPO := $(shell git ls-remote --get-url) GIT_COMMIT := $(shell git rev-list --remove-empty --remotes --max-count=1 --date-order --reverse) -APP_REPO := ${REPO_HOST}/${REPO_USER}/${APP_NAME}.git APP_ENV := $(shell cat NODE_ENV) CODE_VERSION := $(shell cat ./VERSION) APP_BANNER := $(shell cat ./assets/BANNER) @@ -73,16 +69,20 @@ test: banner state help banner; ## ------------------------------------------------------------------------ ## -.PHONY: clone +.PHONY: fetch clone rights clone: @ git clone -b ${APP_ENV} ${APP_REPO} \ && cd ${APP_NAME} \ - && git pull \ - && find . -type f -exec chmod 664 {} \; \ + && git pull \; + +rights: + @ find . -type f -exec chmod 664 {} \; \ && find . -type d -exec chmod 775 {} \; \ && find . -type f -name "*.sh" -exec chmod 755 {} \; +fetch: clone rights; + ## ------------------------------------------------------------------------ ## .PHONY: banner @@ -114,22 +114,13 @@ clean-web: clean-deps: @ rm -rf bower_modules/ \ - node_modules/; + node_modules/ ; clean-files: @ rm -rf ${APP_DIRS} \ bitbucket-pipelines.yml \ codeclimate-config.patch \ - _config.yml; - -## ------------------------------------------------------------------------ ## - -.PHONY: rights - -rights: - @ find . -type f -exec chmod 664 {} \; - @ find . -type d -exec chmod 775 {} \; - @ find . -type f -name "*.sh" -exec chmod a+x {} \; + _config.yml ; ## ------------------------------------------------------------------------ ## diff --git a/README.md b/README.md index 64fb1a6..5fd41da 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,48 @@ # CMDB-rtm # -Plugin for CMDB application that visualize data in real time. +Real-time Tasks Progress Visualization -![Real Time Jobs Progress View](assets/img/cmdb-rtm-progress.gif) +![Real Time Jobs Progress View](assets/img/cmdb-rtm-poc-4-windows.gif) `cmdb` `real-time` `monitoring` `data visualization` --- ## :computer: Live Demo ## -See it in action :point_right: [Real-time Tasks Progress Visualization](http://bit.ly/cmdb-rtm) +Try to open this [link](http://bit.ly/cmdb-rtm) :point_left: in **several tabs** of your current browser -### :name_badge: Badges ### + - [ ] Or better in **different browsers** + - [ ] Or best - use **different devices** to try from -[![Contributors](https://img.shields.io/github/contributors/tbaltrushaitis/cmdb-rtm.svg)](https://github.com/tbaltrushaitis/cmdb-rtm/graphs/contributors) +All data about status will be shown as HTML elements with some (or any) animations run on all devices **simultaneously** + +--- + +## :runner: Getting started ## + +In terminal: + +```shell +$ REPO="cmdb-rtm" \ +&& git clone "https://github.com/tbaltrushaitis/${REPO}" \ +&& cd ${REPO} \ +&& make \ +&& npm start ; +``` + + - [x] It might looks like: + +![Run Application Server](assets/img/npm-start-001.png) + +Then navigate your agent to `http://your-local.domain:8084/` + + - [x] You should see visualized rtm-data: + +![Real Time Jobs Progress View](assets/img/cmdb-rtm-progress.gif) + + - [x] And in server console: + +![Run Application Server](assets/img/user-connected-001.png) --- @@ -26,25 +55,14 @@ See it in action :point_right: [Real-time Tasks Progress Visualization](http://b Front | Library | [jQuery](http://jquery.com/) | 3.3.1 | JavaScript Library Front | Library | [Lodash](https://lodash.com/docs/4.17.4) | 4.17.4 | A modern JavaScript utility library delivering modularity, performance & extras. ---- - -## :runner: Getting started ## - -```shell -$ git clone https://github.com/tbaltrushaitis/cmdb-rtm -$ cd cmdb-rtm -$ cp -pr src/* ./ -$ npm i -$ bower i -$ sudo chmod a+x app/bin/*.sh -$ npm start -``` +[![Contributors](https://img.shields.io/github/contributors/tbaltrushaitis/cmdb-rtm.svg)](https://github.com/tbaltrushaitis/cmdb-rtm/graphs/contributors) --- + ## :pushpin: Todo List ## - - ~~Example Done Item~~ (Done v0.0.0) + - [ ] ~~Example Done Item~~ (Done v0.0.0) --- @@ -52,9 +70,9 @@ $ npm start **v0.0.1:** - - [x] Init of repository - - [x] Makefile - - [x] package.json + - [x] Repository Init + - [x] + bower.json + - [x] + Makefile --- diff --git a/assets/img/cmdb-real-time-jobs-progress-view-001.png b/assets/img/cmdb-real-time-jobs-progress-view-001.png deleted file mode 100644 index 8e6681a..0000000 Binary files a/assets/img/cmdb-real-time-jobs-progress-view-001.png and /dev/null differ diff --git a/assets/img/cmdb-rtm-poc-4-windows.gif b/assets/img/cmdb-rtm-poc-4-windows.gif new file mode 100644 index 0000000..a7b6641 Binary files /dev/null and b/assets/img/cmdb-rtm-poc-4-windows.gif differ diff --git a/assets/img/npm-start-001.png b/assets/img/npm-start-001.png new file mode 100644 index 0000000..9448fac Binary files /dev/null and b/assets/img/npm-start-001.png differ diff --git a/assets/img/user-connected-001.png b/assets/img/user-connected-001.png new file mode 100644 index 0000000..8be2f70 Binary files /dev/null and b/assets/img/user-connected-001.png differ diff --git a/src/app/NODE_ENV b/src/app/NODE_ENV new file mode 100644 index 0000000..c44e75e --- /dev/null +++ b/src/app/NODE_ENV @@ -0,0 +1 @@ +production diff --git a/src/app/server.js b/src/app/server.js index e244f14..b9504ec 100644 --- a/src/app/server.js +++ b/src/app/server.js @@ -164,7 +164,7 @@ app.post('/spawn', function (req, res) { _.each(connections, function (connection) { connection.send({ - "id": idq + "id": id , "progress": progress , "speed": speed , "conn": {