You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by il...@apache.org on 2018/09/10 08:56:22 UTC
[incubator-dubbo-ops] branch develop updated (67a9ff8 -> 9a6f3c8)
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git.
from 67a9ff8 Develop (#104)
new d35d5aa update package - add stylus, vue-perfect-scrollbar
new 850eda6 enhance toolbar, search & side-icon
new 643fadf update footer
new 9a6f3c8 Merge branch 'develop' of https://github.com/apache/incubator-dubbo-ops into develop
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dubbo-admin/dubbo-admin-frontend/package.json | 5 +-
dubbo-admin/dubbo-admin-frontend/src/App.vue | 90 +++++++++++++---------
.../src/components/Toolbar.vue | 24 +++---
3 files changed, 70 insertions(+), 49 deletions(-)
[incubator-dubbo-ops] 03/04: update footer
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
commit 643fadf69d3f22a1090171620112ddcd46ee33d3
Author: beiwei30 <ia...@gmail.com>
AuthorDate: Mon Sep 10 16:55:10 2018 +0800
update footer
---
dubbo-admin/dubbo-admin-frontend/src/App.vue | 90 +++++++++++++++++-----------
1 file changed, 54 insertions(+), 36 deletions(-)
diff --git a/dubbo-admin/dubbo-admin-frontend/src/App.vue b/dubbo-admin/dubbo-admin-frontend/src/App.vue
index fc1782a..28375f0 100644
--- a/dubbo-admin/dubbo-admin-frontend/src/App.vue
+++ b/dubbo-admin/dubbo-admin-frontend/src/App.vue
@@ -22,43 +22,61 @@
<v-content>
<router-view/>
</v-content>
- <footers></footers>
+ <v-footer height="auto" class="white pa-3 app--footer">
+ <span class="caption">Copyright © {{ new Date().getFullYear() }} The Apache Software Foundation. </span>
+ <v-spacer></v-spacer>
+ <span class="caption mr-1"> Make With Love </span>
+ <v-icon color="pink" small>favorite</v-icon>
+ </v-footer>
</v-app>
</template>
<script>
-import Drawer from '@/components/Drawer'
-import Toolbar from '@/components/Toolbar'
-import Footers from '@/components/Footers'
-export default {
- components: {
- Drawer,
- Toolbar,
- Footers
- },
- data () {
- return {
- clipped: false,
- fixed: false,
- dark: false,
- items: [{
- icon: 'bubble_chart',
- title: 'Inspire'
- }],
- miniVariant: false,
- right: true
- }
- },
- created () {
- window.getApp = this
- window.getApp.$on('CHANGE_THEME', () => {
- this.dark = (!this.dark)
- })
- },
- computed: {
- appTitle () {
- return this.$store.state.appTitle
- }
- },
- name: 'App'
-}
+ import Drawer from '@/components/Drawer'
+ import Toolbar from '@/components/Toolbar'
+ import Footers from '@/components/Footers'
+
+ export default {
+ components: {
+ Drawer,
+ Toolbar,
+ Footers
+ },
+ data () {
+ return {
+ clipped: false,
+ fixed: false,
+ dark: false,
+ items: [{
+ icon: 'bubble_chart',
+ title: 'Inspire'
+ }],
+ miniVariant: false,
+ right: true
+ }
+ },
+ created () {
+ window.getApp = this
+ window.getApp.$on('CHANGE_THEME', () => {
+ this.dark = (!this.dark)
+ })
+ },
+ computed: {
+ appTitle () {
+ return this.$store.state.appTitle
+ }
+ },
+ name: 'App'
+ }
</script>
+
+
+<style lang="stylus" scoped>
+ .setting-fab
+ top: 50% !important;
+ right: 0;
+ border-radius: 0
+
+ .page-wrapper
+ min-height: calc(100vh - 64px - 50px - 81px);
+
+</style>
[incubator-dubbo-ops] 02/04: enhance toolbar, search & side-icon
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
commit 850eda62b2ac6bdbb226dcff29e4301f3244a0a8
Author: beiwei30 <ia...@gmail.com>
AuthorDate: Mon Sep 10 16:48:25 2018 +0800
enhance toolbar, search & side-icon
---
.../src/components/Toolbar.vue | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/dubbo-admin/dubbo-admin-frontend/src/components/Toolbar.vue b/dubbo-admin/dubbo-admin-frontend/src/components/Toolbar.vue
index 65f6ec3..5943ffb 100644
--- a/dubbo-admin/dubbo-admin-frontend/src/components/Toolbar.vue
+++ b/dubbo-admin/dubbo-admin-frontend/src/components/Toolbar.vue
@@ -17,22 +17,22 @@
<template>
<v-toolbar
- color="primary"
- fixed
- dark
- app
+ color="primary"
+ fixed
+ dark
+ app
>
- <v-toolbar-title class="ml-0 pl-3">
- <v-toolbar-side-icon @click.stop="handleDrawerToggle"></v-toolbar-side-icon>
- </v-toolbar-title>
+ <v-toolbar-side-icon @click.stop="handleDrawerToggle"></v-toolbar-side-icon>
<v-text-field
- flat
- solo-inverted
- prepend-icon="search"
- label="Search"
- class="hidden-sm-and-down mt-2"
+ flat
+ hide-details
+ solo-inverted
+ prepend-inner-icon="search"
+ label="Search"
+ class="hidden-sm-and-down"
>
</v-text-field>
+
<v-spacer></v-spacer>
<v-btn icon>
<v-icon>settings</v-icon>
[incubator-dubbo-ops] 01/04: update package - add stylus,
vue-perfect-scrollbar
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
commit d35d5aa97b5ecb05d4b8031ab3730fe1dd3f7e24
Author: beiwei30 <ia...@gmail.com>
AuthorDate: Mon Sep 10 16:47:29 2018 +0800
update package - add stylus, vue-perfect-scrollbar
---
dubbo-admin/dubbo-admin-frontend/package.json | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dubbo-admin/dubbo-admin-frontend/package.json b/dubbo-admin/dubbo-admin-frontend/package.json
index 9843430..39d70b8 100644
--- a/dubbo-admin/dubbo-admin-frontend/package.json
+++ b/dubbo-admin/dubbo-admin-frontend/package.json
@@ -14,8 +14,9 @@
"axios": "^0.18.0",
"vue": "^2.5.2",
"vue-codemirror": "^4.0.5",
+ "vue-perfect-scrollbar": "^0.1.0",
"vue-router": "^3.0.1",
- "vuetify": "^1.0.0",
+ "vuetify": "^1.2.2",
"vuex": "^3.0.1"
},
"devDependencies": {
@@ -55,6 +56,8 @@
"rimraf": "^2.6.0",
"semver": "^5.3.0",
"shelljs": "^0.7.6",
+ "stylus": "^0.54.5",
+ "stylus-loader": "^3.0.2",
"uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^1.0.1",
"vue-loader": "^13.3.0",
[incubator-dubbo-ops] 04/04: Merge branch 'develop' of
https://github.com/apache/incubator-dubbo-ops into develop
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
commit 9a6f3c8b8c00d6beee2a3fd0efbad4db97d76ca4
Merge: 643fadf 67a9ff8
Author: beiwei30 <ia...@gmail.com>
AuthorDate: Mon Sep 10 16:56:09 2018 +0800
Merge branch 'develop' of https://github.com/apache/incubator-dubbo-ops into develop
dubbo-admin/dubbo-admin-backend/pom.xml | 6 ++
.../dubbo/admin/controller/RoutesController.java | 75 +++++++++++++++++++++-
.../dubbo/admin/registry/common/domain/Route.java | 75 +++++++++++++++-------
.../src/components/RoutingRule.vue | 22 ++-----
4 files changed, 138 insertions(+), 40 deletions(-)