@mapomodule/uikit 1.0.0-alpha.2 → 1.0.0-alpha.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/CHANGELOG.md +370 -0
  2. package/components/Detail/Detail.vue +281 -126
  3. package/components/Detail/DetailField.vue +68 -29
  4. package/components/Detail/DetailLangSwitch.vue +1 -1
  5. package/components/Detail/defaults.js +33 -25
  6. package/components/DropArea.vue +3 -3
  7. package/components/List/List.vue +120 -42
  8. package/components/List/ListActions.vue +56 -17
  9. package/components/List/ListFilters.vue +158 -113
  10. package/components/List/ListHead.vue +30 -12
  11. package/components/List/ListQuickEdit.vue +207 -55
  12. package/components/List/ListTable.vue +292 -77
  13. package/components/Login.vue +14 -5
  14. package/components/MediaManager/MediaEditor.vue +253 -107
  15. package/components/MediaManager/MediaFolders.vue +134 -43
  16. package/components/MediaManager/MediaGallery.vue +56 -52
  17. package/components/MediaManager/MediaManager.vue +127 -83
  18. package/components/MediaManager/MediaManagerDialog.vue +19 -22
  19. package/components/MediaManager/MediaPreview.vue +180 -0
  20. package/components/MediaManager/MediaUploader.vue +35 -32
  21. package/components/SnackBar.vue +3 -4
  22. package/components/ThemeToggle.vue +13 -0
  23. package/components/fields/DateField.vue +9 -3
  24. package/components/fields/FileField.vue +125 -0
  25. package/components/fields/FksField.vue +88 -0
  26. package/components/fields/MediaField.vue +36 -6
  27. package/components/fields/MediaM2mField.vue +8 -3
  28. package/components/fields/Repeater.vue +338 -0
  29. package/components/fields/SeoPreview.vue +89 -0
  30. package/components/fields/{TinyMce → wygEditor}/defaults.js +7 -5
  31. package/components/fields/{TinyMce → wygEditor}/utils/events.js +0 -0
  32. package/components/fields/{TinyMce → wygEditor}/utils/mapomedia.plugin.js +7 -6
  33. package/components/fields/{TinyMce → wygEditor}/utils/script.injector.js +0 -0
  34. package/components/fields/wygEditor/wygEditor.vue +256 -0
  35. package/components/layout/Sidebar/Sidebar.vue +35 -32
  36. package/components/layout/Sidebar/SidebarFooter.vue +42 -46
  37. package/components/layout/Sidebar/SidebarList.vue +13 -14
  38. package/components/layout/Sidebar/SidebarListItem.vue +99 -38
  39. package/components/layout/Sidebar/SidebarProfile.vue +42 -0
  40. package/components/layout/Topbar/Topbar.vue +3 -35
  41. package/components/layout/routebuilder.js +3 -3
  42. package/defaults.js +2 -2
  43. package/layouts/default.vue +20 -18
  44. package/layouts/empty.vue +10 -0
  45. package/package.json +5 -4
  46. package/pages/index.vue +1 -2
  47. package/components/fields/M2mField.vue +0 -95
  48. package/components/fields/TinyMce/TinyMce.vue +0 -177
  49. package/layouts/error.vue +0 -45
@@ -3,68 +3,135 @@
3
3
  <v-data-table
4
4
  v-model="selection"
5
5
  v-bind="$attrs"
6
- :items="httpEnabled ? items : filteredItems"
6
+ :headers="headers"
7
+ :show-select="!dragOrderingActive && $attrs['show-select']"
8
+ :items="serverPaginationEnabled ? items : filteredItems"
7
9
  :loading="loading"
8
10
  :options.sync="options"
9
- :server-items-length="httpPaginator.count || -1"
11
+ :search="searchString"
12
+ :server-items-length="serverItemsLength"
13
+ :class="{ mapo__listtable__all_selected: selectAll }"
14
+ :item-key="lookup"
15
+ :disable-sort="dragOrderingActive"
16
+ v-sortable-data-table
17
+ @sorted="changeOrder"
10
18
  >
11
19
  <template v-slot:top>
12
20
  <v-toolbar flat>
