namirasoft-site-react 1.4.322 → 1.4.324
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.
- package/dist/components/NSBarNotification.d.ts +1 -0
- package/dist/components/NSBarNotification.js.map +1 -1
- package/dist/routing/NSNotifier.d.ts +1 -0
- package/dist/routing/NSNotifier.js +15 -4
- package/dist/routing/NSNotifier.js.map +1 -1
- package/package.json +1 -1
- package/src/components/NSBarNotification.tsx +1 -0
- package/src/routing/NSNotifier.ts +17 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSBarNotification.js","sourceRoot":"","sources":["../../src/components/NSBarNotification.tsx"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"NSBarNotification.js","sourceRoot":"","sources":["../../src/components/NSBarNotification.tsx"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAgBhC,MAAM,CAAN,IAAY,sBAOX;AAPD,WAAY,sBAAsB;IAE9B,uCAAa,CAAA;IACb,uCAAa,CAAA;IACb,yCAAe,CAAA;IACf,2CAAiB,CAAA;IACjB,qCAAW,CAAA;AACf,CAAC,EAPW,sBAAsB,KAAtB,sBAAsB,QAOjC;AAED,MAAM,CAAN,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAExB,+CAA2B,CAAA;IAC3B,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;IACnB,mCAAe,CAAA;AACnB,CAAC,EANW,gBAAgB,KAAhB,gBAAgB,QAM3B;AAED,MAAM,UAAU,iBAAiB,CAAC,KAA6B;IAE3D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAyB,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,IAAI,SAAS,GAAG,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IACrE,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACtB,IAAI,GAAG,GAAG,EAAE,CAAC;IAEb,SAAS,OAAO;QAEZ,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,QAAQ,IAAI,EACZ,CAAC;QACG,KAAK,OAAO;YACR,GAAG,GAAG,6DAA6D,CAAC;YACpE,MAAM;QACV,KAAK,SAAS;YACV,GAAG,GAAG,+DAA+D,CAAC;YACtE,MAAM;QACV,KAAK,SAAS;YACV,GAAG,GAAG,+DAA+D,CAAC;YACtE,MAAM;QACV,KAAK,aAAa;YACd,GAAG,GAAG,4DAA4D,CAAC;IAC3E,CAAC;IAED,IAAI,KAAK,CAAC,IAAI;QACV,UAAU,CAAC,GAAG,EAAE;YAEZ,OAAO,EAAE,CAAC;QACd,CAAC,EAAE,IAAI,CAAC,CAAC;IAEb,OAAO,CACH,4BAEQ,KAAK,CAAC,IAAI;YACV,4BACI,eAAK,EAAE,EAAE,KAAK,CAAC,EAAE,EACb,SAAS,EAAE,GAAG,MAAM,CAAC,YAAY,IAAI,SAAS,EAAE,EAChD,KAAK,EAAE,KAAK,CAAC,KAAK,aAElB,YAAG,SAAS,EAAE,wBAAwB,YAAG,KAAK,CAAC,IAAI,GAAK,EACxD,cACI,SAAS,EAAE,MAAM,CAAC,YAAY,EAC9B,GAAG,EAAE,GAAG,EACR,GAAG,EAAC,MAAM,EACV,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,OAAO,GAClB,IACA,GACP,GAER,CACN,CAAA;AACL,CAAC;AAAA,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { IStorage } from "namirasoft-core";
|
|
|
3
3
|
export declare class NSNotifier {
|
|
4
4
|
private storage;
|
|
5
5
|
private setState;
|
|
6
|
+
timeout: number;
|
|
6
7
|
constructor(storage: IStorage, setState: () => void);
|
|
7
8
|
getNotifications(): NSBarNotificationProps[];
|
|
8
9
|
setNotifications(notifications: NSBarNotificationProps[]): void;
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import axios from "axios";
|
|
2
2
|
import { NSBarNotificationColor, NotificationType } from "../components/NSBarNotification";
|
|
3
|
-
import { BaseUUID } from "namirasoft-core";
|
|
3
|
+
import { BaseUUID, TimeOperation } from "namirasoft-core";
|
|
4
4
|
export class NSNotifier {
|
|
5
5
|
constructor(storage, setState) {
|
|
6
|
+
this.timeout = 5000;
|
|
6
7
|
this.storage = storage;
|
|
7
8
|
this.setState = setState;
|
|
8
9
|
this.getNotifications = this.getNotifications.bind(this);
|
|
@@ -15,12 +16,22 @@ export class NSNotifier {
|
|
|
15
16
|
this.onError = this.onError.bind(this);
|
|
16
17
|
}
|
|
17
18
|
getNotifications() {
|
|
19
|
+
let ans = [];
|
|
18
20
|
let value = this.storage.get("ns-notifications", "");
|
|
19
21
|
if (value)
|
|
20
|
-
|
|
21
|
-
|
|
22
|
+
ans = JSON.parse(value);
|
|
23
|
+
ans = ans.filter(x => {
|
|
24
|
+
if (x.expired_at)
|
|
25
|
+
return x.expired_at < new Date();
|
|
26
|
+
return false;
|
|
27
|
+
});
|
|
28
|
+
return ans;
|
|
22
29
|
}
|
|
23
30
|
setNotifications(notifications) {
|
|
31
|
+
notifications.forEach(n => {
|
|
32
|
+
if (n.expired_at)
|
|
33
|
+
n.expired_at = TimeOperation.millisecondsLater(this.timeout, new Date());
|
|
34
|
+
});
|
|
24
35
|
this.storage.set("ns-notifications", JSON.stringify(notifications));
|
|
25
36
|
this.setState();
|
|
26
37
|
}
|
|
@@ -35,7 +46,7 @@ export class NSNotifier {
|
|
|
35
46
|
this.setNotifications(notifications);
|
|
36
47
|
setTimeout(() => {
|
|
37
48
|
this.delNotification(message.id);
|
|
38
|
-
},
|
|
49
|
+
}, this.timeout);
|
|
39
50
|
window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
|
|
40
51
|
}
|
|
41
52
|
onInformation(text) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSNotifier.js","sourceRoot":"","sources":["../../src/routing/NSNotifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,sBAAsB,EAA0B,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnH,OAAO,EAAE,QAAQ,EAAY,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"NSNotifier.js","sourceRoot":"","sources":["../../src/routing/NSNotifier.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import axios from "axios";
|
|
2
2
|
import { NSBarNotificationColor, NSBarNotificationProps, NotificationType } from "../components/NSBarNotification";
|
|
3
|
-
import { BaseUUID, IStorage } from "namirasoft-core";
|
|
3
|
+
import { BaseUUID, IStorage, TimeOperation } from "namirasoft-core";
|
|
4
4
|
|
|
5
5
|
export class NSNotifier
|
|
6
6
|
{
|
|
7
7
|
private storage: IStorage;
|
|
8
8
|
private setState: () => void;
|
|
9
|
+
public timeout: number = 5000;
|
|
9
10
|
constructor(storage: IStorage, setState: () => void)
|
|
10
11
|
{
|
|
11
12
|
this.storage = storage;
|
|
@@ -21,13 +22,25 @@ export class NSNotifier
|
|
|
21
22
|
}
|
|
22
23
|
getNotifications(): NSBarNotificationProps[]
|
|
23
24
|
{
|
|
25
|
+
let ans: NSBarNotificationProps[] = [];
|
|
24
26
|
let value = this.storage.get("ns-notifications", "");
|
|
25
27
|
if (value)
|
|
26
|
-
|
|
27
|
-
|
|
28
|
+
ans = JSON.parse(value);
|
|
29
|
+
ans = ans.filter(x =>
|
|
30
|
+
{
|
|
31
|
+
if (x.expired_at)
|
|
32
|
+
return x.expired_at < new Date();
|
|
33
|
+
return false;
|
|
34
|
+
})
|
|
35
|
+
return ans;
|
|
28
36
|
}
|
|
29
37
|
setNotifications(notifications: NSBarNotificationProps[]): void
|
|
30
38
|
{
|
|
39
|
+
notifications.forEach(n =>
|
|
40
|
+
{
|
|
41
|
+
if (n.expired_at)
|
|
42
|
+
n.expired_at = TimeOperation.millisecondsLater(this.timeout, new Date());
|
|
43
|
+
});
|
|
31
44
|
this.storage.set("ns-notifications", JSON.stringify(notifications));
|
|
32
45
|
this.setState();
|
|
33
46
|
}
|
|
@@ -45,7 +58,7 @@ export class NSNotifier
|
|
|
45
58
|
setTimeout(() =>
|
|
46
59
|
{
|
|
47
60
|
this.delNotification(message.id);
|
|
48
|
-
},
|
|
61
|
+
}, this.timeout);
|
|
49
62
|
window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
|
|
50
63
|
}
|
|
51
64
|
onInformation(text: string)
|