surya/freeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Service Worker: Save on IndexDb and Sync to send after to the DB.

Browse Source 
- Insert record on MongoDb, POST, GET.
This commit is contained in:
Paolo Arena
2019-02-01 04:10:31 +01:00
parent f52eb65284
commit 484439efe0
14 changed files with 494 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src-pwa/custom-service-worker.js
View File

@@ -6,15 +6,24 @@
// Questo è il swSrc
console.log('___________________________ PAO: this is my custom service worker');
console.log('05 ___________________________ PAO: this is my custom service worker');
importScripts('https://storage.googleapis.com/workbox-cdn/releases/3.0.0/workbox-sw.js'); //++Todo: Replace with local workbox.js
importScripts('js/idb.js');
importScripts('js/utility.js');
importScripts('https://storage.googleapis.com/workbox-cdn/releases/3.0.0/workbox-sw.js');
if (!workbox) {
workbox = new self.WorkboxSW();
let workbox = new self.WorkboxSW();
}
if (workbox) {
// const url = new URL(location.href);
// const debug = url.searchParams.has('debug');
const debug = false;
workbox.setConfig({ debug: debug });
workbox.core.setCacheNameDetails({ prefix: "freeplanet" });
/**
@@ -28,18 +37,49 @@ if (workbox) {
// workbox.routing.registerRoute(/^http/, workbox.strategies.networkFirst(), 'GET');
workbox.routing.registerRoute(
/\.(?:png|gif|jpg|jpeg|svg)$/,
workbox.strategies.staleWhileRevalidate({
cacheName: 'images',
plugins: [
new workbox.expiration.Plugin({
maxEntries: 60,
maxAgeSeconds: 30 * 24 * 60 * 60, // 30 Days
}),
],
}),
);
workbox.routing.registerRoute(
new RegExp(/.*(?:googleapis|gstatic)\.com.*$/),
workbox.strategies.staleWhileRevalidate({
cacheName: 'google-fonts',
plugins: [
new workbox.expiration.Plugin({
maxAgeSeconds: 30 * 24 * 60 * 60,
maxEntries: 30,
}),
]
})
);
workbox.routing.registerRoute('http://localhost:3000/todos', function (args) {
return fetch(args.event.request)
.then(function (res) {
var clonedRes = res.clone();
clearAllData('todos')
.then(function () {
return clonedRes.json();
})
.then(function (data) {
for (let key in data) {
writeData('todos', data[key])
}
});
return res;
});
});
workbox.routing.registerRoute(
new RegExp(/.*\/(?:statics\/icons).*$/),
workbox.strategies.cacheFirst({
@@ -118,12 +158,37 @@ if (workbox) {
})
);
// workbox.core.setLogLevel(workbox.core.LOG_LEVELS.debug);
workbox.routing.registerRoute(
new RegExp('http://localhost:8080/todos'),
function (args) {
return fetch(args.event.request)
.then(function (res) {
console.log('******* fetch: ', args.event)
var clonedRes = res.clone();
clearAllData('todos')
.then(function () {
return clonedRes.json();
})
.then(function (data) {
for (let key in data) {
writeData('todos', data[key])
}
});
return res
})
}
);
}
if ('serviceWorker' in navigator) {
console.log('***************** Entering in custom-service-worker.js:')
}
// self.addEventListener('fetch', function (event) {
// console.log('[Service Worker] Fetching something ....', event);
// console.log('event.request.cache=', event.request.cache)
@@ -131,8 +196,61 @@ if ('serviceWorker' in navigator) {
// console.log('SAME ORIGIN!', event);
// return;
// }
// event.respondWith(fetch(event.request));
// event.respondWith(caches.match(event.request));
// });
}
self.addEventListener('sync', function (event) {
console.log('[Service Worker] Background syncing', event);
if (event.tag === 'sync-new-todos') {
console.log('[Service Worker] Syncing new Todos');
let authHeader = []
authHeader['content-type'] = 'application/json';
authHeader['accept-language'] = 'en';
// authHeader.append('x-auth', mytok)
event.waitUntil(
readAllData('sync_todos')
.then(function (data) {
for (var dt of data) {
// var postData = new FormData();
// postData.append('_id', dt._id);
// postData.append('title', dt.title);
// postData.append('location', dt.location);
// postData.append('rawLocationLat', dt.rawLocation.lat);
// postData.append('rawLocationLng', dt.rawLocation.lng);
// postData.append('file', dt.picture, dt._id + '.png');
console.log('Data to Send 6: ', JSON.stringify(dt))
// Update myTodo to the server
fetch('http://localhost:3000/todos', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json'
},
// mode: 'no-cors',
mode: 'cors',
body: JSON.stringify(dt)
})
.then(function (resData) {
console.log('Sent data Todo:', resData);
if (resData.ok) {
deleteItemFromData('sync_todos', dt.id);
}
})
.catch(function (err) {
console.log('Error while sending data', err);
});
}
})
);
}
});
// }

2
src/components/categories/category/category.vue
View File

@@ -53,7 +53,7 @@
</q-table>
<!-- <SingleTodo :itemcat='mycat' v-for="mycat of categories_arr" :key="mycat.id"/> -->
<!-- <SingleTodo :itemcat='mycat' v-for="mycat of categories_arr" :key="mycat._id"/> -->
</div>
</q-page>

4
src/components/todos/SingleTodo/SingleTodo.ts
View File

@@ -130,7 +130,7 @@ export default class SingleTodo extends Vue {
// this.classDescr += ' show'
// }
// this.getinputdescr = 'inputdescr' + this.itemtodo.id
// this.getinputdescr = 'inputdescr' + this.itemtodo._id
// console.log('classDescrEdit = ', this.classDescrEdit)
// console.log('classDescr', this.classDescr)
@@ -344,7 +344,7 @@ export default class SingleTodo extends Vue {
.then(ris => {
console.log('ris', ris)
if (ris)
this.removeitem(this.itemtodo.id)
this.removeitem(this.itemtodo._id)
}).catch(err => {
})

2
src/components/todos/SingleTodo/SingleTodo.vue
View File

@@ -59,7 +59,7 @@
<!--{{classPosItemPopup}}-->
<!--</div>-->
<!--<div class="flex-item btn-item">-->
<!--<q-btn class="mybtn" round color="" icon="delete" @click.native="removeitem(itemtodo.id)"></q-btn>-->
<!--<q-btn class="mybtn" round color="" icon="delete" @click.native="removeitem(itemtodo._id)"></q-btn>-->
<!--</div>-->
<!--<div class="flex-item">-->
<!--[{{ itemtodo.id_prev}} - {{ itemtodo.id_next}}]-->

162
src/components/todos/todo/todo.ts
View File

@@ -1,11 +1,12 @@
import Vue from 'vue'
import { Component, Prop, Watch } from 'vue-property-decorator'
import { Component, Watch } from 'vue-property-decorator'
import { SingleTodo } from '../SingleTodo'
import { ITodo } from '@src/model'
import { rescodes } from '../../../store/Modules/rescodes'
import { Todos } from '@store'
import { UserStore } from '@store'
import _ from 'lodash'
@@ -104,13 +105,13 @@ export default class Todo extends Vue {
idprev = rescodes.LIST_START
} else {
const elemprev = this.getelem(index - 1, arr)
idprev = elemprev.id
idprev = elemprev._id
}
if (index === arr.length - 1) {
idnext = rescodes.LIST_END
} else {
const elemnext = this.getelem(index + 1, arr)
idnext = elemnext.id
idnext = elemnext._id
}
elem.modified = ((elem.id_prev !== idprev) || (elem.id_next !== idnext) || (elem.pos !== pos)) ? true : elem.modified
@@ -129,7 +130,7 @@ export default class Todo extends Vue {
}
logelem(mystr, elem) {
console.log(mystr, 'elem [', elem.id, '] ', elem.descr, ' Pr(', this.getPriorityByInd(elem.priority), ') [', elem.id_prev, '-', elem.id_next, '] modif=', elem.modified)
console.log(mystr, 'elem [', elem._id, '] ', elem.descr, ' Pr(', this.getPriorityByInd(elem.priority), ') [', elem.id_prev, '-', elem.id_next, '] modif=', elem.modified)
}
getPriorityToSet(ind1, ind2) {
@@ -164,7 +165,7 @@ export default class Todo extends Vue {
}
getTitlePriority (priority) {
getTitlePriority(priority) {
let cl = ''
if (priority === rescodes.Todos.PRIORITY_HIGH)
@@ -245,6 +246,8 @@ export default class Todo extends Vue {
async load() {
// Set last category selected
localStorage.setItem(rescodes.localStorage.categorySel, this.getCategory())
@@ -257,11 +260,11 @@ export default class Todo extends Vue {
await this.updatetable()
/*
this.todos_arr.forEach((elem, index) => {
this.logelem('LOAD ' + index, elem)
})
*/
/*
this.todos_arr.forEach((elem, index) => {
this.logelem('LOAD ' + index, elem)
})
*/
}
@@ -269,6 +272,8 @@ export default class Todo extends Vue {
const mydateexp = new Date().setDate((new Date()).getDate() + 1)
console.log('User:' + UserStore.state.userId)
const objtodo: ITodo = {
userId: UserStore.state.userId,
descr: '',
@@ -276,6 +281,7 @@ export default class Todo extends Vue {
completed: false,
created_at: new Date(),
modify_at: new Date(),
completed_at: null,
category: '',
expiring_at: mydateexp,
enableExpiring: false,
@@ -298,16 +304,18 @@ export default class Todo extends Vue {
return ''
}
async insertTodo() {
insertTodo() {
if (this.todo.trim() === '')
return
const objtodo = this.initcat()
console.log('autologin userId STATE ', UserStore.state.userId)
objtodo.descr = this.todo
objtodo.category = this.getCategory()
const lastelem = this.getLastList()
objtodo.id_prev = (lastelem !== null) ? lastelem.id : rescodes.LIST_START
objtodo.id_prev = (lastelem !== null) ? lastelem._id : rescodes.LIST_START
objtodo.id_next = rescodes.LIST_END
objtodo.pos = (lastelem !== null) ? lastelem.pos + 1 : 1
objtodo.modified = true
@@ -317,29 +325,69 @@ export default class Todo extends Vue {
return
}
this.$db.todos.add(objtodo) // Add to Indexdb
.then((id) => {
console.log('*** IDNEW = ', id)
// Add to Indexdb
await this.$db.todos.add(objtodo
).then((id) => {
console.log('*** IDNEW = ', id)
if (lastelem !== null) {
lastelem.id_next = id
lastelem.modified = true
this.modify(lastelem, false)
}
this.modify(objtodo, true)
}).catch(err => {
console.log('Errore: ' + err.message)
})
// update also the last elem
if (lastelem !== null) {
lastelem.id_next = id
lastelem.modified = true
this.modify(lastelem, false)
}
this.saveItemToSyncAndDb(objtodo)
// this.modify(objtodo, true)
this.updatetable(false)
}).catch(err => {
console.log('Errore: ' + err.message)
})
console.log('ESCO.........')
// empty the field
this.todo = ''
}
saveItemToSyncAndDb(item: ITodo) {
// Send to Server to Sync
const mythis = this
console.log('saveItemToSyncAndDb')
if ('serviceWorker' in navigator && 'SyncManager' in window) {
navigator.serviceWorker.ready
.then(function (sw) {
// _id: new Date().toISOString(),
console.log('---------------------- navigator.serviceWorker.ready')
// check if exist _id, delete it
mythis.$db.sync_todos
.where('id').equals(item._id)
.delete()
mythis.$db.sync_todos.add(item)
.then(function () {
return sw.sync.register('sync-new-todos')
})
.then(function () {
let snackbarContainer = document.querySelector('#confirmation-toast')
let data = { message: 'Your Post was saved for syncing!' }
// snackbarContainer.MaterialSnackbar.showSnackbar(data)
})
.catch(function (err) {
console.log(err)
})
})
} else {
Todos.actions.dbSaveTodo(item)
}
}
getElemById(id, lista = this.todos_arr) {
let myobj: ITodo
for (myobj of lista) {
if (myobj.id === id) {
if (myobj._id === id) {
return myobj
}
}
@@ -436,7 +484,7 @@ export default class Todo extends Vue {
current = this.getElemById(current.id_next, arrris)
if (current === null)
break
if (current.id === currentprec.id)
if (current._id === currentprec._id)
break
myarr.push(current)
currentprec = current
@@ -452,45 +500,21 @@ export default class Todo extends Vue {
async filtertodos(refresh: boolean = false) {
// console.log('filtertodos')
let arrtemp = []
return await Todos.actions.getTodosByCategory(this.getCategory())
.then(arrtemp => {
if (this.filter) {
// #Todo If need to filter the output database ...
await this.$db.todos
.where('userId').equals(UserStore.state.userId)
.and(todo => todo.category === this.getCategory())
.toArray()
.then((response) => {
Promise.all(response.map(key => key))
.then((ristodos) => {
arrtemp = ristodos
})
})
} else {
await this.$db.todos
.where('userId').equals(UserStore.state.userId)
.and(todo => todo.category === this.getCategory())
.toArray().then(ristodos => {
arrtemp = ristodos
})
arrtemp = _.orderBy(arrtemp, ['completed', 'priority', 'pos'], ['asc', 'desc', 'asc'])
arrtemp = _.orderBy(arrtemp, ['completed', 'priority', 'pos'], ['asc', 'desc', 'asc'])
}
this.updateLinkedList(true, arrtemp)
this.updateLinkedList(true, arrtemp)
this.todos_arr = [...arrtemp] // make copy
})
// set array
// arrtemp = this.setArrayFinale(arrtemp)
this.todos_arr = [...arrtemp] // make copy
return []
}
sortarr(arr, field) {
return arr.slice().sort(function(a, b) {
return arr.slice().sort(function (a, b) {
return a[field] - b[field]
})
@@ -522,7 +546,7 @@ export default class Todo extends Vue {
// }
//
deselectAllRows(item, check, onlythis: boolean = false) {
deselectAllRows(item: ITodo, check, onlythis: boolean = false) {
// console.log('deselectAllRows : ', item)
for (let i = 0; i < this.$refs.single.length; i++) {
@@ -530,13 +554,13 @@ export default class Todo extends Vue {
let contr = <SingleTodo>this.$refs.single[i]
// @ts-ignore
let id = contr.itemtodo.id
let id = contr.itemtodo._id
// Don't deselect the actual clicked!
let des = false
if (onlythis) {
des = item.id === id
}else {
des = ((check && (item.id !== id)) || (!check))
des = item._id === id
} else {
des = ((check && (item._id !== id)) || (!check))
}
if (des) {
// @ts-ignore
@@ -549,7 +573,7 @@ export default class Todo extends Vue {
// let index = -1
// // get index
// this.$refs.single.forEach( (singletodo: SingleTodo) => {
// if (singletodo.itemtodo.id === rec.id)
// if (singletodo.itemtodo._id === rec._id)
// index = -1
// })
//
@@ -559,16 +583,20 @@ export default class Todo extends Vue {
if (recOut[field] !== recIn[field]) {
recOut.modified = true
recOut[field] = recIn[field]
return true
}
return false
}
async modify(myobj: ITodo, update: boolean) {
await this.$db.transaction('rw', [this.$db.todos], async () => {
const miorec = await this.$db.todos.get(myobj.id)
const miorec = await this.$db.todos.get(myobj._id)
this.modifyField(miorec, myobj, 'descr')
this.modifyField(miorec, myobj, 'completed')
if (this.modifyField(miorec, myobj, 'completed'))
miorec.completed_at = new Date()
this.modifyField(miorec, myobj, 'category')
this.modifyField(miorec, myobj, 'expiring_at')
this.modifyField(miorec, myobj, 'priority')
@@ -586,6 +614,8 @@ export default class Todo extends Vue {
await this.$db.todos.put(miorec)
this.saveItemToSyncAndDb(miorec)
if (update)
await this.updatetable(false)
}

2
src/components/todos/todo/todo.vue
View File

@@ -13,7 +13,7 @@
<draggable v-model="todos_arr" :options="{draggable:'.myitemdrag'}"
@start="onStart" @end="onEnd" class="dragArea">
<transition-group>
<div :id="getmyid(mytodo.id)" :key="mytodo.id" v-for="mytodo in todos_arr" class="myitemdrag">
<div :id="getmyid(mytodo._id)" :key="mytodo._id" v-for="mytodo in todos_arr" class="myitemdrag">
<div v-if="(prior !== mytodo.priority) && !mytodo.completed" :class="getTitlePriority(mytodo.priority)">
<label>{{getPriorityByInd(mytodo.priority)}}</label>

91
src/js/utility.js Normal file
View File

@@ -0,0 +1,91 @@
console.log('utility.js')
var dbPromise = idb.open('mydb', 10, function (db) {
console.log('OPEN MYDB')
if (!db.objectStoreNames.contains('sync_todos')) {
db.createObjectStore('sync_todos', { keyPath: 'id' });
}
if (!db.objectStoreNames.contains('todos')) {
db.createObjectStore('todos', { keyPath: 'id' });
}
});
function writeData(st, data) {
console.log('writeData', st, data);
return dbPromise
.then(function (db) {
var tx = db.transaction(st, 'readwrite');
var store = tx.objectStore(st);
store.put(data);
return tx.complete;
});
}
function readAllData(st) {
console.log('readAllData', st);
return dbPromise
.then(function (db) {
var tx = db.transaction(st, 'readonly');
var store = tx.objectStore(st);
return store.getAll();
});
}
function clearAllData(st) {
console.log('clearAllData', st);
return dbPromise
.then(function (db) {
var tx = db.transaction(st, 'readwrite');
var store = tx.objectStore(st);
store.clear();
return tx.complete;
});
}
function deleteItemFromData(st, id) {
console.log('deleteItemFromData', st, 'ID:', id);
dbPromise
.then(function (db) {
var tx = db.transaction(st, 'readwrite');
var store = tx.objectStore(st);
try {
store.delete(id);
return tx.complete;
} catch (e) {
return false;
}
})
.then(function (res) {
if (res)
console.log('Item deleted!');
});
}
function urlBase64ToUint8Array(base64String) {
var padding = '='.repeat((4 - base64String.length % 4) % 4);
var base64 = (base64String + padding)
.replace(/\-/g, '+')
.replace(/_/g, '/');
var rawData = window.atob(base64);
var outputArray = new Uint8Array(rawData.length);
for (var i = 0; i < rawData.length; ++i) {
outputArray[i] = rawData.charCodeAt(i);
}
return outputArray;
}
function dataURItoBlob(dataURI) {
var byteString = atob(dataURI.split(',')[1]);
var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0]
var ab = new ArrayBuffer(byteString.length);
var ia = new Uint8Array(ab);
for (var i = 0; i < byteString.length; i++) {
ia[i] = byteString.charCodeAt(i);
}
var blob = new Blob([ab], { type: mimeString });
return blob;
}

5
src/model/Todos.ts
View File

@@ -1,5 +1,5 @@
export interface ITodo {
id?: number,
_id?: number,
userId: string
category?: string
descr?: string,
@@ -7,6 +7,7 @@ export interface ITodo {
completed: boolean,
created_at: any,
modify_at: any,
completed_at: any,
expiring_at: any,
enableExpiring?: boolean,
id_prev?: number,
@@ -18,4 +19,6 @@ export interface ITodo {
export interface ITodosState {
visuOnlyUncompleted: boolean
networkDataReceived: boolean
todos: ITodo[]
}

11
src/plugins/vue-idb.js
View File

@@ -6,13 +6,16 @@ export default ({ Vue }) => {
// Insert here the database for IndexDB
new VueIdb({
database: 'test',
database: 'mydb',
version: 1,
schemas: [
{ categories: '++id, sub_categ_id, descr_it, campo2bool, campo3bool' },
{ todos: '++id, userId, category, pos, descr, priority, completed, created_at, modify_at, expiring_at, progress, enableExpiring' }
{ categories: '++_id, sub_categ_id, descr_it, campo2bool, campo3bool' },
{ todos: '++_id, userId, category, pos, descr, priority, completed, created_at, modify_at, completed_at, expiring_at, progress, enableExpiring' },
{ sync_todos: '++_id, userId, category, pos, descr, priority, completed, created_at, modify_at, completed_at, expiring_at, progress, enableExpiring' }
],
options: {
todos: { type: 'list', primary: 'pos', label: 'label', updated_at: 'updated_at' },
sync_todos: { type: 'list', primary: 'pos', label: 'label', updated_at: 'updated_at' },
}
})
}
@@ -25,7 +28,7 @@ export default new VueIdb({
version: 1,
database: 'test',
schemas: [
{ categories: '++id, sub_categ_id, descr_it' }
{ categories: '++_id, sub_categ_id, descr_it' }
]
})
*/

1
src/root/home/home.ts
View File

@@ -54,6 +54,7 @@ export default class Home extends Vue {
console.log('§§§§§§§§§§§§§§§§§§§§ IMPOSTA DEFERRED PROMPT !!!!!!!!!!!!!!!!! ')
return false
})
}
test_fetch() {

23
src/store/Api/Inst-Pao.ts
View File

@@ -5,14 +5,27 @@ async function sendRequest (url: string, lang: string, mytok: string, method: st
// let mytok: string = this.getTok()
const authHeader = new Headers()
console.log('sendRequest:', url)
authHeader.append('content-type', 'application/json')
authHeader.append('x-auth', mytok)
authHeader.append('accept-language', lang)
const configInit: RequestInit = {
method: method,
cache: 'no-cache',
body: JSON.stringify(mydata),
headers: authHeader
let configInit: RequestInit
if (method === 'GET') {
configInit = {
method: method,
cache: 'no-cache',
headers: authHeader
}
} else {
configInit = {
method: method,
cache: 'no-cache',
body: JSON.stringify(mydata),
headers: authHeader
}
}
const request: Promise<Response> = fetch(url, configInit)

138
src/store/Modules/Todos.ts
View File

@@ -1,12 +1,22 @@
import { ITodosState } from 'model'
import VueIdb from 'vue-idb'
import { ISigninOptions, ITodo, ITodosState } from 'model'
import { storeBuilder } from './Store/Store'
import Api from '@api'
import { serv_constants } from '../Modules/serv_constants'
import { rescodes } from './rescodes'
import { UserStore } from '@store'
import { IResult } from 'model/other'
const state: ITodosState = {
visuOnlyUncompleted: false
visuOnlyUncompleted: false,
networkDataReceived: false,
todos: []
}
const b = storeBuilder.module<ITodosState>('TodosModule', state)
const stateGetter = b.state()
// Getters
namespace Getters {
@@ -27,8 +37,42 @@ namespace Mutations {
// Cancella Item
}
async function clearAllData(state: ITodosState) {
// Delete item
VueIdb.$db.todos
.where('userId').equals(UserStore.state.userId)
.delete()
.then(() => {
console.log('Todo clearAllData !')
// state
}).catch((error) => {
console.log('err: ', error)
})
}
async function readdbTodoData(state: ITodosState) {
// Delete item
VueIdb.$db.todos
.where('userId').equals(UserStore.state.userId)
// .and(todo => todo.category === this.getCategory())
.toArray()
.then(ristodos => {
console.log('readdbTodoData OK !')
state.todos = ristodos
}).catch((error) => {
console.log('err: ', error)
})
}
export const mutations = {
deleteItem: b.commit(deleteItem),
clearAllData: b.commit(clearAllData),
readdbTodoData: b.commit(readdbTodoData)
}
}
@@ -38,13 +82,95 @@ namespace Actions {
Mutations.mutations.deleteItem(num)
}
function json2array(json){
var result = []
var keys = Object.keys(json);
keys.forEach(function(key){
result.push(json[key])
});
return result;
}
async function dbLoadTodo(context) {
console.log('dbLoadTodo')
const token = localStorage.getItem(rescodes.localStorage.token)
let call = process.env.MONGODB_HOST + '/todos/' + UserStore.state.userId
return await Api.SendReq(call, UserStore.state.lang, token, 'GET', null)
.then((res) => {
return res.json()
}).then((resData) => {
// console.log('res.todos:', res.todos)
state.todos = []
for(var i in resData.todos)
state.todos.push(resData.todos [i])
// state.todos = Object.keys(resData.todos).map((key) => {
// return resData.todos[key]
// })
console.log('state.todos', state.todos)
return rescodes.OK
})
.catch((error) => {
if (process.env.DEV) {
console.log('ERROREEEEEEEEE')
console.log(error)
}
return rescodes.ERR_GENERICO
})
}
async function dbSaveTodo(context, itemtodo: ITodo) {
let call = process.env.MONGODB_HOST + '/todos/' + itemtodo._id
const token = localStorage.getItem(rescodes.localStorage.token)
let res = await Api.SendReq(call, UserStore.state.lang, token, 'PATCH', itemtodo)
.then(function (res) {
state.networkDataReceived = true
return rescodes.OK
})
.catch((error) => {
if (process.env.DEV) {
console.log('ERROREEEEEEEEE')
console.log(error)
}
return rescodes.ERR_GENERICO
})
if ('indexedDB' in window) {
await Mutations.mutations.readdbTodoData()
if (!state.networkDataReceived) {
console.log('From cache', state.todos)
}
}
return res
}
async function getTodosByCategory(context, category: string) {
let myarr = state.todos.filter((p) => {
return p.category === category
})
return myarr
}
export const actions = {
setConta: b.dispatch(deleteItem)
setConta: b.dispatch(deleteItem),
dbSaveTodo: b.dispatch(dbSaveTodo),
dbLoadTodo: b.dispatch(dbLoadTodo),
getTodosByCategory: b.dispatch(getTodosByCategory)
}
}
const stateGetter = b.state()
// Module
const TodosModule = {
@@ -56,6 +182,4 @@ const TodosModule = {
actions: Actions.actions
}
export default ITodosState
export default TodosModule

22
src/store/Modules/UserStore.ts
View File

@@ -6,7 +6,7 @@ import router from '@router'
import { serv_constants } from '../Modules/serv_constants'
import { rescodes } from '../Modules/rescodes'
import { GlobalStore, UserStore } from '@store'
import { GlobalStore, UserStore, Todos } from '@store'
const bcrypt = require('bcryptjs')
@@ -156,7 +156,7 @@ namespace Actions {
let x_auth_token: string = ''
return Api.SendReq(call, state.lang, Getters.getters.tok, 'POST', usertosend)
return await Api.SendReq(call, state.lang, Getters.getters.tok, 'POST', usertosend)
.then((res) => {
console.log(res)
myres = res
@@ -197,7 +197,7 @@ namespace Actions {
let myres
return Api.SendReq(call, state.lang, Getters.getters.tok, 'POST', usertosend)
return await Api.SendReq(call, state.lang, Getters.getters.tok, 'POST', usertosend)
.then((res) => {
console.log(res)
myres = res
@@ -381,7 +381,7 @@ namespace Actions {
let x_auth_token: string = ''
return Api.SendReq(call, state.lang, Getters.getters.tok, 'POST', usertosend)
return await Api.SendReq(call, state.lang, Getters.getters.tok, 'POST', usertosend)
.then((res) => {
myres = res
x_auth_token = String(res.headers.get('x-auth'))
@@ -433,6 +433,8 @@ namespace Actions {
localStorage.setItem(rescodes.localStorage.isLogged, String(true))
localStorage.setItem(rescodes.localStorage.verifiedEmail, Number(verifiedEmail).toString())
setGlobal()
// dispatch('storeUser', authData);
// dispatch('setLogoutTimer', myres.data.expiresIn);
return rescodes.OK
@@ -469,7 +471,7 @@ namespace Actions {
}
console.log(usertosend)
Api.SendReq(call, state.lang, Getters.getters.tok, 'DELETE', usertosend)
return await Api.SendReq(call, state.lang, Getters.getters.tok, 'DELETE', usertosend)
.then(
(res) => {
console.log(res)
@@ -495,10 +497,13 @@ namespace Actions {
function setGlobal() {
GlobalStore.mutations.setleftDrawerOpen(localStorage.getItem(rescodes.localStorage.leftDrawerOpen) === 'true')
GlobalStore.mutations.setCategorySel(localStorage.getItem(rescodes.localStorage.categorySel))
Todos.actions.dbLoadTodo()
}
async function autologin (context) {
try {
console.log('*** Autologin ***')
// INIT
UserStore.mutations.setlang(process.env.LANG_DEFAULT)
// ++Todo: Estrai la Lang dal Localstorage
@@ -521,7 +526,7 @@ namespace Actions {
const username = String(localStorage.getItem(rescodes.localStorage.username))
const verifiedEmail = localStorage.getItem(rescodes.localStorage.verifiedEmail) === '1'
setGlobal()
console.log('autologin userId', userId)
Mutations.mutations.authUser({
userId: userId,
@@ -529,6 +534,11 @@ namespace Actions {
idToken: token,
verifiedEmail: verifiedEmail
})
setGlobal()
console.log('autologin userId STATE ', state.userId)
return true
} catch (e) {
console.error('ERR autologin ', e.message)

1
src/store/Modules/index.ts
View File

@@ -1,3 +1,4 @@
export {storeBuilder} from './Store/Store'
export {default as GlobalStore} from './GlobalStore'
export {default as UserStore} from './UserStore'
export {default as Todos} from './Todos'