sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix spinners, change socket emit names

This commit is contained in:
Dane Everitt 2018-08-01 21:10:28 -07:00
parent 5ca6538965
commit f866ad5b34
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/assets/scripts/components/server/Server.vue
View File

@ -129,15 +129,15 @@
}, },
_socket_error: function (err) { _socket_error: function (err) {
this.$emit('socket-error', {err}); this.$emit('socket::error', {err});
}, },
_socket_connect: function () { _socket_connect: function () {
this.$emit('socket-connected'); this.$emit('socket::connected');
}, },
_socket_status: function (data) { _socket_status: function (data) {
this.$emit('socket-status', {data}); this.$emit('socket::status', {data});
}, },
_socket_serverLog: function (data) { _socket_serverLog: function (data) {

4
resources/assets/scripts/components/server/subpages/ConsolePage.vue
View File

@ -39,7 +39,7 @@
* logs from the server to populate into the terminal. * logs from the server to populate into the terminal.
*/ */
mounted: function () { mounted: function () {
this.$parent.$on('socket-connected', () => { this.$parent.$on('socket::connected', () => {
this.terminal.open(this.$refs.terminal); this.terminal.open(this.$refs.terminal);
this.terminal.fit(); this.terminal.fit();
this.terminal.clear(); this.terminal.clear();
@ -52,7 +52,7 @@
this.terminal.writeln(data); this.terminal.writeln(data);
}); });
this.$parent.$on('socket-status', s => { this.$parent.$on('socket::status', s => {
if (s === Status.STATUS_OFF) { if (s === Status.STATUS_OFF) {
this.loadingConsole = false; this.loadingConsole = false;
} }

6
resources/assets/styles/components/spinners.css
View File

@ -1,8 +1,10 @@
.spinner { .spinner {
color: transparent; @apply .h-4 .relative .bg-transparent;
pointer-events: none; pointer-events: none;
position: relative;
&.spinner-xl {
@apply .h-16; @apply .h-16;
}
&:after { &:after {
@apply .border-2 .border-grey-light .absolute .block .h-4 .w-4 .rounded-full; @apply .border-2 .border-grey-light .absolute .block .h-4 .w-4 .rounded-full;