Merge branch 'master' into migrate-to-ES6-41

package.json

@@ -16,7 +16,7 @@
     "babel-loader": "^8.0.6",
     "browser-sync": "^2.26.10",
     "copy-webpack-plugin": "^5.1.1",
-    "css-loader": "^3.6.0",
+    "css-loader": "^4.0.0",
     "cssnano": "^4.1.10",
     "del": "^5.1.0",
     "eslint": "^6.8.0",
@@ -157,11 +157,11 @@
           "src/components/syncPlay/playbackPermissionManager.js",
           "src/components/syncPlay/syncPlayManager.js",
           "src/components/syncPlay/timeSyncManager.js",
-          "src/controllers/auth/addserver.js",
+          "src/controllers/session/addServer/index.js",
-          "src/controllers/auth/forgotpassword.js",
+          "src/controllers/session/forgotPassword/index.js",
-          "src/controllers/auth/forgotpasswordpin.js",
+          "src/controllers/session/redeemPassword/index.js",
-          "src/controllers/auth/login.js",
+          "src/controllers/session/login/index.js",
-          "src/controllers/auth/selectserver.js",
+          "src/controllers/sessopm/selectServer/index.js",
           "src/controllers/dashboard/apikeys.js",
           "src/controllers/dashboard/dashboard.js",
           "src/controllers/dashboard/devices/device.js",
@@ -178,7 +178,7 @@
           "src/controllers/dashboard/metadatanfo.js",
           "src/controllers/dashboard/networking.js",
           "src/controllers/dashboard/playback.js",
-          "src/controllers/dashboard/plugins/repositories.js",
+          "src/controllers/dashboard/plugins/repositories/index.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtask.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtasks.js",
           "src/controllers/dashboard/serveractivity.js",
@@ -194,6 +194,8 @@
           "src/controllers/hometab.js",
           "src/controllers/playback/nowplaying.js",
           "src/controllers/playback/videoosd.js",
+          "src/controllers/playback/queue/index.js",
+          "src/controllers/playback/video/index.js",
           "src/controllers/searchpage.js",
           "src/controllers/shows/episodes.js",
           "src/controllers/shows/tvgenres.js",
@@ -202,18 +204,18 @@
           "src/controllers/shows/tvshows.js",
           "src/controllers/shows/tvstudios.js",
           "src/controllers/shows/tvupcoming.js",
-          "src/controllers/user/display.js",
+          "src/controllers/user/display/index.js",
-          "src/controllers/user/home.js",
+          "src/controllers/user/home/index.js",
-          "src/controllers/user/menu.js",
+          "src/controllers/user/menu/index.js",
-          "src/controllers/user/playback.js",
+          "src/controllers/user/playback/index.js",
-          "src/controllers/user/profile.js",
+          "src/controllers/user/profile/index.js",
-          "src/controllers/user/subtitles.js",
+          "src/controllers/user/subtitles/index.js",
-          "src/controllers/user/subtitles.js",
+          "src/controllers/user/subtitles/index.js",
-          "src/controllers/wizard/finish.js",
+          "src/controllers/wizard/finish/index.js",
-          "src/controllers/wizard/remoteaccess.js",
+          "src/controllers/wizard/remote/index.js",
-          "src/controllers/wizard/settings.js",
+          "src/controllers/wizard/settings/index.js",
-          "src/controllers/wizard/start.js",
+          "src/controllers/wizard/start/index.js",
-          "src/controllers/wizard/user.js",
+          "src/controllers/wizard/user/index.js",
           "src/elements/emby-button/emby-button.js",
           "src/elements/emby-button/paper-icon-button-light.js",
           "src/elements/emby-checkbox/emby-checkbox.js",

src/assets/css/site.css

@@ -133,3 +133,13 @@ div[data-role=page] {
 .w-100 {
     width: 100%;
 }
+
+.margin-auto-x {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.margin-auto-y {
+    margin-top: auto;
+    margin-bottom: auto;
+}

src/components/appRouter.js

@@ -16,7 +16,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
             show('/settings/settings.html');
         },
         showNowPlaying: function () {
-            show('/nowplaying.html');
+            show('queue');
         }
     };
 

src/controllers/session/forgotPassword/index.html

