commit 02476e8e07aec645c8ec7bb02f545de85a3d8475 · notnite.com/moonlight

+27 -20

packages/core-extensions/src/moonbase/index.tsx

···

       1
       1
        
       import { ExtensionWebExports } from "@moonlight-mod/types";

     

       2
       2
       -
       import ui from "./ui";

     

       2
       2
       +
       import configPage from "./ui/config";

     

       3
       3
       +
       import extensionsPage from "./ui/extensions";

     

       4
       4
       +
       

     

       3
       5
        
       import { CircleXIconSVG, DownloadIconSVG, TrashIconSVG } from "./types";

     

       4
       6
        
       

     

       5
       7
        
       export const webpackModules: ExtensionWebExports["webpackModules"] = {

     
···

       32
       34
        
             const { MoonbaseSettingsStore } =

     

       33
       35
        
               require("moonbase_stores") as typeof import("./webpackModules/stores");

     

       34
       36
        
       

     

       35
       35
       -
             settings.addSection("Moonbase", "Moonbase", ui(require), null, -2, {

     

       36
       36
       -
               stores: [MoonbaseSettingsStore],

     

       37
       37
       -
               element: () => {

     

       38
       38
       -
                 // Require it here because lazy loading SUX

     

       39
       39
       -
                 const SettingsNotice =

     

       40
       40
       -
                   spacepack.findByCode("onSaveButtonColor")[0].exports.default;

     

       41
       41
       -
                 return (

     

       42
       42
       -
                   <SettingsNotice

     

       43
       43
       -
                     submitting={MoonbaseSettingsStore.submitting}

     

       44
       44
       -
                     onReset={() => {

     

       45
       45
       -
                       MoonbaseSettingsStore.reset();

     

       46
       46
       -
                     }}

     

       47
       47
       -
                     onSave={() => {

     

       48
       48
       -
                       MoonbaseSettingsStore.writeConfig();

     

       49
       49
       -
                     }}

     

       50
       50
       -
                   />

     

       51
       51
       -
                 );

     

       52
       52
       -
               }

     

       53
       53
       -
             });

     

       37
       37
       +
             const addSection = (name: string, element: React.FunctionComponent) => {

     

       38
       38
       +
               settings.addSection(name, name, element, null, -2, {

     

       39
       39
       +
                 stores: [MoonbaseSettingsStore],

     

       40
       40
       +
                 element: () => {

     

       41
       41
       +
                   // Require it here because lazy loading SUX

     

       42
       42
       +
                   const SettingsNotice =

     

       43
       43
       +
                     spacepack.findByCode("onSaveButtonColor")[0].exports.default;

     

       44
       44
       +
                   return (

     

       45
       45
       +
                     <SettingsNotice

     

       46
       46
       +
                       submitting={MoonbaseSettingsStore.submitting}

     

       47
       47
       +
                       onReset={() => {

     

       48
       48
       +
                         MoonbaseSettingsStore.reset();

     

       49
       49
       +
                       }}

     

       50
       50
       +
                       onSave={() => {

     

       51
       51
       +
                         MoonbaseSettingsStore.writeConfig();

     

       52
       52
       +
                       }}

     

       53
       53
       +
                     />

     

       54
       54
       +
                   );

     

       55
       55
       +
                 }

     

       56
       56
       +
               });

     

       57
       57
       +
             };

     

       58
       58
       +
             settings.addHeader("moonlight", -2);

     

       59
       59
       +
             addSection("Extensions", extensionsPage(require));

     

       60
       60
       +
             addSection("Config", configPage(require));

     

       54
       61
        
           }

     

       55
       62
        
         }

     

       56
       63
        
       };

+11 -4

packages/core-extensions/src/moonbase/ui/config/index.tsx

···

       40
       40
        
                     className={RemoveButtonClasses.removeButton}

     

       41
       41
        
                     onClick={onClick}

     

       42
       42
        
                   >

     

       43
       43
       -
                     <CircleXIcon width={16} height={16} />

     

       43
       43
       +
                     <CircleXIcon width={24} height={24} />

     

       44
       44
        
                   </Clickable>

     

       45
       45
        
                 )}

     

       46
       46
        
               </Tooltip>

     