13
- <v-btn text v-if="shouldEdit" @click="editItem()">
14
- <v-icon small left class="mr-2"> mdi-plus </v-icon>
15
- Quick add
16
- </v-btn>
21
+ <v-text-field
22
+ v-if="searchable"
23
+ v-model="searchString"
24
+ @input="
25
+ loadingSearch = serverPaginationEnabled;
26
+ search();
27
+ "
28
+ prepend-inner-icon="mdi-magnify"
29
+ label="Search"
30
+ single-line
31
+ hide-details
32
+ outlined
33
+ dense
34
+ clearable
35
+ :loading="loadingSearch"
36
+ class="search-input rounded-0"
37
+ ></v-text-field>
17
38
  <v-spacer></v-spacer>
18
39
  <slot name="dtable.top.center"></slot>
19
40
  <v-spacer></v-spacer>
20
- <v-btn class="ma-2" @click="getDataFromApi" icon>
41
+ <v-btn text v-if="quickModeEnabled && userCan('add')" class="ml-2" @click="quickAction()">
42
+ <v-icon small left class="d-none d-sm-block mr-2"> mdi-plus </v-icon>
43
+ <span class="d-none d-sm-block">Quick</span> add
44
+ </v-btn>
45
+ <v-btn v-if="serverPaginationEnabled" class=" mx-sm-2 ma-2 mx-0" @click="getDataFromApi(false)" icon>
21
46
  <v-icon>mdi-update</v-icon>
22
47
  </v-btn>
23
48
  </v-toolbar>
24
49
  <slot name="dtable.top.under"></slot>
25
50
  </template>
51
+ <template v-if="dragReorder" v-slot:footer.prepend>
52
+ <v-tooltip right>
53
+ <template v-slot:activator="{ on, attrs }">
54
+ <v-btn v-bind="attrs" v-on="on" style="margin-left: 2px;" :class="{'primary--text': dragOrderingActive}" @click="dragOrderingActive = !dragOrderingActive" icon>
55
+ <v-icon>mdi-order-bool-ascending</v-icon></v-btn>
56
+ </template>
57
+ <span>Toggle reordering</span>
58
+ </v-tooltip>
59
+ </template>
26
60
  <template v-if="navigable" v-slot:[`item.${firstColName}`]="{ item }">
27
61
  <NuxtLink :to="detailLink(item)">
28
- {{ item[firstColName] }}
62
+ {{ getPointed(item, firstColName, "Unknown") }}
29
63
  </NuxtLink>
30
64
  </template>
65
+ <template v-slot:item.data-table-select="{ isSelected, select }" v-if="selectAll">
66
+ <v-simple-checkbox v-model="selectAll" @input="select"></v-simple-checkbox>
67
+ </template>
68
+ <template v-slot:header.data-table-select="{ on, props }" v-if="selectAll">
69
+ <v-simple-checkbox v-model="selectAll" @input="on.input"></v-simple-checkbox>
70
+ </template>
31
71
  <template v-slot:[`item.actions`]="{ item }">
32
- <v-icon v-if="shouldEdit" small class="mr-2" @click="editItem(item)">
72
+ <v-icon :disabled="!userCan('change')" v-if="quickModeEnabled" small class="mr-2" @click="quickAction(item)">
33
73
  mdi-pencil
34
74
  </v-icon>
35
- <v-icon small @click="deleteItem(item)"> mdi-delete </v-icon>
75
+ <v-icon :disabled="!userCan('delete')" small @click="deleteItem(item)"> mdi-delete </v-icon>
76
+ </template>
77
+ <template v-slot:item.drag-column>
78
+ <v-icon class="handle-drag">mdi-drag</v-icon>
36
79
  </template>
37
- <template v-for="slot in filterSlots($slots, 'dtable.')" :slot="slot">
80
+ <template v-for="slot in nameSpacedSlots($slots, 'dtable.')" :slot="slot">
38
81
  <slot :name="`dtable.${slot}`"></slot>
39
82
  </template>
40
83
  <template
41
- v-for="slot in filterSlots($scopedSlots, 'dtable.')"
84
+ v-for="slot in nameSpacedSlots($scopedSlots, 'dtable.')"
42
85
  v-slot:[slot]="props"
43
86
  >
44
87
  <slot :name="`dtable.${slot}`" v-bind="props" />
45
88
  </template>
46
89
  </v-data-table>
47
90
  <list-quick-edit
48
- v-if="shouldEdit"
91
+ v-if="quickModeEnabled"
49
92
  ref="editModal"
50
- v-bind="{ ...$attrs, value: false, crud }"
93
+ :offline="offlineMode"
94
+ v-bind="{ ...$attrs, value: false, crud, lookup: lookup }"
51
95
  >
