isite 2024.6.5 → 2024.6.9
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/apps/client-side/site_files/css/bootstrap5-addon.css +3 -2
- package/apps/client-side/site_files/html/directive/i-button.html +5 -8
- package/apps/client-side/site_files/js/first.js +25 -23
- package/lib/mongodb.js +3 -3
- package/lib/parser.js +0 -1
- package/lib/session.js +1 -43
- package/lib/sessions.js +0 -3
- package/package.json +1 -1
|
@@ -99,7 +99,8 @@ i-radio {
|
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
i-button {
|
|
102
|
-
display:
|
|
102
|
+
display: inline-block;
|
|
103
|
+
margin-top: 20px;
|
|
103
104
|
}
|
|
104
105
|
i-button button {
|
|
105
106
|
margin: 5px !important;
|
|
@@ -162,7 +163,7 @@ i-datetime input {
|
|
|
162
163
|
max-height: 100vh;
|
|
163
164
|
}
|
|
164
165
|
.modal-content:has(i-list) {
|
|
165
|
-
min-height:
|
|
166
|
+
min-height: 50px;
|
|
166
167
|
}
|
|
167
168
|
.full .modal-content {
|
|
168
169
|
width: 95vw;
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
<
|
|
2
|
-
<
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
<i class="{{fa}}"></i>
|
|
7
|
-
</button>
|
|
8
|
-
</div>
|
|
1
|
+
<button class="btn {{class}} {{class2}}" type="button" ng-click="onclick()" ng-disabled="busy">
|
|
2
|
+
<span ng-show="busy || clickBusy" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
|
|
3
|
+
{{label}}
|
|
4
|
+
<i class="{{fa}}"></i>
|
|
5
|
+
</button>
|
|
@@ -1,30 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
if (
|
|
5
|
-
SOCIALBROWSER.var.blocking.white_list.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
window.SOCIALBROWSERIntegration = function () {
|
|
2
|
+
try {
|
|
3
|
+
let update = false;
|
|
4
|
+
if (window.SOCIALBROWSER && SOCIALBROWSER.var && SOCIALBROWSER.var.blocking && SOCIALBROWSER.var.blocking.popup && SOCIALBROWSER.var.blocking.white_list && document.location.hostname) {
|
|
5
|
+
if (!SOCIALBROWSER.var.blocking.white_list.some((w) => w.url.contains(document.location.hostname))) {
|
|
6
|
+
SOCIALBROWSER.var.blocking.white_list.push({
|
|
7
|
+
url: '*' + document.location.hostname + '*',
|
|
8
|
+
});
|
|
9
|
+
update = true;
|
|
10
|
+
}
|
|
10
11
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
12
|
+
if (!SOCIALBROWSER.var.blocking.popup.white_list.some((w) => w.url.contains(document.location.hostname))) {
|
|
13
|
+
SOCIALBROWSER.var.blocking.popup.white_list.push({
|
|
14
|
+
url: '*' + document.location.hostname + '*',
|
|
15
|
+
});
|
|
16
|
+
update = true;
|
|
17
|
+
}
|
|
17
18
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
if (update && SOCIALBROWSER.ipc) {
|
|
20
|
+
SOCIALBROWSER.ipc('[update-browser-var]', {
|
|
21
|
+
name: 'blocking',
|
|
22
|
+
data: SOCIALBROWSER.var.blocking,
|
|
23
|
+
});
|
|
24
|
+
}
|
|
23
25
|
}
|
|
26
|
+
} catch (error) {
|
|
27
|
+
console.log(error);
|
|
24
28
|
}
|
|
25
|
-
}
|
|
26
|
-
console.log(error);
|
|
27
|
-
}
|
|
29
|
+
};
|
|
28
30
|
|
|
29
31
|
if (typeof module === 'object') {
|
|
30
32
|
window.module = module;
|
package/lib/mongodb.js
CHANGED
|
@@ -556,9 +556,9 @@ module.exports = function init(____0) {
|
|
|
556
556
|
____0.call('mongodb after update many', {
|
|
557
557
|
db: obj.dbName,
|
|
558
558
|
collection: obj.collectionName,
|
|
559
|
-
exists: result.result
|
|
560
|
-
count: result.result
|
|
561
|
-
ok: result.result
|
|
559
|
+
exists: result.result?.n,
|
|
560
|
+
count: result.result?.nModified,
|
|
561
|
+
ok: result.result?.ok,
|
|
562
562
|
where: obj.where,
|
|
563
563
|
update: $update,
|
|
564
564
|
});
|
package/lib/parser.js
CHANGED
|
@@ -267,7 +267,6 @@ module.exports = function init(req, res, ____0, route) {
|
|
|
267
267
|
requestesCount: req.session.requestesCount,
|
|
268
268
|
busy: req.session.$busy,
|
|
269
269
|
ip: req.session.ip,
|
|
270
|
-
ipLookup: req.session.ip_list.find((info) => info.ip == req.session.ip),
|
|
271
270
|
});
|
|
272
271
|
}
|
|
273
272
|
if (v == 'lang') {
|
package/lib/session.js
CHANGED
|
@@ -132,48 +132,7 @@ module.exports = function init(req, res, ____0, callback) {
|
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
134
|
|
|
135
|
-
|
|
136
|
-
if (session.$busy || !____0.options.ipLookup || session.ip == '127.0.0.1') {
|
|
137
|
-
return session;
|
|
138
|
-
}
|
|
139
|
-
session.$busy = !0;
|
|
140
|
-
if (session.ip_list.length === 0 || !session.ip_list.some((info) => info.ip === session.ip)) {
|
|
141
|
-
____0
|
|
142
|
-
.fetch(`http://ip-api.com/json/${session.ip}`, {
|
|
143
|
-
method: 'get',
|
|
144
|
-
headers: { 'Content-Type': 'application/json' },
|
|
145
|
-
})
|
|
146
|
-
.then((res) => {
|
|
147
|
-
if (res.status == 200) {
|
|
148
|
-
return res.json();
|
|
149
|
-
} else {
|
|
150
|
-
}
|
|
151
|
-
})
|
|
152
|
-
.then((info) => {
|
|
153
|
-
____0.getSession(session, (session) => {
|
|
154
|
-
info.date = new Date();
|
|
155
|
-
info.ip = session.ip;
|
|
156
|
-
session.ip_list.unshift(info);
|
|
157
|
-
session.$busy = !1;
|
|
158
|
-
____0.saveSession(session);
|
|
159
|
-
});
|
|
160
|
-
})
|
|
161
|
-
.catch((err) => {
|
|
162
|
-
setTimeout(() => {
|
|
163
|
-
____0.getSession(session, (session) => {
|
|
164
|
-
session.$busy = !1;
|
|
165
|
-
____0.saveSession(session);
|
|
166
|
-
});
|
|
167
|
-
}, 1000 * 30);
|
|
168
|
-
});
|
|
169
|
-
} else {
|
|
170
|
-
____0.getSession(session, (session) => {
|
|
171
|
-
session.$busy = !1;
|
|
172
|
-
____0.saveSession(session);
|
|
173
|
-
});
|
|
174
|
-
}
|
|
175
|
-
}
|
|
176
|
-
|
|
135
|
+
|
|
177
136
|
AssignFeatures();
|
|
178
137
|
|
|
179
138
|
if (____0.security && session.user_id) {
|
|
@@ -189,7 +148,6 @@ module.exports = function init(req, res, ____0, callback) {
|
|
|
189
148
|
}
|
|
190
149
|
____0.saveSession(session);
|
|
191
150
|
callback(session);
|
|
192
|
-
ipInfo(session);
|
|
193
151
|
}
|
|
194
152
|
}
|
|
195
153
|
);
|
package/lib/sessions.js
CHANGED
|
@@ -121,7 +121,6 @@ module.exports = function init(____0) {
|
|
|
121
121
|
session.lang = ____0.options.lang;
|
|
122
122
|
session.theme = ____0.options.theme;
|
|
123
123
|
session.data = [];
|
|
124
|
-
session.ip_list = [];
|
|
125
124
|
session.requestesCount = 1;
|
|
126
125
|
session.createdTime = new Date().getTime();
|
|
127
126
|
session.$index = sessions.list.length;
|
|
@@ -136,7 +135,6 @@ module.exports = function init(____0) {
|
|
|
136
135
|
session.lang = ____0.options.lang;
|
|
137
136
|
session.theme = ____0.options.theme;
|
|
138
137
|
session.data = [];
|
|
139
|
-
session.ip_list = session.ip_list || [];
|
|
140
138
|
session.requestesCount = 1;
|
|
141
139
|
session.createdTime = new Date().getTime();
|
|
142
140
|
session.$index = sessions.list.length;
|
|
@@ -149,7 +147,6 @@ module.exports = function init(____0) {
|
|
|
149
147
|
session.lang = ____0.options.lang;
|
|
150
148
|
session.theme = ____0.options.theme;
|
|
151
149
|
session.data = [];
|
|
152
|
-
session.ip_list = session.ip_list || [];
|
|
153
150
|
session.requestesCount = 1;
|
|
154
151
|
session.createdTime = new Date().getTime();
|
|
155
152
|
session.$index = sessions.list.length;
|