Merge branch 'v2-next'

Author: rakieta2015

README.md

@@ -163,6 +163,63 @@ $ npm install
 
 ```
 
+## Usage
+
+### Test
+``` bash
+# test
+$ php vendor/bin/phpunit
+```
+
+### If you need separate backend and frontend
+
+``` bash
+# back to laravel directory
+$ cd ../laravel
+
+# start local server
+$ php artisan serve
+
+$ cd ../coreui
+
+$ npm run serve
+```
+Open your browser with address: [localhost:8080](localhost:8080)
+
+If you need change backend adress go to file /coreui/src/main.js
+And change line:
+```js
+Vue.prototype.$apiAdress = 'http://127.0.0.1:8000'
+```
+
+### If you don't need separate backend and frontend
+
+1. Go to file /laravel/routes/web.php
+And uncomment this lines:
+```php
+Route::get('/{any}', function () {
+    return view('coreui.homepage');
+})->where('any', '.*');
+```
+2. Go to file /laravel/config/filesystems.php
+And change this line:
+```php
+'root' => public_path() . '/../../coreui/public/public',
+```
+To this:
+```php
+'root' => public_path('public'),
+```
+3. Go to file /coreui/src/views/media/Media.vue
+And change this line:
+```js
+changePort: 'localhost:8080',
+```
+To this:
+```js
+changePort: 'localhost:8000',
+```
+4. 
 ``` bash
 # back to laravel directory
 $ cd ../laravel
@@ -172,19 +229,14 @@ $ npm run dev
 
 # and repeat generate mixing
 $ npm run dev
-```
-
-## Usage
 
-``` bash
 # start local server
 $ php artisan serve
-
-# test
-$ php vendor/bin/phpunit
 ```
+Open your browser with address: [localhost:8000](localhost:8000) 
+
+### When you have project open in browser
 
-Open your browser with address: [localhost:8000](localhost:8000)  
 Click "Login" on sidebar menu and log in with credentials:
 
 * E-mail: _admin@admin.com_

coreui/package-lock.json

@@ -52,7 +52,7 @@
     "core-js": "~3.6.4",
     "eslint": "~6.8.0",
     "eslint-plugin-vue": "~6.2.1",
-    "node-sass": "~4.13.1",
+    "node-sass": "~4.14.1",
     "npm-run-all": "~4.1.5",
     "sass-loader": "~8.0.2",
     "vue-template-compiler": "~2.6.11"

coreui/package.json

@@ -0,0 +1 @@
+test

coreui/public/public/test.txt

@@ -113,7 +113,8 @@ export default {
   },
   mounted () {
     let self = this;
-    axios.get(   '/api/menu?token=' + localStorage.getItem("api_token") + '&menu=' + 'top_menu')
+    console.log(this.$apiAdress)
+    axios.get( this.$apiAdress + '/api/menu?token=' + localStorage.getItem("api_token") + '&menu=' + 'top_menu' )
     .then(function (response) {
       self.nav = self.rebuildData(response.data);
     }).catch(function (error) {

coreui/src/containers/Menu.vue

@@ -77,7 +77,7 @@ export default {
   methods:{
     logout(){
       let self = this;
-      axios.post('/api/logout?token=' + localStorage.getItem("api_token"),{})
+      axios.post(this.$apiAdress + '/api/logout?token=' + localStorage.getItem("api_token"),{})
       .then(function (response) {
         localStorage.setItem('roles', '');
         self.$router.push({ path: '/login' });

coreui/src/containers/TheHeaderDropdownAccnt.vue

@@ -122,7 +122,10 @@ export default {
       this.show = sidebarClosed ? true : 'responsive'
     })
     let self = this;
-    axios.get(   '/api/menu?token=' + localStorage.getItem("api_token") )
+
+    console.log(this.$apiAdress);
+
+    axios.get( this.$apiAdress + '/api/menu?token=' + localStorage.getItem("api_token") )
     .then(function (response) {
       self.nav = self.rebuildData(response.data);
     }).catch(function (error) {

coreui/src/containers/TheSidebar.vue

@@ -6,6 +6,7 @@ import CoreuiVue from '@coreui/vue'
 import { iconsSet as icons } from './assets/icons/icons.js'
 import store from './store'
 
+Vue.prototype.$apiAdress = 'http://127.0.0.1:8000'
 Vue.config.performance = true
 Vue.use(CoreuiVue)
 

coreui/src/main.js

@@ -21,6 +21,7 @@ const mutations = {
   }
 }
 
+
 export default new Vuex.Store({
   state,
   mutations

coreui/src/store.js

@@ -56,7 +56,7 @@ export default {
   },
   mounted: function(){
     let self = this;
-    axios.get(  '/api/bread/' + self.$route.params.id + '?token=' + localStorage.getItem("api_token"))
+    axios.get(  this.$apiAdress + '/api/bread/' + self.$route.params.id + '?token=' + localStorage.getItem("api_token"))
     .then(function (response) {
       self.form = response.data.form
       self.formFields = response.data.formFields