···

       55
       55
        
         }) {

     

       56
       56
        
           const items = MoonbaseSettingsStore.getConfigOption(config) ?? [];

     

       57
       57
        
           return (

     

       58
       58
       -
             <Flex direction={Flex.Direction.VERTICAL}>

     

       58
       58
       +
             <Flex

     

       59
       59
       +
               style={{

     

       60
       60
       +
                 gap: "20px"

     

       61
       61
       +
               }}

     

       62
       62
       +
               direction={Flex.Direction.VERTICAL}

     

       63
       63
       +
             >

     

       59
       64
        
               {items.map((val, i) => (

     

       60
       65
        
                 <div

     

       61
       66
        
                   key={i}

     
···

       68
       73
        
                   }}

     

       69
       74
        
                 >

     

       70
       75
        
                   <TextInput

     

       71
       71
       -
                     size={TextInput.Sizes.MINI}

     

       76
       76
       +
                     size={TextInput.Sizes.DEFAULT}

     

       72
       77
        
                     value={val}

     

       73
       78
        
                     onChange={(newVal: string) => {

     

       74
       79
        
                       items[i] = newVal;

     
···

       88
       93
        
                 look={Button.Looks.FILLED}

     

       89
       94
        
                 color={Button.Colors.GREEN}

     

       90
       95
        
                 size={Button.Sizes.SMALL}

     

       91
       91
       -
                 className={Margins.marginTop8}

     

       96
       96
       +
                 style={{

     

       97
       97
       +
                   marginTop: "10px"

     

       98
       98
       +
                 }}

     

       92
       99
        
                 onClick={() => {

     

       93
       100
        
                   items.push("");

     

       94
       101
        
                   MoonbaseSettingsStore.setConfigOption(config, items);

+14 -1

packages/core-extensions/src/moonbase/ui/extensions/index.tsx

···

       23
       23
        
         const Margins = spacepack.findByCode("marginCenterHorz:")[0].exports;

     

       24
       24
        
         const SearchBar = spacepack.findByCode("Messages.SEARCH", "hideSearchIcon")[0]

     

       25
       25
        
           .exports.default;

     

       26
       26
       +
         const { Text } = require("common_components");

     

       26
       27
        
       

     

       27
       28
        
         return function ExtensionsPage() {

     

       28
       29
        
           const { extensions } = Flux.useStateFromStoresObject(

     
···

       35
       36
        
           const [query, setQuery] = React.useState("");

     

       36
       37
        
           const [filter, setFilter] = React.useState({ ...defaultFilter });

     

       37
       38
        
           const [selectedTags, setSelectedTags] = React.useState(new Set<string>());

     

       38
       38
       -
       

     

       39
       39
       +
           const TitleBarClasses = spacepack.findByCode("iconWrapper:", "children:")[0]

     

       40
       40
       +
             .exports;

     

       39
       41
        
           const sorted = Object.values(extensions).sort((a, b) => {

     

       40
       42
        
             const aName = a.manifest.meta?.name ?? a.id;

     

       41
       43
        
             const bName = b.manifest.meta?.name ?? b.id;

     
···

       67
       69
        
       

     

       68
       70
        
           return (

     

       69
       71
        
             <>

     

       72
       72
       +
               <div

     

       73
       73
       +
                 className={`${TitleBarClasses.children} ${Margins.marginBottom20}`}

     

       74
       74
       +
               >

     

       75
       75
       +
                 <Text

     

       76
       76
       +
                   className={TitleBarClasses.titleWrapper}

     

       77
       77
       +
                   variant="heading-lg/semibold"

     

       78
       78
       +
                   tag="h2"

     

       79
       79
       +
                 >

     

       80
       80
       +
                   Extensions

     

       81
       81
       +
                 </Text>

     

       82
       82
       +
               </div>

     

       70
       83
        
               <SearchBar

     

       71
       84
        
                 size={SearchBar.Sizes.MEDIUM}

     

       72
       85
        
                 query={query}

-71

packages/core-extensions/src/moonbase/ui/index.tsx

···

       1
       1
       -
       import { WebpackRequireType } from "@moonlight-mod/types";

     

       2
       2
       -
       import extensionsPage from "./extensions";

     

       3
       3
       -
       import configPage from "./config";

     

       4
       4
       -
       

     

       5
       5
       -
       export enum MoonbasePage {

     

       6
       6
       -
         Extensions,

     

       7
       7
       -
         Config

     

       8
       8
       -
       }

     

       9
       9
       -
       

     

       10
       10
       -
       export default (require: WebpackRequireType) => {

     

       11
       11
       -
         const React = require("common_react");

     

       12
       12
       -
         const spacepack = require("spacepack_spacepack").spacepack;

     

       13
       13
       -
       

     

       14
       14
       -
         const Margins = spacepack.findByCode("marginCenterHorz:")[0].exports;

     

       15
       15
       -
       

     

       16
       16
       -
         const { Divider } = spacepack.findByCode(".default.HEADER_BAR")[0].exports

     

       17
       17
       -
           .default;

     

       18
       18
       -
         const TitleBarClasses = spacepack.findByCode("iconWrapper:", "children:")[0]

     

       19
       19
       -
           .exports;

     

       20
       20
       -
         const TabBarClasses = spacepack.findByCode("nowPlayingColumn:")[0].exports;

     

       21
       21
       -
       

     

       22
       22
       -
         const ExtensionsPage = extensionsPage(require);

     

       23
       23
       -
         const ConfigPage = configPage(require);

     

       24
       24
       -
       

     

       25
       25
       -
         return function Moonbase() {

     

       26
       26
       -
           const { Text, TabBar } = require("common_components");

     

       27
       27
       -
       

     

       28
       28
       -
           const [selectedTab, setSelectedTab] = React.useState(

     

       29
       29
       -
             MoonbasePage.Extensions

     

       30
       30
       -
           );

     

       31
       31
       -
       

     

       32
       32
       -
           return (

     

       33
       33
       -
             <>

     

       34
       34
       -
               <div

     

       35
       35
       -
                 className={`${TitleBarClasses.children} ${Margins.marginBottom20}`}

     

       36
       36
       -
               >

     

       37
       37
       -
                 <Text

     

       38
       38
       -
                   className={TitleBarClasses.titleWrapper}

     

       39
       39
       -
                   variant="heading-lg/semibold"

     

       40
       40
       -
                   tag="h2"

     

       41
       41
       -
                 >

     

       42
       42
       -
                   Moonbase

     

       43
       43
       -
                 </Text>

     

       44
       44
       -
                 <Divider />

     

       45
       45
       -
                 <TabBar

     

       46
       46
       -
                   selectedItem={selectedTab}

     

       47
       47
       -
                   onItemSelect={setSelectedTab}

     

       48
       48
       -
                   type="top-pill"

     

       49
       49
       -
                   className={TabBarClasses.tabBar}

     

       50
       50
       -
                 >

     

       51
       51
       -
                   <TabBar.Item

     

       52
       52
       -
                     id={MoonbasePage.Extensions}

     

       53
       53
       -
                     className={TabBarClasses.item}

     

       54
       54
       -
                   >

     

       55
       55
       -
                     Extensions

     

       56
       56
       -
                   </TabBar.Item>

     

       57
       57
       -
                   <TabBar.Item

     

       58
       58
       -
                     id={MoonbasePage.Config}

     

       59
       59
       -
                     className={TabBarClasses.item}

     

       60
       60
       -
                   >

     

       61
       61
       -
                     Config

     

       62
       62
       -
                   </TabBar.Item>

     

       63
       63
       -
                 </TabBar>

     

       64
       64
       -
               </div>

     

       65
       65
       -
       

     

       66
       66
       -
               {selectedTab === MoonbasePage.Extensions && <ExtensionsPage />}

     

       67
       67
       -
               {selectedTab === MoonbasePage.Config && <ConfigPage />}

     

       68
       68
       -
             </>

     

       69
       69
       -
           );

     

       70
       70
       -
         };

     

       71
       71
       -
       };