From f180fea796ad64c600a9165c1bd48f5a79284602 Mon Sep 17 00:00:00 2001 From: sanika Date: Mon, 23 Jan 2023 00:20:34 +0530 Subject: [PATCH 01/65] setup gh-pages --- package-lock.json | 168 +++++++++++++++------------------------------- package.json | 4 +- 2 files changed, 58 insertions(+), 114 deletions(-) diff --git a/package-lock.json b/package-lock.json index 804e502..6670840 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,6 @@ "axios": "^1.2.1", "emoji-picker-react": "^4.4.7", "form-data": "^4.0.0", - "gh-pages": "^4.0.0", "immer": "^9.0.16", "react": "^18.2.0", "react-anchor-link-smooth-scroll": "^1.0.12", @@ -36,6 +35,9 @@ "socket.io-client": "^4.5.4", "thunk": "^0.0.1", "web-vitals": "^2.1.4" + }, + "devDependencies": { + "gh-pages": "^5.0.0" } }, "node_modules/@adobe/css-tools": { @@ -2235,51 +2237,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz", - "integrity": "sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==", - "hasInstallScript": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz", - "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==", - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.2.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/free-solid-svg-icons": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz", - "integrity": "sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==", - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.2.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/react-fontawesome": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", - "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", - "dependencies": { - "prop-types": "^15.8.1" - }, - "peerDependencies": { - "@fortawesome/fontawesome-svg-core": "~1 || ~6", - "react": ">=16.3" - } - }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -5062,6 +5019,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -7012,9 +6970,10 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "node_modules/email-addresses": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz", - "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-5.0.0.tgz", + "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==", + "dev": true }, "node_modules/emittery": { "version": "0.8.1", @@ -8271,6 +8230,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==", + "dev": true, "engines": { "node": ">=4" } @@ -8279,6 +8239,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", + "dev": true, "dependencies": { "filename-reserved-regex": "^2.0.0", "strip-outer": "^1.0.1", @@ -8747,13 +8708,14 @@ } }, "node_modules/gh-pages": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-4.0.0.tgz", - "integrity": "sha512-p8S0T3aGJc68MtwOcZusul5qPSNZCalap3NWbhRUZYu1YOdp+EjZ+4kPmRM8h3NNRdqw00yuevRjlkuSzCn7iQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-5.0.0.tgz", + "integrity": "sha512-Nqp1SjkPIB94Xw/3yYNTUL+G2dxlhjvv1zeN/4kMC1jfViTEqhtVz/Ba1zSXHuvXCN9ADNS1dN4r5/J/nZWEQQ==", + "dev": true, "dependencies": { - "async": "^2.6.1", + "async": "^3.2.4", "commander": "^2.18.0", - "email-addresses": "^3.0.1", + "email-addresses": "^5.0.0", "filenamify": "^4.3.0", "find-cache-dir": "^3.3.1", "fs-extra": "^8.1.0", @@ -8771,6 +8733,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==", + "dev": true, "dependencies": { "array-uniq": "^1.0.1" }, @@ -8778,23 +8741,17 @@ "node": ">=0.10.0" } }, - "node_modules/gh-pages/node_modules/async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "dependencies": { - "lodash": "^4.17.14" - } - }, "node_modules/gh-pages/node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true }, "node_modules/gh-pages/node_modules/fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", @@ -8808,6 +8765,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==", + "dev": true, "dependencies": { "array-union": "^1.0.1", "glob": "^7.0.3", @@ -8823,6 +8781,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -8831,6 +8790,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, "engines": { "node": ">= 4.0.0" } @@ -12985,6 +12945,7 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -12993,6 +12954,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", + "dev": true, "dependencies": { "pinkie": "^2.0.0" }, @@ -16172,6 +16134,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", + "dev": true, "dependencies": { "escape-string-regexp": "^1.0.2" }, @@ -16619,6 +16582,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==", + "dev": true, "dependencies": { "escape-string-regexp": "^1.0.2" }, @@ -19328,35 +19292,6 @@ } } }, - "@fortawesome/fontawesome-common-types": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz", - "integrity": "sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==" - }, - "@fortawesome/fontawesome-svg-core": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz", - "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==", - "requires": { - "@fortawesome/fontawesome-common-types": "6.2.1" - } - }, - "@fortawesome/free-solid-svg-icons": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz", - "integrity": "sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==", - "requires": { - "@fortawesome/fontawesome-common-types": "6.2.1" - } - }, - "@fortawesome/react-fontawesome": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", - "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", - "requires": { - "prop-types": "^15.8.1" - } - }, "@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -21431,7 +21366,8 @@ "array-uniq": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==" + "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", + "dev": true }, "array.prototype.find": { "version": "2.2.1", @@ -22861,9 +22797,10 @@ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "email-addresses": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz", - "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-5.0.0.tgz", + "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==", + "dev": true }, "emittery": { "version": "0.8.1", @@ -23794,12 +23731,14 @@ "filename-reserved-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", - "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==" + "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==", + "dev": true }, "filenamify": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", + "dev": true, "requires": { "filename-reserved-regex": "^2.0.0", "strip-outer": "^1.0.1", @@ -24114,13 +24053,14 @@ } }, "gh-pages": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-4.0.0.tgz", - "integrity": "sha512-p8S0T3aGJc68MtwOcZusul5qPSNZCalap3NWbhRUZYu1YOdp+EjZ+4kPmRM8h3NNRdqw00yuevRjlkuSzCn7iQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-5.0.0.tgz", + "integrity": "sha512-Nqp1SjkPIB94Xw/3yYNTUL+G2dxlhjvv1zeN/4kMC1jfViTEqhtVz/Ba1zSXHuvXCN9ADNS1dN4r5/J/nZWEQQ==", + "dev": true, "requires": { - "async": "^2.6.1", + "async": "^3.2.4", "commander": "^2.18.0", - "email-addresses": "^3.0.1", + "email-addresses": "^5.0.0", "filenamify": "^4.3.0", "find-cache-dir": "^3.3.1", "fs-extra": "^8.1.0", @@ -24131,27 +24071,22 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==", + "dev": true, "requires": { "array-uniq": "^1.0.1" } }, - "async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "requires": { - "lodash": "^4.17.14" - } - }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true }, "fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", @@ -24162,6 +24097,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==", + "dev": true, "requires": { "array-union": "^1.0.1", "glob": "^7.0.3", @@ -24174,6 +24110,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, "requires": { "graceful-fs": "^4.1.6" } @@ -24181,7 +24118,8 @@ "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true } } }, @@ -27185,12 +27123,14 @@ "pinkie": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==" + "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", + "dev": true }, "pinkie-promise": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", + "dev": true, "requires": { "pinkie": "^2.0.0" } @@ -29301,6 +29241,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", + "dev": true, "requires": { "escape-string-regexp": "^1.0.2" } @@ -29627,6 +29568,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==", + "dev": true, "requires": { "escape-string-regexp": "^1.0.2" } diff --git a/package.json b/package.json index abf5c87..91cc166 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "axios": "^1.2.1", "emoji-picker-react": "^4.4.7", "form-data": "^4.0.0", - "gh-pages": "^4.0.0", "immer": "^9.0.16", "react": "^18.2.0", "react-anchor-link-smooth-scroll": "^1.0.12", @@ -58,5 +57,8 @@ "last 1 firefox version", "last 1 safari version" ] + }, + "devDependencies": { + "gh-pages": "^5.0.0" } } From 608b31ddae4418f4585666a2cec7362cc274b153 Mon Sep 17 00:00:00 2001 From: sanika Date: Mon, 23 Jan 2023 00:24:47 +0530 Subject: [PATCH 02/65] setup gh-pages --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 91cc166..0904f3e 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,9 @@ "version": "0.1.0", "private": true, "dependencies": { + "@fortawesome/fontawesome-svg-core": "^6.2.1", + "@fortawesome/free-solid-svg-icons": "^6.2.1", + "@fortawesome/react-fontawesome": "^0.2.0", "@reduxjs/toolkit": "^1.9.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", From f34003f111045482beb0a7a7b51a43c8b79f2be5 Mon Sep 17 00:00:00 2001 From: sanika Date: Mon, 23 Jan 2023 17:41:13 +0530 Subject: [PATCH 03/65] Changes in styling and notification component --- package-lock.json | 77 +++++++++ src/component/Assets/noNotification.png | Bin 0 -> 9069 bytes src/component/Assets/noNotification.svg | 28 ++++ src/component/Home Page/ShareTweet.jsx | 45 ++--- src/component/Home Page/ShareTweetUser.jsx | 7 +- src/component/Home Page/createTweet.jsx | 2 +- src/component/Home Page/homepage.css | 39 ++++- src/component/Messages/ChatUser.jsx | 29 +++- src/component/Messages/Chats.jsx | 173 +++++++++++--------- src/component/Messages/Messages.css | 70 +++++++- src/component/Messages/SearchChatPopUp.jsx | 123 ++++++++------ src/component/Notification/Notification.css | 30 ++++ src/component/Notification/Notification.jsx | 42 ++--- src/component/Notification/Notify.jsx | 5 +- src/component/Profile/profilePage.css | 23 ++- src/component/Sidebar/SideBar.jsx | 59 +++++-- src/component/Sidebar/Sidebar.css | 60 ++++++- src/react-redux/actions/Notifications.jsx | 9 +- src/react-redux/reducers/NotifyRed.jsx | 13 +- 19 files changed, 611 insertions(+), 223 deletions(-) create mode 100644 src/component/Assets/noNotification.png create mode 100644 src/component/Assets/noNotification.svg diff --git a/package-lock.json b/package-lock.json index 6670840..bcf1ff2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,9 @@ "name": "tweeter", "version": "0.1.0", "dependencies": { + "@fortawesome/fontawesome-svg-core": "^6.2.1", + "@fortawesome/free-solid-svg-icons": "^6.2.1", + "@fortawesome/react-fontawesome": "^0.2.0", "@reduxjs/toolkit": "^1.9.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", @@ -2237,6 +2240,51 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz", + "integrity": "sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz", + "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.2.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-solid-svg-icons": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz", + "integrity": "sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.2.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/react-fontawesome": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", + "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "dependencies": { + "prop-types": "^15.8.1" + }, + "peerDependencies": { + "@fortawesome/fontawesome-svg-core": "~1 || ~6", + "react": ">=16.3" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -19292,6 +19340,35 @@ } } }, + "@fortawesome/fontawesome-common-types": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz", + "integrity": "sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==" + }, + "@fortawesome/fontawesome-svg-core": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz", + "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==", + "requires": { + "@fortawesome/fontawesome-common-types": "6.2.1" + } + }, + "@fortawesome/free-solid-svg-icons": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz", + "integrity": "sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==", + "requires": { + "@fortawesome/fontawesome-common-types": "6.2.1" + } + }, + "@fortawesome/react-fontawesome": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", + "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "requires": { + "prop-types": "^15.8.1" + } + }, "@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", diff --git a/src/component/Assets/noNotification.png b/src/component/Assets/noNotification.png new file mode 100644 index 0000000000000000000000000000000000000000..9b279857beddaa063f8128d1b13d57830ed58f70 GIT binary patch literal 9069 zcmX9EbwE>JmzXet0fHdil9Iv@X;45A=?)bE>Cudq7D?$6n9`Gwj?oPckPwLx(mi4z zG5E&s`(xYNd#CQHd(OEpTKknMh=hRz4-XIYLhYF@9v;3W?s^4Cg!@JU1Mc8{?z*a( zc;MlYQr~{?@v?I0a5wQibXAq`Dn^*LaDM>r6*U#{@O~taUcJR(a1y+Drl=3a-$OYk znoni2qBrJqb0tIU*zt*8{7#*D6fR*Gsr2ZRTVoArXw@KxbFbNgJ{9u&7yfiO6UbnO zu7@~I&Y0VqKk09Z^3-oX)9kXw`Xj|8xDvf1wL}YhlA^6?T6)H=gIC1Z(i1Tpe(}gE8jmd%pt$?Qspb8p4+$R=O%ZvWVp0Ybmqu;@r)tBl zAQfH#QK+O!0&DQdVD$XHcenT5iu?MtG6zc(4Tw!DJUdV)V_0##{Ckbhj0tS6j7{64 zPtZf0i}PA|`GNpQPp-@l$6|ic*wSi+kiRP=TcEcX(tI8OWqICx0#QVq`+Mp?8AFJCuTmB<_UJ;K{8UV?5 z?-FCH4L_djA_U^~06XWnUvzye-qNKU0^x}&qw7P4$ryY}?pVtz<53C#AdLE%odpJ8 zu_xKWPHcD|L7@$TR@C&?K`K^Ia)nq*gmYq^`Q1N2rGb7Ro>kb7M0~0KJ`&l$8rHT+0DCh5h(J0C1JjyNxBjNt=j4x0AMZMNMz5`GS8L0!KCk{O=9m^$} zT;8@{ElG~tQwUq>Pnc^muXtmUCKz7AB7Y(?x;|}TVR1Q3OkUPdM4C1r%l(4(!DV20 z{txEG%YBw1UYs5qof}&q``@L$u~+gu+&ll3*7^>RDK09ilaZIVG2Zck$XhA zshKXgah)k@J?gt&sXkP~44dQEesM9BYM%u?7H`F#np~XE1uM5VLsuG;KyXq|$C0nZ z2aTzQ-Wz8BlFNVY^RPkZtV@e^l75m|E<9Nk0+S&{rx_uL<&ykBl{*4ac}P}xgi~wY z%~h-^{tXTGV0xh>@<4Y4>+q>jPU3L*%pQGeP`g$!SIW~c2_9F9=7_<$#>H~l0}V5+ zU4GJTm1n>IDSMn!(}igO%UD|U?(CNMHH)sF;X}q zbpe6oeOqkxmqqCYuIr1Pgy(DjJ+3|a zOA1(&Px)33=>%aNf-|hY{ zraW$v{-STD^3M8;N7ZV{IHAgK1%JVk9q6)>pPmQg&bjTax%6Y^MGZ{t&L)*w!V|v{ zo=Im0E2yF)KP04;rtp6b;WBJ3?Sxxk9H32eZks_nW;adt)X$g-C@+bKa$dgP19UP{ zu@}MuH*hp*9qL+kZSBTkJ2kSS4)znH`oM)mbeR!V>Y&W&1f;DhgbkEaC}&c>#m(Am z5V|_@sM7Bqg1ro^Pgf$g}i9d}FN~K}pCfxv8nXC4@N_zV192zrgr>eieSdL7RyEKY%-t z>vmeeWg(2OkVNdBZ`$?Vbh}c5{GqR@kKT=!a03SO#@pqkNP;BCyf%A;N&1KW!bJ>N zQqpK-Bb{Qzf4`~a;;80K7>vDo+57FW9;?pQm2eqE^##c}yA7ow;+|+Vj9_A@w%%r# zHa)HMxIR>P+GBCsY%_1ZHNMUBrt%jmBAZu<8_X<7+R4bi!oV*g&I6h^gk-e)ZYfv< zAAfS#3aMlhg%Xy!KecqmL<;;~nAz4GGzlgyZ)wU?N*}h}BEb=P z%!nhR`raX|e2r$c%s)6T)b%$?5tgLSpRSRagN#{Ag?KbfuA$nbgAEe}>} zbu={_JSv=(cBx*Pb%``;A?swMo?uxP6<2+oX2VSGerc{H={$exnV$+FHvgQ=nc@aq z$oL1hO#g|qaS;(Q@p*v)-@vr%zn}|N*;kIim&YOC`A}Wb#P`E%NgDJ~OL57n>r8?; z!OKfQsCw>IH{@Av@cHEw-lGzRWxiV5PORtM1W4}#URHVa!Q}azjpF!)J#$~Xcz8Sr6Y?0?w;8lvB zt9R35LAWNBMyF?WhMV$pt;O&3oh>5b#GP)!D zrZ@WoE~N{Xu>v`{1MhBu1f7^dT^67#AXU_8yiSyR(>#B0cSY&#-m?w9gArTuwd|~Z zwD0t&q(RGh0WniMg4AY%Qg=|d6;wUF4jCgH0zK7RBWlZ&n#8YjU-;HFSx#Yq5w*N~ zyk6GYll}^cM1n3*p4!COj(0`iw;J*+BB)*ys_!i^ICjBY#=@sBCwFu(VlPP_0{t_E z1y_&H-9j00EUdJZZzJnF94@d`d@-UGbd($jm{vq{_Y_2ukRg8=Nh9yST`{O8d9D2F zD4eh}o6CcNU)yEOxCMEi{f4=ZvMo;m%{`FwA8;nW3wX_-g>9E4Jwt$Ikh9 z9rRxX7plX>NJ$ z?*G^Z7-~eVBCh|442iF~RXh0mW6KJ!G9@BQV(r%-zEgr*B%}oVEdQle$GR9fJ$2&tiprrB7Np5?zqx+RzpN$ z?1|)UR;ciNtwX}@0wYsEI}C(Je!B9M&*Bp=2t{(oou}UyV+l3Vvxk&ah4*X`$=bIb zma@>fmf9bZe04+V5O7t_5VB*;Mu} zx4LmI_=`_jNHnH0^k06XDE(8bD`4qV5h6D}cbj9fs`!{miYT6`qKnkBZb5iVvM3bV zLrgIYt(}oenxDmQC3{uv$@*cTM7Pw5D~uhg$6a^JEV-ms;$cQmHGXHdSgA9PSZpKb;QBwI2iaCd;6C#k%)Q&t1||KUPK@TDy?<|v9w?E)-tpEx zHMk7Z^lWe1S7#-{Q_T#w^-@_l-5W2kXe@Up1W&UWj8AEYytC06T62%SSuDd7yl0MM zo{wYh`FhVA$N}pv`&IqDJ~yP4K^W)KLiP?Nl!hbRB5A?je-8K?MT&(QuXU}Cu8bD|RPHW;h1w|{`SixQ+h8V6njvvVFX4;;@PbcKpyYCBi_f#n4 zuSAHC#;|A7-D#Asu#hT0B)@4*mU3g|1vu&uSFji?Zn#>0lcPzL$!(f=`Zk>`VhIVfFltpY)Rj@%?{jt-3dLZf$LKHE~wPzPf3DE%Y0CN=Hv7 zus~KivW?j^8UK)2+rK&`^e8@?54z@$dC+d`@LXC%&S}3<8vyCM+GGtlu9~e?gDPt@ z%gg# z<|z^MJrAQI&@qw$Ql2&uk=1%u10$1lr@k?1jFamHKfEjf5EZw7z4UE$W3m@bt#*vg zAq54)if&tLm)%xtMDK8EWPuDGQ5lPfvTO#T6pDf_CdR9(R#help#=jLF)@+`Kv8K? zxhtA%valuO6Y@n?*=nCeEqZM(1mR;@BjS6_A&plWP3G=3lpSRwE&7Z<1fP9Xj^qeg zir|;CVJm15MNm_GEeL9d8L{}fO|F`deNLQ~$GA{+2+=?PGaRs>1GkJK3tftEEQ2o! zE;3zneF&Qhwy87Z`9vCW83&74mZ40!f7ETuT1mRZZot97-b&cGMr>C16*bva9=lEO zY=dFGL*7f|Cq&-sN=jATtGFS2_U(F%Zjk#7LoSxBQEu0_I6QGJb74!&umNUV{iqxN zyCu!J%~H_&Kkd!ontpC(Z4W8B(o^_=mc~i#4r}RHfSdh!Cp@58pNsrWTW)s#7l-r4 zI8Qc$m+Z%@aI2a225|=$!q5j)%S^!|ZTp0+6MB8+X%SVWptJ{9DKC7N3DOHg@cU0? z7^u0twL`;!)h2U#Tv=*hjVxKq=~P5&JW8s^~FlJ}1-0f+o~% z{nU7bwwFz5Zc&**BF~0~s{GmBWNzf2la4VHhi`ySvSWT6j~`rpoZ)Il;H?a*Vst!TeD$LJpMdk~M)b}<7E z_-PQZ@@oTTXf{90oxTf3hwjUJO>oy~`9#T?)45Gt_v#&I0z0nr5GRGtU4L<~k>*!Z z8FS-O&rKmtaG5bHxUbzgY%~kHxDoN%F77wf0nA=q0%%VOqoTD}BH}Gb=QB;0RO+4! zGHWCruSQ$6Op!qSNenyo!gDl!EsMm8Lk*nI6`BIbU@c@hI0TuXE2-l5MZrpH3uB)@ zR~7}-rw(hC;IV9s@r0>;LO*?{`wXjKU??5-4lt~QR+`JbIwZYx*91Sa68{Oi(OEnINf(Hru4Qs ze~Q=8xmUd@>8(IYiJ$~l3i+neciBfIMhBV&BOE0Q&86Q%%^uo#b_(#Pd=^bxRzNEa zKk>AwE{u5S_QfO}{Ur}_d{Yv`;a`?J{G4`MFNl!17T8HDxO@~k0yFDgzMM?R)2elZ zQ-1-!dc>Kfovt(L0j3CjVET24^iu73to$?Asr=zA>%*r=^^f)O&d-}g*B}8+_r>^D z;eZe}=vx!5+&{g6C*3KuNhF3s!Mw}gY&&mup@#9WsFpH~bRdBux-04Go9QKA;3W5( z*H)N?dP9Wa$#i=%m)4z&P(#n>ExMBTLLa0RY&T!>*7fj?QWseR$SwK!#y#rg(z_&R z+$?6*aE?Do-R}c}8_n_dUTvAbsN!Q2h}2aEs1BKjc2FX!cr~=QM|+Pj%}K@>5_^=A z;^1ap^#=cPqcNiRV-JXMoO&30<%PUWF@Z&lN8X75JT>Ay~5fXcp+T-oeD z6$l#>=|Q@?-~A$hGUQ_MQp7=KkdMKya1{EK(A?q52CaWIP(>{*b5g zl4kidkneTlBK^whOb;E2LnRe+H@@h>XWzvHT1E&hmVP09Ak@=rN=+-PT=ZH0BYb{r z-MacuymiD=7OMBqxzHue#IkR+xDi5faDkX7?oW!+7LGdc zVNUngO)SaeAQZTkr7YfzQKTAD>S}<`q|v1KQzQH5nl_m}n#j^52H}-vMfDe|7VeTw ziMYGsuDs`LFu@F&chc)LKZP`KrmfhB$}($(=NlUyDVc^C{ideAc|4*LUPVBSo7&>~ zp6wyf&;6|}`pO#w$pQsdk`y?;%npOFoP;P&u^h$%wn9e0K&~f+o`$GfZdp z;i)u}8}rR`vMTv?xJ{WH^?}0jumPna#zJKpxiqDq+!Qi{LZPPg$a6QQD*1_$oH!$C z(T@Op8u!&WoEwC^_#<(>j}qG9D{Nj{wq=-o80Cmz9o;wvhtxx9yGkbt*_Q{|>&jLI z4w{DpHFH!49k@&bsi&Uj-w~25Ni2s@2%*cSZ=hJs^HQg9`I0G*?moZsPDqcg7N)X! zSoq}cK|)U8!I8n`RpGFwy?4chnBJjWlN$l*wG4}{_rD3@LJYg28LppOa_?SUwT|8% z$+}>6?7f&PWs9$!%;#93vF82!({`-bWm_QF;d!1cZX`1u7~tU7$Bezsb1L9+ebMuc z-1m>UBegn+!TymXuermY->%teVUq8UGTKF=x&i0!WM@2Wj5qgS1>y26RG}T8j5r-Q z%O|ZFW**OjzY|QKE-otE%gWssJUc-qW%7UCTMfpQkMB$-Po8xL%S$)C^@5y%UOztY zjUZ-m?VFsY!Lr3N5(|SJsXr`D4P0P$G!9zNECUC`irvBl)eB)iN_n()-3JrlT9e7! zA#qAz*UERp2s$GhviCpct}w*uo0ZwYWo&A@Md#am!1TX;qj=9$1^*h0Hry>FLY5dD zbaJ!S^I576D5O;>2}+PN9SK(wd+7DlJl}yDZriR_;$ZTk&h3I`+ zegtvXUYVjyXYAoH>WeF15Lm+(`+Kxc+E(XnedV8g)BN;9$#qEF`?r(w8HaOq=X3!P ziL?EUVO6KWqX#!56E|J3l$FE8>J?6#F>*j)C+FGHKH_J^}%w`FyqFj z65ErZ6exI*$K{XdiA0zw>*mp`?Q3aMx zlHY|39ltrfU6$mWsBtt}zIvWa@AC36|nI zY1~e8-xjlU&raM$_aFVoZ6eNX z(`+<1+qx{sq7J5i%akJ{=fVQ>V6r|z_h573uS1{ITc5MT@DFu#J55)o9WcQqGlW{@ zg!)*feYL*?)ws#)q2wQVaavbtvjLgL8B&W z(%J&2W*@5JjgsIwu=!+`mJK)#&m>M5cyT6}ba~tA_tQR-gB_y}-;#ry?0n>lf zpg>$;=Rf)LIgr-P@15lMDcZ9)+Ace8n=F_%bxNAPb~$Xpb6no(v2am9_l5P}o3$1p z?-Z^KLNt@C;gPohIt9$h%`M+9!WSY>-TwWKqD+V?0PBY@oNYC`E2r`|#7+}CVLSK? z;$3-F?C9g^DurJ13qLBR?TDR=y_xR6iCV~PRomDQB06_2D~!RMOH7%HC3rmpNty=% zLE!IKv0XRyxRQWL2fwBJCUGyFDHpToGx(bFT>e`WA2)CTc>XXFcVJ|h`P;BqW_g#H zrj4oV>a_PJ!=;wWbiG)`Y3{Q9a~;_&w*EfX$9BY;Egd zVrf%?q<|!s?@#JZ#?KA|9IGS;onhd|M?u53_Fs#URFyt@}w`+IC>Ceuk< zO@6%`Ymqylk|TL0IV*7=XKQ&?1KHI-P^MJ0_O7t^dOa{IH=X%XJa^$|haIBX_7b+p z%wwMS|JPpRl46}~`>Ah~6FRYvD^xsrcz84>tb}r?fbwS1j8!qC!_`yQM>x%xHn>>mw5p@@#0J7kXJ%$(F|13OpghC| zy>GigrYnw1GT++A;WU2c8f zeiapbk}<0`r{a86z$6vetY2_n*Izh5hoJcSow>J3i}xO|7f={UhXy`n@1dlhr=TcZ zYP&kR`E$J{jLrV?CER6JV$NTu^OC<8h&y_bTg%TKa#}5hhT}y-4~xcG+HL|j)q$1iz(rYah| z%jHneW=`@a{n?Z^J<6XY7q3FL0t)q_s_qi+dH7D}=7EpPD%{c+INB0mrBQB8irAl0 zSKcdI@lQUgvSN$LL%_K~L-fWqwyCY_rv}+BroTqB-GNq(_&z4cm!r)_#qa0OxPyHi z{_;RlZ~9~#R^3Vx+%j?t9EEZyU&`wkB{W~=i03UysRi*&Iu#MceuA>@LoKB^{hhaP3Zps DZrjqV literal 0 HcmV?d00001 diff --git a/src/component/Assets/noNotification.svg b/src/component/Assets/noNotification.svg new file mode 100644 index 0000000..3bf4e6a --- /dev/null +++ b/src/component/Assets/noNotification.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/component/Home Page/ShareTweet.jsx b/src/component/Home Page/ShareTweet.jsx index 24f3c4d..081f5f5 100644 --- a/src/component/Home Page/ShareTweet.jsx +++ b/src/component/Home Page/ShareTweet.jsx @@ -2,6 +2,8 @@ import React, { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import MsgSearchUser from "../../react-redux/actions/Message"; import ShareTweetUser from "./ShareTweetUser"; +import deleteIcon from "../Assets/delete.svg" + function ShareTweet() { const [search, setSearch] = useState("") @@ -15,41 +17,26 @@ function ShareTweet() { // const [info2, setInfo2] = useState([]) const dispatch = useDispatch(); - function handleSearch(e) { - setSearch(e.target.value) - dispatch(MsgSearchUser(e.target.value)); - console.log(MsgSearchUser) - } - // useEffect(() => { - // if (toMsgUser) { - // if (msgUser.length > 0) { - - // setSearchListArray(msgUser) - // } - // else { - // setSearchListArray([]) - // } - // } - // }, [toMsgUser, msgUser]) - // useEffect(() => { - // if (msgUser.length > 0) { - // setInfo(msgUser) - // info.map((i, index) => { - // console.log(i._id) - // if (i._id === user._id) { - // console.warn(index) - // info.splice(index,1) - // } - // }) - // } - // }, []) console.log(info) + function setOPacity() { /*SET BACKGROUND OPACITY*/ + var items = document.getElementsByClassName("POPUPBG") + for (var i = 0; i < items.length; i++) { + document.getElementsByClassName("POPUPBG")[i].style.opacity = 1; + } +} return <>
+

