Merge branch 'master' into fix/hanging-playback-when-no-stream-available

ajkapala21 · Mar 16, 2024 · 186a31a · 186a31a
2 parents ef55147 + cb07c40
commit 186a31a
Show file tree

Hide file tree

Showing 33 changed files with 334 additions and 582 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app/app/App.js b/packages/app/app/App.js
@@ -67,7 +67,7 @@ class App extends React.PureComponent {
 
     this.updateConnectivityStatus(navigator.onLine);
     window.addEventListener('online', () => this.updateConnectivityStatus(true));
-    window.addEventListener('offline', () => this.updateConnectivityStatus(false));
+    window.addEventListener('offline', () => this.updateConnectivityStatus(false)); 
   }
 
   updateConnectivityStatus = (isConnected) => {

diff --git a/packages/app/app/actions/github.js b/packages/app/app/actions/github.js
diff --git a/packages/app/app/actions/githubContrib.js b/packages/app/app/actions/githubContrib.js
@@ -1,6 +1,4 @@
-import {
-  GITHUB_REPO_CONTRIB_ENDPOINT
-} from '../rest/Github';
+const GITHUB_REPO_CONTRIB_ENDPOINT = 'https://api.github.com/repos/nukeop/nuclear/stats/contributors';
 
 export const GITHUB_CONTRIB_START = 'GITHUB_CONTRIB_START';
 export const GITHUB_CONTRIB_SUCCESS = 'GITHUB_CONTRIB_SUCCESS';

diff --git a/packages/app/app/actions/plugins.js b/packages/app/app/actions/plugins.js
@@ -102,7 +102,7 @@ export function loadUserPlugin(path) {
     try {
       const api = createApi();
       const pluginContents = await fs.promises.readFile(path, 'utf8');
-      const transformedPluginContents = await remote.app.transformSource(pluginContents);
+      const transformedPluginContents = await remote.app.g(pluginContents);
 
       const plugin = eval(transformedPluginContents.code);
 

diff --git a/packages/app/app/components/Dashboard/GenresTab/styles.scss b/packages/app/app/components/Dashboard/GenresTab/styles.scss
@@ -1,37 +1,40 @@
-@import '../../../vars';
+@import "../../../vars";
 
 .genre_tab_container {
-  display: flex;
-  flex-flow: row wrap;
-  overflow-x: hidden;
-
-  svg, path {
+  display: grid;
+  justify-items: center;
+  align-items: center;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 2fr));
+  grid-auto-rows: auto;
+  gap: 4px;
+
+  svg,
+  path {
     stroke: $white;
   }
 
   svg {
     width: 96px;
     height: 96px;
   }
-
-
+
   .svg_icon {
     margin-bottom: 1rem;
   }
-  
+
   .genre_container {
     position: relative;
     display: flex;
     flex-flow: row;
     justify-content: center;
     align-items: center;
-    width: 25%;
-    height: 0;
-    padding-bottom: 25%;
     border-radius: 0.25rem;
     transition: $short-duration;
     overflow: hidden;
     cursor: pointer;
+    width: 100%;
+    height: 100%;
+    min-height: 200px;
 
     &:hover {
       transform: scale(1.1);
@@ -67,25 +70,4 @@
     text-transform: uppercase;
     text-align: center;
   }
-
-  @media screen and (max-width: 1366px) {
-    .genre_container {
-      width: 33.33%;
-      padding-bottom: 33.33%;
-    }
-  }
-
-  @media screen and (max-width: 1180px) {
-    .genre_container {
-      width: 50%;
-      padding-bottom: 50%;
-    }
-  }
-
-  @media screen and (max-width: 1050px) {
-    .genre_container {
-      width: 100%;
-      padding-bottom: 100%;
-    }
-  }
 }
diff --git a/packages/app/app/components/LibraryView/LibraryFolders/index.js b/packages/app/app/components/LibraryView/LibraryFolders/index.js
@@ -14,7 +14,6 @@ import { compose, withHandlers } from 'recompose';
 
 import styles from './styles.scss';
 
-
 const LibraryFolders = ({
   openLocalFolderPicker,
   scanLocalFolders,

diff --git a/...s/app/app/components/LibraryView/utils.js → ...s/app/app/components/LibraryView/utils.ts b/...s/app/app/components/LibraryView/utils.js → ...s/app/app/components/LibraryView/utils.ts
diff --git a/packages/app/app/components/PluginsView/index.js b/packages/app/app/components/PluginsView/index.js