52
- <template v-for="slot in filterSlots($slots, 'qedit.')" :slot="slot">
96
+ <template v-for="slot in nameSpacedSlots($slots, 'qedit.')" :slot="slot">
53
97
  <slot :name="`qedit.${slot}`"></slot>
54
98
  </template>
55
- <template
56
- v-for="slot in filterSlots($scopedSlots, 'qedit.')"
57
- v-slot:[slot]="props"
58
- >
99
+ <template v-for="slot in nameSpacedSlots($scopedSlots, 'qedit.')" v-slot:[slot]="props">
59
100
  <slot :name="`qedit.${slot}`" v-bind="props" />
60
101
  </template>
61
102
  </list-quick-edit>
62
103
  </div>
63
104
  </template>
64
105
 
106
+ <style lang="scss" scoped>
107
+ .mapo__listtable__all_selected {
108
+ .v-data-table__selected {
109
+ background: none !important;
110
+ }
111
+ }
112
+ .search-input{
113
+ max-width: 300px;
114
+ @media (max-width: 400px) {
115
+ &.v-input--is-focused{
116
+ position: absolute;
117
+ z-index: 1;
118
+ width: calc(100% - 32px);
119
+ &.theme--dark{
120
+ background: #272727;
121
+ }
122
+ &.theme--light{
123
+ background: #fff;
124
+ }
125
+ }
126
+ }
127
+ }
128
+ .handle-drag{ cursor: grab; }
129
+ </style>
65
130
 
66
131
  <script>
67
132
  import { getPointed } from "@mapomodule/utils/helpers/objHelpers";
133
+ import { debounce } from "@mapomodule/utils/helpers/debounce";
134
+ import Sortable from "sortablejs"
68
135
 
69
136
  export default {
70
137
  name: "ListTable",
@@ -72,16 +139,20 @@ export default {
72
139
  items: [],
73
140
  loading: true,
74
141
  selection: [],
142
+ selectAll: false,
75
143
  options: {},
76
144
  httpPaginator: {},
77
- disableHttp: false
145
+ searchString: "",
146
+ loadingSearch: false,
147
+ noPagination: false,
148
+ dragOrderingActive: false
78
149
  }),
