Skip to content

Commit

Permalink
Merge pull request #114 from BrenekH/fix/111/empty-path-masks-field-m…
Browse files Browse the repository at this point in the history
…atches-everything

Disallow empty path masks
  • Loading branch information
BrenekH authored Sep 11, 2021
2 parents 3d06003 + 25319f3 commit ff8aab3
Show file tree
Hide file tree
Showing 19 changed files with 4,014 additions and 1,792 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ The frontend code can be run in debug mode using `npm run start`.
It is recommended to run a Controller using the default port on your local machine so that the development Web UI can make requests to it.
If you want to point React at a different Controller, you can modify the `proxy` field in the `package.json` file, just make sure to change it back before committing anything or submitting changes.

To "deploy" the frontend to the Controller, run `npm run build` and copy the generated `build` folder to `controller/user_interfacer/webfiles`.
To perform both actions with one command on Linux systems, use `npm run build && cp -r build/. ../controller/user_interfacer/webfiles/` from within the `frontend` directory.
To "deploy" the frontend to the Controller, run `npm run build` and copy the generated `build` folder to `controller/userinterfacer/webfiles`.
To perform both actions with one command on Linux systems, use `npm run build && cp -r build/. ../controller/userinterfacer/webfiles/` from within the `frontend` directory.

## Docker

