Merge pull request #926 from mehmetcoban/master

fixed api key page

public/js/settings/categories.js

@@ -81,7 +81,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 28);
+/******/ 	return __webpack_require__(__webpack_require__.s = 29);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -136649,14 +136649,14 @@ var app = new vue__WEBPACK_IMPORTED_MODULE_0___default.a({
 
 /***/ }),
 
-/***/ 28:
+/***/ 29:
 /*!****************************************************************!*\
   !*** multi ./resources/assets/js/views/settings/categories.js ***!
   \****************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(/*! C:\xampp7.3\htdocs\Akaunting\Dev\Modul\GitHub_Akaunting_3\resources\assets\js\views\settings\categories.js */"./resources/assets/js/views/settings/categories.js");
+module.exports = __webpack_require__(/*! C:\xampp7.3\htdocs\GitHub\AkauntingGit1\resources\assets\js\views\settings\categories.js */"./resources/assets/js/views/settings/categories.js");
 
 
 /***/ })

public/mix-manifest.json

@@ -22,6 +22,7 @@
     "/js/incomes/invoices.js": "/js/incomes/invoices.js",
     "/js/incomes/revenues.js": "/js/incomes/revenues.js",
     "/js/install.js": "/js/install.js",
+    "/js/modules/apps.js": "/js/modules/apps.js",
     "/js/modules/item.js": "/js/modules/item.js",
     "/js/portal/dashboard.js": "/js/portal/dashboard.js",
     "/js/portal/invoices.js": "/js/portal/invoices.js",

resources/assets/js/views/modules/apps.js

@@ -0,0 +1,25 @@
+/**
+ * First we will load all of this project's JavaScript dependencies which
+ * includes Vue and other libraries. It is a great starting point when
+ * building robust, powerful web applications using Vue and Laravel.
+ */
+
+require('./../../bootstrap');
+
+import Vue from 'vue';
+
+import Global from './../../mixins/global';
+
+import Form from './../../plugins/form';
+
+const app = new Vue({
+    el: '#app',
+    mixins: [
+        Global
+    ],
+    data: function () {
+        return {
+            form: new Form('form-app')
+        }
+    }
+});

resources/views/modules/api_key/create.blade.php

@@ -6,7 +6,7 @@
     <div class="card">
         {!! Form::open([
             'route' => 'apps.api-key.store',
-            'id' => 'app',
+            'id' => 'form-app',
             '@submit.prevent' => 'onSubmit',
             'files' => true,
             'role' => 'form',
@@ -23,7 +23,7 @@
                                     <i class="fa fa-key"></i>
                                 </span>
                             </div>
-                            {!! Form::text('api_key', setting('apps.api_key', null), ['class' => 'form-control', 'required' => 'required', 'placeholder' => trans('general.form.enter', ['field' => trans('modules.api_key')])]) !!}
+                            {!! Form::text('api_key', setting('apps.api_key', ''), ['class' => 'form-control', 'required' => 'required', 'placeholder' => trans('general.form.enter', ['field' => trans('modules.api_key')])]) !!}
                         </div>
                         {!! $errors->first('api_key', '<p class="help-block">:message</p>') !!}
                     </div>
@@ -44,5 +44,5 @@
 @endsection
 
 @push('scripts_start')
-    <script src="{{ asset('public/js/apps.js?v=' . version('short')) }}"></script>
+    <script src="{{ asset('public/js/modules/apps.js?v=' . version('short')) }}"></script>
 @endpush

webpack.mix.js

@@ -50,6 +50,7 @@ mix
 
     // Modules
     .js('resources/assets/js/views/modules/item.js', 'public/js/modules')
+    .js('resources/assets/js/views/modules/apps.js', 'public/js/modules')
 
     // Portal
     .js('resources/assets/js/views/portal/dashboard.js', 'public/js/portal')