@@ -1,5 +1,5 @@
 <div data-role="page" id="forgotPasswordPage" class="page standalonePage forgotPasswordPage">
-    <div>
+    <div class="padded-left padded-right padded-bottom-page">
         <form class="forgotPasswordForm" style="text-align: center; margin: 0 auto;">
             <div style="text-align: left;">
                 <h1>${HeaderForgotPassword}</h1>

src/controllers/session/login/index.html

@@ -1,6 +1,6 @@
-<div id="loginPage" data-role="page" class="page standalonePage flex flex-direction-column align-items-center justify-content-center" data-backbutton="false">
+<div id="loginPage" data-role="page" class="page standalonePage flex flex-direction-column" data-backbutton="false">
-    <div class="padded-left padded-right padded-bottom-page">
+    <div class="padded-left padded-right padded-bottom-page margin-auto-y">
-        <form class="manualLoginForm hide">
+        <form class="manualLoginForm margin-auto-x hide">
             <div class="padded-left padded-right flex align-items-center justify-content-center">
                 <h1 class="sectionTitle">${HeaderPleaseSignIn}</h1>
             </div>

src/controllers/session/resetPassword/index.html

@@ -1,5 +1,5 @@
 <div data-role="page" class="page standalonePage forgotPasswordPinPage">
-    <div>
+    <div class="padded-left padded-right padded-bottom-page">
         <form class="forgotPasswordPinForm" style="text-align: center; margin: 0 auto;">
             <div style="text-align: left;">
                 <h2>${HeaderPasswordReset}</h2>

src/controllers/session/selectServer/index.html

@@ -0,0 +1,17 @@
+<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage pageContainer fullWidthContent vertical flex flex-direction-column">
+    <div class="margin-auto-y">
+        <div class="verticalSection flex-shrink-zero w-100 flex flex-direction-column">
+            <div class="padded-left padded-right flex align-items-center justify-content-center">
+                <h1 class="sectionTitle sectionTitle-cards">${HeaderSelectServer}</h1>
+            </div>
+            <div class="padded-top padded-bottom-focusscale flex-grow flex" data-horizontal="true" data-centerfocus="card">
+                <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x servers flex-grow" style="display: block; text-align: center;" data-hovermenu="false" data-multiselect="false"></div>
+            </div>
+        </div>
+        <div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap margin-auto-x">
+            <a is="emby-linkbutton" href="addserver.html" class="raised cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
+                <span>${ButtonAddServer}</span>
+            </a>
+        </div>
+    </div>
+</div>

src/scripts/routes.js

