Add delete node

orvice · Jul 3, 2017 · 7b3cae1 · 7b3cae1
1 parent ea5ada7
commit 7b3cae1
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 7 deletions.
diff --git a/app/Controllers/Api/Admin/NodeController.php b/app/Controllers/Api/Admin/NodeController.php
@@ -49,6 +49,13 @@ public function update(Request $req, Response $res, $args)
         return $this->saveModel($res, Node::find($args['id']), $arr);
     }
 
+    public function delete(Request $req, Response $res, $args)
+    {
+        $node = Node::find($args['id']);
+        $node->delete();
+        return $this->echoJsonWithData($res, []);
+    }
+
     public function trafficLogs(Request $req, Response $res, $args)
     {
         $pageNum = 1;

diff --git a/public/assets/js/admin.js b/public/assets/js/admin.js
diff --git a/public/assets/js/app.js b/public/assets/js/app.js
diff --git a/public/assets/js/home.js b/public/assets/js/home.js
diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php
@@ -2,5 +2,7 @@
 
 return [
     'add' => 'Add',
+    'delete' => 'Delete',
+    'action' => 'Action',
     'node-add' => 'Add Node',
 ];
diff --git a/routes/web.php b/routes/web.php
@@ -109,6 +109,7 @@
     $this->put('/admin/config', 'App\Controllers\Api\Admin\ConfigController:update')->add(new Admin());
     $this->get('/admin/nodes', 'App\Controllers\Api\Admin\NodeController:index')->add(new Admin());
     $this->post('/admin/nodes', 'App\Controllers\Api\Admin\NodeController:store')->add(new Admin());
+    $this->delete('/admin/nodes/{id}', 'App\Controllers\Api\Admin\NodeController:delete')->add(new Admin());
     $this->get('/admin/trafficLogs', 'App\Controllers\Api\Admin\TrafficLogController:index')->add(new Admin());
 });
 

diff --git a/src/lang/vue-i18n-locales.generated.js b/src/lang/vue-i18n-locales.generated.js
@@ -7,6 +7,8 @@ export default {
         },
         "admin": {
             "add": "Add",
+            "delete": "Delete",
+            "action": "Action",
             "node-add": "Add Node"
         },
         "alert": {

diff --git a/src/pages/Admin/Node.vue b/src/pages/Admin/Node.vue
@@ -11,9 +11,11 @@
                 <div uk-grid class="uk-child-width-1-1@s uk-child-width-1-1@m uk-child-width-1-4@xl">
                     <div class="uk-card uk-card-default uk-card-body">
                         <div class="uk-margin">
-                            <router-link tag="li" :to="{ name: 'node-add' }" exact><button class="uk-button uk-button-primary" >
-                                {{$t("admin.node-add")}}
-                            </button></router-link>
+                            <router-link tag="li" :to="{ name: 'node-add' }" exact>
+                                <button class="uk-button uk-button-primary">
+                                    {{$t("admin.node-add")}}
+                                </button>
+                            </router-link>
                         </div>
 
                         <table class="uk-table uk-table-striped">
@@ -23,6 +25,7 @@
                                 <th>{{$t("ss.node")}}</th>
                                 <th>{{$t("ss.server_addr")}}</th>
                                 <th>{{$t("ss.traffic_rate")}}</th>
+                                <th>{{$t("admin.action")}}</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -31,6 +34,11 @@
                                 <td>{{node.name}}</td>
                                 <td>{{node.server}}</td>
                                 <td>{{node.traffic_rate}}</td>
+                                <td> <div class="uk-margin">
+                                    <button class="uk-button uk-button-danger" @click="deleteNode(node.id)">
+                                        {{$t("admin.delete")}}
+                                    </button>
+                                </div></td>
                             </tr>
                             </tbody>
                         </table>
@@ -49,7 +57,7 @@
 <script>
     import admin from '../../http/admin'
     import pagination from 'laravel-vue-pagination-uikit'
-    import {bytesToSize} from '../../tools/util'
+    import {bytesToSize,notify} from '../../tools/util'
     export default {
         name: 'Node',
         components: {
@@ -77,6 +85,16 @@
             timeFormat(ut){
                 return new Date(ut * 1e3).toISOString();
             },
+            deleteNode(id){
+                admin.delete(`nodes/` + id)
+                    .then(response => {
+                        notify(this.$t('base.success'),'primary');
+                        this.Results();
+                    })
+                    .catch(e => {
+                        notify(this.$t('base.something-wrong'),'danger');
+                    })
+            },
             bytesToSize,
         },
         mounted: function () {

diff --git a/src/tools/util.js b/src/tools/util.js
@@ -7,4 +7,13 @@ export const bytesToSize = function (bytes) {
 };
 
 export const timeFormat = function (t) {
+};
+
+export const notify = function(message,status){
+    UIkit.notification({
+        message: message,
+        status: status,
+        pos: 'top-center',
+        timeout: 5000
+    });
 };