From: Aoichaan0513 Date: Wed, 12 Jun 2019 07:30:12 +0000 (+0900) Subject: v2.4.3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c69b2ac31382620f6b71b98ef9bc165c204bc398;p=serene%2FMyBrowser.git v2.4.3 ・UI・コンテキストメニュー・メニューで使用されるアイコンの一部変更 (内部ページで使用されているものと同等のものに変更。アウトライン) ・言語ファイル (英語)の翻訳を現段階ではすべて完了 ・一部リポジトリの更新 ・その他バグ・不具合の修正 --- diff --git a/app/electron/WindowManager.js b/app/electron/WindowManager.js index d78f82a..a581770 100644 --- a/app/electron/WindowManager.js +++ b/app/electron/WindowManager.js @@ -487,6 +487,13 @@ module.exports = class WindowManager { config.set('window.bounds', window.getBounds()); }); + window.on('focus', () => { + window.webContents.send(`window-focus-${id}`, {}); + }); + window.on('blur', () => { + window.webContents.send(`window-blur-${id}`, {}); + }); + window.on('maximize', this.fixBounds.bind(this, id, (floatingWindows.indexOf(id) != -1))); window.on('unmaximize', this.fixBounds.bind(this, id, (floatingWindows.indexOf(id) != -1))); window.on('enter-full-screen', this.fixBounds.bind(this, id, (floatingWindows.indexOf(id) != -1))); @@ -949,13 +956,12 @@ module.exports = class WindowManager { if (view.isDestroyed()) return; let menu; - if (params.linkURL !== '') { + if (params.linkURL !== '' && !params.hasImageContents) { menu = Menu.buildFromTemplate( [ { label: lang.window.view.contextMenu.link.newTab, click: () => { - this.addView(windowId, `view-source:${view.webContents.getURL()}`, false); this.addView(windowId, params.linkURL, true); } }, @@ -992,7 +998,7 @@ module.exports = class WindowManager { } ] ); - } else if (params.hasImageContents) { + } else if (params.linkURL === '' && params.hasImageContents) { menu = Menu.buildFromTemplate( [ { @@ -1041,6 +1047,81 @@ module.exports = class WindowManager { } ] ); + } else if (params.linkURL !== '' && params.hasImageContents) { + menu = Menu.buildFromTemplate( + [ + { + label: lang.window.view.contextMenu.link.newTab, + click: () => { + this.addView(windowId, params.linkURL, true); + } + }, + { + label: lang.window.view.contextMenu.link.newWindow, + enabled: false, + click: () => { view.webContents.openDevTools(); } + }, + { + label: lang.window.view.contextMenu.link.openPrivateWindow, + enabled: false, + click: () => { view.webContents.openDevTools(); } + }, + { type: 'separator' }, + { + label: lang.window.view.contextMenu.link.copy, + accelerator: 'CmdOrCtrl+C', + click: () => { + clipboard.clear(); + clipboard.writeText(params.linkURL); + } + }, + { type: 'separator' }, + { + label: lang.window.view.contextMenu.image.newTab, + click: () => { + this.addView(windowId, params.srcURL, true); + } + }, + { + label: lang.window.view.contextMenu.image.saveImage, + enabled: !view.webContents.getURL().startsWith(`${protocolStr}://`), + click: () => { + download(window, params.srcURL, { + directory: app.getPath('downloads'), + saveAs: true + }); + } + }, + { + label: lang.window.view.contextMenu.image.copyImage, + click: () => { + const img = nativeImage.createFromDataURL(params.srcURL); + + clipboard.clear(); + clipboard.writeImage(img); + } + }, + { + label: lang.window.view.contextMenu.image.copyLink, + click: () => { + clipboard.clear(); + clipboard.writeText(params.srcURL); + } + }, + { type: 'separator' }, + { + label: lang.window.view.contextMenu.devTool, + accelerator: 'CmdOrCtrl+Shift+I', + enabled: !view.webContents.getURL().startsWith(`${protocolStr}://`), + click: () => { + if (view.webContents.isDevToolsOpened()) + view.webContents.devToolsWebContents.focus(); + else + view.webContents.openDevTools(); + } + } + ] + ); } else if (params.isEditable) { menu = Menu.buildFromTemplate( [ @@ -1170,6 +1251,7 @@ module.exports = class WindowManager { { label: lang.window.view.contextMenu.savePage, accelerator: 'CmdOrCtrl+S', + icon: `${app.getAppPath()}/static/save.png`, enabled: !view.webContents.getURL().startsWith(`${protocolStr}://`), click: () => { dialog.showSaveDialog(window, { diff --git a/app/langs/en.js b/app/langs/en.js index a2caee9..ca02d50 100644 --- a/app/langs/en.js +++ b/app/langs/en.js @@ -6,16 +6,16 @@ module.exports = { window: { titleBar: { tab: { - close: 'このタブを閉じる', - new: '新しいタブを開く' + close: 'Close this tab', + new: 'Open a new tab' }, buttons: { - minimize: '最小化', + minimize: 'Minimize', maximize: { - maximize: '最大化', - restore: '元に戻す (縮小)' + maximize: 'Maximize', + restore: 'Restore (Shrink)' }, - close: '閉じる' + close: 'Close' } }, toolBar: { @@ -30,24 +30,24 @@ module.exports = { info: { info: 'Information on this page', clicked: { - internal: `保護された ${pkg.name} ページを表示しています`, - secure: 'このサイトへの接続は保護されています', - insecure: 'このサイトへの接続は保護されていません' + internal: `Showing protected ${pkg.name} page`, + secure: 'The connection to this site is secure', + insecure: 'The connection to this site is not secure' } }, bookmark: { - add: 'ブックマークに追加', - remove: 'ブックマークから削除', + add: 'Add to bookmark', + remove: 'Remove from bookmark', clicked: { - add: 'ブックマークに追加しました', - remove: 'ブックマークから削除しました', - addPrivate: 'プライベート ブックマークに追加しました', - removePrivate: 'プライベート ブックマークから削除しました' + add: 'Added to bookmark', + remove: 'Removed from bookmark', + addPrivate: 'Added to private bookmark', + removePrivate: 'Removed from private bookmarks' } }, }, extensions: { - adBlock: '{replace}個の広告をブロックしました', + adBlock: 'Blocked {replace} ads', feedback: 'Send Feedback' }, menu: { @@ -62,6 +62,7 @@ module.exports = { app: { app: 'Application', list: 'App list', + store: 'Flast Store', install: 'Install {title}', uninstall: 'Uninstall {title}', run: 'Launch {title}' @@ -77,16 +78,16 @@ module.exports = { view: { contextMenu: { link: { - newTab: '新しいタブで開く', - newWindow: '新しいウィンドウで開く', - openPrivateWindow: 'プライベート ウィンドウで開く', - copy: 'リンクをコピー' + newTab: 'Open link in new tab', + newWindow: 'Open link in new window', + openPrivateWindow: 'Open link in private window', + copy: 'Copy link' }, image: { - newTab: '新しいタブで画像を開く', - saveImage: '名前を付けて画像を保存', - copyImage: '画像をコピー', - copyLink: '画像アドレスをコピー' + newTab: 'Open image in new tab', + saveImage: 'Save image as', + copyImage: 'Copy image', + copyLink: 'Copy image link' }, editable: { undo: 'Undo', @@ -98,7 +99,7 @@ module.exports = { }, selection: { copy: 'Copy', - textSearch: '{name}で「{text}」を検索' + textSearch: 'Search {name} for "{text}" ' }, back: 'Back', forward: 'Forward', diff --git a/app/langs/ja.js b/app/langs/ja.js index 53421ef..b3b8978 100644 --- a/app/langs/ja.js +++ b/app/langs/ja.js @@ -62,6 +62,7 @@ module.exports = { app: { app: 'アプリ', list: 'アプリ リスト', + store: 'Flast Store', install: '{title} をインストール', uninstall: '{title} をアンインストール', run: '{title} を起動' @@ -98,7 +99,7 @@ module.exports = { }, selection: { copy: 'コピー', - textSearch: '{name}で「{text}」を検索' + textSearch: '{name} で「{text}」を検索' }, back: '戻る', forward: '進む', diff --git a/app/package.json b/app/package.json index 212c56a..1c07a5b 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "Flast", "description": "Cross-platform browser based on Chromium.", - "version": "2.4.1", + "version": "2.4.3", "flast_channel": "Stable", "flast_package_id": "org.aoichaan0513.Flast", "private": true, @@ -28,9 +28,9 @@ }, "dependencies": { "@cliqz/adblocker": "0.8.0", - "@material-ui/core": "^4.1.0", + "@material-ui/core": "4.1.0", + "@material-ui/lab": "4.0.0-alpha.15", "@material-ui/icons": "^4.1.0", - "@material-ui/lab": "^4.0.0-alpha.15", "@tippy.js/react": "^2.2.0", "axios": "0.18.0", "electron-dl": "^1.14.0", diff --git a/app/pages/static/bundle.js b/app/pages/static/bundle.js new file mode 100644 index 0000000..ffe4969 --- /dev/null +++ b/app/pages/static/bundle.js @@ -0,0 +1,65 @@ +!function(e){var t={};function n(r){if(t[r])return t[r].exports;var i=t[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)n.d(r,i,function(t){return e[t]}.bind(null,i));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=79)}([function(e,t,n){"use strict";e.exports=n(65)},function(e,t){function n(){return e.exports=n=Object.assign||function(e){for(var t=1;t=0||Object.prototype.propertyIsEnumerable.call(e,n)&&(o[n]=e[n])}return o}},function(e,t,n){e.exports=n(69)()},function(e,t,n){"use strict";function r(e){var t,n,i="";if(e)if("object"==typeof e)if(e.push)for(t=0;t1&&void 0!==arguments[1]?arguments[1]:{};return function(n){var r=t.defaultTheme,o=t.withTheme,l=void 0!==o&&o,s=t.name,h=a()(t,["defaultTheme","withTheme","name"]),m=s,v=Object(d.a)(e,i()({defaultTheme:r,Component:n,name:s||n.displayName,classNamePrefix:m},h)),y=u.a.forwardRef(function(e,t){e.classes;var o,c=e.innerRef,d=a()(e,["classes","innerRef"]),h=v(e),m=d;return("string"==typeof s||l)&&(o=Object(p.a)()||r,s&&(m=Object(f.a)({theme:o,name:s,props:d})),l&&!m.theme&&(m.theme=o)),u.a.createElement(n,i()({ref:c||t,classes:h},m))});return c()(y,n),y}},m=n(29);t.a=function(e,t){return h(e,i()({defaultTheme:m.a},t))}},function(e,t,n){"use strict";n.d(t,"a",function(){return r}),n.d(t,"b",function(){return i});n(10);function r(e){return e.charAt(0).toUpperCase()+e.slice(1)}function i(){for(var e=arguments.length,t=new Array(e),n=0;n0?r:e)-s/100).concat(o,")")},between:f,only:function(e){return f(e,e)},width:function(e){return n[e]}},c)}},function(e,t,n){"use strict";!function e(){if("undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE)try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(e)}catch(e){console.error(e)}}(),e.exports=n(66)},function(e,t,n){"use strict";var r=function(){};e.exports=r},function(e,t,n){"use strict";(function(e){n.d(t,"e",function(){return de}),n.d(t,"b",function(){return fe}),n.d(t,"d",function(){return ce}),n.d(t,"f",function(){return f}),n.d(t,"c",function(){return c}),n.d(t,"a",function(){return B});var r=n(7),i=n(30),o=(n(34),n(37)),a=n(26),l=n(31),u={}.constructor;function s(e){if(null==e||"object"!=typeof e)return e;if(Array.isArray(e))return e.map(s);if(e.constructor!==u)return e;var t={};for(var n in e)t[n]=s(e[n]);return t}function c(e,t,n){void 0===e&&(e="unnamed");var r=n.jss,i=s(t),o=r.plugins.onCreateRule(e,i,n);return o||(e[0],null)}var d=function(e,t){for(var n="",r=0;r=this.index)t.push(e);else for(var r=0;rn)return void t.splice(r,0,e)},t.reset=function(){this.registry=[]},t.remove=function(e){var t=this.registry.indexOf(e);this.registry.splice(t,1)},t.toString=function(e){return this.registry.filter(function(e){return e.attached}).map(function(t){return t.toString(e)}).join("\n")},Object(o.a)(e,[{key:"index",get:function(){return 0===this.registry.length?0:this.registry[this.registry.length-1].options.index}}]),e}()),K=void 0!==e?e:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{},Q="2f1acc6c3a606b082e5eef5e54414ffb";null==K[Q]&&(K[Q]=0);var Y=K[Q]++,X=function(){var e=0;return function(t,n){e+=1;var r="c",i="";return n&&(r=n.options.classNamePrefix||"c",null!=n.options.jss.id&&(i+=n.options.jss.id)),""+r+Y+i+e}},G=function(e){var t;return function(){return t||(t=e()),t}};function J(e,t){try{return e.attributeStyleMap?e.attributeStyleMap.get(t):e.style.getPropertyValue(t)}catch(e){return""}}function Z(e,t,n){try{var r=n;if(Array.isArray(n)&&(r=f(n,!0),"!important"===n[n.length-1]))return e.style.setProperty(t,r,"important"),!0;e.attributeStyleMap?e.attributeStyleMap.set(t,r):e.style.setProperty(t,r)}catch(e){return!1}return!0}function ee(e,t){try{e.attributeStyleMap?e.attributeStyleMap.delete(t):e.style.removeProperty(t)}catch(e){}}function te(e,t){return e.selectorText=t,e.selectorText===t}var ne=G(function(){return document.querySelector("head")});function re(e){var t=q.registry;if(t.length>0){var n=function(e,t){for(var n=0;nt.index&&r.options.insertionPoint===t.insertionPoint)return r}return null}(t,e);if(n&&n.renderer)return{parent:n.renderer.element.parentNode,node:n.renderer.element};if((n=function(e,t){for(var n=e.length-1;n>=0;n--){var r=e[n];if(r.attached&&r.options.insertionPoint===t.insertionPoint)return r}return null}(t,e))&&n.renderer)return{parent:n.renderer.element.parentNode,node:n.renderer.element.nextSibling}}var r=e.insertionPoint;if(r&&"string"==typeof r){var i=function(e){for(var t=ne(),n=0;n0&&void 0!==arguments[0]?arguments[0]:["all"],t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.duration,r=void 0===n?a.standard:n,u=t.easing,s=void 0===u?o.easeInOut:u,c=t.delay,d=void 0===c?0:c;i()(t,["duration","easing","delay"]);return(Array.isArray(e)?e:[e]).map(function(e){return"".concat(e," ").concat("string"==typeof r?r:l(r)," ").concat(s," ").concat("string"==typeof d?d:l(d))}).join(",")},getAutoHeightDuration:function(e){if(!e)return 0;var t=e/36;return Math.round(10*(4+15*Math.pow(t,.25)+t/5))}}},function(e,t){e.exports=function(e){return e&&e.__esModule?e:{default:e}}},function(e,t,n){"use strict";var r=n(15);Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e,t){var n=o.default.memo(o.default.forwardRef(function(t,n){return o.default.createElement(a.default,(0,i.default)({},t,{ref:n}),e)}));0;return n.muiName=a.default.muiName,n};var i=r(n(1)),o=r(n(0)),a=r(n(80))},function(e,t){e.exports=function(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}},function(e,t,n){"use strict";n.d(t,"c",function(){return a}),n.d(t,"b",function(){return u}),n.d(t,"a",function(){return s}),n.d(t,"d",function(){return c});n(10);function r(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1;return en?n:e}function i(e){if(e.type)return e;if("#"===e.charAt(0))return i(function(e){e=e.substr(1);var t=new RegExp(".{1,".concat(e.length/3,"}"),"g"),n=e.match(t);return n&&1===n[0].length&&(n=n.map(function(e){return e+e})),n?"rgb(".concat(n.map(function(e){return parseInt(e,16)}).join(", "),")"):""}(e));var t=e.indexOf("("),n=e.substring(0,t);if(-1===["rgb","rgba","hsl","hsla"].indexOf(n))throw new Error(["Material-UI: unsupported `".concat(e,"` color."),"We support the following formats: #nnn, #nnnnnn, rgb(), rgba(), hsl(), hsla()."].join("\n"));var r=e.substring(t+1,e.length-1).split(",");return{type:n,values:r=r.map(function(e){return parseFloat(e)})}}function o(e){var t=e.type,n=e.values;return-1!==t.indexOf("rgb")?n=n.map(function(e,t){return t<3?parseInt(e,10):e}):-1!==t.indexOf("hsl")&&(n[1]="".concat(n[1],"%"),n[2]="".concat(n[2],"%")),"".concat(t,"(").concat(n.join(", "),")")}function a(e,t){var n=l(e),r=l(t);return(Math.max(n,r)+.05)/(Math.min(n,r)+.05)}function l(e){var t="hsl"===(e=i(e)).type?i(function(e){var t=(e=i(e)).values,n=t[0],r=t[1]/100,a=t[2]/100,l=r*Math.min(a,1-a),u=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:(e+n/30)%12;return a-l*Math.max(Math.min(t-3,9-t,1),-1)},s="rgb",c=[Math.round(255*u(0)),Math.round(255*u(8)),Math.round(255*u(4))];return"hsla"===e.type&&(s+="a",c.push(t[3])),o({type:s,values:c})}(e)).values:e.values;return t=t.map(function(e){return(e/=255)<=.03928?e/12.92:Math.pow((e+.055)/1.055,2.4)}),Number((.2126*t[0]+.7152*t[1]+.0722*t[2]).toFixed(3))}function u(e,t){return e=i(e),t=r(t),"rgb"!==e.type&&"hsl"!==e.type||(e.type+="a"),e.values[3]=t,o(e)}function s(e,t){if(e=i(e),t=r(t),-1!==e.type.indexOf("hsl"))e.values[2]*=1-t;else if(-1!==e.type.indexOf("rgb"))for(var n=0;n<3;n+=1)e.values[n]*=1-t;return o(e)}function c(e,t){if(e=i(e),t=r(t),-1!==e.type.indexOf("hsl"))e.values[2]+=(100-e.values[2])*t;else if(-1!==e.type.indexOf("rgb"))for(var n=0;n<3;n+=1)e.values[n]+=(255-e.values[n])*t;return o(e)}},function(e,t){e.exports=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}},function(e,t){function n(e,t){for(var n=0;n0&&void 0!==arguments[0]?arguments[0]:{};return a()({paddingLeft:t(2),paddingRight:t(2)},n,i()({},e.up("sm"),a()({paddingLeft:t(3),paddingRight:t(3)},n[e.up("sm")])))},toolbar:(r={minHeight:56},i()(r,"".concat(e.up("xs")," and (orientation: landscape)"),{minHeight:48}),i()(r,e.up("sm"),{minHeight:64}),r)},n)}var m={50:"#e8eaf6",100:"#c5cae9",200:"#9fa8da",300:"#7986cb",400:"#5c6bc0",500:"#3f51b5",600:"#3949ab",700:"#303f9f",800:"#283593",900:"#1a237e",A100:"#8c9eff",A200:"#536dfe",A400:"#3d5afe",A700:"#304ffe"},v={50:"#fce4ec",100:"#f8bbd0",200:"#f48fb1",300:"#f06292",400:"#ec407a",500:"#e91e63",600:"#d81b60",700:"#c2185b",800:"#ad1457",900:"#880e4f",A100:"#ff80ab",A200:"#ff4081",A400:"#f50057",A700:"#c51162"},y={50:"#fafafa",100:"#f5f5f5",200:"#eeeeee",300:"#e0e0e0",400:"#bdbdbd",500:"#9e9e9e",600:"#757575",700:"#616161",800:"#424242",900:"#212121",A100:"#d5d5d5",A200:"#aaaaaa",A400:"#303030",A700:"#616161"},g={50:"#ffebee",100:"#ffcdd2",200:"#ef9a9a",300:"#e57373",400:"#ef5350",500:"#f44336",600:"#e53935",700:"#d32f2f",800:"#c62828",900:"#b71c1c",A100:"#ff8a80",A200:"#ff5252",A400:"#ff1744",A700:"#d50000"},b={black:"#000",white:"#fff"},x=n(18),w={text:{primary:"rgba(0, 0, 0, 0.87)",secondary:"rgba(0, 0, 0, 0.54)",disabled:"rgba(0, 0, 0, 0.38)",hint:"rgba(0, 0, 0, 0.38)"},divider:"rgba(0, 0, 0, 0.12)",background:{paper:b.white,default:y[50]},action:{active:"rgba(0, 0, 0, 0.54)",hover:"rgba(0, 0, 0, 0.08)",hoverOpacity:.08,selected:"rgba(0, 0, 0, 0.14)",disabled:"rgba(0, 0, 0, 0.26)",disabledBackground:"rgba(0, 0, 0, 0.12)"}},k={text:{primary:b.white,secondary:"rgba(255, 255, 255, 0.7)",disabled:"rgba(255, 255, 255, 0.5)",hint:"rgba(255, 255, 255, 0.5)",icon:"rgba(255, 255, 255, 0.5)"},divider:"rgba(255, 255, 255, 0.12)",background:{paper:y[800],default:"#303030"},action:{active:b.white,hover:"rgba(255, 255, 255, 0.1)",hoverOpacity:.1,selected:"rgba(255, 255, 255, 0.2)",disabled:"rgba(255, 255, 255, 0.3)",disabledBackground:"rgba(255, 255, 255, 0.12)"}};function E(e,t,n,r){e[t]||(e.hasOwnProperty(n)?e[t]=e[n]:"light"===t?e.light=Object(x.d)(e.main,r):"dark"===t&&(e.dark=Object(x.a)(e.main,1.5*r)))}function S(e){return Math.round(1e5*e)/1e5}var T={textTransform:"uppercase"},C='"Roboto", "Helvetica", "Arial", sans-serif';function P(e,t){var n="function"==typeof t?t(e):t,r=n.fontFamily,i=void 0===r?C:r,o=n.fontSize,l=void 0===o?14:o,s=n.fontWeightLight,d=void 0===s?300:s,f=n.fontWeightRegular,p=void 0===f?400:f,h=n.fontWeightMedium,m=void 0===h?500:h,v=n.htmlFontSize,y=void 0===v?16:v,g=n.allVariants,b=u()(n,["fontFamily","fontSize","fontWeightLight","fontWeightRegular","fontWeightMedium","htmlFontSize","allVariants"]),x=l/14,w=function(e){return"".concat(e/y*x,"rem")},k=function(e,t,n,r,o){return a()({fontFamily:i,fontWeight:e,fontSize:w(t),lineHeight:n},i===C?{letterSpacing:"".concat(S(r/t),"em")}:{},o,g)},E={h1:k(d,96,1,-1.5),h2:k(d,60,1,-.5),h3:k(p,48,1.04,0),h4:k(p,34,1.17,.25),h5:k(p,24,1.33,0),h6:k(m,20,1.6,.15),subtitle1:k(p,16,1.75,.15),subtitle2:k(m,14,1.57,.1),body1:k(p,16,1.5,.15),body2:k(p,14,1.43,.15),button:k(m,14,1.75,.4,T),caption:k(p,12,1.66,.4),overline:k(p,12,2.66,1,T)};return c()(a()({htmlFontSize:y,pxToRem:w,round:S,fontFamily:i,fontSize:l,fontWeightLight:d,fontWeightRegular:p,fontWeightMedium:m},E),b,{clone:!1})}var O=.2,_=.14,R=.12;function N(){return["".concat(arguments.length<=0?void 0:arguments[0],"px ").concat(arguments.length<=1?void 0:arguments[1],"px ").concat(arguments.length<=2?void 0:arguments[2],"px ").concat(arguments.length<=3?void 0:arguments[3],"px rgba(0,0,0,").concat(O,")"),"".concat(arguments.length<=4?void 0:arguments[4],"px ").concat(arguments.length<=5?void 0:arguments[5],"px ").concat(arguments.length<=6?void 0:arguments[6],"px ").concat(arguments.length<=7?void 0:arguments[7],"px rgba(0,0,0,").concat(_,")"),"".concat(arguments.length<=8?void 0:arguments[8],"px ").concat(arguments.length<=9?void 0:arguments[9],"px ").concat(arguments.length<=10?void 0:arguments[10],"px ").concat(arguments.length<=11?void 0:arguments[11],"px rgba(0,0,0,").concat(R,")")].join(",")}var j=["none",N(0,1,3,0,0,1,1,0,0,2,1,-1),N(0,1,5,0,0,2,2,0,0,3,1,-2),N(0,1,8,0,0,3,4,0,0,3,3,-2),N(0,2,4,-1,0,4,5,0,0,1,10,0),N(0,3,5,-1,0,5,8,0,0,1,14,0),N(0,3,5,-1,0,6,10,0,0,1,18,0),N(0,4,5,-2,0,7,10,1,0,2,16,1),N(0,5,5,-3,0,8,10,1,0,3,14,2),N(0,5,6,-3,0,9,12,1,0,3,16,2),N(0,6,6,-3,0,10,14,1,0,4,18,3),N(0,6,7,-4,0,11,15,1,0,4,20,3),N(0,7,8,-4,0,12,17,2,0,5,22,4),N(0,7,8,-4,0,13,19,2,0,5,24,4),N(0,7,9,-4,0,14,21,2,0,5,26,4),N(0,8,9,-5,0,15,22,2,0,6,28,5),N(0,8,10,-5,0,16,24,2,0,6,30,5),N(0,8,11,-5,0,17,26,2,0,6,32,5),N(0,9,11,-5,0,18,28,2,0,7,34,6),N(0,9,12,-6,0,19,29,2,0,7,36,6),N(0,10,13,-6,0,20,31,3,0,8,38,7),N(0,10,13,-6,0,21,33,3,0,8,40,7),N(0,10,14,-6,0,22,35,3,0,8,42,7),N(0,11,14,-7,0,23,36,3,0,9,44,8),N(0,11,15,-7,0,24,38,3,0,9,46,8)],M={borderRadius:4};var z=n(14),A=n(35);var D=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.breakpoints,n=void 0===t?{}:t,r=e.mixins,i=void 0===r?{}:r,o=e.palette,l=void 0===o?{}:o,s=e.shadows,d=e.spacing,S=e.typography,T=void 0===S?{}:S,C=u()(e,["breakpoints","mixins","palette","shadows","spacing","typography"]),O=function(e){var t=e.primary,n=void 0===t?{light:m[300],main:m[500],dark:m[700]}:t,r=e.secondary,i=void 0===r?{light:v.A200,main:v.A400,dark:v.A700}:r,o=e.error,l=void 0===o?{light:g[300],main:g[500],dark:g[700]}:o,s=e.type,d=void 0===s?"light":s,f=e.contrastThreshold,p=void 0===f?3:f,h=e.tonalOffset,S=void 0===h?.2:h,T=u()(e,["primary","secondary","error","type","contrastThreshold","tonalOffset"]);function C(e){return Object(x.c)(e,k.text.primary)>=p?k.text.primary:w.text.primary}function P(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:500,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:300,r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:700;return!(e=a()({},e)).main&&e[t]&&(e.main=e[t]),E(e,"light",n,S),E(e,"dark",r,S),e.contrastText||(e.contrastText=C(e.main)),e}var O={dark:k,light:w};return c()(a()({common:b,type:d,primary:P(n),secondary:P(i,"A400","A200","A700"),error:P(l),grey:y,contrastThreshold:p,getContrastText:C,augmentColor:P,tonalOffset:S},O[d]),T,{clone:!1})}(l),_=Object(p.a)(n),R=function(){var e,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:8;if(t.mui)return t;e="function"==typeof t?t:function(e){return t*e};var n=function(){for(var t=arguments.length,n=new Array(t),r=0;r=0?r=setTimeout(u,t-s):(r=null,n||(l=e.apply(o,i),o=i=null))}null==t&&(t=100);var s=function(){o=this,i=arguments,a=Date.now();var s=n&&!r;return r||(r=setTimeout(u,t)),s&&(l=e.apply(o,i),o=i=null),l};return s.clear=function(){r&&(clearTimeout(r),r=null)},s.flush=function(){r&&(l=e.apply(o,i),o=i=null,clearTimeout(r),r=null)},s}n.debounce=n,e.exports=n},function(e,t,n){"use strict";function r(e,t){for(var n=0;n + * + * Copyright (c) 2014-2017, Jon Schlinkert. + * Released under the MIT License. + */var r=n(72);function i(e){return!0===r(e)&&"[object Object]"===Object.prototype.toString.call(e)}e.exports=function(e){var t,n;return!1!==i(e)&&("function"==typeof(t=e.constructor)&&(!1!==i(n=t.prototype)&&!1!==n.hasOwnProperty("isPrototypeOf")))}},function(e,t,n){var r=n(76),i=n(51),o=n(77);e.exports=function(e){return r(e)||i(e)||o()}},function(e,t,n){"use strict";var r=n(15);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=r(n(0)),o=(0,r(n(16)).default)(i.default.createElement(i.default.Fragment,null,i.default.createElement("path",{fill:"none",d:"M0 0h24v24H0V0z"}),i.default.createElement("g",null,i.default.createElement("path",{d:"M12 5.69l5 4.5V18h-2v-6H9v6H7V10.19l5-4.5M12 3L2 12h3v8h6v-6h2v6h6v-8h3L12 3z"}))),"HomeOutlined");t.default=o},function(e,t,n){"use strict";var r=n(15);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=r(n(0)),o=(0,r(n(16)).default)(i.default.createElement(i.default.Fragment,null,i.default.createElement("path",{fill:"none",d:"M0 0h24v24H0V0z"}),i.default.createElement("g",null,i.default.createElement("path",{d:"M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9z"}),i.default.createElement("path",{d:"M12 8v5l4.25 2.52.77-1.28-3.52-2.09V8z"}))),"HistoryOutlined");t.default=o},function(e,t,n){"use strict";var r=n(15);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=r(n(0)),o=(0,r(n(16)).default)(i.default.createElement(i.default.Fragment,null,i.default.createElement("path",{fill:"none",d:"M0 0h24v24H0V0z"}),i.default.createElement("g",null,i.default.createElement("path",{d:"M13 5v6h1.17L12 13.17 9.83 11H11V5h2m2-2H9v6H5l7 7 7-7h-4V3zm4 15H5v2h14v-2z"}))),"GetAppOutlined");t.default=o},function(e,t,n){"use strict";var r=n(15);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=r(n(0)),o=(0,r(n(16)).default)(i.default.createElement(i.default.Fragment,null,i.default.createElement("path",{fill:"none",d:"M0 0h24v24H0V0z"}),i.default.createElement("g",null,i.default.createElement("path",{d:"M15 7v12.97l-4.21-1.81-.79-.34-.79.34L5 19.97V7h10m4-6H8.99C7.89 1 7 1.9 7 3h10c1.1 0 2 .9 2 2v13l2 1V3c0-1.1-.9-2-2-2zm-4 4H5c-1.1 0-2 .9-2 2v16l7-3 7 3V7c0-1.1-.9-2-2-2z"}))),"BookmarksOutlined");t.default=o},function(e,t,n){"use strict";var r=n(15);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=r(n(0)),o=(0,r(n(16)).default)(i.default.createElement(i.default.Fragment,null,i.default.createElement("path",{fill:"none",d:"M0 0h24v24H0V0z"}),i.default.createElement("path",{d:"M4 8h4V4H4v4zm6 12h4v-4h-4v4zm-6 0h4v-4H4v4zm0-6h4v-4H4v4zm6 0h4v-4h-4v4zm6-10v4h4V4h-4zm-6 4h4V4h-4v4zm6 6h4v-4h-4v4zm0 6h4v-4h-4v4z"})),"AppsOutlined");t.default=o},function(e,t,n){"use strict";var r=n(15);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=r(n(0)),o=(0,r(n(16)).default)(i.default.createElement(i.default.Fragment,null,i.default.createElement("path",{fill:"none",d:"M0 0h24v24H0V0z"}),i.default.createElement("path",{d:"M19.43 12.98c.04-.32.07-.64.07-.98 0-.34-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.09-.16-.26-.25-.44-.25-.06 0-.12.01-.17.03l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.06-.02-.12-.03-.18-.03-.17 0-.34.09-.43.25l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98 0 .33.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.09.16.26.25.44.25.06 0 .12-.01.17-.03l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.06.02.12.03.18.03.17 0 .34-.09.43-.25l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zm-1.98-1.71c.04.31.05.52.05.73 0 .21-.02.43-.05.73l-.14 1.13.89.7 1.08.84-.7 1.21-1.27-.51-1.04-.42-.9.68c-.43.32-.84.56-1.25.73l-1.06.43-.16 1.13-.2 1.35h-1.4l-.19-1.35-.16-1.13-1.06-.43c-.43-.18-.83-.41-1.23-.71l-.91-.7-1.06.43-1.27.51-.7-1.21 1.08-.84.89-.7-.14-1.13c-.03-.31-.05-.54-.05-.74s.02-.43.05-.73l.14-1.13-.89-.7-1.08-.84.7-1.21 1.27.51 1.04.42.9-.68c.43-.32.84-.56 1.25-.73l1.06-.43.16-1.13.2-1.35h1.39l.19 1.35.16 1.13 1.06.43c.43.18.83.41 1.23.71l.91.7 1.06-.43 1.27-.51.7 1.21-1.07.85-.89.7.14 1.13z"}),i.default.createElement("path",{d:"M12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"})),"SettingsOutlined");t.default=o},function(e,t,n){"use strict";var r=n(15);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=r(n(0)),o=(0,r(n(16)).default)(i.default.createElement(i.default.Fragment,null,i.default.createElement("path",{fill:"none",d:"M0 0h24v24H0z"}),i.default.createElement("path",{d:"M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"})),"Menu");t.default=o},function(e,t,n){"use strict";function r(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(t,"__esModule",{value:!0});var i=r(n(19)),o=r(n(20)),a=r(n(23)),l=r(n(24)),u=r(n(25)),s=r(n(38)),c=r(n(2)),d=r(n(1)),f=r(n(0));r(n(3)),r(n(10));var p,h=(p=null,function(){if(null!==p)return p;var e,t,n,r=!1;try{window.addEventListener("test",null,(e={},t="passive",n={get:function(){r=!0}},Object.defineProperty(e,t,n)))}catch(e){}return p=r,r}()),m={capture:!1,passive:!1};function v(e){return d({},m,e)}function y(e,t,n){var r=[e,t];return r.push(h?n:n.capture),r}function g(e,t,n,r){e.addEventListener.apply(e,y(t,n,r))}function b(e,t,n,r){e.removeEventListener.apply(e,y(t,n,r))}var x=function(e){function t(){return i(this,t),a(this,l(t).apply(this,arguments))}return u(t,e),o(t,[{key:"componentDidMount",value:function(){this.applyListeners(g)}},{key:"componentDidUpdate",value:function(e){this.applyListeners(b,e),this.applyListeners(g)}},{key:"componentWillUnmount",value:function(){this.applyListeners(b)}},{key:"applyListeners",value:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this.props,n=t.target;if(n){var r=n;"string"==typeof n&&(r=window[n]),function(e,t){e.children,e.target;var n=c(e,["children","target"]);Object.keys(n).forEach(function(e){if("on"===e.substring(0,2)){var r=n[e],i=s(r),o="object"===i;if(o||"function"===i){var a="capture"===e.substr(-7).toLowerCase(),l=e.substring(2).toLowerCase();l=a?l.substring(0,l.length-7):l,o?t(l,r.handler,r.options):t(l,r,v({capture:a}))}}})}(t,e.bind(null,r))}}},{key:"render",value:function(){return this.props.children||null}}]),t}(f.PureComponent);x.propTypes={},t.withOptions=function(e,t){return{handler:e,options:v(t)}},t.default=x},function(e,t,n){var r=n(49),i=n(51),o=n(50);e.exports=function(e){return r(e)||i(e)||o()}},,,function(e,t,n){"use strict"; +/** @license React v16.8.6 + * react.production.min.js + * + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */var r=n(47),i="function"==typeof Symbol&&Symbol.for,o=i?Symbol.for("react.element"):60103,a=i?Symbol.for("react.portal"):60106,l=i?Symbol.for("react.fragment"):60107,u=i?Symbol.for("react.strict_mode"):60108,s=i?Symbol.for("react.profiler"):60114,c=i?Symbol.for("react.provider"):60109,d=i?Symbol.for("react.context"):60110,f=i?Symbol.for("react.concurrent_mode"):60111,p=i?Symbol.for("react.forward_ref"):60112,h=i?Symbol.for("react.suspense"):60113,m=i?Symbol.for("react.memo"):60115,v=i?Symbol.for("react.lazy"):60116,y="function"==typeof Symbol&&Symbol.iterator;function g(e){for(var t=arguments.length-1,n="https://reactjs.org/docs/error-decoder.html?invariant="+e,r=0;rj.length&&j.push(e)}function A(e,t,n){return null==e?0:function e(t,n,r,i){var l=typeof t;"undefined"!==l&&"boolean"!==l||(t=null);var u=!1;if(null===t)u=!0;else switch(l){case"string":case"number":u=!0;break;case"object":switch(t.$$typeof){case o:case a:u=!0}}if(u)return r(i,t,""===n?"."+D(t,0):n),1;if(u=0,n=""===n?".":n+":",Array.isArray(t))for(var s=0;sthis.eventPool.length&&this.eventPool.push(e)}function de(e){e.eventPool=[],e.getPooled=se,e.release=ce}i(ue.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e&&(e.preventDefault?e.preventDefault():"unknown"!=typeof e.returnValue&&(e.returnValue=!1),this.isDefaultPrevented=ae)},stopPropagation:function(){var e=this.nativeEvent;e&&(e.stopPropagation?e.stopPropagation():"unknown"!=typeof e.cancelBubble&&(e.cancelBubble=!0),this.isPropagationStopped=ae)},persist:function(){this.isPersistent=ae},isPersistent:le,destructor:function(){var e,t=this.constructor.Interface;for(e in t)this[e]=null;this.nativeEvent=this._targetInst=this.dispatchConfig=null,this.isPropagationStopped=this.isDefaultPrevented=le,this._dispatchInstances=this._dispatchListeners=null}}),ue.Interface={type:null,target:null,currentTarget:function(){return null},eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null},ue.extend=function(e){function t(){}function n(){return r.apply(this,arguments)}var r=this;t.prototype=r.prototype;var o=new t;return i(o,n.prototype),n.prototype=o,n.prototype.constructor=n,n.Interface=i({},r.Interface,e),n.extend=r.extend,de(n),n},de(ue);var fe=ue.extend({data:null}),pe=ue.extend({data:null}),he=[9,13,27,32],me=$&&"CompositionEvent"in window,ve=null;$&&"documentMode"in document&&(ve=document.documentMode);var ye=$&&"TextEvent"in window&&!ve,ge=$&&(!me||ve&&8=ve),be=String.fromCharCode(32),xe={beforeInput:{phasedRegistrationNames:{bubbled:"onBeforeInput",captured:"onBeforeInputCapture"},dependencies:["compositionend","keypress","textInput","paste"]},compositionEnd:{phasedRegistrationNames:{bubbled:"onCompositionEnd",captured:"onCompositionEndCapture"},dependencies:"blur compositionend keydown keypress keyup mousedown".split(" ")},compositionStart:{phasedRegistrationNames:{bubbled:"onCompositionStart",captured:"onCompositionStartCapture"},dependencies:"blur compositionstart keydown keypress keyup mousedown".split(" ")},compositionUpdate:{phasedRegistrationNames:{bubbled:"onCompositionUpdate",captured:"onCompositionUpdateCapture"},dependencies:"blur compositionupdate keydown keypress keyup mousedown".split(" ")}},we=!1;function ke(e,t){switch(e){case"keyup":return-1!==he.indexOf(t.keyCode);case"keydown":return 229!==t.keyCode;case"keypress":case"mousedown":case"blur":return!0;default:return!1}}function Ee(e){return"object"==typeof(e=e.detail)&&"data"in e?e.data:null}var Se=!1;var Te={eventTypes:xe,extractEvents:function(e,t,n,r){var i=void 0,o=void 0;if(me)e:{switch(e){case"compositionstart":i=xe.compositionStart;break e;case"compositionend":i=xe.compositionEnd;break e;case"compositionupdate":i=xe.compositionUpdate;break e}i=void 0}else Se?ke(e,n)&&(i=xe.compositionEnd):"keydown"===e&&229===n.keyCode&&(i=xe.compositionStart);return i?(ge&&"ko"!==n.locale&&(Se||i!==xe.compositionStart?i===xe.compositionEnd&&Se&&(o=oe()):(re="value"in(ne=r)?ne.value:ne.textContent,Se=!0)),i=fe.getPooled(i,t,n,r),o?i.data=o:null!==(o=Ee(n))&&(i.data=o),H(i),o=i):o=null,(e=ye?function(e,t){switch(e){case"compositionend":return Ee(t);case"keypress":return 32!==t.which?null:(we=!0,be);case"textInput":return(e=t.data)===be&&we?null:e;default:return null}}(e,n):function(e,t){if(Se)return"compositionend"===e||!me&&ke(e,t)?(e=oe(),ie=re=ne=null,Se=!1,e):null;switch(e){case"paste":return null;case"keypress":if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1