From bae2bbc8dae9943f7f21c893d7c1413d1c95366b Mon Sep 17 00:00:00 2001 From: tibing Date: Thu, 21 Jul 2016 15:17:07 +0300 Subject: [PATCH 1/7] fix(maps\leaflet): Leaflet maps controls overlapping on mobile version Close#29 --- src/app/theme/components/baSidebar/baSidebar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/theme/components/baSidebar/baSidebar.scss b/src/app/theme/components/baSidebar/baSidebar.scss index 1f843eee..b5f6d40b 100644 --- a/src/app/theme/components/baSidebar/baSidebar.scss +++ b/src/app/theme/components/baSidebar/baSidebar.scss @@ -8,7 +8,7 @@ $angle-right: "\f101"; width: $sidebar-width; top: $top-height; left: 0; - z-index: 904; + z-index: 1001; display: block; min-height: 100%; background-color: $sidebar; From 0a6eb8de5ed520a9d605f18d913a89c12dfca327 Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Wed, 17 Aug 2016 23:17:17 +0300 Subject: [PATCH 2/7] fix(license): fix license copyright --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 88bd8b83..997810b7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2016 AngularClass LLC +Copyright (c) 2016 akveo.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From a30c41a11daff83dffe9ed6665333138d11c73b8 Mon Sep 17 00:00:00 2001 From: Geoffrey Roguelon Date: Thu, 18 Aug 2016 12:45:44 -0500 Subject: [PATCH 3/7] Replace bower packages by NPM packages. In the issue akveo/ng2-admin#162, search should be made to be sure of non regression. --- .bowerrc | 3 --- .travis.yml | 1 - Dockerfile | 3 +-- bower.json | 21 ------------------- config/webpack.common.js | 4 ---- .../002-installation-guidelines/index.md | 7 +------ .../articles/012-project-structure/index.md | 4 +--- package.json | 2 +- 8 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 .bowerrc delete mode 100644 bower.json diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 4bee294f..00000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "node_modules" -} diff --git a/.travis.yml b/.travis.yml index 157b81b5..060120df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ install: - npm install -g npm@3 - npm install -g webpack - npm install -g typescript - - npm install -g bower - npm install diff --git a/Dockerfile b/Dockerfile index 991928ae..5a67d9a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,7 @@ RUN git clone https://github.com/akveo/ng2-admin.git /var/www \ && cd /var/www \ && npm install --global rimraf \ && npm run clean \ - && npm install --global bower typings webpack webpack-dev-server typescript \ - && bower install --allow-root \ + && npm install --global typings webpack webpack-dev-server typescript \ && npm install \ && npm run prebuild:prod && npm run build:prod diff --git a/bower.json b/bower.json deleted file mode 100644 index ae477332..00000000 --- a/bower.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "ng2-admin", - "version": "0.4.2", - "description": "Angular 2 and Bootstrap 4 Admin Template.", - "author": "akveo", - "homepage": "http://akveo.github.io/ng2-admin/", - "license": "MIT", - "moduleType": [ - "es6" - ], - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "test", - "tests" - ], - "dependencies": { - "Ionicons": "ionicons#~2.0.1" - } -} diff --git a/config/webpack.common.js b/config/webpack.common.js index 0393e28e..ce54840d 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -211,10 +211,6 @@ module.exports = { allChunks: true }), - new webpack.ResolverPlugin( - new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('bower.json', ['main']) - ), - /* * Plugin: ForkCheckerPlugin * Description: Do type checking in a separate process, so webpack don't need to wait. diff --git a/docs/contents/articles/002-installation-guidelines/index.md b/docs/contents/articles/002-installation-guidelines/index.md index a8bec08c..1fc7bca1 100644 --- a/docs/contents/articles/002-installation-guidelines/index.md +++ b/docs/contents/articles/002-installation-guidelines/index.md @@ -39,11 +39,6 @@ npm install --global typings npm install --global typescript ``` -* bower -``` -npm install --global bower -``` - ## Clone repository and install dependencies You will need to clone the source code of ng2-admin GitHub repository: @@ -59,7 +54,7 @@ This will setup a working copy of ng2-admin on your local machine. **Note**: If you have any issues after the installation, additionally run the following: ```bash -typings install && bower install +typings install ``` ## Running local copy diff --git a/docs/contents/articles/012-project-structure/index.md b/docs/contents/articles/012-project-structure/index.md index ee55241d..2b89cbfa 100644 --- a/docs/contents/articles/012-project-structure/index.md +++ b/docs/contents/articles/012-project-structure/index.md @@ -54,8 +54,6 @@ ng2-admin/ ├──typedoc.json * typescript documentation generator ├──tsconfig.json * config that webpack uses for typescript ├──typings.json * our typings manager - ├──package.json * what npm uses to manage it's dependencies - ├──bower.json * DEPRECATED - moving to npm as primary package manager for all dependenties - └──.bowerrc * DEPRECARD - temporary bower configuration + └──package.json * what npm uses to manage it's dependencies ``` In our template we tried to separate theme layer and presentation layer. We believe most of other templates have them combined. That's why when you start developing using them, it gets very hard for you to remove things you don't need. diff --git a/package.json b/package.json index 5d2b1a60..6a701d67 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "google-maps": "^3.2.1", "http-server": "^0.9.0", "ie-shim": "^0.1.0", + "ionicons": "^2.0.1", "jquery": "^2.2.3", "jquery-slimscroll": "^1.3.6", "leaflet": "^0.7.7", @@ -129,7 +130,6 @@ "gh-pages": "wintersmith build -C docs && gh-pages -d docs/build", "start": "npm run server:dev", "start:hmr": "npm run server:dev:hmr", - "postinstall": "bower install", "version": "npm run build", "postversion": "git push && git push --tags" }, From 46691c94cad83713a3abbbeac4e235aeb72f6989 Mon Sep 17 00:00:00 2001 From: Geoffrey Roguelon Date: Thu, 18 Aug 2016 13:04:43 -0500 Subject: [PATCH 4/7] Remove old traces of typings. In the commit akveo/ng2-admin@e7fca6d4, we moved to @types for TypeScript typings. It remains some traces in the documentation. This commit remove them. --- Dockerfile | 2 +- .../contents/articles/002-installation-guidelines/index.md | 7 +------ docs/contents/articles/012-project-structure/index.md | 1 - src/main.browser.ts | 2 +- src/vendor.browser.ts | 2 +- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 991928ae..8eb287ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN git clone https://github.com/akveo/ng2-admin.git /var/www \ && cd /var/www \ && npm install --global rimraf \ && npm run clean \ - && npm install --global bower typings webpack webpack-dev-server typescript \ + && npm install --global bower webpack webpack-dev-server typescript \ && bower install --allow-root \ && npm install \ && npm run prebuild:prod && npm run build:prod diff --git a/docs/contents/articles/002-installation-guidelines/index.md b/docs/contents/articles/002-installation-guidelines/index.md index a8bec08c..80c1ce9d 100644 --- a/docs/contents/articles/002-installation-guidelines/index.md +++ b/docs/contents/articles/002-installation-guidelines/index.md @@ -29,11 +29,6 @@ npm install --global webpack npm install --global webpack-dev-server ``` -* typings -```bash -npm install --global typings -``` - * typescript ```bash npm install --global typescript @@ -59,7 +54,7 @@ This will setup a working copy of ng2-admin on your local machine. **Note**: If you have any issues after the installation, additionally run the following: ```bash -typings install && bower install +bower install ``` ## Running local copy diff --git a/docs/contents/articles/012-project-structure/index.md b/docs/contents/articles/012-project-structure/index.md index ee55241d..42aa8a09 100644 --- a/docs/contents/articles/012-project-structure/index.md +++ b/docs/contents/articles/012-project-structure/index.md @@ -53,7 +53,6 @@ ng2-admin/ ├──tslint.json * typescript lint config ├──typedoc.json * typescript documentation generator ├──tsconfig.json * config that webpack uses for typescript - ├──typings.json * our typings manager ├──package.json * what npm uses to manage it's dependencies ├──bower.json * DEPRECATED - moving to npm as primary package manager for all dependenties └──.bowerrc * DEPRECARD - temporary bower configuration diff --git a/src/main.browser.ts b/src/main.browser.ts index 7ac3b9e8..f1de52a0 100644 --- a/src/main.browser.ts +++ b/src/main.browser.ts @@ -38,7 +38,7 @@ export function main(initialHmrState?: any): Promise { * Vendors * For vendors for example jQuery, Lodash, angular2-jwt just import them anywhere in your app * You can also import them in vendors to ensure that they are bundled in one file - * Also see custom-typings.d.ts as you also need to do `typings install x` where `x` is your module + * Also see custom-typings.d.ts as you also need to do `npm install @types/x` where `x` is your module */ diff --git a/src/vendor.browser.ts b/src/vendor.browser.ts index e89dc2a1..379786f2 100644 --- a/src/vendor.browser.ts +++ b/src/vendor.browser.ts @@ -1,7 +1,7 @@ // For vendors for example jQuery, Lodash, angular2-jwt just import them here unless you plan on // chunking vendors files for async loading. You would need to import the async loaded vendors // at the entry point of the async loaded file. Also see custom-typings.d.ts as you also need to -// run `typings install x` where `x` is your module +// run `npm install @types/x` where `x` is your module // Angular 2 import '@angular/platform-browser'; From 5234538032e0fb654ccc5ecb1c260aa8ba568eb2 Mon Sep 17 00:00:00 2001 From: Geoffrey ROGUELON Date: Fri, 19 Aug 2016 11:13:31 -0500 Subject: [PATCH 5/7] Fix the path of Ionicons in SCSS file. --- src/app/theme/sass/_ionicons.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/theme/sass/_ionicons.scss b/src/app/theme/sass/_ionicons.scss index 213ad922..1861ce8b 100644 --- a/src/app/theme/sass/_ionicons.scss +++ b/src/app/theme/sass/_ionicons.scss @@ -1,3 +1,3 @@ -$ionicons-font-path: "~Ionicons/fonts"; +$ionicons-font-path: "~ionicons/fonts"; -@import "~Ionicons/scss/ionicons"; +@import "~ionicons/scss/ionicons"; From f92922d5ba0645ab9163548db71e98a783277661 Mon Sep 17 00:00:00 2001 From: Hristo Georgiev Date: Sun, 21 Aug 2016 18:50:13 +0300 Subject: [PATCH 6/7] Update baContentTop.html to comply with ng2 links Use the routerLink directive instead of a href attribute --- src/app/theme/components/baContentTop/baContentTop.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/theme/components/baContentTop/baContentTop.html b/src/app/theme/components/baContentTop/baContentTop.html index 47e31e94..59249b0c 100644 --- a/src/app/theme/components/baContentTop/baContentTop.html +++ b/src/app/theme/components/baContentTop/baContentTop.html @@ -3,7 +3,7 @@ From 4ee8cb146602ac77b02e5b6d43b761349e03cf0e Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Mon, 22 Aug 2016 19:22:51 +0300 Subject: [PATCH 7/7] fix(preloader): fix menu being shown before preloader goes away --- src/app/theme/sass/_preloader.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/theme/sass/_preloader.scss b/src/app/theme/sass/_preloader.scss index 87970996..5622442d 100644 --- a/src/app/theme/sass/_preloader.scss +++ b/src/app/theme/sass/_preloader.scss @@ -31,7 +31,7 @@ left: 0; width: 100%; height: 100%; - z-index: 1000; + z-index: 1003; background: #000000; & > div { display: block;