79
150
  props: {
80
151
  crud: {
81
152
  type: Object,
82
- required: true,
153
+ required: true
83
154
  },
84
- http: Boolean,
155
+ serverPagination: Boolean,
85
156
  navigable: Boolean,
86
157
  lookup: {
87
158
  type: String,
@@ -97,44 +168,99 @@ export default {
97
168
  type: Array,
98
169
  default: () => [],
99
170
  },
171
+ searchable: {
172
+ type: Boolean,
173
+ default: false,
174
+ },
175
+ data: {
176
+ type: Array,
177
+ required: false
178
+ },
179
+ dragReorder: {
180
+ type: Boolean,
181
+ default: false,
182
+ },
183
+ },
184
+ directives: {
185
+ sortableDataTable: {
186
+ bind (el, binding, vnode) {
187
+ const options = {
188
+ animation: 150,
189
+ handle: '.handle-drag',
190
+ onUpdate: function (event) {
191
+ vnode.child.$emit('sorted', event)
192
+ },
193
+ }
194
+ Sortable.create(el.getElementsByTagName('tbody')[0], options)
195
+ }
196
+ }
100
197
  },
101
198
  watch: {
102
199
  selection(val) {
103
200
  this.$emit("input", val);
104
201
  },
105
- filters:{
106
- deep: true,
107
- handler(){
108
- this.httpEnabled && this.getDataFromApi();
202
+ selectAll(val) {
203
+ this.$emit("input", val ? "all" : this.selection);
204
+ },
205
+ dragOrderingActive(val) {
206
+ if (val) {
207
+ this.searchString = ""
208
+ this.options = {...this.options, sortBy: []}
109
209
  }
210
+ this.$emit("drag-order-change", val)
211
+ },
212
+ filters: {
213
+ deep: true,
214
+ handler() {
215
+ this.serverPaginationEnabled && this.getDataFromApi();
216
+ },
110
217
  },
111
218
  options: {
112
219
  deep: true,
113
220
  handler(options) {
114
- this.disableHttp = options.itemsPerPage === -1;
221
+ this.noPagination = options.itemsPerPage === -1;
115
222
  this.setQparams(options);
116
- this.httpEnabled && this.getDataFromApi();
223
+ this.serverPaginationEnabled && this.getDataFromApi(false);
117
224
  },
118
225
  },
119
- disableHttp(){
226
+ noPagination() {
120
227
  this.getDataFromApi();
228
+ },
229
+ data: {
230
+ deep: true,
231
+ handler(data) {
232
+ if (data) this.items = data;
233
+ },
121
234
  }
122
235
  },
123
236
  methods: {
124
- getDataFromApi() {
237
+ getPointed: getPointed,
238
+ getDataFromApi(clearSelection = true) {
239
+ if (clearSelection) {
240
+ this.selection = [];
241
+ this.selectAll = false;
242
+ }
243
+ this.loading = !this.offlineMode;
244
+ !this.offlineMode && this.debouncedDataFromApi();
245
+ },
246
+ debouncedDataFromApi: debounce(function () {
125
247
  return new Promise((resolve, reject) => {
126
248
  this.selection = [];
127
- this.loading = true;
128
- if (!this.httpEnabled) {
129
- this.crud.list().then((data) => {
249
+ if (!this.serverPaginationEnabled) {
250
+ this.crud
251
+ .list()
252
+ .then((data) => {
130
253
  this.items = data;
131
254
  this.loading = false;
255
+ this.httpPaginator = {};
132
256
  resolve(data);
133
257
  })
134
258
  .catch((error) => reject(error));
135
259
  } else {
136
- const params = this.getHttpParams()
137
- this.crud.list({ params }).then((data) => {
260
+ const params = this.getHttpParams();
261
+ this.crud
262
+ .list({ params })
263
+ .then((data) => {
138
264
  this.items = data.items;
139
265
  this.httpPaginator = data.paginator;
140
266
  this.loading = false;
@@ -143,6 +269,23 @@ export default {
143
269
  .catch((error) => reject(error));
144
270
  }
145
271
  });
272
+ }, 500),
273
+ changeOrder(event){
274
+ if (this.offlineMode) {
275
+ const element = this.items[event.oldIndex]
276
+ this.items.splice(event.oldIndex, 1, )
277
+ this.items.splice(event.newIndex, 0, element);
278
+ } else {
279
+ this.crud.update_order(this.items[event.oldIndex][this.lookup], this.items[event.newIndex][this.lookup]).then(
280
+ res => res.reordered && this.getDataFromApi()
281
+ ).catch(error => {
282
+ this.getDataFromApi()
283
+ this.$mapo.$snack.open({
284
+ message: error.response?.data?.detail || "Reorder failed",
285
+ color: "error",
286
+ })
287
+ });
288
+ }
146
289
  },
147
290
  setQparams(options) {
148
291
  this.$router.push({
@@ -152,60 +295,119 @@ export default {
152
295
  },
153
296
  });
154
297
  },
155
- restoreFromQparams(){
298
+ restoreFromQparams() {
156
299
  this.options = {
157
300
  ...this.options,
158
- sortBy: this.$route.query.sort?.split(".") || [],
159
- sortDesc: this.$route.query.order?.split(".").map((e) => e == "desc") || [],
160
- itemsPerPage: parseInt(this.$route.query.items) || this.options.itemsPerPage || 10,
301
+ sortBy:
302
+ this.$route.query.sort?.split(",").map((p) => p.replace(/^-/, "")) ||
303
+ this.options.sortBy ||
304
+ [],
305
+ sortDesc:
306
+ this.$route.query.order?.split(",").map((p) => p.startsWith("-")) ||
307
+ this.options.sortDesc ||
308
+ [],
309
+ itemsPerPage:
310
+ parseInt(this.$route.query.items) || this.options.itemsPerPage || 10,
311
+ page: parseInt(this.$route.query.page) || this.options.page || 1,
161
312
  };
313
+ this.searchString = this.$route.query.search;
162
314
  },
163
315
  getOrderParams(options) {
164
316
  const { sortBy, sortDesc, page, itemsPerPage } = options;
165
- const sort = sortBy.length ? sortBy.join(".") : undefined;
166
- const order = sortDesc.length
167
- ? sortDesc.map((e) => (e ? "desc" : "asc")).join(".")
168
- : undefined;
169
- return { sort, order, items: itemsPerPage, page: page !== 1 ? page : undefined };
317
+ const sort =
318
+ sortBy.map((field, i) => (sortDesc[i] ? "-" : "") + field).join(",") || undefined;
319
+ return { sort, items: itemsPerPage, page: page !== 1 ? page : undefined };
170
320
  },
171
321
  getHttpParams() {
172
322
  const params = new URLSearchParams();
173
323
  for (const [key, value] of Object.entries(this.getOrderParams(this.options))) {
174
- value !== undefined && params.append(key, value)
324
+ value !== undefined && params.append(key, value);
175
325
  }
176
- this.filters.forEach(fi => {
177
- const query = []
178
- const format = (val) => val.replaceAll('.', '__')
179
- if (fi.datepicker){
180
- const dates = fi.active[0].value.split(',')
181
- query.push(`${format(fi.value)}__gte=${dates[0]}`, `${format(fi.value)}__lte=${dates[1]}`)
326
+ this.filters.forEach((fi) => {
327
+ const query = [];
328
+ const format = (val) => val.replaceAll(".", "__");
329
+ if (fi.datepicker) {
330
+ const dates = fi.active[0].value.split(",");
331
+ query.push(
332
+ `${format(fi.value)}__gte=${dates[0]}`,
333
+ `${format(fi.value)}__lte=${dates[1]}`
334
+ );
182
335
  } else if (fi.active.length > 1) {
183
- query.push(`${format(fi.value)}=[${ fi.active.map(a=>a.value).join(",")}]`)
336
+ query.push(`${format(fi.value)}=[${fi.active.map((a) => a.value).join(",")}]`);
184
337
  } else {
185
- query.push(`${format(fi.value)}=${ fi.active[0].value}`)
338
+ query.push(`${format(fi.value)}=${fi.active[0].value}`);
186
339
  }
187
- query.forEach(q => params.append('fltr', q))
188
- })
340
+ query.forEach((q) => params.append("fltr", q));
341
+ });
342
+ if (this.searchString && this.searchable) params.append("search", this.searchString);
189
343
  return params;
190
344
  },
191
- editItem(item) {
192
- this.$refs.editModal.open(item).then((r) => r && this.getDataFromApi());
345
+ quickAction(item) {
346
+ this.$refs.editModal.open(item).then((r) => {
347
+ if (!r) return;
348
+ if (!this.offlineMode) {
349
+ this.getDataFromApi();
350
+ } else {
351
+ let index = item ? this.items.findIndex((i) => i[this.lookup] === item[this.lookup]) : -1;
352
+ let update = true;
353
+
354
+ if (index !== -1) {
355
+ this.items.splice(index, 1, r);
356
+ } else {
357
+ index = this.items.push(r);
358
+ update = false;
359
+ }
360
+ this.$emit("update:data", this.items, r, index);
361
+ }
362
+ });
193
363
  },
194
364
  deleteItem(item) {
195
- const callback = (item) =>
196
- this.crud.delete(item[this.lookup]).then(this.getDataFromApi);
197
- this.$mapo.$confirm
198
- .open({
199
- title: "Delete",
200
- question: "Are you sure you want to delete this item?",
201
- approveButton: { text: "Delete", attrs: { color: "red" } }
202
- }).then((res) => (res ? callback(item) : null));
365
+ const callback = (item) => {
366
+ if (!this.offlineMode) {
367
+ this.crud.delete(item[this.lookup]).then(this.getDataFromApi);
368
+ } else {
369
+ const index = this.items.findIndex((i) => i[this.lookup] === item[this.lookup]);
370
+
371
+ if (index !== -1) {
372
+ this.items.splice(index, 1);
373
+ this.$emit("update:data", this.items, r, index);
374
+ }
375
+ }
376
+ };
377
+
378
+ this.$mapo.$confirm
379
+ .open({
380
+ title: "Delete",
381
+ question: "Are you sure you want to delete this item?",
382
+ approveButton: { text: "Delete", attrs: { color: "red", text: true } },
383
+ })
384
+ .then((res) => (res ? callback(item) : null));
203
385
  },
204
- filterSlots(slots, scope) {
386
+ nameSpacedSlots(slots, scope) {
205
387
  return Object.keys(slots)
206
388
  .filter((name) => name.startsWith(scope))
207
389
  .map((name) => name.replace(scope, ""));
208
390
  },
391
+ toggleSelectAll() {
392
+ this.selectAll = !this.selectAll;
393
+ },
394
+ search: debounce(function () {
395
+ this.$router.push({
396
+ query: {
397
+ ...this.$route.query,
398
+ search: this.searchString || undefined,
399
+ },
400
+ });
401
+
402
+ this.serverPaginationEnabled && this.getDataFromApi();
403
+ this.loadingSearch = false;
404
+ }, 1000),
405
+ userCan(action) {
406
+ if (this.$mapo.$auth.routeMiddlewares.includes("permissions")){
407
+ return this.$mapo.$auth.user.permissions.includes(action)
408
+ }
409
+ return true
410
+ },
209
411
  },
210
412
  computed: {
211
413
  filteredItems() {
@@ -234,25 +436,38 @@ export default {
234
436
  },
235
437
  firstColName() {
236
438
  return (
237
- this.$attrs.headers &&
238
- this.$attrs.headers.length &&
239
- this.$attrs.headers[0].value
439
+ this.$attrs.headers && this.$attrs.headers.length && this.$attrs.headers[0].value
240
440
  );
241
441
  },
242
- shouldEdit() {
442
+ headers() {
443
+ const dragColumn = { sortable: false, value: 'drag-column', width: '64px' }
444
+ return this.dragOrderingActive ? [ dragColumn,...this.$attrs.headers ] : this.$attrs.headers
445
+ },
446
+ quickModeEnabled() {
243
447
  return (
244
- this.filterSlots(this.$slots, "qedit.body").length ||
245
- this.filterSlots(this.$scopedSlots, "qedit.body").length ||
448
+ this.nameSpacedSlots(this.$slots, "qedit.body").length ||
449
+ this.nameSpacedSlots(this.$scopedSlots, "qedit.body").length ||
246
450
  (this.$attrs.editFields && this.$attrs.editFields.length)
247
451
  );
248
452
  },
249
- httpEnabled(){
250
- return this.http && !this.disableHttp
251
- }
453
+ serverPaginationEnabled() {
454
+ return this.serverPagination && !this.noPagination && !this.offlineMode;
455
+ },
456
+ offlineMode() {
457
+ return !!this.data;
458
+ },
459
+ serverItemsLength() {
460
+ return this.httpPaginator.count || (this.serverPaginationEnabled && (this.options.page * this.options.itemsPerPage)) || -1;
461
+ },
252
462
  },
253
463
  mounted() {
254
- this.restoreFromQparams()
255
- this.httpEnabled || this.getDataFromApi();
464
+ this.restoreFromQparams();
465
+ if (!this.offlineMode) {
466
+ this.getDataFromApi();
467
+ } else {
468
+ this.items = this.data;
469
+ this.loading = false;
470
+ }
256
471
  },
257
472
  };
258
473
  </script>
@@ -17,6 +17,7 @@
17
17
  filled
18
18
  dense
19
19
  light
20
+ :error-messages="errors.username"
20
21
  ></v-text-field>
21
22
  <v-text-field
22
23
  class="rounded-0"
@@ -29,13 +30,20 @@
29
30
  dense
30
31
  filled
31
32
  light
33
+ :error-messages="errors.password"
32
34
  :type="showPass ? 'text' : 'password'"
33
35
  ></v-text-field>
34
36
  <div class="text-center">
35
37
  <v-btn type="submit" class="rounded-0" elevation="0" dark>
36
38
  Log In
37
39
  </v-btn>
40
+ <v-messages
41
+ v-model="errors.non_field_errors"
42
+ color="error"
43
+ class="mt-4 text-center"
44
+ />
38
45
  </div>
46
+
39
47
  </v-form>
40
48
  </div>
41
49
  </div>
@@ -48,6 +56,7 @@ export default {
48
56
  username: "",
49
57
  password: null,
50
58
  showPass: false,
59
+ errors: {}
51
60
  };
52
61
  },
53
62
  watch: {
@@ -77,11 +86,11 @@ export default {
77
86
  query: this.otherQuery,
78
87
  })
79
88
  )
80
- .catch((err) => {
81
- console.log(err)
82
- this.$mapo.$snack.open({message: err})
83
- this.hasErr = true;
84
- this.errMsg = err.message;
89
+ .catch((error) => {
90
+ this.errors = error.response?.data || {}
91
+ if (!Object.keys(this.errors).length){
92
+ this.$mapo.$snack.open({message: "Cannot login right now. Try again later.", color: "error"})
93
+ }
85
94
  });
86
95
  },
87
96
  },