Merge dev to master

Author: Blari

README.md

@@ -1,71 +1,106 @@
-# React Material Admin Full
+# React Material Admin Full — Material-UI Dashboard Template
 
-## This project was generated by Flatlogic Platform.
+Built with [React](https://facebook.github.io/react/), [Material-UI](https://material-ui.com), [React Router](https://reacttraining.com/react-router/).
+**No jQuery and Bootstrap!**
 
-## To start the project:
+**This version uses React 17, React Router v5, MaterialUI v5, built with React Hooks and React Context (No Redux)**
 
-Install dependencies via npm or yarn
+[Demo](https://flatlogic.com/admin-dashboards/react-material-admin/demo). Use any credentials to log in.
 
-```shell
-npm install
-```
+[![image](https://user-images.githubusercontent.com/24964748/55800639-df780300-5adc-11e9-84b7-7c2437088516.png)](https://flatlogic.com/admin-dashboards/react-material-admin/demo)
 
-```shell
-yarn
-```
+## Features
 
-Run development server
+- React (**17.0.2**)
+- React Hooks
+- React Context
+- **No jQuery and Bootstrap!**
+- Mobile friendly layout (responsive)
+- Create-react-app under the hood
+- React Router v5
+- Material-UI v5
+- Modular Architecture
+- CSS-in-JS styles
+- Styled Components
+- Webpack build
+- Stylish, clean, responsive layout
+- Authentication
 
-```shell
-yarn start
-```
+## Pages
 
-## Support
+We have implemented some basic pages, so you can see our template in action.
 
-For any additional information please refer to [Flatlogic homepage](https://flatlogic.com).
+- Profile
+- Dashboard
+- E-commerce (Product Management, Products Grid, Product Page)
+- Typography
+- Tables (Static, dynamic)
+- Forms
+- Notifications
+- Charts
+- Icons
+- Maps
+- Login
+- Error
 
-## To start the project with Docker:
+## Quick Start
 
-## Description:
+#### 1. Get the latest version
 
-The project contains the **docker folder** and the `Dockerfile`.
+You can start by cloning the latest version of React Dashboard on your
+local machine by running:
 
-The `Dockerfile` is used to Deploy the project to Google Cloud.
+```shell
+$ git clone https://github.com/flatlogic/react-material-admin.git MyApp
+$ cd MyApp
+```
 
-The **docker folder** contains a couple of helper scripts:
+#### 2. Run `yarn install`
 
-- `docker-compose.yml` (all our services: web, backend, db are described here)
-- `start-backend.sh` (starts backend, but only after the database)
-- `wait-for-it.sh` (imported from https://github.com/vishnubob/wait-for-it)
+This will install both run-time project dependencies and developer tools listed
+in [package.json](package.json) file.
 
-  > To avoid breaking the application, we recommend you don't edit the following files: everything that includes the **docker folder** and `Dokerfile`.
+#### 3. Run `yarn start`
 
-## Run services:
+Runs the app in the development mode.
 
-1. Install docker compose (https://docs.docker.com/compose/install/)
+Open http://localhost:3000 to view it in the browser. Whenever you modify any of the source files inside the `/src` folder,
+the module bundler ([Webpack](http://webpack.github.io/)) will recompile the
+app on the fly and refresh all the connected browsers.
 
-2. Move to `docker` folder. All next steps should be done from this folder.
+#### 4. Run `yarn build`
 
-   `cd docker`
+Builds the app for production to the build folder.
+It correctly bundles React in production mode and optimizes the build for the best performance.
 
-3. Make executables from `wait-for-it.sh` and `start-backend.sh`:
+The build is minified and the filenames include the hashes.
+Your app is ready to be deployed!
 
-   `chmod +x start-backend.sh && chmod +x wait-for-it.sh`
+## Support
 
-4. Download dependend projects for services.
+For any additional information please refer to [Support forum](https://flatlogic.com/forum).
 
-5. Review the docker-compose.yml file. Make sure that all services have Dockerfiles. Only db service doesn't require a Dockerfile.
+## How can I support developers?
 
-6. Make sure you have needed ports (see them in `ports`) available on your local machine.
+- Star our GitHub repo :star:
+- [Tweet about it](https://twitter.com/intent/tweet?text=Amazing%20dashboard%20built%20with%20NodeJS,%20React%20and%20Bootstrap!&url=https://github.com/flatlogic/react-material-template&via=flatlogic).
+- Create pull requests, submit bugs, suggest new features or documentation updates :wrench:
+- Follow [@flatlogic on Twitter](https://twitter.com/flatlogic).
+- Subscribe to Flatlogic newsletter at [flatlogic.com](https://flatlogic.com/)
+- Like our page on [Facebook](https://www.facebook.com/flatlogic/) :thumbsup:
 
-7. Start services:
+## More from Flatlogic
 
-   7.1. With an empty database `rm -rf data && docker-compose up`
+- [React Native Starter](https://github.com/flatlogic/react-native-starter) - 🚀 A powerful react native starter template that bootstraps development of your mobile application
+- [Sing App](https://github.com/flatlogic/sing-app) - 💥 Free and open-source admin dashboard template built with Bootstrap 4
+- [Awesome Bootstrap Checkboxes & Radios](https://github.com/flatlogic/awesome-bootstrap-checkbox) - ✅ Pure css way to make inputs look prettier
+- [React Dashboard](https://github.com/flatlogic/react-dashboard) - 🔥 React Dashboard - isomorphic admin dashboard template with GraphQL
+- [Light Blue Dashboard](https://github.com/flatlogic/light-blue-dashboard) - 💦 Free and open-source admin dashboard template built with Bootstrap
 
-   7.2. With a stored (from previus runs) database data `docker-compose up`
+## Premium themes
 
-8. Check http://localhost:3000
+Looking for premium themes and templates? Check out more [admin dashboard templates at flatlogic.com](https://flatlogic.com/admin-dashboards).
 
-9. Stop services:
+## License
 
-   9.1. Just press `Ctr+C`
+[MIT](https://github.com/flatlogic/react-material-dashboard/blob/master/LICENSE.txt).