Merge branch 'release/v5.3.0'

Valandur · Aug 23, 2018 · d8e02f5 · d8e02f5
2 parents e4f7db5 + d83b15c
commit d8e02f5
Show file tree

Hide file tree

Showing 9 changed files with 4,153 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webapi-admin-panel",
-  "version": "5.2.1",
+  "version": "5.3.0",
   "homepage": ".",
   "proxy": "http://localhost:8080/",
   "devDependencies": {

diff --git a/src/containers/Full/Views.tsx b/src/containers/Full/Views.tsx
@@ -61,6 +61,9 @@ const UMItems = load(() =>
 const WebBooksBooks = load(() =>
 	import('../../views/Integrations/WebBooks/Books')
 );
+const VShopsShops = load(() =>
+	import('../../views/Integrations/VillagerShops/Shops')
+);
 
 export const views: Array<ViewDefinition> = [
 	{
@@ -251,6 +254,21 @@ export const views: Array<ViewDefinition> = [
 			}
 		]
 	},
+	{
+		title: 'VShops',
+		path: '/vshop',
+		perms: ['vshop'],
+		servlets: ['/vshop'],
+		views: [
+			{
+				title: 'VShopShops',
+				path: '/vshop/shop',
+				icon: 'shop',
+				perms: ['vshop', 'shop'],
+				component: VShopsShops
+			}
+		]
+	},
 	{
 		title: 'WebBooks',
 		path: '/web-books',