Share with

- {/* */} +
+
{ + document.getElementById("SHAREBLOCK").style.display = "none" + setOPacity(); + }}> +
+
{(viewChatList) ? (chatLists.length > 0 ? (chatLists.map((chat, index) => { {/* console.log(chat) */ } diff --git a/src/component/Home Page/ShareTweetUser.jsx b/src/component/Home Page/ShareTweetUser.jsx index ef6b023..5c5f8ac 100644 --- a/src/component/Home Page/ShareTweetUser.jsx +++ b/src/component/Home Page/ShareTweetUser.jsx @@ -78,11 +78,8 @@ function ShareTweetUser(props) { return <>
- {/* {(props.displaypic === null) ? () : - ((props.displaypic.startsWith("https:")) ? () : - ( - )) - } */} + {(info.displaypic === null) ? () : + () }

{info.name}

{ diff --git a/src/component/Home Page/createTweet.jsx b/src/component/Home Page/createTweet.jsx index 01bb29e..b5fb97d 100644 --- a/src/component/Home Page/createTweet.jsx +++ b/src/component/Home Page/createTweet.jsx @@ -463,7 +463,7 @@ setText("")

{ handleEmojis() }} /> - {showEmoji ? (
) : null} + {showEmoji ? (
) : null}

Emojis

diff --git a/src/component/Home Page/homepage.css b/src/component/Home Page/homepage.css index 1c0bf64..77c8ed8 100644 --- a/src/component/Home Page/homepage.css +++ b/src/component/Home Page/homepage.css @@ -347,7 +347,7 @@ color:#47C87A; padding-left: 1.5vw; overflow-x: hidden; overflow-y: scroll; - padding-bottom:20px; + padding-bottom:50px; } #CREATETWEET { @@ -517,7 +517,7 @@ color:#47C87A; position: absolute; top:0px; /* display: none; */ - left: 20vw; + left: 21vw; /* z-index:9999; */ } @@ -836,7 +836,7 @@ display: none; .shareTweetSearchIpt{ border: none; outline: none; - margin-top:5px; + margin-top:10px; width: 34vw; height: 32px; background: none; @@ -853,10 +853,24 @@ display: none; margin-top:30px; z-index:20; } +.shareePopup{ + background-color: rgb(255,255,255, 0.1); + background-color: #1A1C1E; + position: fixed; + z-index:80; + margin:0; + margin-left:-0.5vw; + width:35vw; + padding-bottom: 4px; + padding-top:4px; + border-top-right-radius:20px; + border-top-left-radius:18px; + margin-top:-10px; +} .shareTweetFlexbox{ display: flex; flex-direction: column; - margin-top:px; + margin-top:35px; z-index:16; } .shareUser { @@ -907,9 +921,20 @@ display: none; } .shareTweetLine{ border-bottom:0.5px solid rgba(255, 255, 255, 0.4); - width:34vw; - margin-top:35px; - margin-bottom:0; + width:35vw; + margin-top:40px; + margin-bottom:-4px; +} + +.msgDelete { + width: 22px; + height: 22px; + opacity: 0.8; + cursor: pointer; + margin-top: 4px; + margin-left: 32vw; + z-index: 90; + position: fixed; } /* CREATE TWEET/ RETWEET */ diff --git a/src/component/Messages/ChatUser.jsx b/src/component/Messages/ChatUser.jsx index d41dcf0..a2ce2c0 100644 --- a/src/component/Messages/ChatUser.jsx +++ b/src/component/Messages/ChatUser.jsx @@ -5,6 +5,7 @@ import { ActiveUserList, CreateChat, ViewChatsAction } from "../../react-redux/a import { Messages } from "../../react-redux/actions/SearchApi"; import greenmessage from "../Assets/greenmsg.svg" import avatar from "../Assets/avatar.svg" +import { NotifyChatSeen } from "../../react-redux/actions/Notifications"; function ChatUser(props) { const {user} = useSelector((a)=>a.AuthReducer) @@ -14,18 +15,34 @@ function ChatUser(props) { const dispatch = useDispatch(); const[info, setInfo] = useState([]) const chatList = props.sidechat - // console.log(props.sidechat) + const newMsgNotify = localStorage.getItem("new Notify") + const {unseenChats} = useSelector((n)=>n.NotificationReducer) + const [latestmsg, setLatestmsg] = useState("") + + useEffect(()=>{ + console.log(unseenChats) + if(unseenChats.length>0){ + unseenChats.map((unseen)=>{ + console.log(unseen) + // if(unseen.chat._id == props.sidechat._id){ + // setLatestmsg(unseen.chat.latestmsg) + // } + }) + } + }, [unseenChats]) + + console.log(props.sidechat) useEffect(()=>{ props.sidechat.users.map((chat)=>{ - // console.log(chat) if(chat._id != user._id){ // setChats([...chats, chatUser]) // console.log(chat) // console.log(chats) setInfo(chat) } - + // console.log(props.sidechat.users._id) + // console.log(newMsgNotify) }) },[user, chatList]) // console.log(chats) @@ -67,7 +84,7 @@ function ChatUser(props) { dispatch(Messages(greenmessage, "Messages", 3)) navigate(`/chats/${usernum}`) dispatch(CreateChat(usernum)) - // dispatch(ViewChatsAction(viewChatIdd)) + dispatch(NotifyChatSeen()) } // console.log(props.msg) return <> @@ -80,6 +97,10 @@ function ChatUser(props) {

{ handleUserChat(info._id) }}>{info.user_name}

+ {newMsgNotify?( + !newMsgNotify.is_read ? (

New Chat:{latestmsg}

):null + ):null} + {/*

{props.msg}

*/}
diff --git a/src/component/Messages/Chats.jsx b/src/component/Messages/Chats.jsx index a5f8d58..76d9cd0 100644 --- a/src/component/Messages/Chats.jsx +++ b/src/component/Messages/Chats.jsx @@ -19,6 +19,7 @@ import { io } from "socket.io-client"; import { AddChatNotify } from "../../react-redux/actions/Notifications"; import NoChats from "./NoChats"; import SearchChatUser from "./SearchChatPopUp"; +import deleteIcon from "../Assets/delete.svg" // import { Socket } from "socket.io-client"; @@ -29,8 +30,8 @@ function Chats() { const [socketConnected, setSocketConnected] = useState(false) const { user } = useSelector((a) => a.AuthReducer) const { userid } = useParams(); - const chatReducer = useSelector((c) => c.MsgSearchReducer) - const { chatLists, viewChatList, isActive,chatBool, sendChatMessage, viewChatMsgs, loading } = chatReducer + const chatReducer = useSelector((c) => c.MsgSearchReducer) + const { chatLists, viewChatList, isActive, chatBool, sendChatMessage, viewChatMsgs, loading } = chatReducer const dispatch = useDispatch(); const [chats, setChats] = useState([]) @@ -39,20 +40,20 @@ function Chats() { const [topPic, setTopPic] = useState("") const [sendChatId, setSendChatId] = useState() - useEffect(()=>{ - document.getElementById("SEARCHBOX").style.display="none" - },[]) - useEffect(()=>{ + useEffect(() => { + document.getElementById("SEARCHBOX").style.display = "none" + }, []) + useEffect(() => { dispatch(ViewChatList()) // console.log(chatLists) console.log(viewChatList) - },[]) - useEffect(()=>{ - if(viewChatList){ + }, []) + useEffect(() => { + if (viewChatList) { setSideChats(chatLists) console.log(chatLists) } - },[chatReducer]) + }, [chatReducer]) // console.log(chatLists) // console.log(chats) // set socket connection @@ -64,60 +65,62 @@ function Chats() { socket.on("connection", () => { setSocketConnected(true) }) - - return (()=>{ + + return (() => { socket.disconnect() }) }, []) - useEffect(()=>{ - if(isNaN(parseInt(userid))){ - document.getElementById("NOCHATBLOCK").style.display="flex"; - document.getElementById("SCROLLCHATS").style.display="none"; - document.getElementById("CHATTYPE").style.visibility="hidden"; + useEffect(() => { + if (isNaN(parseInt(userid))) { + document.getElementById("NOCHATBLOCK").style.display = "flex"; + document.getElementById("SCROLLCHATS").style.display = "none"; + document.getElementById("CHATTYPE").style.visibility = "hidden"; } - else{ - document.getElementById("NOCHATBLOCK").style.display="none"; - document.getElementById("SCROLLCHATS").style.display="flex"; - document.getElementById("CHATTYPE").style.visibility="visible"; + else { + document.getElementById("NOCHATBLOCK").style.display = "none"; + document.getElementById("SCROLLCHATS").style.display = "flex"; + document.getElementById("CHATTYPE").style.visibility = "visible"; } - },[userid]) -const [chatMsgs, setChatMsgs] = useState([]) - useEffect(()=>{ - if(isActive){ - if(viewChatList){ - chatLists.map((chatt)=>{ - chatt.users.map((chatUser=>{ + }, [userid]) + const [chatMsgs, setChatMsgs] = useState([]) + useEffect(() => { + if (isActive) { + if (viewChatList) { + chatLists.map((chatt) => { + chatt.users.map((chatUser => { // console.log(chatUser) - if(chatUser._id == userid){ - console.warn(chatUser) - setTopName(chatUser.name) - setTopPic(chatUser.displaypic) - setSendChatId(chatt._id) - currentChattingWith = chatt._id; - dispatch(ViewChatsAction(chatt._id)) - // console.log(viewChatMsgs) + if (chatUser._id == userid) { + console.warn(chatUser) + setTopName(chatUser.name) + setTopPic(chatUser.displaypic) + setSendChatId(chatt._id) + currentChattingWith = chatt._id; + dispatch(ViewChatsAction(chatt._id)) + // console.log(viewChatMsgs) } })) }) } } - },[userid, chatLists, viewChatList, isActive]) + }, [userid, chatLists, viewChatList, isActive]) - useEffect(()=>{ - if(chatBool){ + useEffect(() => { + if (chatBool) { // console.warn(viewChatMsgs) setChatMsgs(viewChatMsgs) } - },[chatReducer]) + }, [chatReducer]) const [textMsg, setTextMsg] = useState("") const [showEmoji, setShowEmoji] = useState(false) const [sendImage, setSendImage] = useState(null); const [imageInArr, setImageInArr] = useState(null) const [vdoInArr, setVdoInArr] = useState(null) + const [newChatMsg, setNewChatMsg] = useState("") + const [notifs, setNotifs] = useState([]) const fd = new FormData(); function handleSendImage(e) { @@ -151,7 +154,7 @@ const [chatMsgs, setChatMsgs] = useState([]) "_id": user._id }, } - + // console.log(sendChatId) function sendChatMsg(chattid) { // console.log(chattid) @@ -167,19 +170,19 @@ const [chatMsgs, setChatMsgs] = useState([]) fd.append("file", null) } console.warn(socket.connected) - if(socket.connected && textMsg!=""){ - dispatch(SendChatsAction(fd, socket)) - // setChatMsgs([...chatMsgs, sendChat]) - dispatch(FakeViewChatsAction(sendChat)) - } - if(!socket.connected){ - socket = io(ENDPOINT) - socket.emit("setup", user); + if (socket.connected && textMsg != "") { + dispatch(SendChatsAction(fd, socket)) + // setChatMsgs([...chatMsgs, sendChat]) + dispatch(FakeViewChatsAction(sendChat)) + } + if (!socket.connected) { + socket = io(ENDPOINT) + socket.emit("setup", user); - socket.on("connection", () => { - setSocketConnected(true) - }) - } + socket.on("connection", () => { + setSocketConnected(true) + }) + } setTextMsg("") setSendImage(null) setSendVideo(null) @@ -192,18 +195,23 @@ const [chatMsgs, setChatMsgs] = useState([]) useEffect(() => { socket.on("message recieved", (newChatMsgRecieved) => { if (newChatMsgRecieved.chat._id !== currentChattingWith || !currentChattingWith) { - handleNotify(newChatMsgRecieved) + if (!notifs.includes(newChatMsgRecieved)) { + handleNotify(newChatMsgRecieved) + } + console.warn(newChatMsgRecieved) + setNewChatMsg(newChatMsgRecieved) } else { console.warn(newChatMsgRecieved) - // setChatMsgs([...chatMsgs, sendChat]) + setNewChatMsg(newChatMsgRecieved) dispatch(FakeViewChatsAction(newChatMsgRecieved)) + setChatMsgs([newChatMsgRecieved, ...chatMsgs]) // setAllChats([...allChats, newChatMsgRecieved]) } }) - },[]) - + }, []) + //Notifications handler : if not current user const handleNotify = (new_unseen_chat) => { dispatch(AddChatNotify(new_unseen_chat)) @@ -224,18 +232,15 @@ const [chatMsgs, setChatMsgs] = useState([])
- - {(topPic === null) ? ( ) : - () - - } + + {(topPic === null) ? () : + ()}

{topName}

- {/* { + { document.getElementById("SELECT_CHAT_BLOCK").style.display="flex" - }} /> */} - + }} />
-
+
@@ -269,18 +274,17 @@ const [chatMsgs, setChatMsgs] = useState([])
- +
- {/* {console.log(chats)} */} - {sideChats.map((oneChat, index)=>{ - return - })} - {/* {(chats.map((sideChats, indexx)=>{ + {sideChats.map((oneChat, index) => { + return + })} + {/* {(chats.map((sideChats, indexx)=>{ return }))} */}
- {/* {(viewChatList) ? (chatLists.length > 0 ? (chatLists.map((chat, index) => { + {/* {(viewChatList) ? (chatLists.length > 0 ? (chatLists.map((chat, index) => { {console.log(chat)} return })) : null) : null} @@ -288,7 +292,7 @@ const [chatMsgs, setChatMsgs] = useState([]) {console.log(chat)} return })) : null) : null} */} - {/* {isActive ? ( + {/* {isActive ? (
{/* {(list.displaypic === null) ? ( ) : ((list.displaypic.startsWith("https:")) ? () : @@ -303,12 +307,27 @@ const [chatMsgs, setChatMsgs] = useState([])
) : null} */} -
- +
+ {(loading == true) ? : null} - +
+
+

Select a User

+
+ { + document.getElementById("SELECT_CHAT_BLOCK").style.display="none" + }} /> +
+
+ + {sideChats.map((oneChat, index) => { + return + })} +
+
+ {/* */} } export default Chats; \ No newline at end of file diff --git a/src/component/Messages/Messages.css b/src/component/Messages/Messages.css index acdaa49..4ebafaf 100644 --- a/src/component/Messages/Messages.css +++ b/src/component/Messages/Messages.css @@ -179,7 +179,7 @@ cursor: pointer; margin-top: 4px; margin-left: 32vw; - z-index: 20; + z-index: 90; position: fixed; } @@ -234,6 +234,16 @@ text-decoration: underline; cursor: pointer; } +.msgNotify{ + font-family: 'Montserrat'; + font-style: normal; + font-weight: 500; + font-size: 13px; + line-height: 20px; + color:rgba(255, 255, 255, 0.8); + margin-top:-16px; + margin-left: 0.5vw; +} .chatSearch{ display: none; } @@ -285,7 +295,9 @@ scroll-behavior: smooth; /* margin-top:20px; */ } - +#SELECT_CHAT_BLOCK{ + display: none; +} .ChatSearch1 { border: none; outline: none; @@ -338,7 +350,7 @@ border: none; margin-top: 4px; width: 25vw; - height: 55px; + height: 70px; border-bottom: 0.5px solid rgba(255, 255, 255, 0.2); padding-left: 1vw; margin-left: -1vw; @@ -755,8 +767,25 @@ width:63vw; .msgDelete{ margin-left:48vw; } + .searchPopup{ + z-index:110; + } + .shareTweetFlexbox{ + /* z-index:90; */ + /* z-index:110; */ + } #SELECT_CHAT_BLOCK{ - display:none + display:flex; + width:54vw; + margin-top:-50px; + margin-left:-2vw; + z-index:110; + } + #shareBlock1{ + width:54vw; + } + #shareDlt{ + margin-top:-29px; } .chatSearch{ display: flex; @@ -769,6 +798,21 @@ width:63vw; border-radius: 50%; height:30px; } + #msgLine{ + width:52vw; + } + #msgSearchUserr{ + width:53vw; + border: none; + margin-top: 4px; + height: 70px; + border-bottom: 0.5px solid rgba(255, 255, 255, 0.2); + padding-left: 1vw; + margin-left: -1vw; +} + #ChatUser2{ + width:52vw; + } } @media(max-width:650px){ .noChatDiv{ @@ -874,6 +918,24 @@ width:61vw; .msgDelete{ margin-left:57vw; } + #SELECT_CHAT_BLOCK{ + width:60vw; + margin-top:-50px; + margin-left:-8vw; + } + #shareBlock1{ + width:60vw; + } + #shareDlt{ + margin-top:-29px; + margin-left:52vw; + } + #msgLine{ + width:60vw; + } + #msgSearchUserr{ + width:58vw; +} } @media(max-width:400px){ .CHATS, .MSGS{ diff --git a/src/component/Messages/SearchChatPopUp.jsx b/src/component/Messages/SearchChatPopUp.jsx index 92389c8..4243628 100644 --- a/src/component/Messages/SearchChatPopUp.jsx +++ b/src/component/Messages/SearchChatPopUp.jsx @@ -9,72 +9,95 @@ import avatar from "../Assets/avatar.svg" function SearchChatUser(props) { - const { user } = useSelector((a) => a.AuthReducer) - const viewChatIdd = props.viewChatid; - // console.log(viewChatIdd) + const {user} = useSelector((a)=>a.AuthReducer) + // const viewChatIdd = props.viewChatid; + // // console.log(viewChatIdd) const navigate = useNavigate(); const dispatch = useDispatch(); - const { userid } = useParams(); - // console.log(user) - // console.log(props.user) - const [info, setInfo] = useState({}) - // useEffect(() => { - // props.user.map((u) => { - // if (u.user_name != user.user_name) { - // // console.log(u); - // setInfo(u) - // return u - // } - // }) - // }, [props.user, userid]) + const[info, setInfo] = useState([]) + const chatList = props.sidechat + const newMsgNotify = localStorage.getItem("new Notify") + const {unseenChats} = useSelector((n)=>n.NotificationReducer) + + useEffect(()=>{ + console.log(unseenChats) + }, [unseenChats]) + + // console.log(props.sidechat) + useEffect(()=>{ + props.sidechat.users.map((chat)=>{ + // console.log(chat) + if(chat._id != user._id){ + // setChats([...chats, chatUser]) + // console.log(chat) + // console.log(chats) + setInfo(chat) + } + // console.log(props.sidechat.users._id) + // console.log(newMsgNotify) + }) + },[user, chatList]) + // console.log(chats) + const { userid } = useParams(); + // // console.log(user) + // // console.log(props.user) + // const [info, setInfo] = useState({}) // useEffect(()=>{ // props.user.map((u)=>{ - // if(u._id == userid) + // if(u.user_name!= user.user_name) // { - // // console.warn(u); - // // console.log(props.indexx) - // document.getElementsByClassName("chatUser")[props.indexx].style.backgroundColor="rgba(255,255,255,0.1)" - // var ChatToColor =document.getElementsByClassName("chatUser") - // for(var i=0;i{ + props.sidechat.users.map((u)=>{ + if(u._id == userid) + { + document.getElementsByClassName("chatUser")[props.indexx].style.backgroundColor="rgba(255,255,255,0.1)" + var ChatToColor =document.getElementsByClassName("chatUser") + for(var i=0;i -
-

