From 0bd721795b6a3d4e63ff32510a1426e840d57f4a Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Tue, 23 Jul 2019 21:09:08 +0800 Subject: [PATCH] code clean up --- frontend/conf/crawlab.conf | 5 - frontend/conf/mime.types | 88 - frontend/conf/nginx.conf | 19 - frontend/src/components/BackToTop/index.vue | 116 -- .../components/Common/CrawlConfirmDialog.vue | 66 + frontend/src/components/Config/ConfigList.vue | 12 +- .../src/components/ImageCropper/index.vue | 1420 ----------------- .../ImageCropper/utils/data2blob 2.js | 19 - .../ImageCropper/utils/data2blob.js | 19 - .../ImageCropper/utils/effectRipple.js | 39 - .../components/ImageCropper/utils/language.js | 232 --- .../components/ImageCropper/utils/mimes.js | 7 - .../components/InfoView/SpiderInfoView.vue | 35 +- frontend/src/i18n/zh.js | 2 + frontend/src/store/modules/spider.js | 7 +- frontend/src/views/node/NodeList.vue | 26 +- frontend/src/views/spider/SpiderList.vue | 44 +- 17 files changed, 129 insertions(+), 2027 deletions(-) delete mode 100644 frontend/conf/crawlab.conf delete mode 100644 frontend/conf/mime.types delete mode 100644 frontend/conf/nginx.conf delete mode 100644 frontend/src/components/BackToTop/index.vue create mode 100644 frontend/src/components/Common/CrawlConfirmDialog.vue delete mode 100644 frontend/src/components/ImageCropper/index.vue delete mode 100755 frontend/src/components/ImageCropper/utils/data2blob 2.js delete mode 100755 frontend/src/components/ImageCropper/utils/data2blob.js delete mode 100755 frontend/src/components/ImageCropper/utils/effectRipple.js delete mode 100755 frontend/src/components/ImageCropper/utils/language.js delete mode 100755 frontend/src/components/ImageCropper/utils/mimes.js diff --git a/frontend/conf/crawlab.conf b/frontend/conf/crawlab.conf deleted file mode 100644 index da8513f3..00000000 --- a/frontend/conf/crawlab.conf +++ /dev/null @@ -1,5 +0,0 @@ -server { - listen 8080; - root /opt/crawlab/frontend/dist; - index index.html; -} diff --git a/frontend/conf/mime.types b/frontend/conf/mime.types deleted file mode 100644 index cd3d700e..00000000 --- a/frontend/conf/mime.types +++ /dev/null @@ -1,88 +0,0 @@ -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/png png; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - image/svg+xml svg svgz; - image/webp webp; - - application/font-woff woff; - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.wap.wmlc wmlc; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; - application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/frontend/conf/nginx.conf b/frontend/conf/nginx.conf deleted file mode 100644 index 56e4cd80..00000000 --- a/frontend/conf/nginx.conf +++ /dev/null @@ -1,19 +0,0 @@ -events { - worker_connections 1024; - multi_accept on; -} - -http { - include mime.types; - default_type application/octet-stream; - - server { - listen 8080; - root /opt/dist; - index index.html; - - location ~ .*\.(js|css)?$ { - expires 1d; - } - } -} diff --git a/frontend/src/components/BackToTop/index.vue b/frontend/src/components/BackToTop/index.vue deleted file mode 100644 index 39977178..00000000 --- a/frontend/src/components/BackToTop/index.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - - - diff --git a/frontend/src/components/Common/CrawlConfirmDialog.vue b/frontend/src/components/Common/CrawlConfirmDialog.vue new file mode 100644 index 00000000..06ef1dba --- /dev/null +++ b/frontend/src/components/Common/CrawlConfirmDialog.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/frontend/src/components/Config/ConfigList.vue b/frontend/src/components/Config/ConfigList.vue index 56dc01c0..8cab5294 100644 --- a/frontend/src/components/Config/ConfigList.vue +++ b/frontend/src/components/Config/ConfigList.vue @@ -32,6 +32,14 @@ + + + + @@ -134,10 +142,11 @@ import { mapState } from 'vuex' import FieldsTableView from '../TableView/FieldsTableView' +import CrawlConfirmDialog from '../Common/CrawlConfirmDialog' export default { name: 'ConfigList', - components: { FieldsTableView }, + components: { CrawlConfirmDialog, FieldsTableView }, data () { return { crawlTypeList: [ @@ -149,6 +158,7 @@ export default { previewLoading: false, saveLoading: false, dialogVisible: false, + crawlConfirmDialogVisible: false, columnsDict: {} } }, diff --git a/frontend/src/components/ImageCropper/index.vue b/frontend/src/components/ImageCropper/index.vue deleted file mode 100644 index 04b1ede9..00000000 --- a/frontend/src/components/ImageCropper/index.vue +++ /dev/null @@ -1,1420 +0,0 @@ - - - - - - - diff --git a/frontend/src/components/ImageCropper/utils/data2blob 2.js b/frontend/src/components/ImageCropper/utils/data2blob 2.js deleted file mode 100755 index 9c47f8af..00000000 --- a/frontend/src/components/ImageCropper/utils/data2blob 2.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * database64文件格式转换为2进制 - * - * @param {[String]} data dataURL 的格式为 “data:image/png;base64,****”,逗号之前都是一些说明性的文字,我们只需要逗号之后的就行了 - * @param {[String]} mime [description] - * @return {[blob]} [description] - */ -export default function(data, mime) { - data = data.split(',')[1] - data = window.atob(data) - var ia = new Uint8Array(data.length) - for (var i = 0; i < data.length; i++) { - ia[i] = data.charCodeAt(i) - } - // canvas.toDataURL 返回的默认格式就是 image/png - return new Blob([ia], { - type: mime - }) -} diff --git a/frontend/src/components/ImageCropper/utils/data2blob.js b/frontend/src/components/ImageCropper/utils/data2blob.js deleted file mode 100755 index 9c47f8af..00000000 --- a/frontend/src/components/ImageCropper/utils/data2blob.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * database64文件格式转换为2进制 - * - * @param {[String]} data dataURL 的格式为 “data:image/png;base64,****”,逗号之前都是一些说明性的文字,我们只需要逗号之后的就行了 - * @param {[String]} mime [description] - * @return {[blob]} [description] - */ -export default function(data, mime) { - data = data.split(',')[1] - data = window.atob(data) - var ia = new Uint8Array(data.length) - for (var i = 0; i < data.length; i++) { - ia[i] = data.charCodeAt(i) - } - // canvas.toDataURL 返回的默认格式就是 image/png - return new Blob([ia], { - type: mime - }) -} diff --git a/frontend/src/components/ImageCropper/utils/effectRipple.js b/frontend/src/components/ImageCropper/utils/effectRipple.js deleted file mode 100755 index 46a01640..00000000 --- a/frontend/src/components/ImageCropper/utils/effectRipple.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 点击波纹效果 - * - * @param {[event]} e [description] - * @param {[Object]} arg_opts [description] - * @return {[bollean]} [description] - */ -export default function(e, arg_opts) { - var opts = Object.assign({ - ele: e.target, // 波纹作用元素 - type: 'hit', // hit点击位置扩散center中心点扩展 - bgc: 'rgba(0, 0, 0, 0.15)' // 波纹颜色 - }, arg_opts) - var target = opts.ele - if (target) { - var rect = target.getBoundingClientRect() - var ripple = target.querySelector('.e-ripple') - if (!ripple) { - ripple = document.createElement('span') - ripple.className = 'e-ripple' - ripple.style.height = ripple.style.width = Math.max(rect.width, rect.height) + 'px' - target.appendChild(ripple) - } else { - ripple.className = 'e-ripple' - } - switch (opts.type) { - case 'center': - ripple.style.top = (rect.height / 2 - ripple.offsetHeight / 2) + 'px' - ripple.style.left = (rect.width / 2 - ripple.offsetWidth / 2) + 'px' - break - default: - ripple.style.top = (e.pageY - rect.top - ripple.offsetHeight / 2 - document.body.scrollTop) + 'px' - ripple.style.left = (e.pageX - rect.left - ripple.offsetWidth / 2 - document.body.scrollLeft) + 'px' - } - ripple.style.backgroundColor = opts.bgc - ripple.className = 'e-ripple z-active' - return false - } -} diff --git a/frontend/src/components/ImageCropper/utils/language.js b/frontend/src/components/ImageCropper/utils/language.js deleted file mode 100755 index 727872d9..00000000 --- a/frontend/src/components/ImageCropper/utils/language.js +++ /dev/null @@ -1,232 +0,0 @@ -export default { - zh: { - hint: '点击,或拖动图片至此处', - loading: '正在上传……', - noSupported: '浏览器不支持该功能,请使用IE10以上或其他现在浏览器!', - success: '上传成功', - fail: '图片上传失败', - preview: '头像预览', - btn: { - off: '取消', - close: '关闭', - back: '上一步', - save: '保存' - }, - error: { - onlyImg: '仅限图片格式', - outOfSize: '单文件大小不能超过 ', - lowestPx: '图片最低像素为(宽*高):' - } - }, - 'zh-tw': { - hint: '點擊,或拖動圖片至此處', - loading: '正在上傳……', - noSupported: '瀏覽器不支持該功能,請使用IE10以上或其他現代瀏覽器!', - success: '上傳成功', - fail: '圖片上傳失敗', - preview: '頭像預覽', - btn: { - off: '取消', - close: '關閉', - back: '上一步', - save: '保存' - }, - error: { - onlyImg: '僅限圖片格式', - outOfSize: '單文件大小不能超過 ', - lowestPx: '圖片最低像素為(寬*高):' - } - }, - en: { - hint: 'Click or drag the file here to upload', - loading: 'Uploading…', - noSupported: 'Browser is not supported, please use IE10+ or other browsers', - success: 'Upload success', - fail: 'Upload failed', - preview: 'Preview', - btn: { - off: 'Cancel', - close: 'Close', - back: 'Back', - save: 'Save' - }, - error: { - onlyImg: 'Image only', - outOfSize: 'Image exceeds size limit: ', - lowestPx: 'Image\'s size is too low. Expected at least: ' - } - }, - ro: { - hint: 'Atinge sau trage fișierul aici', - loading: 'Se încarcă', - noSupported: 'Browser-ul tău nu suportă acest feature. Te rugăm încearcă cu alt browser.', - success: 'S-a încărcat cu succes', - fail: 'A apărut o problemă la încărcare', - preview: 'Previzualizează', - - btn: { - off: 'Anulează', - close: 'Închide', - back: 'Înapoi', - save: 'Salvează' - }, - - error: { - onlyImg: 'Doar imagini', - outOfSize: 'Imaginea depășește limita de: ', - loewstPx: 'Imaginea este prea mică; Minim: ' - } - }, - ru: { - hint: 'Нажмите, или перетащите файл в это окно', - loading: 'Загружаю……', - noSupported: 'Ваш браузер не поддерживается, пожалуйста, используйте IE10 + или другие браузеры', - success: 'Загрузка выполнена успешно', - fail: 'Ошибка загрузки', - preview: 'Предпросмотр', - btn: { - off: 'Отменить', - close: 'Закрыть', - back: 'Назад', - save: 'Сохранить' - }, - error: { - onlyImg: 'Только изображения', - outOfSize: 'Изображение превышает предельный размер: ', - lowestPx: 'Минимальный размер изображения: ' - } - }, - 'pt-br': { - hint: 'Clique ou arraste o arquivo aqui para carregar', - loading: 'Carregando…', - noSupported: 'Browser não suportado, use o IE10+ ou outro browser', - success: 'Sucesso ao carregar imagem', - fail: 'Falha ao carregar imagem', - preview: 'Pré-visualizar', - btn: { - off: 'Cancelar', - close: 'Fechar', - back: 'Voltar', - save: 'Salvar' - }, - error: { - onlyImg: 'Apenas imagens', - outOfSize: 'A imagem excede o limite de tamanho: ', - lowestPx: 'O tamanho da imagem é muito pequeno. Tamanho mínimo: ' - } - }, - fr: { - hint: 'Cliquez ou glissez le fichier ici.', - loading: 'Téléchargement…', - noSupported: 'Votre navigateur n\'est pas supporté. Utilisez IE10 + ou un autre navigateur s\'il vous plaît.', - success: 'Téléchargement réussit', - fail: 'Téléchargement echoué', - preview: 'Aperçu', - btn: { - off: 'Annuler', - close: 'Fermer', - back: 'Retour', - save: 'Enregistrer' - }, - error: { - onlyImg: 'Image uniquement', - outOfSize: 'L\'image sélectionnée dépasse la taille maximum: ', - lowestPx: 'L\'image sélectionnée est trop petite. Dimensions attendues: ' - } - }, - nl: { - hint: 'Klik hier of sleep een afbeelding in dit vlak', - loading: 'Uploaden…', - noSupported: 'Je browser wordt helaas niet ondersteund. Gebruik IE10+ of een andere browser.', - success: 'Upload succesvol', - fail: 'Upload mislukt', - preview: 'Voorbeeld', - btn: { - off: 'Annuleren', - close: 'Sluiten', - back: 'Terug', - save: 'Opslaan' - }, - error: { - onlyImg: 'Alleen afbeeldingen', - outOfSize: 'De afbeelding is groter dan: ', - lowestPx: 'De afbeelding is te klein! Minimale afmetingen: ' - } - }, - tr: { - hint: 'Tıkla veya yüklemek istediğini buraya sürükle', - loading: 'Yükleniyor…', - noSupported: 'Tarayıcı desteklenmiyor, lütfen IE10+ veya farklı tarayıcı kullanın', - success: 'Yükleme başarılı', - fail: 'Yüklemede hata oluştu', - preview: 'Önizle', - btn: { - off: 'İptal', - close: 'Kapat', - back: 'Geri', - save: 'Kaydet' - }, - error: { - onlyImg: 'Sadece resim', - outOfSize: 'Resim yükleme limitini aşıyor: ', - lowestPx: 'Resmin boyutu çok küçük. En az olması gereken: ' - } - }, - 'es-MX': { - hint: 'Selecciona o arrastra una imagen', - loading: 'Subiendo...', - noSupported: 'Tu navegador no es soportado, porfavor usa IE10+ u otros navegadores mas recientes', - success: 'Subido exitosamente', - fail: 'Sucedió un error', - preview: 'Vista previa', - btn: { - off: 'Cancelar', - close: 'Cerrar', - back: 'Atras', - save: 'Guardar' - }, - error: { - onlyImg: 'Unicamente imagenes', - outOfSize: 'La imagen excede el tamaño maximo:', - lowestPx: 'La imagen es demasiado pequeño. Se espera por lo menos:' - } - }, - de: { - hint: 'Klick hier oder zieh eine Datei hier rein zum Hochladen', - loading: 'Hochladen…', - noSupported: 'Browser wird nicht unterstützt, bitte verwende IE10+ oder andere Browser', - success: 'Upload erfolgreich', - fail: 'Upload fehlgeschlagen', - preview: 'Vorschau', - btn: { - off: 'Abbrechen', - close: 'Schließen', - back: 'Zurück', - save: 'Speichern' - }, - error: { - onlyImg: 'Nur Bilder', - outOfSize: 'Das Bild ist zu groß: ', - lowestPx: 'Das Bild ist zu klein. Mindestens: ' - } - }, - ja: { - hint: 'クリック・ドラッグしてファイルをアップロード', - loading: 'アップロード中...', - noSupported: 'このブラウザは対応されていません。IE10+かその他の主要ブラウザをお使いください。', - success: 'アップロード成功', - fail: 'アップロード失敗', - preview: 'プレビュー', - btn: { - off: 'キャンセル', - close: '閉じる', - back: '戻る', - save: '保存' - }, - error: { - onlyImg: '画像のみ', - outOfSize: '画像サイズが上限を超えています。上限: ', - lowestPx: '画像が小さすぎます。最小サイズ: ' - } - } -} diff --git a/frontend/src/components/ImageCropper/utils/mimes.js b/frontend/src/components/ImageCropper/utils/mimes.js deleted file mode 100755 index e20c085c..00000000 --- a/frontend/src/components/ImageCropper/utils/mimes.js +++ /dev/null @@ -1,7 +0,0 @@ -export default { - 'jpg': 'image/jpeg', - 'png': 'image/png', - 'gif': 'image/gif', - 'svg': 'image/svg+xml', - 'psd': 'image/photoshop' -} diff --git a/frontend/src/components/InfoView/SpiderInfoView.vue b/frontend/src/components/InfoView/SpiderInfoView.vue index a3ea417b..7bd6b99f 100644 --- a/frontend/src/components/InfoView/SpiderInfoView.vue +++ b/frontend/src/components/InfoView/SpiderInfoView.vue @@ -1,5 +1,11 @@