vue

frontend/src/components/Dashboard/DashboardServices.vue

@@ -66,7 +66,7 @@
             </thead>
 
             <draggable tag="tbody" v-model="groupsList" class="sortable_groups" handle=".drag_icon">
-            <tr v-for="(group, index) in $store.getters.groupsInOrder" v-bind:key="index">
+            <tr v-for="(group, index) in $store.getters.groupsClean" v-bind:key="index">
                 <td><span class="drag_icon d-none d-md-inline"><font-awesome-icon icon="bars" /></span> {{group.name}}</td>
                 <td>{{$store.getters.servicesInGroup(group.id).length}}</td>
                 <td>

frontend/src/forms/User.vue

@@ -81,10 +81,7 @@
   },
   watch: {
     in_user() {
-        const u = this.in_user
-        delete u.password
-        delete u.confirm_password
-        this.user = u
+        this.user = this.in_user
     }
   },
   methods: {

frontend/src/pages/Index.vue

@@ -3,7 +3,7 @@
 
         <Header/>
 
-        <div v-for="(group, index) in $store.getters.groups" v-bind:key="index">
+        <div v-for="(group, index) in $store.getters.groupsInOrder" v-bind:key="index">
             <Group :group=group />
         </div>
 

frontend/src/pages/Settings.vue

@@ -146,11 +146,12 @@
     cache: [],
     }
   },
-  async created() {
+      async mounted () {
+          this.cache = await Api.cache()
+      },
+      async created() {
     const qrurl = `statping://setup?domain=${core.domain}&api=${core.api_secret}`
     this.qrcode = "https://chart.googleapis.com/chart?chs=500x500&cht=qr&chl=" + encodeURI(qrurl)
-
-    this.cache = await Api.cache()
   },
   beforeMount() {
 

frontend/src/store.js

@@ -41,7 +41,8 @@ export default new Vuex.Store({
         integrations: state => state.integrations,
 
         servicesInOrder: state => state.services.sort((a, b) => a.order_id - b.order_id),
-        groupsInOrder:  state => state.groups.filter(g => g.name !== '').sort((a, b) => a.order_id - b.order_id),
+        groupsInOrder:  state => state.groups.sort((a, b) => a.order_id - b.order_id),
+        groupsClean: state => state.groups.filter(g => g.name !== '').sort((a, b) => a.order_id - b.order_id),
 
         serviceById: (state) => (id) => {
             return state.services.find(s => s.id === id)
@@ -50,7 +51,7 @@ export default new Vuex.Store({
             return state.services.find(s => s.permalink === permalink)
         },
         servicesInGroup: (state) => (id) => {
-            return state.services.filter(s => s.group_id === id)
+            return state.services.filter(s => s.group_id === id).sort((a, b) => a.order_id - b.order_id)
         },
         onlineServices: (state) => (online) => {
             return state.services.filter(s => s.online === online)
@@ -59,7 +60,7 @@ export default new Vuex.Store({
             return state.groups.find(g => g.id === id)
         },
         cleanGroups: (state) => () => {
-          return state.groups.filter(g => g.name !== 'Empty Group')
+          return state.groups.filter(g => g.name !== '').sort((a, b) => a.order_id - b.order_id)
         },
         userById: (state) => (id) => {
             return state.users.find(u => u.id === id)