IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 553-delete-comment

Browse Source
This commit is contained in:
Wolfgang Huß 2019-05-20 06:08:55 +02:00
commit 8d6e3794cf
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/digital-ocean/https/README.md
View File

@ -32,10 +32,10 @@ Once you are done, apply the configuration:
$ kubectl apply -f . $ kubectl apply -f .
``` ```
By now, your cluster should have an external IP address assigned. If you visit By now, your cluster should have a load balancer assigned with an external IP
your dashboard, this is how it should look like: address. On Digital Ocean, this is how it should look like:
![Screenshot of the kubernetes dashboard showing the extrenal ip address](./ip-address.png) ![Screenshot of Digital Ocean dashboard showing external ip address](./ip-address.png)
Check the ingress server is working correctly: Check the ingress server is working correctly:

BIN
deployment/digital-ocean/https/ip-address.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 226 KiB

After

Width:  |  Height:  |  Size: 141 KiB

10
webapp/components/Empty.vue
View File

@ -5,8 +5,8 @@
:margin="margin" :margin="margin"
> >
<ds-text> <ds-text>
<hc-image <img
:image-props="{ src: imgSrc }" :src="iconPath"
width="80" width="80"
class="hc-empty-icon" class="hc-empty-icon"
style="margin-bottom: 5px" style="margin-bottom: 5px"
@ -24,12 +24,8 @@
</template> </template>
<script> <script>
import HcImage from '~/components/Image'
export default { export default {
name: 'HcEmpty', name: 'HcEmpty',
components: {
HcImage
},
props: { props: {
/** /**
* Icon that should be shown * Icon that should be shown
@ -58,7 +54,7 @@ export default {
} }
}, },
computed: { computed: {
imgSrc() { iconPath() {
return `/img/empty/${this.icon}.svg` return `/img/empty/${this.icon}.svg`
} }
} }