Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Further improvements - Push notification

KrzysztofPajak4333fa9466db
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Messages.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Messages.cshtml
index f1a0714ab..bd35d97f4 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Messages.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Messages.cshtml
@@ -7,6 +7,7 @@
}
@using Grand.Domain.Common
+<script asp-src="/_content/Grand.Web.Admin/administration/chart.min.js"></script>
<div class="row">
<div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Receivers.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Receivers.cshtml
index 4c5b828aa..ee69690e9 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Receivers.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Receivers.cshtml
@@ -121,7 +121,8 @@ $(document).ready(function() {
@if (!(Model.Allowed == 0 && Model.Denied == 0))
{
- <script src="/_content/Grand.Web.Admin/administration/chart.min.js" type="text/javascript"></script>
+ <script asp-src="/_content/Grand.Web.Admin/administration/chart.min.js"></script>
+
<script>
$(document).ready(function () {
var config = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/PushNotifications.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/PushNotifications.cshtml
index a896c146d..44b15add0 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/PushNotifications.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/PushNotifications.cshtml
@@ -55,12 +55,12 @@
<admin-input asp-for="AuthDomain" />
</div>
</div>
- <div class="form-group">
+ @*<div class="form-group">
<admin-label asp-for="DatabaseUrl" />
<div class="col-md-9 col-sm-9">
<admin-input asp-for="DatabaseUrl" />
</div>
- </div>
+ </div>*@
<div class="form-group">
<admin-label asp-for="ProjectId" />
<div class="col-md-9 col-sm-9">
diff --git a/src/Web/Grand.Web/wwwroot/theme/script/vue.push.notifications.js b/src/Web/Grand.Web/wwwroot/theme/script/vue.push.notifications.js
index 098637057..4ae323daa 100644
--- a/src/Web/Grand.Web/wwwroot/theme/script/vue.push.notifications.js
+++ b/src/Web/Grand.Web/wwwroot/theme/script/vue.push.notifications.js
@@ -38,12 +38,12 @@
messaging.requestPermission()
.then(function () {
- var success = false;
- var value = "";
+ let success = false;
+ let value = "";
messaging.getToken()
.then(function (currentToken) {
- if (currentToken) {
+ if (currentToken != null) {
success = true;
value = currentToken;
} else {
@@ -56,43 +56,32 @@
value = 'An error occurred while retrieving token. ' + err;
})
.finally(function () {
-
- var postData = {
- success: success,
- value: value,
- };
- addAntiForgeryToken(postData);
+ var bodyFormData = new FormData();
+ bodyFormData.append('success', success);
+ bodyFormData.append('value', value);
axios({
url: url,
- data: postData,
- method: 'post',
- headers: {
- 'Accept': 'application/json',
- 'Content-Type': 'application/json'
- }
+ data: bodyFormData,
+ method: 'post'
})
});
})
.catch(function (err) {
- var postData = {
- success: false,
- value: "Permission denied",
- };
- addAntiForgeryToken(postData);
+ var bodyFormData = new FormData();
+ bodyFormData.append('success', success);
+ bodyFormData.append('value', value);
axios({
url: url,
- data: postData,
- method: 'post',
- headers: {
- 'Accept': 'application/json',
- 'Content-Type': 'application/json'
- }
+ data: bodyFormData,
+ method: 'post'
})
});
messaging.onMessage(function (payload) {
+ console.log(payload);
+
const notificationTitle = payload.notification.title;
const notificationOptions = {
body: payload.notification.body,