Merge pull request #144 from HDI-Project/milestone122

Milestone122

Author: sorinvelescuB

.gitignore

@@ -1,8 +1,10 @@
 # tmp files
 .DS_Store
-mtv.tar*
 tempCodeRunnerFile.ts
 tempCodeRunnerFile.py
+mtv.tar*
+.vscode/
+
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

.vscode/settings.json

@@ -50,7 +50,6 @@ ADD . /mtv
 WORKDIR /mtv
 
 # install application packages for python and node
-RUN make install-theme
 RUN make install
 RUN cd ./client && npm install && npm run build:prod
 

Dockerfile

@@ -40,7 +40,6 @@ install: clean-build clean-pyc clean-client ## install the packages for running
 .PHONY: install-develop
 install-develop: clean-build clean-pyc clean-client ## install the package in editable mode and dependencies for development
 	pip install -e .[dev]
-	# npm install --quiet -g gulp-cli
 	cd client && npm install
 
 .PHONY: install-theme

Makefile

@@ -6,7 +6,8 @@
 <!-- [![PyPI Shield](https://img.shields.io/pypi/v/mtv.svg)](https://pypi.python.org/pypi/mtv) -->
 [![Build Status](https://travis-ci.com/dyuliu/mtv.svg?branch=master)](https://travis-ci.com/dyuliu/mtv)
 [![Coverage Status](https://coveralls.io/repos/github/dyuliu/MTV/badge.svg)](https://coveralls.io/github/dyuliu/MTV)
-
+[![Github All Releases](https://img.shields.io/github/downloads/dyuliu/MTV/total)](https://github.com/dyuliu/MTV/releases)
+[![Docker Pulls](https://img.shields.io/docker/pulls/dyuliu/mtv)](https://hub.docker.com/r/dyuliu/mtv)
 
 # MTV
 
@@ -21,7 +22,6 @@ The Restful APIs documentation: http://45.77.5.58/apidoc/
 [The MIT License](https://github.com/HDI-Project/MTV/blob/master/LICENSE)
 
 
-
 ## Before You Begin
 
 Before you begin we recommend you read about the basic building blocks that assemble the **MTV**:

README.md

@@ -1,13 +1,16 @@
 const STATIC = './public/lib-static';               // manually installed
+const NPM = './node_modules';                       // package.json
 
 let assets = {
     css: [ 
+        // `${NPM}/bootstrap/dist/css/bootstrap.min.css`,
         `${STATIC}/tooltipster/css/tooltipster.css`
-],
+    ],
     js: [
-        `${STATIC}/jquery.min.js`,
+        `${NPM}/jquery/dist/jquery.min.js`,
         `${STATIC}/jquery-ui.js`,
-        `${STATIC}/jquery.rest.js`, 
+        `${NPM}/jquery.rest/dist/jquery.rest.min.js`,
+        // `${NPM}/bootstrap/dist/js/bootstrap.min.js`,
         `${STATIC}/bootstrap.min.js`,
     ]
 }