This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push:
new a5a31ac change structure
a5a31ac is described below
commit a5a31ac52354eaf8a26ed6cde16b20e2a5bb0345
Author: nzomkxia <[email protected]>
AuthorDate: Tue Oct 9 22:02:24 2018 +0800
change structure
---
dubbo-admin-frontend/src/App.vue | 6 ++---
.../components/{ => governance}/AccessControl.vue | 4 ++--
.../components/{ => governance}/LoadBalance.vue | 4 ++--
.../src/components/{ => governance}/Overrides.vue | 4 ++--
.../components/{ => governance}/RoutingRule.vue | 27 ++++++++++++----------
.../components/{ => governance}/WeightAdjust.vue | 4 ++--
.../src/components/{ => public}/AceEditor.vue | 0
.../src/components/{ => public}/Drawer.vue | 0
.../src/components/{ => public}/Footers.vue | 0
.../src/components/{ => public}/Toolbar.vue | 0
.../src/components/{ => public}/VWidget.vue | 0
dubbo-admin-frontend/src/router/index.js | 10 ++++----
12 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/dubbo-admin-frontend/src/App.vue b/dubbo-admin-frontend/src/App.vue
index c610359..4b760be 100644
--- a/dubbo-admin-frontend/src/App.vue
+++ b/dubbo-admin-frontend/src/App.vue
@@ -30,9 +30,9 @@
</v-app>
</template>
<script>
- import Drawer from '@/components/Drawer'
- import Toolbar from '@/components/Toolbar'
- import Footers from '@/components/Footers'
+ import Drawer from '@/components/public/Drawer'
+ import Toolbar from '@/components/public/Toolbar'
+ import Footers from '@/components/public/Footers'
export default {
components: {
diff --git a/dubbo-admin-frontend/src/components/AccessControl.vue
b/dubbo-admin-frontend/src/components/governance/AccessControl.vue
similarity index 99%
rename from dubbo-admin-frontend/src/components/AccessControl.vue
rename to dubbo-admin-frontend/src/components/governance/AccessControl.vue
index de7be6a..f369869 100644
--- a/dubbo-admin-frontend/src/components/AccessControl.vue
+++ b/dubbo-admin-frontend/src/components/governance/AccessControl.vue
@@ -149,8 +149,8 @@
<script>
import yaml from 'js-yaml'
-import { AXIOS } from './http-common'
-import AceEditor from '@/components/AceEditor'
+import { AXIOS } from '../http-common'
+import AceEditor from '@/components/public/AceEditor'
export default {
name: 'AccessControl',
diff --git a/dubbo-admin-frontend/src/components/LoadBalance.vue
b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
similarity index 98%
rename from dubbo-admin-frontend/src/components/LoadBalance.vue
rename to dubbo-admin-frontend/src/components/governance/LoadBalance.vue
index 83f8bb6..99241f7 100644
--- a/dubbo-admin-frontend/src/components/LoadBalance.vue
+++ b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
@@ -109,8 +109,8 @@
</template>
<script>
import yaml from 'js-yaml'
- import {AXIOS} from './http-common'
- import AceEditor from '@/components/AceEditor'
+ import {AXIOS} from '../http-common'
+ import AceEditor from '@/components/public/AceEditor'
export default {
components: {
AceEditor
diff --git a/dubbo-admin-frontend/src/components/Overrides.vue
b/dubbo-admin-frontend/src/components/governance/Overrides.vue
similarity index 98%
rename from dubbo-admin-frontend/src/components/Overrides.vue
rename to dubbo-admin-frontend/src/components/governance/Overrides.vue
index 33f3c10..3ccb694 100644
--- a/dubbo-admin-frontend/src/components/Overrides.vue
+++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue
@@ -107,9 +107,9 @@
</template>
<script>
- import AceEditor from '@/components/AceEditor'
+ import AceEditor from '@/components/public/AceEditor'
import yaml from 'js-yaml'
- import {AXIOS} from './http-common'
+ import {AXIOS} from '../http-common'
export default {
components: {
AceEditor
diff --git a/dubbo-admin-frontend/src/components/RoutingRule.vue
b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
similarity index 94%
rename from dubbo-admin-frontend/src/components/RoutingRule.vue
rename to dubbo-admin-frontend/src/components/governance/RoutingRule.vue
index fc58de4..3ad644d 100644
--- a/dubbo-admin-frontend/src/components/RoutingRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
@@ -19,15 +19,16 @@
<v-container grid-list-xl fluid >
<v-layout row wrap>
<v-flex xs12 >
- <v-card flat color="transparent">
- <v-card-text>
- <v-layout row wrap >
- <v-text-field label="Search dubbo service"
- v-model="filter" clearable></v-text-field>
- <v-btn @click="submit" color="primary" large>Search</v-btn>
- </v-layout>
- </v-card-text>
- </v-card>
+ <!--<v-card flat color="transparent">-->
+ <!--<v-card-text>-->
+ <!--<v-layout row wrap >-->
+ <!--<v-text-field label="Search dubbo service"-->
+ <!--v-model="filter" clearable></v-text-field>-->
+ <!--<v-btn @click="submit" color="primary"
large>Search</v-btn>-->
+ <!--</v-layout>-->
+ <!--</v-card-text>-->
+ <!--</v-card>-->
+ <search v-model="filter" :submit="submit" label="Search dubbo
service"></search>
</v-flex>
</v-layout>
@@ -118,11 +119,13 @@
</template>
<script>
import yaml from 'js-yaml'
- import AceEditor from '@/components/AceEditor'
- import {AXIOS} from './http-common'
+ import AceEditor from '@/components/public/AceEditor'
+ import Search from '@/components/public/Search'
+ import {AXIOS} from '../http-common'
export default {
components: {
- AceEditor
+ AceEditor,
+ Search
},
data: () => ({
dropdown_font: [ 'Service', 'App', 'IP' ],
diff --git a/dubbo-admin-frontend/src/components/WeightAdjust.vue
b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
similarity index 98%
rename from dubbo-admin-frontend/src/components/WeightAdjust.vue
rename to dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
index 7a6e054..1f54169 100644
--- a/dubbo-admin-frontend/src/components/WeightAdjust.vue
+++ b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
@@ -109,9 +109,9 @@
</template>
<script>
- import AceEditor from '@/components/AceEditor'
+ import AceEditor from '@/components/public/AceEditor'
import yaml from 'js-yaml'
- import {AXIOS} from './http-common'
+ import {AXIOS} from '../http-common'
export default {
components: {
AceEditor
diff --git a/dubbo-admin-frontend/src/components/AceEditor.vue
b/dubbo-admin-frontend/src/components/public/AceEditor.vue
similarity index 100%
rename from dubbo-admin-frontend/src/components/AceEditor.vue
rename to dubbo-admin-frontend/src/components/public/AceEditor.vue
diff --git a/dubbo-admin-frontend/src/components/Drawer.vue
b/dubbo-admin-frontend/src/components/public/Drawer.vue
similarity index 100%
rename from dubbo-admin-frontend/src/components/Drawer.vue
rename to dubbo-admin-frontend/src/components/public/Drawer.vue
diff --git a/dubbo-admin-frontend/src/components/Footers.vue
b/dubbo-admin-frontend/src/components/public/Footers.vue
similarity index 100%
rename from dubbo-admin-frontend/src/components/Footers.vue
rename to dubbo-admin-frontend/src/components/public/Footers.vue
diff --git a/dubbo-admin-frontend/src/components/Toolbar.vue
b/dubbo-admin-frontend/src/components/public/Toolbar.vue
similarity index 100%
rename from dubbo-admin-frontend/src/components/Toolbar.vue
rename to dubbo-admin-frontend/src/components/public/Toolbar.vue
diff --git a/dubbo-admin-frontend/src/components/VWidget.vue
b/dubbo-admin-frontend/src/components/public/VWidget.vue
similarity index 100%
rename from dubbo-admin-frontend/src/components/VWidget.vue
rename to dubbo-admin-frontend/src/components/public/VWidget.vue
diff --git a/dubbo-admin-frontend/src/router/index.js
b/dubbo-admin-frontend/src/router/index.js
index 9327e25..a19c7b3 100644
--- a/dubbo-admin-frontend/src/router/index.js
+++ b/dubbo-admin-frontend/src/router/index.js
@@ -19,11 +19,11 @@ import Vue from 'vue'
import Router from 'vue-router'
import ServiceSearch from '@/components/ServiceSearch'
import ServiceDetail from '@/components/ServiceDetail'
-import RoutingRule from '@/components/RoutingRule'
-import AccessControl from '@/components/AccessControl'
-import LoadBalance from '@/components/LoadBalance'
-import WeightAdjust from '@/components/WeightAdjust'
-import Overrides from '@/components/Overrides'
+import RoutingRule from '@/components/governance/RoutingRule'
+import AccessControl from '@/components/governance/AccessControl'
+import LoadBalance from '@/components/governance/LoadBalance'
+import WeightAdjust from '@/components/governance/WeightAdjust'
+import Overrides from '@/components/governance/Overrides'
Vue.use(Router)
