diff --git a/README.md b/README.md index 8ec5eafd..059a4620 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Using this template you will be able to leverage lots of built-in components and * Maps * Hover sidebar -All other features like themining, login, additional pages, etc are available in a [full version](https://flatlogic.com/admin-dashboards/sing-app-html5). +All other features like themining, login, additional pages, etc are available in a [full version](https://flatlogic.com/templates/sing-app-html5). [![full-version](https://user-images.githubusercontent.com/36201579/40107708-aa2939d6-5901-11e8-8fc1-b31ad46326b7.png)](https://flatlogic.com/admin-dashboards/sing-app-html5/demo) @@ -43,12 +43,12 @@ $ git clone -o sing-app-lite -b master --single-branch \ $ cd MyApp ``` -#### 2. Run `npm install && bower install` +#### 2. Run `yarn install` This will install both run-time project dependencies and developer tools listed in [package.json](../package.json) file. We are moving all dependencies to npm, so there will be no bower dependencies soon. -#### 3. Run `gulp build` +#### 3. Run `yarn build` This command will build the app from the source files (`/src`) into the output `/dist` folder. Then open `dist/index.html` in your browser. @@ -56,7 +56,7 @@ This command will build the app from the source files (`/src`) into the output Now you can open your web app in a browser, on mobile devices and start hacking. The page must be served from a web server, e.g. apache, nginx, WebStorm built-in web server, etc., otherwise some features may not work properly. -#### 3. Run `gulp watch` +#### 3. Run `yarn watch` This command will watch for changes in `/src` and recompile handlebars' templates & scss styles on the fly into html & css accordingly. For more information please refer to full [documentation](https://demo.flatlogic.com/sing-app/documentation). diff --git a/bower.json b/bower.json deleted file mode 100644 index f09387de..00000000 --- a/bower.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "sing", - "version": "4.1.0", - "description": "Sing Dashboard App", - "main": "index.html", - "authors": [ - "okendoken flatlogic.com" - ], - "dependencies": { - "jquery": "3.3.1", - "jquery-pjax": "2.0.1", - "font-awesome": "4.7.0", - "bootstrap-select": "1.13.2", - "jasny-bootstrap": "3.1.3", - "slimScroll": "1.3.8", - "widgster": "0.0.3", - "pace.js": "https://github.com/HubSpot/pace.git#v0.7.1", - "animate.css": "3.7.0", - "awesome-bootstrap-checkbox": "1.0.1", - "backbone": "1.3.3", - "jquery.sparkline": "http://omnipotent.net/jquery.sparkline/2.1.2/jquery.sparkline.min.js", - "flot": "0.8.3", - "flot.animator": "https://github.com/Codicode/flotanimator.git#3c256c0183d713fd3bf41d04417873928eb1a751", - "flot-orderBars": "https://github.com/emmerich/flot-orderBars.git#d44ff4f2fec4c8bb1254e59567ee39fa3684372e", - "flot.dashes": "https://github.com/cquartier/flot.dashes.git#454016a8d61b3e7af375e4ffda36c7c55413f62b", - "gmaps": "0.4.25", - "bootstrap_calendar": "1.0.1", - "jquery-ui": "1.12.1", - "jquery-ui-touch-punch": "git://github.com/furf/jquery-ui-touch-punch.git#4bc009145202d9c7483ba85f3a236a8f3470354d", - "messenger": "1.5.0", - "bootstrap": "4.3.1", - "hammerjs": "hammer#^2.0.8", - "jquery-hammerjs": "^2.0.0", - "owl.carousel": "^2.3.3" - }, - "private": true, - "ignore": [ - "**/.*", - "vendor" - ], - "resolutions": { - "jquery": "~2.1.3", - "bootstrap": "~4" - }, - "devDependencies": { - "glyphicons-halflings": "*", - "popper.js": "1.14.4" - } -} diff --git a/changelog.md b/changelog.md new file mode 100644 index 00000000..72554842 --- /dev/null +++ b/changelog.md @@ -0,0 +1,20 @@ +# Changelog + +## [1.2.0] + +### Updated + +- Migrated from bower to npm +- Design updates + +## [1.1.0] + +### New Features + +- Bootstrap v4.3.1 update + +## [1.0.0] + +### Fixed + +- Google map key \ No newline at end of file diff --git a/dist/charts.html b/dist/charts.html index a4160647..d6d5b16b 100644 --- a/dist/charts.html +++ b/dist/charts.html @@ -1,8 +1,8 @@
-