⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
some visual changes + bugfix
Daniele4098d3d46c8
diff --git a/webmarker/src/componets/AddModal.js b/webmarker/src/componets/AddModal.jsindex b4e9e2c8..f2282c21 100644--- a/webmarker/src/componets/AddModal.js+++ b/webmarker/src/componets/AddModal.js@@ -19,7 +19,19 @@ const AddModal = ({onExit}) => {}async function submitBookmark() {- if(name != '' && link != '' && tag != '') {+ function isValidHttpUrl(string) {+ let url;++ try {+ url = new URL(string);+ } catch (_) {+ return false;+ }++ return url.protocol === "http:" || url.protocol === "https:";+ }++ if(name != '' && isValidHttpUrl(link) && tag != '') {fetch("/post", {// Adding method type@@ -43,7 +55,7 @@ const AddModal = ({onExit}) => {}else {- alert('Please fill all fields...');+ alert('Please fill all fields and make sure url is valid.\n\n(i.e. starts with http/https)');}}diff --git a/webmarker/src/componets/EditModal.js b/webmarker/src/componets/EditModal.jsdeleted file mode 100644index 63971f03..00000000--- a/webmarker/src/componets/EditModal.js+++ /dev/null@@ -1,9 +0,0 @@-import React from 'react';--const EditModal = ({id}) => {- return (- <div>{id}</div>- )-}--export default EditModal\ No newline at end of filediff --git a/webmarker/src/componets/List.js b/webmarker/src/componets/List.jsindex 60d84f0c..314cfb04 100644--- a/webmarker/src/componets/List.js+++ b/webmarker/src/componets/List.js@@ -26,7 +26,7 @@ const List = ({data}) => {<table className="table"><thead><tr>- <th>#</th>+ <th className='number'>#</th><th>Name</th><th>Title</th><th>Link</th>@@ -38,12 +38,12 @@ const List = ({data}) => {try {const url = new URL(e.link)return <tr key={i}>- <td>{i + 1}</td>+ <td className='number'>{i + 1}</td><td>{e.name}</td><td>{e.title}</td><td><a href={e.link}>{url.hostname}</a></td><td>{e.tag}</td>- <td className="delete" onClick={() => deleteEntity(e._id)}><div>X</div></td>+ <td className="delete" onClick={() => deleteEntity(e._id)}><div>x</div></td></tr>} catch (e) {console.log(e)diff --git a/webmarker/src/styles/List.css b/webmarker/src/styles/List.cssindex 3c654025..b6712a1e 100644--- a/webmarker/src/styles/List.css+++ b/webmarker/src/styles/List.css@@ -2,11 +2,13 @@width: 100%;text-align: left;padding-top: 20px;+ border-spacing: 10px 10px;}.table td {font-size: 1.3rem;- padding: 5px;+ padding: 10px;+ box-shadow: rgba(0, 0, 0, 0.4) 0px 2px 4px, rgba(0, 0, 0, 0.3) 0px 7px 13px -3px, rgba(0, 0, 0, 0.2) 0px -3px 0px inset;}.table th {@@ -16,13 +18,9 @@.table tbody tr:nth-of-type(2n-1) {background-color:#273949;-}-.table tbody td {- border-radius: 10px;}-.table a {text-decoration: none;color: rgb(194, 193, 193);@@ -34,7 +32,11 @@}.delete {- background-color: red;+ background-color: rgb(255, 123, 123);color: white;cursor: pointer;-}\ No newline at end of file+}++.number {+ text-align: center;+}diff --git a/webmarker_backend/package-lock.json b/webmarker_backend/package-lock.jsonindex 505b6e40..45c5ae5b 100644--- a/webmarker_backend/package-lock.json+++ b/webmarker_backend/package-lock.json@@ -9,9 +9,11 @@"version": "1.0.0","license": "MIT","dependencies": {+ "cheerio": "^1.0.0-rc.10","express": "^4.17.3","mongodb": "^4.5.0",- "phantom": "^6.3.0"+ "phantom": "^6.3.0",+ "url-parse": "^1.5.10"},"devDependencies": {"nodemon": "^2.0.15"@@ -260,6 +262,11 @@"node": ">= 0.8"}},+ "node_modules/boolbase": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",+ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="+ },"node_modules/boxen": {"version": "5.1.2","resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz",@@ -455,6 +462,41 @@"node": ">=8"}},+ "node_modules/cheerio": {+ "version": "1.0.0-rc.10",+ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",+ "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",+ "dependencies": {+ "cheerio-select": "^1.5.0",+ "dom-serializer": "^1.3.2",+ "domhandler": "^4.2.0",+ "htmlparser2": "^6.1.0",+ "parse5": "^6.0.1",+ "parse5-htmlparser2-tree-adapter": "^6.0.1",+ "tslib": "^2.2.0"+ },+ "engines": {+ "node": ">= 6"+ },+ "funding": {+ "url": "https://github.com/cheeriojs/cheerio?sponsor=1"+ }+ },+ "node_modules/cheerio-select": {+ "version": "1.6.0",+ "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz",+ "integrity": "sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==",+ "dependencies": {+ "css-select": "^4.3.0",+ "css-what": "^6.0.1",+ "domelementtype": "^2.2.0",+ "domhandler": "^4.3.1",+ "domutils": "^2.8.0"+ },+ "funding": {+ "url": "https://github.com/sponsors/fb55"+ }+ },"node_modules/chokidar": {"version": "3.5.3","resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",@@ -660,6 +702,32 @@"node": ">=8"}},+ "node_modules/css-select": {+ "version": "4.3.0",+ "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",+ "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",+ "dependencies": {+ "boolbase": "^1.0.0",+ "css-what": "^6.0.1",+ "domhandler": "^4.3.1",+ "domutils": "^2.8.0",+ "nth-check": "^2.0.1"+ },+ "funding": {+ "url": "https://github.com/sponsors/fb55"+ }+ },+ "node_modules/css-what": {+ "version": "6.1.0",+ "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",+ "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",+ "engines": {+ "node": ">= 6"+ },+ "funding": {+ "url": "https://github.com/sponsors/fb55"+ }+ },"node_modules/dashdash": {"version": "1.14.1","resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",@@ -735,6 +803,57 @@"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz","integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="},+ "node_modules/dom-serializer": {+ "version": "1.4.1",+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",+ "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",+ "dependencies": {+ "domelementtype": "^2.0.1",+ "domhandler": "^4.2.0",+ "entities": "^2.0.0"+ },+ "funding": {+ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"+ }+ },+ "node_modules/domelementtype": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/fb55"+ }+ ]+ },+ "node_modules/domhandler": {+ "version": "4.3.1",+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",+ "dependencies": {+ "domelementtype": "^2.2.0"+ },+ "engines": {+ "node": ">= 4"+ },+ "funding": {+ "url": "https://github.com/fb55/domhandler?sponsor=1"+ }+ },+ "node_modules/domutils": {+ "version": "2.8.0",+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",+ "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",+ "dependencies": {+ "dom-serializer": "^1.0.1",+ "domelementtype": "^2.2.0",+ "domhandler": "^4.2.0"+ },+ "funding": {+ "url": "https://github.com/fb55/domutils?sponsor=1"+ }+ },"node_modules/dot-prop": {"version": "5.3.0","resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",@@ -795,6 +914,14 @@"once": "^1.4.0"}},+ "node_modules/entities": {+ "version": "2.2.0",+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",+ "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",+ "funding": {+ "url": "https://github.com/fb55/entities?sponsor=1"+ }+ },"node_modules/es6-promise": {"version": "4.2.8","resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",@@ -1132,6 +1259,24 @@"node": ">=0.10.0"}},+ "node_modules/htmlparser2": {+ "version": "6.1.0",+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",+ "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",+ "funding": [+ "https://github.com/fb55/htmlparser2?sponsor=1",+ {+ "type": "github",+ "url": "https://github.com/sponsors/fb55"+ }+ ],+ "dependencies": {+ "domelementtype": "^2.0.1",+ "domhandler": "^4.0.0",+ "domutils": "^2.5.2",+ "entities": "^2.0.0"+ }+ },"node_modules/http-cache-semantics": {"version": "4.1.0","resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",@@ -1755,6 +1900,17 @@"node": ">=8"}},+ "node_modules/nth-check": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",+ "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",+ "dependencies": {+ "boolbase": "^1.0.0"+ },+ "funding": {+ "url": "https://github.com/fb55/nth-check?sponsor=1"+ }+ },"node_modules/oauth-sign": {"version": "0.9.0","resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",@@ -1824,6 +1980,19 @@"semver": "bin/semver.js"}},+ "node_modules/parse5": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",+ "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="+ },+ "node_modules/parse5-htmlparser2-tree-adapter": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",+ "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",+ "dependencies": {+ "parse5": "^6.0.1"+ }+ },"node_modules/parseurl": {"version": "1.3.3","resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",@@ -2002,6 +2171,11 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/querystringify": {+ "version": "2.2.0",+ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",+ "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="+ },"node_modules/range-parser": {"version": "1.2.1","resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",@@ -2147,6 +2321,11 @@"node": ">=0.6"}},+ "node_modules/requires-port": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",+ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="+ },"node_modules/responselike": {"version": "1.0.2","resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",@@ -2517,6 +2696,11 @@"resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz","integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="},+ "node_modules/tslib": {+ "version": "2.4.0",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",+ "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="+ },"node_modules/tunnel-agent": {"version": "0.6.0","resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",@@ -2648,6 +2832,15 @@"punycode": "^2.1.0"}},+ "node_modules/url-parse": {+ "version": "1.5.10",+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",+ "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",+ "dependencies": {+ "querystringify": "^2.1.1",+ "requires-port": "^1.0.0"+ }+ },"node_modules/url-parse-lax": {"version": "3.0.0","resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",@@ -3071,6 +3264,11 @@"type-is": "~1.6.18"}},+ "boolbase": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",+ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="+ },"boxen": {"version": "5.1.2","resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz",@@ -3208,6 +3406,32 @@}}},+ "cheerio": {+ "version": "1.0.0-rc.10",+ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",+ "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",+ "requires": {+ "cheerio-select": "^1.5.0",+ "dom-serializer": "^1.3.2",+ "domhandler": "^4.2.0",+ "htmlparser2": "^6.1.0",+ "parse5": "^6.0.1",+ "parse5-htmlparser2-tree-adapter": "^6.0.1",+ "tslib": "^2.2.0"+ }+ },+ "cheerio-select": {+ "version": "1.6.0",+ "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz",+ "integrity": "sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==",+ "requires": {+ "css-select": "^4.3.0",+ "css-what": "^6.0.1",+ "domelementtype": "^2.2.0",+ "domhandler": "^4.3.1",+ "domutils": "^2.8.0"+ }+ },"chokidar": {"version": "3.5.3","resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",@@ -3374,6 +3598,23 @@"integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==","dev": true},+ "css-select": {+ "version": "4.3.0",+ "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",+ "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",+ "requires": {+ "boolbase": "^1.0.0",+ "css-what": "^6.0.1",+ "domhandler": "^4.3.1",+ "domutils": "^2.8.0",+ "nth-check": "^2.0.1"+ }+ },+ "css-what": {+ "version": "6.1.0",+ "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",+ "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="+ },"dashdash": {"version": "1.14.1","resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",@@ -3431,6 +3672,39 @@"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz","integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="},+ "dom-serializer": {+ "version": "1.4.1",+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",+ "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",+ "requires": {+ "domelementtype": "^2.0.1",+ "domhandler": "^4.2.0",+ "entities": "^2.0.0"+ }+ },+ "domelementtype": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="+ },+ "domhandler": {+ "version": "4.3.1",+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",+ "requires": {+ "domelementtype": "^2.2.0"+ }+ },+ "domutils": {+ "version": "2.8.0",+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",+ "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",+ "requires": {+ "dom-serializer": "^1.0.1",+ "domelementtype": "^2.2.0",+ "domhandler": "^4.2.0"+ }+ },"dot-prop": {"version": "5.3.0","resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",@@ -3485,6 +3759,11 @@"once": "^1.4.0"}},+ "entities": {+ "version": "2.2.0",+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",+ "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="+ },"es6-promise": {"version": "4.2.8","resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",@@ -3751,6 +4030,17 @@"pinkie-promise": "^2.0.0"}},+ "htmlparser2": {+ "version": "6.1.0",+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",+ "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",+ "requires": {+ "domelementtype": "^2.0.1",+ "domhandler": "^4.0.0",+ "domutils": "^2.5.2",+ "entities": "^2.0.0"+ }+ },"http-cache-semantics": {"version": "4.1.0","resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",@@ -4226,6 +4516,14 @@"integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==","dev": true},+ "nth-check": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",+ "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",+ "requires": {+ "boolbase": "^1.0.0"+ }+ },"oauth-sign": {"version": "0.9.0","resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",@@ -4282,6 +4580,19 @@}}},+ "parse5": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",+ "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="+ },+ "parse5-htmlparser2-tree-adapter": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",+ "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",+ "requires": {+ "parse5": "^6.0.1"+ }+ },"parseurl": {"version": "1.3.3","resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",@@ -4412,6 +4723,11 @@"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz","integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="},+ "querystringify": {+ "version": "2.2.0",+ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",+ "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="+ },"range-parser": {"version": "1.2.1","resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",@@ -4538,6 +4854,11 @@"throttleit": "^1.0.0"}},+ "requires-port": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",+ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="+ },"responselike": {"version": "1.0.2","resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",@@ -4824,6 +5145,11 @@"resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz","integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="},+ "tslib": {+ "version": "2.4.0",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",+ "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="+ },"tunnel-agent": {"version": "0.6.0","resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",@@ -4927,6 +5253,15 @@"punycode": "^2.1.0"}},+ "url-parse": {+ "version": "1.5.10",+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",+ "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",+ "requires": {+ "querystringify": "^2.1.1",+ "requires-port": "^1.0.0"+ }+ },"url-parse-lax": {"version": "3.0.0","resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",diff --git a/webmarker_backend/package.json b/webmarker_backend/package.jsonindex f7598e87..2c8b6c7a 100644--- a/webmarker_backend/package.json+++ b/webmarker_backend/package.json@@ -9,9 +9,11 @@"author": "","license": "MIT","dependencies": {+ "cheerio": "^1.0.0-rc.10","express": "^4.17.3","mongodb": "^4.5.0",- "phantom": "^6.3.0"+ "phantom": "^6.3.0",+ "url-parse": "^1.5.10"},"devDependencies": {"nodemon": "^2.0.15"diff --git a/webmarker_backend/server.js b/webmarker_backend/server.jsindex 54b012b6..76117210 100644--- a/webmarker_backend/server.js+++ b/webmarker_backend/server.js@@ -1,7 +1,9 @@const express = require('express');const app = express();const { MongoClient, ObjectId } = require('mongodb');-const phantom = require('phantom');+const request = require('request');+const cheerio = require('cheerio');+const URL = require('url-parse');const port = process.env.PORT || 3001;@@ -16,11 +18,18 @@ app.get('/get', async (req, res) => {res.send(data);});-app.post('/post', async (req, res) => {- const title = await getTitle(req.body.link);- req.body.title = title;-- insertDoc(req.body);+app.post('/post', (req, res) => {+ let title;+ const pageToVisit = req.body.link;+ request(pageToVisit, (error, response, body) => {+ if(response.statusCode === 200) {+ // Parse the document body+ const $ = cheerio.load(body);++ req.body.title = $('title').text();+ insertDoc(req.body);+ }+ });});app.delete('/delete', async (req, res) => {@@ -87,20 +96,6 @@ async function deleteDoc(doc) {}}-async function getTitle(url) {- const instance = await phantom.create();- const page = await instance.createPage();- await page.on('onResourceRequested', function(requestData) {- console.info('Requesting', requestData.url);- });-- const status = await page.open(url);- const title = await page.property('title');- await instance.exit();-- return title;-}-app.listen(port, () => {console.log(`Success! running on port ${port}.`);});\ No newline at end of file