Expand Down
36 changes: 18 additions & 18 deletions controller/userinterfacer/webfiles/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{
"files": {
"main.css": "/static/css/main.d1f77bb4.chunk.css",
"main.js": "/static/js/main.5a15e6fa.chunk.js",
"main.js.map": "/static/js/main.5a15e6fa.chunk.js.map",
"runtime-main.js": "/static/js/runtime-main.055bee68.js",
"runtime-main.js.map": "/static/js/runtime-main.055bee68.js.map",
"static/css/2.a49f93ba.chunk.css": "/static/css/2.a49f93ba.chunk.css",
"static/js/2.b4ebe8d9.chunk.js": "/static/js/2.b4ebe8d9.chunk.js",
"static/js/2.b4ebe8d9.chunk.js.map": "/static/js/2.b4ebe8d9.chunk.js.map",
"static/js/3.a09c83ab.chunk.js": "/static/js/3.a09c83ab.chunk.js",
"static/js/3.a09c83ab.chunk.js.map": "/static/js/3.a09c83ab.chunk.js.map",
"main.css": "/static/css/main.386e5276.chunk.css",
"main.js": "/static/js/main.633a313d.chunk.js",
"main.js.map": "/static/js/main.633a313d.chunk.js.map",
"runtime-main.js": "/static/js/runtime-main.d9007f64.js",
"runtime-main.js.map": "/static/js/runtime-main.d9007f64.js.map",
"static/css/2.62793d63.chunk.css": "/static/css/2.62793d63.chunk.css",
"static/js/2.87856085.chunk.js": "/static/js/2.87856085.chunk.js",
"static/js/2.87856085.chunk.js.map": "/static/js/2.87856085.chunk.js.map",
"static/js/3.0271195d.chunk.js": "/static/js/3.0271195d.chunk.js",
"static/js/3.0271195d.chunk.js.map": "/static/js/3.0271195d.chunk.js.map",
"index.html": "/index.html",
"static/css/2.a49f93ba.chunk.css.map": "/static/css/2.a49f93ba.chunk.css.map",
"static/css/main.d1f77bb4.chunk.css.map": "/static/css/main.d1f77bb4.chunk.css.map",
"static/js/2.b4ebe8d9.chunk.js.LICENSE.txt": "/static/js/2.b4ebe8d9.chunk.js.LICENSE.txt",
"static/css/2.62793d63.chunk.css.map": "/static/css/2.62793d63.chunk.css.map",
"static/css/main.386e5276.chunk.css.map": "/static/css/main.386e5276.chunk.css.map",
"static/js/2.87856085.chunk.js.LICENSE.txt": "/static/js/2.87856085.chunk.js.LICENSE.txt",
"static/media/Encodarr-Logo.4b0cc1bf.svg": "/static/media/Encodarr-Logo.4b0cc1bf.svg",
"static/media/Info-I.ffc9d3a2.svg": "/static/media/Info-I.ffc9d3a2.svg",
"static/media/addLibraryIcon.dd5f1d29.svg": "/static/media/addLibraryIcon.dd5f1d29.svg",
"static/media/terminalIcon.5147de0e.svg": "/static/media/terminalIcon.5147de0e.svg"
},
"entrypoints": [
"static/js/runtime-main.055bee68.js",
"static/css/2.a49f93ba.chunk.css",
"static/js/2.b4ebe8d9.chunk.js",
"static/css/main.d1f77bb4.chunk.css",
"static/js/main.5a15e6fa.chunk.js"
"static/js/runtime-main.d9007f64.js",
"static/css/2.62793d63.chunk.css",
"static/js/2.87856085.chunk.js",
"static/css/main.386e5276.chunk.css",
"static/js/main.633a313d.chunk.js"
]
}
2 changes: 1 addition & 1 deletion controller/userinterfacer/webfiles/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000e30"/><meta name="description" content="Encode media libraries"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"/><link rel="manifest" href="/manifest.json"/><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5"/><meta name="msapplication-TileColor" content="#2b5797"/><title>Encodarr</title><link href="/static/css/2.a49f93ba.chunk.css" rel="stylesheet"><link href="/static/css/main.d1f77bb4.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,a,i=r[0],c=r[1],l=r[2],s=0,p=[];s<i.length;s++)a=i[s],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&p.push(o[a][0]),o[a]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);p.length;)p.shift()();return u.push.apply(u,l||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var c=t[i];0!==o[c]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var u,i=document.createElement("script");i.charset="utf-8",i.timeout=120,a.nc&&i.setAttribute("nonce",a.nc),i.src=function(e){return a.p+"static/js/"+({}[e]||e)+"."+{3:"a09c83ab"}[e]+".chunk.js"}(e);var c=new Error;u=function(r){i.onerror=i.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:i})}),12e4);i.onerror=i.onload=u,document.head.appendChild(i)}return Promise.all(r)},a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/",a.oe=function(e){throw console.error(e),e};var i=this["webpackJsonpencodarr-react-frontend"]=this["webpackJsonpencodarr-react-frontend"]||[],c=i.push.bind(i);i.push=r,i=i.slice();for(var l=0;l<i.length;l++)r(i[l]);var f=c;t()}([])</script><script src="/static/js/2.b4ebe8d9.chunk.js"></script><script src="/static/js/main.5a15e6fa.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000e30"/><meta name="description" content="Encode media libraries"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"/><link rel="manifest" href="/manifest.json"/><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5"/><meta name="msapplication-TileColor" content="#2b5797"/><title>Encodarr</title><link href="/static/css/2.62793d63.chunk.css" rel="stylesheet"><link href="/static/css/main.386e5276.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,a,i=r[0],c=r[1],l=r[2],s=0,p=[];s<i.length;s++)a=i[s],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&p.push(o[a][0]),o[a]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);p.length;)p.shift()();return u.push.apply(u,l||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var c=t[i];0!==o[c]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var u,i=document.createElement("script");i.charset="utf-8",i.timeout=120,a.nc&&i.setAttribute("nonce",a.nc),i.src=function(e){return a.p+"static/js/"+({}[e]||e)+"."+{3:"0271195d"}[e]+".chunk.js"}(e);var c=new Error;u=function(r){i.onerror=i.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:i})}),12e4);i.onerror=i.onload=u,document.head.appendChild(i)}return Promise.all(r)},a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/",a.oe=function(e){throw console.error(e),e};var i=this["webpackJsonpencodarr-react-frontend"]=this["webpackJsonpencodarr-react-frontend"]||[],c=i.push.bind(i);i.push=r,i=i.slice();for(var l=0;l<i.length;l++)r(i[l]);var f=c;t()}([])</script><script src="/static/js/2.87856085.chunk.js"></script><script src="/static/js/main.633a313d.chunk.js"></script></body></html>
14 changes: 14 additions & 0 deletions controller/userinterfacer/webfiles/static/css/2.62793d63.chunk.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
object-assign
(c) Sindre Sorhus
@license MIT
*/

/*!
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/

/** @license React v0.20.2
* scheduler.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.
*/

/** @license React v17.0.2
* react-dom.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.
*/

/** @license React v17.0.2
* react-jsx-runtime.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.
*/

/** @license React v17.0.2
* 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.
*/

Large diffs are not rendered by default.

Loading

0 comments on commit ff8aab3

Please sign in to comment.