@@ -64,6 +64,14 @@ export default {
})
- }
+ },
+ methods: {
+ closeCollapse(){
+ if (process.client) {
+ document.querySelector('.items').style.display = 'none'
+ document.querySelector('.items2').style.display = 'none'
+ }
+ },
+ },
}
diff --git a/package-lock.json b/package-lock.json
index c35cfc3..77160a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3002,6 +3002,72 @@
"tslib": "^2.1.0"
}
},
+ "node_modules/@firebase/app-compat": {
+ "version": "0.2.43",
+ "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.43.tgz",
+ "integrity": "sha512-HM96ZyIblXjAC7TzE8wIk2QhHlSvksYkQ4Ukh1GmEenzkucSNUmUX4QvoKrqeWsLEQ8hdcojABeCV8ybVyZmeg==",
+ "license": "Apache-2.0",
+ "peer": true,
+ "dependencies": {
+ "@firebase/app": "0.10.13",
+ "@firebase/component": "0.6.9",
+ "@firebase/logger": "0.4.2",
+ "@firebase/util": "1.10.0",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@firebase/app-compat/node_modules/@firebase/app": {
+ "version": "0.10.13",
+ "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.10.13.tgz",
+ "integrity": "sha512-OZiDAEK/lDB6xy/XzYAyJJkaDqmQ+BCtOEPLqFvxWKUz5JbBmej7IiiRHdtiIOD/twW7O5AxVsfaaGA/V1bNsA==",
+ "license": "Apache-2.0",
+ "peer": true,
+ "dependencies": {
+ "@firebase/component": "0.6.9",
+ "@firebase/logger": "0.4.2",
+ "@firebase/util": "1.10.0",
+ "idb": "7.1.1",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@firebase/app-compat/node_modules/@firebase/component": {
+ "version": "0.6.9",
+ "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.9.tgz",
+ "integrity": "sha512-gm8EUEJE/fEac86AvHn8Z/QW8BvR56TBw3hMW0O838J/1mThYQXAIQBgUv75EqlCZfdawpWLrKt1uXvp9ciK3Q==",
+ "license": "Apache-2.0",
+ "peer": true,
+ "dependencies": {
+ "@firebase/util": "1.10.0",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@firebase/app-compat/node_modules/@firebase/logger": {
+ "version": "0.4.2",
+ "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz",
+ "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==",
+ "license": "Apache-2.0",
+ "peer": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@firebase/app-compat/node_modules/@firebase/util": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.0.tgz",
+ "integrity": "sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==",
+ "license": "Apache-2.0",
+ "peer": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@firebase/app-compat/node_modules/idb": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
+ "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==",
+ "license": "ISC",
+ "peer": true
+ },
"node_modules/@firebase/app-types": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz",
@@ -7046,13 +7112,29 @@
}
},
"node_modules/buffer": {
- "version": "4.9.2",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
- "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+ "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
"dependencies": {
- "base64-js": "^1.0.2",
- "ieee754": "^1.1.4",
- "isarray": "^1.0.0"
+ "base64-js": "^1.3.1",
+ "ieee754": "^1.2.1"
}
},
"node_modules/buffer-equal-constant-time": {
@@ -14049,6 +14131,17 @@
"vm-browserify": "^1.0.1"
}
},
+ "node_modules/node-libs-browser/node_modules/buffer": {
+ "version": "4.9.2",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+ "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+ "license": "MIT",
+ "dependencies": {
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4",
+ "isarray": "^1.0.0"
+ }
+ },
"node_modules/node-libs-browser/node_modules/punycode": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
diff --git a/server/database.js b/server/database.js
index f5491ed..814f5cc 100644
--- a/server/database.js
+++ b/server/database.js
@@ -16,7 +16,8 @@ mongoose.plugin((schema) => {
// mongodb database connection string. change it as per your needs. here "mydb" is the name of the database. You don't need to create DB from mongodb terminal. mongoose create the database automatically.
// mongoose.connect('mongodb://localhost:27017/bargrest_barg', {
mongoose.connect(
- "mongodb://root:asrerb6udsf13sdfb6@srv-captain--danak-mongo-2:27017/bargrest_bargtest?authSource=admin",
+ // "mongodb://root:asrerb6udsf13sdfb6@db-public-danak.run.danakcorp.com:21365/bargrest_bargtest?authSource=admin",
+ "mongodb://root:asrerb6udsf13sdfb6@srv-captain--danak-mongo-2:27017/bargrest_bargtest?authSource=admin",
{
useNewUrlParser: true,
useUnifiedTopology: true,
diff --git a/static/firebase-messaging-sw.js b/static/firebase-messaging-sw.js
index 7b7be4b..058ee9a 100644
--- a/static/firebase-messaging-sw.js
+++ b/static/firebase-messaging-sw.js
@@ -1,9 +1,8 @@
-
importScripts(
- 'https://www.gstatic.com/firebasejs/8.10.0/firebase-app.js'
+ 'https://www.gstatic.com/firebasejs/8.10.1/firebase-app.js'
)
importScripts(
- 'https://www.gstatic.com/firebasejs/8.10.0/firebase-messaging.js'
+ 'https://www.gstatic.com/firebasejs/8.10.1/firebase-messaging.js'
)
firebase.initializeApp({"apiKey":"AIzaSyB6PlyAxtiuc3Lr8PM5y2W8E_KxWrXDSkI","authDomain":"barg-336706.firebaseapp.com","projectId":"barg-336706","storageBucket":"barg-336706.appspot.com","messagingSenderId":"889370893165","appId":"1:889370893165:web:198f891c6c49fc13a09864","measurementId":"G-C91HQP1H4V"})
@@ -16,7 +15,7 @@ self.addEventListener('push', function (e) {
data = e.data.json();
var options = {
body: data.notification.body,
- icon: data.notification.icon,
+ icon: '/favicon.png',
vibrate: [100, 50, 100],
data: {
dateOfArrival: Date.now(),
diff --git a/yarn.lock b/yarn.lock
index e723eb6..edab288 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1421,6 +1421,17 @@
"@firebase/util" "1.3.0"
tslib "^2.1.0"
+"@firebase/app-compat@0.x":
+ version "0.2.43"
+ resolved "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.43.tgz"
+ integrity sha512-HM96ZyIblXjAC7TzE8wIk2QhHlSvksYkQ4Ukh1GmEenzkucSNUmUX4QvoKrqeWsLEQ8hdcojABeCV8ybVyZmeg==
+ dependencies:
+ "@firebase/app" "0.10.13"
+ "@firebase/component" "0.6.9"
+ "@firebase/logger" "0.4.2"
+ "@firebase/util" "1.10.0"
+ tslib "^2.1.0"
+
"@firebase/app-types@0.6.3":
version "0.6.3"
resolved "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.3.tgz"
@@ -1431,6 +1442,17 @@
resolved "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz"
integrity sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg==
+"@firebase/app@0.10.13":
+ version "0.10.13"
+ resolved "https://registry.npmjs.org/@firebase/app/-/app-0.10.13.tgz"
+ integrity sha512-OZiDAEK/lDB6xy/XzYAyJJkaDqmQ+BCtOEPLqFvxWKUz5JbBmej7IiiRHdtiIOD/twW7O5AxVsfaaGA/V1bNsA==
+ dependencies:
+ "@firebase/component" "0.6.9"
+ "@firebase/logger" "0.4.2"
+ "@firebase/util" "1.10.0"
+ idb "7.1.1"
+ tslib "^2.1.0"
+
"@firebase/app@0.6.30", "@firebase/app@0.x":
version "0.6.30"
resolved "https://registry.npmjs.org/@firebase/app/-/app-0.6.30.tgz"
@@ -1477,6 +1499,14 @@
"@firebase/util" "1.3.0"
tslib "^2.1.0"
+"@firebase/component@0.6.9":
+ version "0.6.9"
+ resolved "https://registry.npmjs.org/@firebase/component/-/component-0.6.9.tgz"
+ integrity sha512-gm8EUEJE/fEac86AvHn8Z/QW8BvR56TBw3hMW0O838J/1mThYQXAIQBgUv75EqlCZfdawpWLrKt1uXvp9ciK3Q==
+ dependencies:
+ "@firebase/util" "1.10.0"
+ tslib "^2.1.0"
+
"@firebase/database-compat@^0.1.1":
version "0.1.8"
resolved "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.8.tgz"
@@ -1601,6 +1631,13 @@
dependencies:
tslib "^2.1.0"
+"@firebase/logger@0.4.2":
+ version "0.4.2"
+ resolved "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz"
+ integrity sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==
+ dependencies:
+ tslib "^2.1.0"
+
"@firebase/messaging-types@0.5.0":
version "0.5.0"
resolved "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.5.0.tgz"
@@ -1677,6 +1714,13 @@
node-fetch "2.6.7"
tslib "^2.1.0"
+"@firebase/util@1.10.0":
+ version "1.10.0"
+ resolved "https://registry.npmjs.org/@firebase/util/-/util-1.10.0.tgz"
+ integrity sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==
+ dependencies:
+ tslib "^2.1.0"
+
"@firebase/util@1.3.0":
version "1.3.0"
resolved "https://registry.npmjs.org/@firebase/util/-/util-1.3.0.tgz"
@@ -3711,7 +3755,7 @@ buffer-xor@^1.0.3:
resolved "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==
-buffer@^4.3.0, buffer@>=6.0.3:
+buffer@^4.3.0:
version "4.9.2"
resolved "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"
integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
@@ -3728,6 +3772,14 @@ buffer@^5.5.0:
base64-js "^1.3.1"
ieee754 "^1.1.13"
+buffer@>=6.0.3:
+ version "6.0.3"
+ resolved "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz"
+ integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+ dependencies:
+ base64-js "^1.3.1"
+ ieee754 "^1.2.1"
+
builtin-status-codes@^3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"
@@ -6671,7 +6723,12 @@ idb@3.0.2:
resolved "https://registry.npmjs.org/idb/-/idb-3.0.2.tgz"
integrity sha512-+FLa/0sTXqyux0o6C+i2lOR0VoS60LU/jzUo5xjfY6+7sEEgy4Gz1O7yFBXvjd7N0NyIGWIRg8DcQSLEG+VSPw==
-ieee754@^1.1.12, ieee754@^1.1.13, ieee754@^1.1.4:
+idb@7.1.1:
+ version "7.1.1"
+ resolved "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz"
+ integrity sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==
+
+ieee754@^1.1.12, ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1:
version "1.2.1"
resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==