Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
tbaltrushaitis committed Feb 4, 2018
2 parents b0e5dca + 9578217 commit a019ead
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 42 deletions.
29 changes: 10 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 ;

## ------------------------------------------------------------------------ ##

Expand Down
62 changes: 40 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

---

Expand All @@ -26,35 +55,24 @@ 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)

---

## :memo: Changelog ##

**v0.0.1:**

- [x] Init of repository
- [x] Makefile
- [x] package.json
- [x] Repository Init
- [x] + bower.json
- [x] + Makefile

---

Expand Down
Binary file not shown.
Binary file added assets/img/cmdb-rtm-poc-4-windows.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/npm-start-001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/user-connected-001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/app/NODE_ENV
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
production
2 changes: 1 addition & 1 deletion src/app/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down

0 comments on commit a019ead

Please sign in to comment.