From 7967c0c93ac4791c6dbecb61e6d81285daf90dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Petit?= Date: Wed, 17 Aug 2016 11:44:42 +0200 Subject: [PATCH 1/6] Adding new category 'livechat' with 3 techs: livechat, tawkto, userlike --- src/apps.json | 30 ++++++++++++++++++- src/drivers/chrome/_locales/el/messages.json | 3 +- src/drivers/chrome/_locales/en/messages.json | 3 +- src/drivers/chrome/_locales/es/messages.json | 3 +- src/drivers/chrome/_locales/fr/messages.json | 3 +- src/drivers/chrome/_locales/gr/messages.json | 3 +- src/drivers/chrome/_locales/it/messages.json | 3 +- src/drivers/chrome/_locales/ro/messages.json | 3 +- src/drivers/chrome/_locales/ru/messages.json | 3 +- src/drivers/firefox/locale/de-DE.properties | 1 + src/drivers/firefox/locale/el-GR.properties | 1 + src/drivers/firefox/locale/en-GB.properties | 1 + src/drivers/firefox/locale/en-US.properties | 1 + src/drivers/firefox/locale/es-ES.properties | 1 + src/drivers/firefox/locale/fr-FR.properties | 1 + src/drivers/firefox/locale/it-IT.properties | 1 + src/drivers/firefox/locale/nl-NL.properties | 1 + src/drivers/firefox/locale/ro-RO.properties | 1 + src/drivers/firefox/locale/ru-RU.properties | 1 + src/icons/LiveChat.png | Bin 0 -> 1979 bytes src/icons/TawkTo.png | Bin 0 -> 2076 bytes src/icons/UserLike.svg | 1 + 22 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 src/icons/LiveChat.png create mode 100644 src/icons/TawkTo.png create mode 100644 src/icons/UserLike.svg diff --git a/src/apps.json b/src/apps.json index f4ad3a9b2..0a01af5e5 100755 --- a/src/apps.json +++ b/src/apps.json @@ -3932,6 +3932,14 @@ "implies": "PHP", "website": "www.lithium.com" }, + "LiveChat": { + "cats": [ + 52 + ], + "icon": "LiveChat.png", + "script": "cdn\\.livechatinc\\.com/.*tracking\\.js", + "website": "livechatinc.com" + }, "LiveJournal": { "cats": [ 11 @@ -6947,6 +6955,14 @@ ], "website": "taiga.io" }, + "Tawk.to": { + "cats": [ + 52 + ], + "icon": "TawkTo.png", + "script": "//embed\\.tawk\\.to", + "website": "tawk.to" + }, "Tealeaf": { "cats": [ 10 @@ -7326,6 +7342,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 @@ -9179,6 +9206,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/LiveChat.png b/src/icons/LiveChat.png new file mode 100644 index 0000000000000000000000000000000000000000..5f0619e17ef2194dc2eeeb6f84cd8da1e104331d GIT binary patch literal 1979 zcmV;s2SoUZP)sUoN6)1%3P}SgA#% z&?3=Ba`@Z!M~R?{n@Vn^Hdd&JQmV>s6G9sS=1~mP#s)w4F}pLj=bU+HR_msy>XpvU z?45h=cg}YncgEVcZ=ZSY+&TBusZ(8(laoIz6bgH))#@5e1Arn4uQHC&6a%gaW&T!v|y5l9`_qk`A3*RJcfrc$YI z&dts3KYsl9o})*PzHbc<4t8I?dUcp4RWg}$Xpw#E)-7dO7XDv@x%50&<@0%6sZ^Zl z>FFF@e|!4$=_jn4H*XFQ?M#nDMkLzW+Hl~&0W>!^lcE=o!v6}-^kaJZK8A;f6=5W^ z*{nlsH;<2xf7e=ASm2n$aU8p)r3FWh9LCzUYe5!@;>w&V#1jP2|AhgKEnBu=)25Ah z_09tO8fZp~K;vr*g(BF& zzP>)3IPqh(efyIj>~>4j@H|hk$GKb%Zq)_FpA!*E8N88%LWQ6z;vf#|1M@5yPKr_R zX>-7H0osf53v1S_#?sOv2$Mxw{6m77nOU09w9XLSQn3V=6e%~5uoE%h$cPACj7cN~ zOcj=(iv?%~H7%%A8b~!j`5_hH+1Uqt6=4SCW_fu@cC&2@ckj;P*s%e!bP2t^y*PB} z5KM#F5a(jl1{0PI@Afsge|;CY{Ws{s3>O`gMd0ZsVAC$B-acVeK@s&OW>$n55X(aU z3e5Sey9!40`q@|YTW^&>j+e4 z6*N_scjH5)x_f~{3JMX02$>fKWOLs-_EfHwN|mp?ke`c0G0+U2fIEE`m67j3bv^?; zya2QJWh9^32T7(M9s| zK2&)QM(0OLPq%s0#Ak-?;l9-}I^k>#X+buBC8DEdq z1}+C6Iyet>9lLc^AY~X-K`=ytsgph+Yy6~irQ-$bwBxg98omJnNdU4|Iw?uGcPs>i zTg!kC9%O&i&t*;o5Ru-KZh%U+`B2Urbg3Zc2M8dDI*gzddoY9nVHhz6TvrT;0R>j7 znktAS`p=d(=3uVdj_N-z$b4mT0+}a14P6$4#cT14*F%T<#`?etNf;)I5z-X&fP`(s zvaN6pYfEEEJ-HhT9}K~0eHz6-{sP&jJ_ozG6>hNrPr53XpcNcSPCN$)e5Eo(K8|y5yn&s&cA@DTKgIo5cEil?MD^|% z?*C*D?9I=?ShZGYuHGDn+0lc>{omm|KCur37AjGkxIQ8BpGL7%l56f$yI{WjXUzQa z7~DI*2htXtOG7|4Y9sI_N8ohdK6(a=m&Z`N`T^XBQ_yY|%1**q-2%JwahMHRMy+ebbxG*DuDq7L_~O@t zGe9J2Na0{Tw_1hCZPzKormAS#{VcrCejcvlNQrq0a$I{{C1f---PJcD87fRL6+A4J z$_yyyK#-Wqi1i5(F~|qe9s!mrq#M?|3B}G;D;h2V3&zTaQS{zDH8m|BdHit_dCNE| zWTUPxgbZq*!oV}}E_|juNH=6>@UMIK;s$sef`wA4v}#o@r%%8By6WlaK}ScPHxUKR zRFlNm4@1V!<6()1CoU4!blSl6>(}wK*Iv`@?d_T{6+N4@$dk8d!GX?>j>;d&VBD|g$)Sq>AMprPoBis*qG|>?sjOu zB*|}hr$M^;8X1w;wr!g;Iy!2R7-26yd-g2$?%m7ADE@xn#xyZ8fr}R};>?*}VPxcY zc*MbMX~L+`UP-#YLynxXE?>TUt*fi6k0#zCOB=Rs-74jm$z&9RG&VMhcT-bSpbuCz zGBSdpp&^8WbmjTVBRbNVIc7@H|0MmtM^5jd{T_y&=kE|LUBto<_yN^<8`Doioj-rx z`1s?07>5rZk^NXUZ{Doa=`_a?B>EE!h#zR0oV-o)CK+>*9Dl&r{|2E}pShrZ8B_oO N002ovPDHLkV1gq(qd@=w literal 0 HcmV?d00001 diff --git a/src/icons/TawkTo.png b/src/icons/TawkTo.png new file mode 100644 index 0000000000000000000000000000000000000000..87d0b6611318f539033064d9f99e50efb4769a8c GIT binary patch literal 2076 zcmV+%2;=vOP)i|m zq9huF2@xX+z7pJ}fsbh|sdo$bEnai70)yi-cjO@JLgnUneF zckegnmz>|dmrw^0p@jGk?Cp($@Ea1F91|VaDcYC$;Vokya*Z`KG$i?ap78|y&S`Q|_EzIG$A zTCy#&VZ(av?CMsz&Q7q16ecEOp}@uJ=I!>0+3oQ{^~X!UdHzXO^gSB9;q6+u!V0eZ zTq`4y-qec5j9aXjQU=U9{uIQL<%+t8^wZF{e@~)zaJyTWhp;cB5zG=dq>#Ggy1+Rj5Wl7>Cjr zfI8j{RLXHI+fG&*g&>aFHR_`P@N8;kRb$ZBs@Z~qBCqPfFk`lO1~nZU`p~kv7c(<6 z@G6U?Fd2zTP6jcNWNRR`oE9wd!#e4SB>kR|6MKwtyA|0a?R8T6F&du-S=?N63 zCLtog`RyknAm({h%tfVB7i^;075`ZMS8@ddmBhoCH5a{d+^p@0ytDxaOv0-p+=n6H{1e@JAuWf zC2~s&Bnn`Fh0g^lQeZY>X-yJH)tf98DKtT~THWK7{QHrR;@??SnHHoXm~I$DHx!bgSJ6$I2k&5DE&O z2?1qL6N3Q(lvX4hXa4VwlZU@TV#m`v8egd#yTmYKqEf(Xi$~!o3nxmaFdr_$u;5s= z2wPd_XIKc!)gOG}_Kf31M~`k^{Z3^PFU%iAz&^$nj$(BF6~q!_eC{Nk^$X~=T}1EA zvw#3$fslmw02+00$X(4Mt*5;rG!(@WVca{8CY8bA#W(Tt+$=h^1B(a|3kV5|UD#W>JFxn@ex6S3~f-30z-^NOcntGhGAgQPr(5|%n(2b00YKx6dWb{AH8mL0RZKZ zuQNCgN{W#XqFxZyeryv62_m5ADNF}~6ayRqia{b0K`X~ChhdY@BS;Jk4=4~mBv?Qf zR{ypA3W=?|x4H!B6%lA8MSx2RWnbY<59ncn8xt%8NF-4VWw$mcG%L>+ihYd9O z!O!+?+jBn>`61AGWgafuAq#0W&MqJ9GH6IFIT3?efXN{rJ1GE z3y=yKBo6NAw(|LJNB9WT_xR0UX2GzN)(SDh5W#0)scdFa7T)g7ux`=vtDQGJH;jZp zG=XBAH~-zgZ8x!eu^fjZC#|ktb`jSThU@gD}I%CkQZZ4U8kE{POJ-2oXrIg8u;!g!%k^jc(Ea0000userlike_general_logo_small_60x60 \ No newline at end of file From 3cc14fd6e9c433a190f4ae4ff8047788e3e32b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Petit?= Date: Wed, 17 Aug 2016 12:03:30 +0200 Subject: [PATCH 2/6] Adding LiveAgent in category live chat --- src/apps.json | 10 +++++++++- src/icons/LiveAgent.png | Bin 0 -> 1517 bytes 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/icons/LiveAgent.png diff --git a/src/apps.json b/src/apps.json index 0a01af5e5..0c1570878 100755 --- a/src/apps.json +++ b/src/apps.json @@ -3932,6 +3932,14 @@ "implies": "PHP", "website": "www.lithium.com" }, + "LiveAgent": { + "cats": [ + 52 + ], + "env": "^LiveAgent$", + "icon": "LiveAgent.png", + "website": "www.ladesk.com" + }, "LiveChat": { "cats": [ 52 @@ -9209,4 +9217,4 @@ "51": "Landing Page Builders", "52": "Live Chat" } -} \ No newline at end of file +} diff --git a/src/icons/LiveAgent.png b/src/icons/LiveAgent.png new file mode 100644 index 0000000000000000000000000000000000000000..112c6a95b91bcf7ddf2e6f9d7cd0fc65604eb080 GIT binary patch literal 1517 zcmVKEsa-dbWikhrm49z=sr%j_+I1up0A|<<*Vw{fLiMH33*l|jV_Rpjh{mK^YU%S^La@yu?Z`yp@(~?*9{d}0+8tem0 zh{(V7YMBlrhSMj&m&cX4`H-^OFTH=Ft&nv6t zHAt`O3`eAFGzg497bEA0hNq+zpMh)=q}4NvrqCpst<8|OWoTk!DR45KAVq5)1Z$x^ z2xD-N{T(Mi(yTh9YF{F7VB2yB>ZHwkZir4I&e?Psv6Ql7HdG3MJxfoc&@rV^< z#wfyQFDMb8wavQ6=l2Mc@I9Bj@i}4)lNjRn`vFd)o$3P^$KMl4z+9iT)2n0d8o?T+ zi2mY5LdgsPml$|t3eHdx_c1`4TVHY4Gf%oxC>grph%Jx7sDWWawpQ$dw04Y2(U!$r zeyc?64_m~}NzpNjBxZoGP0<>~tM7v0E(9^i>j1cvj7QRtFiws%KI@Y3B@GyMWpygZ zBSX>jGQ7oB`_aMcn-(91 zptO#{2mPS<_BZB%t?FJS>JLCjPRgp^UmWVzQR2;SyJ<6PZ-;CbP_8N5B?K}hBnng$ z7~NAE=p9z6td41Eb24Wkz9)Pg8%OJYsr& zq^d_S=>e5Dk#LGb1|Z&_sH%Eq^Nl?)MnLWF5y;F@wgGG4GMwn8+|E+S9ntuN4tM?i zkW1kGq=FL(Ktg-yJ~bgP4N`kt*8Ey=-1WR}FNV724wy^=b}=ucn|ES8__8X%2vvFW zOS%Rc?xTgIbr>;_z}AP|HCEdYjOscFOR{`X8VcU+0cF-7#7bNffs+X&5HYnBt5Z@F zaFFdB5pb;L=Sv9S1~zYcNE6tR^9k6C5U@S9Ko)C>*Y2W*utJL1Z)jimHG$XDFw*N5 z7HJpT@IgNXxR6pHUHO?cNiPK-!iY{mS@6J=?j7-8A;&72-k|kGm`DI*bd#}p;+<=h6}_-%JJ!`-fNTn22r;ax-2t{YCUpVc zwyT(lyFDAVeIChtL+zIu4;E&TNI;fVA@EunPLu}7Cl{7q@LOWoZLBHEyHsZNJps6P zgh^0ykT?Zl64_4l;UX8{imTl`N(VJ%^3#(J;oMUqs=VP2Eaa ztw*psey>&09d5Y_h7oX_0Fyupp&o+M^9PzQZtFhGmIwPG_<#8d4&S4pG?!)#O0hsmH^KPO-(;|?T8@|At1EA_0u zO5pOfp{(ltFx-tbpyi~FZ`|iTAKz2q6QvYV>aOXZlEC}OB%JA|FQyqH6Og-ZM^HG0 zbk&29je)cxqjSgD_8S83e?00jy?&>iUe_5Wc0>P+hQFZ0QoWHRmQD?_Ywq=5JITkh TW;)Hu00000NkvXXu0mjf47tzp literal 0 HcmV?d00001 From 8b196cc2e5150b603deab0958459649c548902ec Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Wed, 17 Aug 2016 19:07:17 -0500 Subject: [PATCH 3/6] Fix svg2png in tests, update node deps --- .travis.yml | 1 + bin/wappalyzer-build | 2 +- docker/Dockerfile | 1 - docker/node/package.json | 9 +++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fda78932..d6812a640 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ 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..152b0e513 100755 --- a/bin/wappalyzer-build +++ b/bin/wappalyzer-build @@ -42,7 +42,7 @@ 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 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..30f0c9552 100644 --- a/docker/node/package.json +++ b/docker/node/package.json @@ -12,13 +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": "*", + "phantomjs-prebuilt": "*", + "svg2png": "*", "svgo": "*" }, "engines": { From 5a88077b68b739d840f9ab1501cf4346d5107cbe Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Wed, 17 Aug 2016 19:15:00 -0500 Subject: [PATCH 4/6] compressing converted icons --- bin/wappalyzer-build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build index 152b0e513..382c91f29 100755 --- a/bin/wappalyzer-build +++ b/bin/wappalyzer-build @@ -48,6 +48,10 @@ 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 -o 7 + wappalyzer links # Npm Module From 64a2eaafe6b93be0aa1c1ea70db6671549620b9f Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Wed, 17 Aug 2016 19:31:38 -0500 Subject: [PATCH 5/6] svg2png only supports node >= 5, so test with latest --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6812a640..3f1090e37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: node_js node_js: - - "4" - "node" sudo: false before_install: From f4e7789a8de3b4a67dd5826348b75a8662da6783 Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Wed, 17 Aug 2016 19:34:02 -0500 Subject: [PATCH 6/6] fix imagemin, use imagemin for SVGs, compress converted icons --- bin/wappalyzer-build | 10 +++------- docker/node/package.json | 5 ++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build index 382c91f29..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..." @@ -50,7 +46,7 @@ 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 -o 7 +node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/converted/* $WAPPALYZER_ROOT/src/icons/converted wappalyzer links diff --git a/docker/node/package.json b/docker/node/package.json index 30f0c9552..cbfe4c39e 100644 --- a/docker/node/package.json +++ b/docker/node/package.json @@ -17,10 +17,9 @@ "read-chunk": "2.0.*", "jsonlint": "*", "jpm": "*", - "imagemin-cli": "*", + "imagemin-cli": "2.*.*", "phantomjs-prebuilt": "*", - "svg2png": "*", - "svgo": "*" + "svg2png": "3.*.*" }, "engines": { "node": ">= 4"