From b6163b1fe1cb8269572f3f021add19fa43991481 Mon Sep 17 00:00:00 2001 From: Dean Bartok-Thomas Date: Sun, 1 Sep 2019 23:09:20 +0100 Subject: [PATCH] Added orders list and filtering, displaying of order too --- package.json | 1 + src/api/order.js | 13 + src/router/index.js | 31 ++ src/views/orders/components/OrderDetail.vue | 334 ++++++++++++++++++++ src/views/orders/create.vue | 13 + src/views/orders/edit.vue | 13 + src/views/orders/list.vue | 204 ++++++++++++ 7 files changed, 609 insertions(+) create mode 100644 src/api/order.js create mode 100644 src/views/orders/components/OrderDetail.vue create mode 100644 src/views/orders/create.vue create mode 100644 src/views/orders/edit.vue create mode 100644 src/views/orders/list.vue diff --git a/package.json b/package.json index 351bf5dc..3780f34b 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "js-cookie": "2.2.0", "jsonlint": "1.6.3", "jszip": "3.2.1", + "moment": "^2.24.0", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", diff --git a/src/api/order.js b/src/api/order.js new file mode 100644 index 00000000..1585e733 --- /dev/null +++ b/src/api/order.js @@ -0,0 +1,13 @@ +import axios from 'axios' + +const apiUrl = 'https://orders.service.development.therig.onlinefuelslabs.io' + +export function fetchList(query) { + query.platform = 'OLFDE' + query.accountId = '5caf6ca5bca1f9001212b6ec' + return axios.get(`${apiUrl}/orders`, { params: query }) +} + +export function fetchOrder(id) { + return axios.get(`${apiUrl}/orders/${id}`) +} diff --git a/src/router/index.js b/src/router/index.js index fb160cfb..41a94db8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -292,6 +292,37 @@ export const asyncRoutes = [ } ] }, + { + path: '/orders', + component: Layout, + redirect: '/orders/list', + name: 'Orders', + meta: { + title: 'Orders', + icon: 'example' + }, + children: [ + { + path: 'create', + component: () => import('@/views/orders/create'), + name: 'CreateOrder', + meta: { title: 'Create Order', icon: 'edit' } + }, + { + path: 'edit/:id', + component: () => import('@/views/orders/edit'), + name: 'EditOrder', + meta: { title: 'Edit Order', noCache: true, activeMenu: '/orders/list' }, + hidden: true + }, + { + path: 'list', + component: () => import('@/views/orders/list'), + name: 'OrderList', + meta: { title: 'Order List', icon: 'list' } + } + ] + }, { path: '/permission', component: Layout, diff --git a/src/views/orders/components/OrderDetail.vue b/src/views/orders/components/OrderDetail.vue new file mode 100644 index 00000000..c7d242cc --- /dev/null +++ b/src/views/orders/components/OrderDetail.vue @@ -0,0 +1,334 @@ + + + + + diff --git a/src/views/orders/create.vue b/src/views/orders/create.vue new file mode 100644 index 00000000..78935d4e --- /dev/null +++ b/src/views/orders/create.vue @@ -0,0 +1,13 @@ + + + + diff --git a/src/views/orders/edit.vue b/src/views/orders/edit.vue new file mode 100644 index 00000000..c16bed3e --- /dev/null +++ b/src/views/orders/edit.vue @@ -0,0 +1,13 @@ + + + + diff --git a/src/views/orders/list.vue b/src/views/orders/list.vue new file mode 100644 index 00000000..c0bb3fcf --- /dev/null +++ b/src/views/orders/list.vue @@ -0,0 +1,204 @@ + + + + +