From ceb45c49c0f13d6a2b8adda978f692ff3eb8e8e9 Mon Sep 17 00:00:00 2001 From: maksim-karatkevich Date: Mon, 18 May 2020 17:15:12 +0300 Subject: [PATCH 1/6] chore: update deploy docs script (#5686) Co-authored-by: Maksim Karatkevich --- .github/workflows/docsDeploy.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docsDeploy.yml b/.github/workflows/docsDeploy.yml index ff5ef821..338c9e7e 100644 --- a/.github/workflows/docsDeploy.yml +++ b/.github/workflows/docsDeploy.yml @@ -19,5 +19,11 @@ jobs: - uses: actions/checkout@v2 with: ref: demo - - run: npm install - - run: npm run docs:gh-pages + - name: Deploy + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + npm install --silent + git config --global user.email "github-action@akveo.com" + git config --global user.name "Github Action" + npm run docs:gh-pages From f1d9c7b95245987efd051fafcb2c9ff64bb17125 Mon Sep 17 00:00:00 2001 From: maksim-karatkevich Date: Tue, 19 May 2020 10:34:32 +0300 Subject: [PATCH 2/6] fix: deploy script (#5688) Co-authored-by: Maksim Karatkevich --- .github/workflows/docsDeploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docsDeploy.yml b/.github/workflows/docsDeploy.yml index 338c9e7e..b532163a 100644 --- a/.github/workflows/docsDeploy.yml +++ b/.github/workflows/docsDeploy.yml @@ -21,7 +21,7 @@ jobs: ref: demo - name: Deploy env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GH_TOKEN }} run: | npm install --silent git config --global user.email "github-action@akveo.com" From ca3504e11a21a26597f83f0d75a5c4c2f604d33e Mon Sep 17 00:00:00 2001 From: maksim-karatkevich Date: Wed, 20 May 2020 10:41:39 +0300 Subject: [PATCH 3/6] feat: update banner links in readme (#5692) Co-authored-by: Maksim Karatkevich --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9259f735..4da8bb11 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ### Material admin theme is based on the most popular Angular dashboard template - [ngx-admin](https://hubs.ly/H0nJG1G0) ### Included: Angular 9+, [Nebular](https://hubs.ly/H0nJG5g0) and [Eva design system](https://hubs.ly/H0nJGdC0). Free for personal and commercial usage. -### Get material ngx-admin integrated with backend technology of your choice. [Check out our store](https://hubs.ly/H0n4Zvy0). +### Get material ngx-admin integrated with backend technology of your choice. [Check out our store](https://hubs.ly/H0qwyl60). @@ -25,11 +25,11 @@ ### Backend Integration Bundles Easy way to integrate ngx-admin with backend (.NET, Node.js, Java etc.). - + -[Check out our Store](https://hubs.ly/H0n4Zvy0) for ready to use Backend Bundles. +[Check out our Store](https://hubs.ly/H0qwyl60) for ready to use Backend Bundles. ### With 6 stunning visual themes From 3cd55786f212f2f31ab93ad5adcb5dca6e3f2573 Mon Sep 17 00:00:00 2001 From: Dmitry Nehaychik <4dmitr@gmail.com> Date: Wed, 27 May 2020 15:01:55 +0300 Subject: [PATCH 4/6] docs: update readme (#5695) --- README.md | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 4da8bb11..f5df6892 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,13 @@ -# ngx-admin [Eva Design System](https://hubs.ly/H0n4ZDy0) [![Build Status](https://travis-ci.org/akveo/ngx-admin.svg?branch=master)](https://travis-ci.org/akveo/ngx-admin) [![Dependency Status](https://david-dm.org/akveo/ngx-admin/status.svg)](https://david-dm.org/akveo/ng2-admin) +# ngx-admin [Eva Design System](https://hubs.ly/H0n4ZDy0) [![Build Status](https://travis-ci.org/akveo/ngx-admin.svg?branch=master)](https://travis-ci.org/akveo/ngx-admin) [Who uses ngx-admin?](https://github.com/akveo/ngx-admin/issues/1645)| [Documentation](https://hubs.ly/H0n4Sfq0) | [Installation Guidelines](https://hubs.ly/H0n4Svc0) # New! Material theme for ngx-admin -### Material admin theme is based on the most popular Angular dashboard template - [ngx-admin](https://hubs.ly/H0nJG1G0) -### Included: Angular 9+, [Nebular](https://hubs.ly/H0nJG5g0) and [Eva design system](https://hubs.ly/H0nJGdC0). Free for personal and commercial usage. -### Get material ngx-admin integrated with backend technology of your choice. [Check out our store](https://hubs.ly/H0qwyl60). +Material admin theme is based on the most popular Angular dashboard template - [ngx-admin](https://hubs.ly/H0nJG1G0) +To use material theme checkout `feat/material-theme` branch. - +Get material ngx-admin integrated with backend technology of your choice. [Check out our store](https://hubs.ly/H0qwyl60). ## Key features @@ -23,34 +22,24 @@ ### Backend Integration Bundles -Easy way to integrate ngx-admin with backend (.NET, Node.js, Java etc.). - - - - +Easy way to integrate ngx-admin with any backend (PHP, .Net, .Net Core, Java etc. ) + [Check out our Store](https://hubs.ly/H0qwyl60) for ready to use Backend Bundles. ### With 6 stunning visual themes +| | | +| --- | --- | +| Material Dark | Material Light | -#### Material Dark - +| | | +| --- | --- | +| Dark| Default | -#### Material Light - - -#### Default - - -#### Dark - - -#### Cosmic - - -#### Corporate - +| | | +| --- | --- | +| Cosmic | Corporate | ### What's included: From 14149647eb43130c94b696b87b7a6b452c38f9d3 Mon Sep 17 00:00:00 2001 From: Denis Strigo Date: Wed, 17 Jun 2020 18:09:51 +0300 Subject: [PATCH 5/6] docs(readme): add banner to readme with free bundle (#5713) Co-authored-by: d.strigo --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index f5df6892..022f7b6f 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,11 @@ Easy way to integrate ngx-admin with any backend (PHP, .Net, .Net Core, Java etc [Check out our Store](https://hubs.ly/H0qwyl60) for ready to use Backend Bundles. +### Free Bundles + + +[Download ngx-admin with .net backend for FREE!](https://hubs.ly/H0rvhPL0) + ### With 6 stunning visual themes | | | From c2ce881c415f5cae1280b315120b05cab01f641d Mon Sep 17 00:00:00 2001 From: Denis Strigo Date: Wed, 17 Jun 2020 21:41:04 +0300 Subject: [PATCH 6/6] docs(readme): update link to free banner in readme (#5715) Co-authored-by: d.strigo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 022f7b6f..b11ee1a5 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Easy way to integrate ngx-admin with any backend (PHP, .Net, .Net Core, Java etc [Check out our Store](https://hubs.ly/H0qwyl60) for ready to use Backend Bundles. ### Free Bundles - + [Download ngx-admin with .net backend for FREE!](https://hubs.ly/H0rvhPL0)