diff --git a/.travis.yml b/.travis.yml index 3fda78932..3f1090e37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "4" + - "node" sudo: false before_install: - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build index cb1389954..24e0f788c 100755 --- a/bin/wappalyzer-build +++ b/bin/wappalyzer-build @@ -22,13 +22,9 @@ echo "Prettifying apps.json..." node $WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js -ist $'\t' $WAPPALYZER_ROOT/src/apps.json -echo "Compressing PNG icons..." +echo "Compressing PNG and SVG icons..." -node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 7 - -echo "Compressing SVG icons..." - -node $WAPPALYZER_NODE_PATH/node_modules/svgo/bin/svgo -q -f $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons +node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* $WAPPALYZER_ROOT/src/icons echo "Converting SVG icons to PNG..." @@ -42,12 +38,16 @@ do dest="$WAPPALYZER_ROOT/src/icons/converted/$(basename "$svg").png" if [[ ! -f "$dest" ]]; then - svg2png "$svg" --width=32 --height=32 --output "$dest" || true + node $WAPPALYZER_NODE_PATH/node_modules/svg2png/bin/svg2png-cli "$svg" --width=32 --height=32 --output "$dest" || true fi done IFS="$OIFS" +echo "Compressing converted PNG icons..." + +node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/converted/* $WAPPALYZER_ROOT/src/icons/converted + wappalyzer links # Npm Module diff --git a/docker/Dockerfile b/docker/Dockerfile index d8c6fd4a4..e4834db06 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -39,7 +39,6 @@ RUN su wappalyzer -c "mkdir $WAPPALYZER_NODE_PATH" ADD node/package.json $WAPPALYZER_NODE_PATH/package.json -RUN npm i -g npm svg2png --prefix=/usr/local RUN ln -s -f /usr/local/bin/npm /usr/bin/npm RUN su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm i" diff --git a/docker/node/package.json b/docker/node/package.json index 0bf01f87d..cbfe4c39e 100644 --- a/docker/node/package.json +++ b/docker/node/package.json @@ -12,14 +12,14 @@ "test": "./bin/wappalyzer build" }, "devDependencies": { - "file-type": "3.4.*", - "is-svg": "1.1.*", - "read-chunk": "1.0.*", + "file-type": "3.8.*", + "is-svg": "2.0.*", + "read-chunk": "2.0.*", "jsonlint": "*", "jpm": "*", - "imagemin-cli": "*", - "phantomjs-prebuilt": "*", - "svgo": "*" + "imagemin-cli": "2.*.*", + "phantomjs-prebuilt": "*", + "svg2png": "3.*.*" }, "engines": { "node": ">= 4" diff --git a/src/apps.json b/src/apps.json index 5773a19ee..70bde6c20 100755 --- a/src/apps.json +++ b/src/apps.json @@ -3932,6 +3932,22 @@ "implies": "PHP", "website": "www.lithium.com" }, + "LiveAgent": { + "cats": [ + 52 + ], + "env": "^LiveAgent$", + "icon": "LiveAgent.png", + "website": "www.ladesk.com" + }, + "LiveChat": { + "cats": [ + 52 + ], + "icon": "LiveChat.png", + "script": "cdn\\.livechatinc\\.com/.*tracking\\.js", + "website": "livechatinc.com" + }, "LiveJournal": { "cats": [ 11 @@ -6958,6 +6974,14 @@ ], "website": "taiga.io" }, + "Tawk.to": { + "cats": [ + 52 + ], + "icon": "TawkTo.png", + "script": "//embed\\.tawk\\.to", + "website": "tawk.to" + }, "Tealeaf": { "cats": [ 10 @@ -7337,6 +7361,17 @@ "script": "underscore.*\\.js", "website": "underscorejs.org" }, + "UserLike": { + "cats": [ + 52 + ], + "icon": "UserLike.svg", + "script": [ + "userlike\\.min\\.js", + "userlikelib\\.min\\.js" + ], + "website": "userlike.com" + }, "UserRules": { "cats": [ 13 @@ -9190,6 +9225,7 @@ "48": "Network Storage", "49": "Feed Readers", "50": "Document Management Systems", - "51": "Landing Page Builders" + "51": "Landing Page Builders", + "52": "Live Chat" } -} \ No newline at end of file +} diff --git a/src/drivers/chrome/_locales/el/messages.json b/src/drivers/chrome/_locales/el/messages.json index bacd7cfa5..0700ee471 100644 --- a/src/drivers/chrome/_locales/el/messages.json +++ b/src/drivers/chrome/_locales/el/messages.json @@ -55,5 +55,6 @@ "categoryName48": { "message": "Δικτυακός Αποθηκευτικός Χώρος" }, "categoryName49": { "message": "Feed Readers" }, "categoryName50": { "message": "Συστήματα Διαχειρίσης Εγγράφων" }, - "categoryName51": { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" } + "categoryName51": { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" }, + "categoryName52": { "message": "Live Chat" } } diff --git a/src/drivers/chrome/_locales/en/messages.json b/src/drivers/chrome/_locales/en/messages.json index 1d8f78b02..bdf959ace 100644 --- a/src/drivers/chrome/_locales/en/messages.json +++ b/src/drivers/chrome/_locales/en/messages.json @@ -55,5 +55,6 @@ "categoryName48": { "message": "Network Storage" }, "categoryName49": { "message": "Feed Readers" }, "categoryName50": { "message": "Document Management Systems" }, - "categoryName51": { "message": "Landing Page Builder" } + "categoryName51": { "message": "Landing Page Builder" }, + "categoryName52": { "message": "Live Chat" } } diff --git a/src/drivers/chrome/_locales/es/messages.json b/src/drivers/chrome/_locales/es/messages.json index 8e4c42490..a62320673 100644 --- a/src/drivers/chrome/_locales/es/messages.json +++ b/src/drivers/chrome/_locales/es/messages.json @@ -59,5 +59,6 @@ "categoryName48": { "message": "Network Storage" }, "categoryName49": { "message": "Feed Readers" }, "categoryName50": { "message": "Document Management Systems" }, - "categoryName51": { "message": "Landing Page Builder" } + "categoryName51": { "message": "Landing Page Builder" }, + "categoryName52": { "message": "Live Chat" } } diff --git a/src/drivers/chrome/_locales/fr/messages.json b/src/drivers/chrome/_locales/fr/messages.json index b0b900f9a..52fabcef7 100644 --- a/src/drivers/chrome/_locales/fr/messages.json +++ b/src/drivers/chrome/_locales/fr/messages.json @@ -59,5 +59,6 @@ "categoryName48": { "message": "Stockage réseau" }, "categoryName49": { "message": "Lecteur RSS" }, "categoryName50": { "message": "Système de gestion de documents" }, - "categoryName51": { "message": "Landing Page Builder" } + "categoryName51": { "message": "Landing Page Builder" }, + "categoryName52": { "message": "Chat en direct" } } diff --git a/src/drivers/chrome/_locales/gr/messages.json b/src/drivers/chrome/_locales/gr/messages.json index bacd7cfa5..0700ee471 100644 --- a/src/drivers/chrome/_locales/gr/messages.json +++ b/src/drivers/chrome/_locales/gr/messages.json @@ -55,5 +55,6 @@ "categoryName48": { "message": "Δικτυακός Αποθηκευτικός Χώρος" }, "categoryName49": { "message": "Feed Readers" }, "categoryName50": { "message": "Συστήματα Διαχειρίσης Εγγράφων" }, - "categoryName51": { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" } + "categoryName51": { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" }, + "categoryName52": { "message": "Live Chat" } } diff --git a/src/drivers/chrome/_locales/it/messages.json b/src/drivers/chrome/_locales/it/messages.json index 266ce5102..fe25a3cf7 100644 --- a/src/drivers/chrome/_locales/it/messages.json +++ b/src/drivers/chrome/_locales/it/messages.json @@ -59,6 +59,7 @@ "categoryName48": { "message": "Network Storage" }, "categoryName49": { "message": "Lettore di Feed" }, "categoryName50": { "message": "Sistema di Gestione Documenti" }, - "categoryName51": { "message": "Landing Page Builder" } + "categoryName51": { "message": "Landing Page Builder" }, + "categoryName52": { "message": "Live Chat" } } diff --git a/src/drivers/chrome/_locales/ro/messages.json b/src/drivers/chrome/_locales/ro/messages.json index 66718fa93..851974d2b 100644 --- a/src/drivers/chrome/_locales/ro/messages.json +++ b/src/drivers/chrome/_locales/ro/messages.json @@ -55,5 +55,6 @@ "categoryName48": { "message": "Network Storage" }, "categoryName49": { "message": "Feed Readers" }, "categoryName50": { "message": "Document Management Systems" }, - "categoryName51": { "message": "Landing Page Builder" } + "categoryName51": { "message": "Landing Page Builder" }, + "categoryName52": { "message": "Live Chat" } } diff --git a/src/drivers/chrome/_locales/ru/messages.json b/src/drivers/chrome/_locales/ru/messages.json index b71511911..6338d320e 100644 --- a/src/drivers/chrome/_locales/ru/messages.json +++ b/src/drivers/chrome/_locales/ru/messages.json @@ -45,7 +45,8 @@ "categoryName48" : { "message" : "Сетевое хранилище" }, "categoryName49" : { "message" : "Граббер контента" }, "categoryName50" : { "message" : "Управление документами" }, - "categoryName51": { "message": "Генератор лендингов" }, + "categoryName51" : { "message": "Генератор лендингов" }, + "categoryName52" : { "message": "Live Chat" }, "github" : { "message" : "Форкнуть на GitHub!" }, "noAppsDetected" : { "message" : "Нет данных о сайте" }, "nothingToDo" : { "message" : "Тут нечего искать" }, diff --git a/src/drivers/firefox/locale/de-DE.properties b/src/drivers/firefox/locale/de-DE.properties index 54780b3be..430d023bb 100755 --- a/src/drivers/firefox/locale/de-DE.properties +++ b/src/drivers/firefox/locale/de-DE.properties @@ -65,3 +65,4 @@ cat48 = Netzwerkspeicher cat49 = Feed-Leser cat50 = Document Management Systems cat51 = Landing Page Builder +cat52 = Live Chat diff --git a/src/drivers/firefox/locale/el-GR.properties b/src/drivers/firefox/locale/el-GR.properties index 02222be90..753498c7d 100644 --- a/src/drivers/firefox/locale/el-GR.properties +++ b/src/drivers/firefox/locale/el-GR.properties @@ -65,3 +65,4 @@ cat48 = Δικτυακός Αποθηκευτικός Χώρος cat49 = Feed Readers cat50 = Συστήματα Διαχειρίσης Εγγράφων cat51 = Σύστημα Κατασκευής Σελίδων Υποδοχής +cat52 = Live Chat diff --git a/src/drivers/firefox/locale/en-GB.properties b/src/drivers/firefox/locale/en-GB.properties index 5f9ff5b18..072240c37 100755 --- a/src/drivers/firefox/locale/en-GB.properties +++ b/src/drivers/firefox/locale/en-GB.properties @@ -65,3 +65,4 @@ cat48 = Network Storage cat49 = Feed Readers cat50 = Document Management Systems cat51 = Landing Page Builder +cat52 = Live Chat diff --git a/src/drivers/firefox/locale/en-US.properties b/src/drivers/firefox/locale/en-US.properties index 5f9ff5b18..072240c37 100755 --- a/src/drivers/firefox/locale/en-US.properties +++ b/src/drivers/firefox/locale/en-US.properties @@ -65,3 +65,4 @@ cat48 = Network Storage cat49 = Feed Readers cat50 = Document Management Systems cat51 = Landing Page Builder +cat52 = Live Chat diff --git a/src/drivers/firefox/locale/es-ES.properties b/src/drivers/firefox/locale/es-ES.properties index 8f1e65477..68999f709 100755 --- a/src/drivers/firefox/locale/es-ES.properties +++ b/src/drivers/firefox/locale/es-ES.properties @@ -65,3 +65,4 @@ cat48 = Network Storage cat49 = Feed Readers cat50 = Document Management Systems cat51 = Landing Page Builder +cat52 = Live Chat diff --git a/src/drivers/firefox/locale/fr-FR.properties b/src/drivers/firefox/locale/fr-FR.properties index 42536e288..f65c5da0c 100644 --- a/src/drivers/firefox/locale/fr-FR.properties +++ b/src/drivers/firefox/locale/fr-FR.properties @@ -65,3 +65,4 @@ cat48 = Stockage réseau cat49 = Lecteur RSS cat50 = Système de gestion de documents cat51 = Landing Page Builder +cat52 = Chat en direct diff --git a/src/drivers/firefox/locale/it-IT.properties b/src/drivers/firefox/locale/it-IT.properties index a205dc72a..5e106196a 100755 --- a/src/drivers/firefox/locale/it-IT.properties +++ b/src/drivers/firefox/locale/it-IT.properties @@ -65,3 +65,4 @@ cat48 = Network Storage cat49 = Lettore di Feed cat50 = Sistema di Gestione Documenti cat51 = Landing Page Builder +cat52 = Live Chat diff --git a/src/drivers/firefox/locale/nl-NL.properties b/src/drivers/firefox/locale/nl-NL.properties index f72eabb62..9d2833f50 100755 --- a/src/drivers/firefox/locale/nl-NL.properties +++ b/src/drivers/firefox/locale/nl-NL.properties @@ -65,3 +65,4 @@ cat48 = Network Storage cat49 = Feed Readers cat50 = Document Management Systems cat51 = Landing Page Builder +cat52 = Live Chat diff --git a/src/drivers/firefox/locale/ro-RO.properties b/src/drivers/firefox/locale/ro-RO.properties index 6ecb71a3e..61bf776f5 100644 --- a/src/drivers/firefox/locale/ro-RO.properties +++ b/src/drivers/firefox/locale/ro-RO.properties @@ -62,3 +62,4 @@ cat48 = Network Storage cat49 = Feed Readers cat50 = Document Management Systems cat51 = Landing Page Builder +cat52 = Live Chat diff --git a/src/drivers/firefox/locale/ru-RU.properties b/src/drivers/firefox/locale/ru-RU.properties index 4f8bdffb4..5c820a05f 100644 --- a/src/drivers/firefox/locale/ru-RU.properties +++ b/src/drivers/firefox/locale/ru-RU.properties @@ -65,3 +65,4 @@ cat48 = Сетевое хранилище cat49 = Граббер контента cat50 = Управление документами cat51 = Генератор лендингов +cat52 = Live Chat diff --git a/src/icons/LiveAgent.png b/src/icons/LiveAgent.png new file mode 100644 index 000000000..112c6a95b Binary files /dev/null and b/src/icons/LiveAgent.png differ diff --git a/src/icons/LiveChat.png b/src/icons/LiveChat.png new file mode 100644 index 000000000..5f0619e17 Binary files /dev/null and b/src/icons/LiveChat.png differ diff --git a/src/icons/TawkTo.png b/src/icons/TawkTo.png new file mode 100644 index 000000000..87d0b6611 Binary files /dev/null and b/src/icons/TawkTo.png differ diff --git a/src/icons/UserLike.svg b/src/icons/UserLike.svg new file mode 100644 index 000000000..75f524c0c --- /dev/null +++ b/src/icons/UserLike.svg @@ -0,0 +1 @@ +userlike_general_logo_small_60x60 \ No newline at end of file