@@ -24,77 +24,88 @@ define([
     console.debug('defining core routes');
 
     defineRoute({
-        path: '/addserver.html',
+        alias: '/addserver.html',
+        path: '/controllers/session/addServer/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/addserver'
+        controller: 'session/addServer/index'
     });
     defineRoute({
-        path: '/selectserver.html',
+        alias: '/selectserver.html',
+        path: '/controllers/session/selectServer/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/selectserver',
+        controller: 'session/selectServer/index',
         type: 'selectserver'
     });
     defineRoute({
-        path: '/login.html',
+        alias: '/login.html',
+        path: '/controllers/session/login/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/login',
+        controller: 'session/login/index',
         type: 'login'
     });
     defineRoute({
-        path: '/forgotpassword.html',
+        alias: '/forgotpassword.html',
+        path: '/controllers/session/forgotPassword/index.html',
         anonymous: true,
         startup: true,
-        controller: 'auth/forgotpassword'
+        controller: 'session/forgotPassword/index'
     });
     defineRoute({
-        path: '/forgotpasswordpin.html',
+        alias: '/forgotpasswordpin.html',
+        path: '/controllers/session/redeemPassword/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/forgotpasswordpin'
+        controller: 'session/redeemPassword/index'
     });
 
     defineRoute({
-        path: '/mypreferencesmenu.html',
+        alias: '/mypreferencesmenu.html',
+        path: '/controllers/user/menu/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/menu'
+        controller: 'user/menu/index'
     });
     defineRoute({
-        path: '/myprofile.html',
+        alias: '/myprofile.html',
+        path: '/controllers/user/profile/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/profile'
+        controller: 'user/profile/index'
     });
     defineRoute({
-        path: '/mypreferencesdisplay.html',
+        alias: '/mypreferencesdisplay.html',
+        path: '/controllers/user/display/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/display'
+        controller: 'user/display/index'
     });
     defineRoute({
-        path: '/mypreferenceshome.html',
+        alias: '/mypreferenceshome.html',
+        path: '/controllers/user/home/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/home'
+        controller: 'user/home/index'
     });
     defineRoute({
-        path: '/mypreferencesplayback.html',
+        alias: '/mypreferencesplayback.html',
+        path: '/controllers/user/playback/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/playback'
+        controller: 'user/playback/index'
     });
     defineRoute({
-        path: '/mypreferencessubtitles.html',
+        alias: '/mypreferencessubtitles.html',
+        path: '/controllers/user/subtitles/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/subtitles'
+        controller: 'user/subtitles/index'
     });
 
     defineRoute({
@@ -140,10 +151,11 @@ define([
         controller: 'dashboard/dlna/profiles'
     });
     defineRoute({
-        path: '/addplugin.html',
+        alias: '/addplugin.html',
+        path: '/controllers/dashboard/plugins/add/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/add'
+        controller: 'dashboard/plugins/add/index'
     });
     defineRoute({
         path: '/library.html',
@@ -192,14 +204,16 @@ define([
         controller: 'dashboard/metadatanfo'
     });
     defineRoute({
-        path: '/notificationsetting.html',
+        alias: '/notificationsetting.html',
+        path: '/controllers/dashboard/notifications/notification/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/notifications/notification'
+        controller: 'dashboard/notifications/notification/index'
     });
     defineRoute({
-        path: '/notificationsettings.html',
+        alias: '/notificationsettings.html',
-        controller: 'dashboard/notifications/notifications',
+        path: '/controllers/dashboard/notifications/notifications/index.html',
+        controller: 'dashboard/notifications/notifications/index',
         autoFocus: false,
         roles: 'admin'
     });
@@ -210,16 +224,18 @@ define([
         controller: 'dashboard/playback'
     });
     defineRoute({
-        path: '/availableplugins.html',
+        alias: '/availableplugins.html',
+        path: '/controllers/dashboard/plugins/available/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/available'
+        controller: 'dashboard/plugins/available/index'
     });
     defineRoute({
-        path: '/repositories.html',
+        alias: '/repositories.html',
+        path: '/controllers/dashboard/plugins/repositories/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/repositories'
+        controller: 'dashboard/plugins/repositories/index'
     });
 
     defineRoute({
@@ -288,10 +304,11 @@ define([
         transition: 'fade'
     });
     defineRoute({
-        path: '/installedplugins.html',
+        alias: '/installedplugins.html',
+        path: '/controllers/dashboard/plugins/installed/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/installed'
+        controller: 'dashboard/plugins/installed/index'
     });
     defineRoute({
         path: '/scheduledtask.html',
@@ -367,16 +384,18 @@ define([
     });
 
     defineRoute({
-        path: '/wizardremoteaccess.html',
+        alias: '/wizardremoteaccess.html',
+        path: '/controllers/wizard/remote/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/remoteaccess'
+        controller: 'wizard/remote/index'
     });
     defineRoute({
-        path: '/wizardfinish.html',
+        alias: '/wizardfinish.html',
+        path: '/controllers/wizard/finish/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/finish'
+        controller: 'wizard/finish/index'
     });
     defineRoute({
         path: '/wizardlibrary.html',
@@ -385,28 +404,32 @@ define([
         controller: 'dashboard/mediaLibrary'
     });
     defineRoute({
-        path: '/wizardsettings.html',
+        alias: '/wizardsettings.html',
+        path: '/controllers/wizard/settings/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/settings'
+        controller: 'wizard/settings/index'
     });
     defineRoute({
-        path: '/wizardstart.html',
+        alias: '/wizardstart.html',
+        path: '/controllers/wizard/start/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/start'
+        controller: 'wizard/start/index'
     });
     defineRoute({
-        path: '/wizarduser.html',
+        alias: '/wizarduser.html',
-        controller: 'wizard/user',
+        path: '/controllers/wizard/user/index.html',
+        controller: 'wizard/user/index',
         autoFocus: false,
         anonymous: true
     });
 
     defineRoute({
-        path: '/videoosd.html',
+        alias: '/video',
+        path: '/controllers/playback/video/index.html',
         transition: 'fade',
-        controller: 'playback/videoosd',
+        controller: 'playback/video/index',
         autoFocus: false,
         type: 'video-osd',
         supportsThemeMedia: true,
@@ -414,8 +437,9 @@ define([
         enableMediaControl: false
     });
     defineRoute({
-        path: '/nowplaying.html',
+        alias: '/queue',
-        controller: 'playback/nowplaying',
+        path: '/controllers/playback/queue/index.html',
+        controller: 'playback/queue/index',
         autoFocus: false,
         transition: 'fade',
         fullscreen: true,

src/scripts/site.js

@@ -890,7 +890,7 @@ var AppInfo = {};
             };
 
             appRouter.showVideoOsd = function () {
-                return Dashboard.navigate('videoosd.html');
+                return Dashboard.navigate('video');
             };
 
             appRouter.showSelectServer = function () {

src/selectserver.html

@@ -1,15 +0,0 @@
-<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage pageContainer fullWidthContent vertical flex flex-direction-column align-items-center justify-content-center">
-    <div class="verticalSection flex-shrink-zero w-100 flex flex-direction-column">
-        <div class="padded-left padded-right flex align-items-center justify-content-center">
-            <h1 class="sectionTitle sectionTitle-cards">${HeaderSelectServer}</h1>
-        </div>
-        <div class="padded-top padded-bottom-focusscale flex-grow flex" data-horizontal="true" data-centerfocus="card">
-            <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x servers flex-grow" style="display: block; text-align: center;" data-hovermenu="false" data-multiselect="false"></div>
-        </div>
-    </div>
-    <div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap" style="margin-left:auto;margin-right:auto;">
-        <a is="emby-linkbutton" href="addserver.html" class="raised block cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
-            <span>${ButtonAddServer}</span>
-        </a>
-    </div>
-</div>

yarn.lock

@@ -2968,24 +2968,24 @@ css-has-pseudo@^0.10.0:
     postcss "^7.0.6"
     postcss-selector-parser "^5.0.0-rc.4"
 
-css-loader@^3.6.0:
+css-loader@^4.0.0:
-  version "3.6.0"
+  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.0.0.tgz#814434d4e1e2d5f430c70e85e78268db7f3cced1"
-  integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
+  integrity sha512-/7d5slKnmY2S39FNifJ7JQ8MhcMM/rDIjAZ2Sc/Z8lnOWOmc10hijg28ovBtljY364pQaF01O2nj5AIBDnJ9vQ==
   dependencies:
-    camelcase "^5.3.1"
+    camelcase "^6.0.0"
     cssesc "^3.0.0"
     icss-utils "^4.1.1"
-    loader-utils "^1.2.3"
+    loader-utils "^2.0.0"
     normalize-path "^3.0.0"
     postcss "^7.0.32"
     postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^3.0.2"
+    postcss-modules-local-by-default "^3.0.3"
     postcss-modules-scope "^2.2.0"
     postcss-modules-values "^3.0.0"
     postcss-value-parser "^4.1.0"
     schema-utils "^2.7.0"
-    semver "^6.3.0"
+    semver "^7.3.2"
 
 css-prefers-color-scheme@^3.1.1:
   version "3.1.1"
@@ -8640,15 +8640,15 @@ postcss-modules-extract-imports@^2.0.0:
   dependencies:
     postcss "^7.0.5"
 
-postcss-modules-local-by-default@^3.0.2:
+postcss-modules-local-by-default@^3.0.3:
-  version "3.0.2"
+  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"
-  integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
+  integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==
   dependencies:
     icss-utils "^4.1.1"
-    postcss "^7.0.16"
+    postcss "^7.0.32"
     postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.0"
+    postcss-value-parser "^4.1.0"
 
 postcss-modules-scope@^2.2.0:
   version "2.2.0"
@@ -9015,7 +9015,7 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
+postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
@@ -9039,7 +9039,7 @@ postcss@^5.0.0, postcss@^5.0.18:
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
   version "7.0.32"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
   integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
@@ -9968,7 +9968,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.2:
+semver@7.3.2, semver@^7.3.2:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==