Select a User

-
- { - document.getElementById("SELECT_CHAT_BLOCK").style.display="none" - }} /> -
-
- {(info.displaypic === null) ? () : - () - } -
-

{info.name}

-

{ - handleUserChat(info._id) - }}>{info.user_name}

-
-
-
+
+ {(info.displaypic === null) ? ( ) : + () + } +
+

{info.name}

+

{ + handleUserChat(info._id) + }}>{info.user_name}

+ {newMsgNotify?( + !newMsgNotify.is_read ? (

New Chat:{newMsgNotify.text}

):null + ):null} + + {/*

{props.msg}

*/}
- +
+ } export default SearchChatUser \ No newline at end of file diff --git a/src/component/Notification/Notification.css b/src/component/Notification/Notification.css index 982d5f7..b3953de 100644 --- a/src/component/Notification/Notification.css +++ b/src/component/Notification/Notification.css @@ -35,6 +35,14 @@ flex-direction: column; .notifyCard:hover{ background-color: rgba(255, 255, 255, 0.1); } +.notifyCircle{ + width:12px; + height:12px; + margin-top:20px; + margin-left:27vw; + border-radius: 50%; + background-color: #47C87A; +} .notify1{ display: flex; flex-direction: column; @@ -93,6 +101,12 @@ white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word; } +.alterNotify{ + margin-left:14vw; +} +.alterNotText{ + margin-left:2vw; +} .notifTweet{ cursor: pointer; color:#47C87A @@ -138,11 +152,20 @@ word-wrap: break-word; font-size: 0.9rem; margin-left:8vw; } + .alterNotify{ + margin-left:25vw; + } } @media(max-width:600px){ .notifyCard{ margin-left: 13vw; } + .alterNotify{ + margin-left: 23vw;; + } + .alterNotText{ + width:50vw; + } } @media (max-width:500px){ .notifyCard{ @@ -153,6 +176,13 @@ word-wrap: break-word; font-size: 0.9rem; margin-left:11vw; } + .alterNotify{ + margin-left:-5vw;; + } + .alterNotText{ + width:50vw; + margin-left:10vw; + } } @media (max-width:320px){ .notifyMsg{ diff --git a/src/component/Notification/Notification.jsx b/src/component/Notification/Notification.jsx index 4f94635..f192a56 100644 --- a/src/component/Notification/Notification.jsx +++ b/src/component/Notification/Notification.jsx @@ -2,44 +2,48 @@ import React, { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { ViewNotifyAction } from "../../react-redux/actions/Notifications"; import Loader from "../Assets/Loader"; +import noNotification from "../Assets/noNotification.svg"; import Sidebar from "../Sidebar/SideBar"; import "./Notification.css"; import Notify from "./Notify"; -function Notifications (){ +function Notifications() { const dispatch = useDispatch(); - const notify = useSelector((n)=>n.NotificationReducer) + const notify = useSelector((n) => n.NotificationReducer) console.log(notify) - const {notifyBool, viewNotifs, loading} = notify + const { notifyBool, viewNotifs, loading } = notify const [notifyList, setNotifylist] = useState([]) - useEffect(()=>{ + useEffect(() => { dispatch(ViewNotifyAction()) - },[]) - useEffect(()=>{ -if(notifyBool){ - console.log(viewNotifs) - setNotifylist(viewNotifs) -} - },[notifyBool]) - useEffect(()=>{ - if(loading===true){ + }, []) + useEffect(() => { + if (notifyBool) { + console.log(viewNotifs) + setNotifylist(viewNotifs) + } + }, [notifyBool]) + useEffect(() => { + if (loading === true) { document.body.style.opacity = 0.5; } - else{ + else { document.body.style.opacity = 1; } - },[loading]) + }, [loading]) return <>
- {notifyList.map((notif, index)=>{ - return - })} + {notifyList.length > 0 ? notifyList.map((notif, index) => { + return + }) : +
+

No New Notifications

+
}
- {(loading===true)?:null} + {(loading === true) ? : null} } export default Notifications \ No newline at end of file diff --git a/src/component/Notification/Notify.jsx b/src/component/Notification/Notify.jsx index 9453118..3510eff 100644 --- a/src/component/Notification/Notify.jsx +++ b/src/component/Notification/Notify.jsx @@ -22,6 +22,7 @@ function Notify(props) { function handleNotify(notifId) { console.log(notifId) document.getElementsByClassName("notifyCard")[index].style.backgroundColor = "rgb(26, 28, 30)" + document.getElementsByClassName("notifyCircle")[index].style.display="none" dispatch(ReadNotifyAction(notifId)) // document.getElementsByClassName("notifyCard")[index].style.backgroundColor = "rgba(255, 255, 255, 0.1)" // if() @@ -29,9 +30,11 @@ function Notify(props) { useEffect(() => { if (isRead) { document.getElementsByClassName("notifyCard")[index].style.backgroundColor = "rgb(26, 28, 30)" + document.getElementsByClassName("notifyCircle")[index].style.display="none" } else { document.getElementsByClassName("notifyCard")[index].style.backgroundColor = "rgba(255, 255, 255, 0.1)" + document.getElementsByClassName("notifyCircle")[index].style.display="block" } }, [isRead]) @@ -54,7 +57,7 @@ function Notify(props) { }} className="notifTweet">#Tweet

: null} {/*

There is no new cj:nullbcjhdbjlastestfyy bgguiyh mesjhbj,hvbvhhhh,nhghhjftcsage

*/}
- + diff --git a/src/component/Profile/profilePage.css b/src/component/Profile/profilePage.css index dffd718..9763b2f 100644 --- a/src/component/Profile/profilePage.css +++ b/src/component/Profile/profilePage.css @@ -500,7 +500,7 @@ line-height: 20px; color: #47c87a; cursor: pointer; - margin-left:-5.2vw; + margin-left:-8vw; margin-top: 30px; text-transform: capitalize; @@ -860,6 +860,13 @@ font-size: 0.9rem; margin-left: 9vw; width:22vw; } +#ProfileImage { + width: 56vw; +} + +#ProfileVideo { + width: 56vw; +} } @media(max-width:670px){ .pTweet1{ @@ -936,6 +943,13 @@ font-size: 0.9rem; margin-left: 11vw; } + #ProfileImage { + width: 55vw; + } + + #ProfileVideo { + width: 55vw; + } } @media(max-width:550px){ .pTweet1{ @@ -1147,4 +1161,11 @@ font-size: 0.9rem; font-size: 0.9rem; margin-top:-4px; } + #ProfileImage { + width: 78vw; + } + + #ProfileVideo { + width: 78vw; + } } diff --git a/src/component/Sidebar/SideBar.jsx b/src/component/Sidebar/SideBar.jsx index 2cdd010..f799665 100644 --- a/src/component/Sidebar/SideBar.jsx +++ b/src/component/Sidebar/SideBar.jsx @@ -30,6 +30,7 @@ import { InactiveUserList } from "../../react-redux/actions/Message"; import deleteIcon from "../Assets/delete.svg" import ScrollableChat from "../Messages/ScrollableChats"; import NoChats from "../Messages/NoChats"; +import { ViewNotifyAction } from "../../react-redux/actions/Notifications"; function Sidebar() { @@ -209,13 +210,6 @@ function Sidebar() { else navigate("/messages") } - - function LogoutMouseover() { - document.getElementById("logout").style.display = "block" - } - function LogoutMouseout() { - document.getElementById("logout").style.display = "none" - } function openSidebar() { document.getElementById("SIDEBAR").style.display = "block" // document.getElementById("SIDEBAR").style.transitionDelay="1s" @@ -225,6 +219,35 @@ function Sidebar() { // document.getElementById("SIDEBAR").style.transitionDelay="1s" } const [show, setShow] = useState(false) +function handleShowOption(){ +setShow(!show) +if(show){ + document.getElementById("dropdown").style.display="block" + setShow(false) +} +else{ + document.getElementById("dropdown").style.display="none" + setShow(true) +} +} + + /* SIDEBAR NOTIFICATION MARK */ + const [notifBool, setNotifBool] = useState(false) + const { notifyBool, viewNotifs} = useSelector((n) => n.NotificationReducer) + useEffect(() => { + dispatch(ViewNotifyAction()) + }, []) + useEffect(()=>{ + if(notifyBool){ + if(viewNotifs.length>0) + setNotifBool(true) + else + setNotifBool(false) + } + console.log(notifBool) + },[notifyBool]) + + return <>
@@ -236,19 +259,23 @@ function Sidebar() {
- + +
- { dispatch(Home(greenhome, "Home", 0)) }}/> - { dispatch(BookmarksNav(greenbm, "Bookmark", 2)) }} /> - { MsgSidebar() }} /> - { handleProfile() }} /> - + { dispatch(Home(greenhome, "Home", 0)) }} /> + { dispatch(BookmarksNav(greenbm, "Bookmark", 2)) }} /> + { MsgSidebar() }} /> + { handleProfile() }} /> +