Skip to content

Commit

Permalink
fix didi logo problem
Browse files Browse the repository at this point in the history
  • Loading branch information
xzyaoi committed Dec 10, 2018
1 parent 7bde2aa commit e30758d
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 8 deletions.
8 changes: 7 additions & 1 deletion Makefile
Expand Up @@ -8,7 +8,10 @@ default:
@echo "\tmake publish"
test:

format:
build-arm:
cd cli && env GOOS=linux GOARCH=arm go build cli/

format-py:
autoflake -i cvpm/*.py
# autoflake -i cvpm/**/*.py

Expand All @@ -18,6 +21,9 @@ format:
yapf -i cvpm/*.py
# yapf -i cvpm/**/*.py

format-go:
gofmt -l -s -w *.go

docs:
cd docs && npm run docs:build

Expand Down
14 changes: 10 additions & 4 deletions dashboard/src/components/CVPM-Status.vue
Expand Up @@ -4,9 +4,12 @@
<h2>Status</h2>
</v-card-title>
<v-card-text >
<p class="cvpm-status-content">Installed: {{status.installed}}</p>
<p class="cvpm-status-content">Running: {{status.running}} </p>
<p class="cvpm-status-content">System Status: {{status.status}}</p>
<p class="cvpm-status-content" v-if="status.cpu">CPU: {{status.cpu}}</p>
<p class="cvpm-status-content" v-if="status.memory">Memory: {{(status.memory / 1024 / 1024).toFixed(2) }} MB</p>
<p class="cvpm-status-content" v-if="status.platformVersion">Operating System: {{status.platform}} {{status.platformVersion}} on {{status.os}}</p>
<p class="cvpm-status-content" v-if="status.installed">Installed: {{status.installed}}</p>
<p class="cvpm-status-content" v-if="status.running">Running: {{status.running}} </p>
<p class="cvpm-status-content" v-if="status.status">System Status: {{status.status}}</p>
</v-card-text>
</v-card>
</template>
Expand All @@ -19,7 +22,10 @@ export default {
}),
methods: {
getStatus () {
this.status = systemService.getStatus()
let self = this
systemService.getStatus().then(function (res) {
self.status = res.data
})
}
},
created () {
Expand Down
8 changes: 7 additions & 1 deletion dashboard/src/services/system.js
Expand Up @@ -15,7 +15,13 @@ class SystemService {
this.endpoint = endpoint
}
getStatus () {
return getStatus()
return new Promise((resolve, reject) => {
axios.get(this.endpoint + '/system').then(function (res) {
resolve(res)
}).catch(function (err) {
reject(err)
})
})
}
getPackages () {
return new Promise((resolve, reject) => {
Expand Down
Empty file.
2 changes: 1 addition & 1 deletion docs/en-US/guide/credits.md
Expand Up @@ -14,4 +14,4 @@ We would like to extend our sincere appreciate for the following organizations a
* [Amazon Web Services](https://aws.amazon.com) for providing general web services.
* [DiDi Cloud](https://www.didiyun.com/?channel=14204) for providing cloud services for free.

During the development, we are standing on the shoulders of many open source software listed below but not limited to.
[![didi_logo.png](https://i.loli.net/2018/12/10/5c0de4006eac3.png)](https://www.didiyun.com/?channel=14204)
3 changes: 2 additions & 1 deletion docs/zh-CN/guide/credits.md
Expand Up @@ -16,4 +16,5 @@ We would like to extend our sincere appreciate for the following organizations a
* [Amazon Web Services](https://aws.amazon.com)提供的部分云计算服务。
* [DiDi Cloud](https://www.didiyun.com/?channel=14204)免费提供云计算服务。

![DiDi Cloud](/public/sponsors/didi_logo.png)
[![didi_logo.png](https://i.loli.net/2018/12/10/5c0de4006eac3.png)](https://www.didiyun.com/?channel=14204)

0 comments on commit e30758d

Please sign in to comment.