From 4033a175de76ab679aedf6641851cf7211af9062 Mon Sep 17 00:00:00 2001 From: Gevorg Harutyunyan Date: Sat, 19 Aug 2017 05:10:04 +0400 Subject: [PATCH 1/6] Update README.md --- README.md | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index fac77a1b..c2a04525 100644 --- a/README.md +++ b/README.md @@ -17,19 +17,10 @@ ## Getting Started -### 1. Download +### 1. [Download ZIP](https://github.com/modularcode/modular-admin-html/releases) or Git Clone -You can download this project in 2 different ways: download zip or ```git clone https://github.com/modularcode/modular-admin-html.git ```. - -#### [Download ZIP](https://github.com/modularcode/modular-admin-html/releases) - - -#### Git clone - -Clone repository to the local `modular-admin-html` folder ``` git clone https://github.com/modularcode/modular-admin-html.git - ``` ### 2. Build the project @@ -53,31 +44,12 @@ npm start Open the project [http://localhost:4000](http://localhost:4000). -> The project is built by Gulp. - **Warning!** all changes made in ```dist/``` folder would be overwriten on application build. +
-------- - - -## Running in Docker - -To build the container, you need to install docker and docker-compose than launch the docker daemon. -After launching the daemon run the following commands from the project folder: - -Build the image -``` -docker-compose build -``` - -Launch the container -``` -docker-compose up -``` - -------- +You can also [run the project in docker](#running-in-docker)
@@ -249,6 +221,20 @@ In addition to application files, there are also third party plugin files (e.g.
+## Running in Docker + +You can run the project in docker. To build the container, you need to install docker and docker-compose than launch the docker daemon. After launching the daemon run the following commands from the project folder: + +Build the image +``` +docker-compose build +``` + +Launch the container +``` +docker-compose up +``` + ## Get in touch You can get in touch with us in gitter chat [![Join the chat at https://gitter.im/modularcode/modular-admin](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/modularcode/modular-admin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) or in the [ModularCode Facebook Group](https://www.facebook.com/groups/710770032358423/). From ba49b4fad1573384f2b68d7440a7d5325e2e1598 Mon Sep 17 00:00:00 2001 From: Gevorg Harutyunyan Date: Sat, 19 Aug 2017 05:26:18 +0400 Subject: [PATCH 2/6] Update README.md --- README.md | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c2a04525..e9a9b37a 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,13 @@ [ModularAdmin](http://modularcode.github.io/modular-admin-html/) is an open source dashboard theme built in a modular way. That makes it extremely easy to scale, modify and maintain. +### Heads up for the ModularAdmin v2! +We're working hard on version 2, which is a complete rewrite. +**Please consider [supporting us](#support-us) to make this happen!** +V2 code | V2 preview +(in development) + + ## Getting Started @@ -235,7 +242,14 @@ Launch the container docker-compose up ``` -## Get in touch + +## Support us! + +### Contribute + +Be part of our team! Feel free to open new issues/pull-requests. + +### Get in touch You can get in touch with us in gitter chat [![Join the chat at https://gitter.im/modularcode/modular-admin](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/modularcode/modular-admin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) or in the [ModularCode Facebook Group](https://www.facebook.com/groups/710770032358423/). Feel free to contact us with any questions, sugestions, remarks and potential feature requests that you might have. @@ -244,13 +258,9 @@ Feel free to contact us with any questions, sugestions, remarks and potential fe * Aram Manukyan | [LinkedIn](https://www.linkedin.com/profile/view?id=AAkAABCehqwBm7aTR7IohpOidW1sVIHMo33U46o) * David Tigranyan | [LinkedIn](https://www.linkedin.com/profile/view?id=AAkAAAk1QJIB86I-V65l3qtgpTvfrMozBNc4p_8) -## Hire Us? - -Do you have a great project? Need theme customization or intagration with back-end? Want to create something awesome? -We may be available for hire. Just drop a message to gevharut[at]gmail.com and let's talk. -## Backers +### Backers Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/modular-admin-html#backer)] From 24991c471eb9aa6118f86c8f3dd9a72686a6eba6 Mon Sep 17 00:00:00 2001 From: Gevorg Harutyunyan Date: Sat, 19 Aug 2017 05:30:38 +0400 Subject: [PATCH 3/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e9a9b37a..05bd3095 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Open the project [http://localhost:4000](http://localhost:4000).
-You can also [run the project in docker](#running-in-docker) +You can also [run the project in docker](#running-in-docker) thanks to @japrogramer
From 04ec3f1f6bc8db820d9deb7be6220e4f21752f3a Mon Sep 17 00:00:00 2001 From: Gevorg Harutyunyan Date: Sat, 19 Aug 2017 05:34:14 +0400 Subject: [PATCH 4/6] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 05bd3095..d5e8a749 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,10 @@ ### Heads up for the ModularAdmin v2! We're working hard on version 2, which is a complete rewrite. -**Please consider [supporting us](#support-us) to make this happen!** V2 code | V2 preview -(in development) +(in development) +**Please consider [supporting us](#support-us) to make this happen!** + From bd2b934fc02676669c9d7d8400fa8e491d260dc6 Mon Sep 17 00:00:00 2001 From: Gevorg Harutyunyan Date: Sat, 19 Aug 2017 05:34:48 +0400 Subject: [PATCH 5/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d5e8a749..aae9e21d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ### Heads up for the ModularAdmin v2! We're working hard on version 2, which is a complete rewrite. V2 code | V2 preview -(in development) + **Please consider [supporting us](#support-us) to make this happen!** From 56a8ecafaa623f975df4bad08f3d49dc2e16c7c1 Mon Sep 17 00:00:00 2001 From: Gevorg Harutyunyan Date: Sat, 19 Aug 2017 05:35:46 +0400 Subject: [PATCH 6/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aae9e21d..88b2e570 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ### Heads up for the ModularAdmin v2! We're working hard on version 2, which is a complete rewrite. -V2 code | V2 preview +V2 demo | V2 code **Please consider [supporting us](#support-us) to make this happen!**