- {(() => {
- switch (this.state.page) {
- case 'modding':
- return
- )
- }
+ return (
+
+
+
+
+
+ );
}
-
-export default App
diff --git a/src/ui/Debug.tsx b/src/ui/Debug.tsx
index 41ad966e..30bd7d4e 100644
--- a/src/ui/Debug.tsx
+++ b/src/ui/Debug.tsx
@@ -1,30 +1,34 @@
-import React from 'react'
-import './App.css'
+import { dataDir } from '@tauri-apps/api/path';
+import { invoke } from '@tauri-apps/api/tauri';
-import TopBar from './components/TopBar'
+import TextInput from './components/common/TextInput';
+import TopBar from './components/TopBar';
-import { invoke } from '@tauri-apps/api/tauri'
-import { dataDir } from '@tauri-apps/api/path'
-import TextInput from './components/common/TextInput'
+import './App.css';
-let proxyAddress = ''
+let proxyAddress = '';
async function setProxyAddress(address: string) {
- proxyAddress = address
- await invoke('set_proxy_addr', { addr: address })
+ proxyAddress = address;
+ await invoke('set_proxy_addr', { addr: address });
}
async function startProxy() {
- await invoke('connect', { port: 2222, certificatePath: (await dataDir()) + '\\cultivation\\ca' })
- await invoke('open_in_browser', { url: 'https://hoyoverse.com' })
+ await invoke('connect', {
+ port: 2222,
+ certificatePath: (await dataDir()) + '\\cultivation\\ca',
+ });
+ await invoke('open_in_browser', { url: 'https://hoyoverse.com' });
}
async function stopProxy() {
- await invoke('disconnect')
+ await invoke('disconnect');
}
async function generateCertificates() {
- await invoke('generate_ca_files', { path: (await dataDir()) + '\\cultivation' })
+ await invoke('generate_ca_files', {
+ path: (await dataDir()) + '\\cultivation',
+ });
}
async function generateInfo() {
@@ -32,23 +36,23 @@ async function generateInfo() {
certificatePath: (await dataDir()) + '\\cultivation\\ca',
isAdmin: await invoke('is_elevated'),
connectingTo: proxyAddress,
- })
- alert('check your dev console and send that in #cultivation')
+ });
+ alert('check your dev console and send that in #cultivation');
}
-class Debug extends React.Component {
- render() {
- return (
-
-
- )
- }
+export default function Debug() {
+ return (
+
+
+ );
}
-
-export default Debug
diff --git a/src/ui/Main.tsx b/src/ui/Main.tsx
index 5a7dd9b4..116140f6 100644
--- a/src/ui/Main.tsx
+++ b/src/ui/Main.tsx
@@ -1,241 +1,231 @@
-import React from 'react'
-
// Major Components
-import TopBar from './components/TopBar'
-import ServerLaunchSection from './components/ServerLaunchSection'
-import MainProgressBar from './components/common/MainProgressBar'
-import Options from './components/menu/Options'
-import MiniDialog from './components/MiniDialog'
-import DownloadList from './components/common/DownloadList'
-import Downloads from './components/menu/Downloads'
-import NewsSection from './components/news/NewsSection'
-import Game from './components/menu/Game'
-import RightBar from './components/RightBar'
-
-import { getConfigOption, setConfigOption } from '../utils/configuration'
-import { invoke } from '@tauri-apps/api'
-import { listen } from '@tauri-apps/api/event'
-import { dataDir } from '@tauri-apps/api/path'
-import { appWindow } from '@tauri-apps/api/window'
-import { unpatchGame } from '../utils/metadata'
-import DownloadHandler from '../utils/download'
+import { batch, onCleanup, onMount, Show } from 'solid-js';
+import { createMutable } from 'solid-js/store';
+import { invoke } from '@tauri-apps/api';
+import { listen, UnlistenFn } from '@tauri-apps/api/event';
+import { dataDir } from '@tauri-apps/api/path';
+import { appWindow } from '@tauri-apps/api/window';
// Graphics
-import cogBtn from '../resources/icons/cog.svg'
-import downBtn from '../resources/icons/download.svg'
-import wrenchBtn from '../resources/icons/wrench.svg'
-import { ExtrasMenu } from './components/menu/ExtrasMenu'
+import cogBtn from '../resources/icons/cog.svg';
+import downBtn from '../resources/icons/download.svg';
+import wrenchBtn from '../resources/icons/wrench.svg';
+import { getConfigOption, setConfigOption } from '../utils/configuration';
+import DownloadHandler from '../utils/download';
+import { unpatchGame } from '../utils/metadata';
+import DownloadList from './components/common/DownloadList';
+import MainProgressBar from './components/common/MainProgressBar';
+import Downloads from './components/menu/Downloads';
+import { ExtrasMenu } from './components/menu/ExtrasMenu';
+import Game from './components/menu/Game';
+import Options from './components/menu/Options';
+import MiniDialog from './components/MiniDialog';
+import NewsSection from './components/news/NewsSection';
+import RightBar from './components/RightBar';
+import ServerLaunchSection from './components/ServerLaunchSection';
+import TopBar from './components/TopBar';
interface IProps {
- downloadHandler: DownloadHandler
+ downloadHandler: DownloadHandler;
}
interface IState {
- isDownloading: boolean
- optionsOpen: boolean
- miniDownloadsOpen: boolean
- downloadsOpen: boolean
- gameDownloadsOpen: boolean
- extrasOpen: boolean
- migotoSet: boolean
- playGame: (exe?: string, proc_name?: string) => void
+ isDownloading: boolean;
+ optionsOpen: boolean;
+ miniDownloadsOpen: boolean;
+ downloadsOpen: boolean;
+ gameDownloadsOpen: boolean;
+ extrasOpen: boolean;
+ migotoSet: boolean;
+ playGame: (exe?: string, proc_name?: string) => void;
}
-export class Main extends React.Component this.setState({ optionsOpen: !this.state.optionsOpen })}
- className="TopButton"
- >
- 
-
+ return (
+ <>
+ (state.optionsOpen = !state.optionsOpen)}
+ class="TopButton">
+
+
+ (state.downloadsOpen = !state.downloadsOpen)}>
+ 
+
+ this.setState({ downloadsOpen: !this.state.downloadsOpen })}
- >
-
+ id="modsBtn"
+ onClick={() => {
+ // Create and dispatch a custom "openMods" event
+ const event = new CustomEvent('changePage', {
+ detail: 'modding',
+ });
+ window.dispatchEvent(event);
+ }}
+ class="TopButton">
+ 
- {this.state.migotoSet && (
- {
- // Create and dispatch a custom "openMods" event
- const event = new CustomEvent('changePage', { detail: 'modding' })
- window.dispatchEvent(event)
- }}
- className="TopButton"
- >
-
-
- )}
- {/* this.setState({ gameDownloadsOpen: !this.state.gameDownloadsOpen })}>
+
+ {/* this.setState({ extrasOpen: false })} playGame={this.state.playGame}>
- Yo
-
- )
- }
-
- {
- // Mini downloads section
- this.state.miniDownloadsOpen ? (
- this.setState({ downloadsOpen: false })}
- />
- ) : null
- }
-
- {
- // Options menu
- this.state.optionsOpen ? (
- this.setState({ optionsOpen: !this.state.optionsOpen })}
- />
- ) : null
- }
-
- {
- // Game downloads menu
- this.state.gameDownloadsOpen ? (
- this.setState({ gameDownloadsOpen: false })}
- />
- ) : null
- }
-
-
this.setState({ gameDownloadsOpen: !this.state.gameDownloadsOpen })}>
*/}
-
-
-
- {
- this.setState({ miniDownloadsOpen: false })
- }}
- >
-
-
-
- ) : null
- }
-
- {
- // Download menu
- this.state.downloadsOpen ? (
-
-
+ (state.extrasOpen = false)}
+ playGame={state.playGame}>
+ Yo
+
+
+
+
+
+
+
+ (state.downloadsOpen = false)}
+ />
+
+
+
+ (state.optionsOpen = !state.optionsOpen)}
+ downloadManager={props.downloadHandler}
+ />
+
+
+
+ (state.gameDownloadsOpen = false)}
+ />
+
+
+ {
- constructor(props: IProps) {
- super(props)
-
- this.state = {
- isDownloading: false,
- category: '',
- downloadList: null,
- }
-
- this.setCategory = this.setCategory.bind(this)
- this.addDownload = this.addDownload.bind(this)
- }
+export function Mods(props: IProps) {
+ const [category, setCategory] = createSignal('');
+ const [downloadList, setDownloadList] = createSignal<
+ { name: string; url: string; mod: ModData }[] | null
+ >(null);
- async addDownload(mod: ModData) {
- const dlLinks = await getModDownload(String(mod.id))
+ async function addDownload(mod: ModData) {
+ const dlLinks = await getModDownload(String(mod.id));
// Not gonna bother allowing sorting for now
- const firstLink = dlLinks[0].downloadUrl
- const fileExt = firstLink.split('.').pop()
+ const firstLink = dlLinks[0].downloadUrl;
+ const fileExt = firstLink.split('.').pop();
- const modName = `${mod.id}.${fileExt}`
+ const modName = `${mod.id}.${fileExt}`;
- if (dlLinks.length === 0) return
+ if (dlLinks.length === 0) return;
// If there is one download we don't care to choose
if (dlLinks.length === 1) {
- this.downloadMod(firstLink, modName, mod)
- return
+ downloadMod(firstLink, modName, mod);
+ return;
}
- this.setState({
- downloadList: dlLinks.map((link) => ({
+ setDownloadList(
+ dlLinks.map((link) => ({
name: link.filename,
url: link.downloadUrl,
- mod: mod,
- })),
- })
+ mod,
+ }))
+ );
}
- async downloadMod(link: string, modName: string, mod: ModData) {
- const modFolder = await getModsFolder()
- const path = `${modFolder}/${modName}`
+ async function downloadMod(link: string, modName: string, mod: ModData) {
+ const modFolder = await getModsFolder();
+ const path = `${modFolder}/${modName}`;
- if (!modFolder) return
+ if (!modFolder) return;
- this.props.downloadHandler.addDownload(link, path, async () => {
- const unzipRes = await unzip(path, modFolder, false, true)
+ props.downloadHandler.addDownload(link, path, async () => {
+ const unzipRes = await unzip(path, modFolder, false, true);
// Write a modinfo.json file
invoke('write_file', {
path: `${unzipRes.new_folder}/modinfo.json`,
contents: JSON.stringify(mod),
- })
- })
- }
-
- async setCategory(value: string) {
- this.setState(
- {
- category: value,
- },
- this.forceUpdate
- )
+ });
+ });
}
- render() {
- return (
-
this.setState({ miniDownloadsOpen: !this.state.miniDownloadsOpen })}
- >
- {this.state.isDownloading ?
+
+
+
+ (state.miniDownloadsOpen = false)}>
+
+
-
- )
- }
+
+
+
+ );
}
diff --git a/src/ui/Mods.tsx b/src/ui/Mods.tsx
index 3129ebc8..195a2643 100644
--- a/src/ui/Mods.tsx
+++ b/src/ui/Mods.tsx
@@ -1,28 +1,23 @@
-import { invoke } from '@tauri-apps/api'
-import React from 'react'
-import DownloadHandler from '../utils/download'
-import { getModDownload, ModData } from '../utils/gamebanana'
-import { getModsFolder } from '../utils/mods'
-import { unzip } from '../utils/zipUtils'
-import ProgressBar from './components/common/MainProgressBar'
-import { ModHeader } from './components/mods/ModHeader'
-import { ModList } from './components/mods/ModList'
-import TopBar from './components/TopBar'
-
-import './Mods.css'
-import Back from '../resources/icons/back.svg'
-import Menu from './components/menu/Menu'
-import BigButton from './components/common/BigButton'
-import Tr from '../utils/language'
+import { createSignal, For, Show } from 'solid-js';
+import { invoke } from '@tauri-apps/api';
+
+import Back from '../resources/icons/back.svg';
+import DownloadHandler from '../utils/download';
+import { getModDownload, ModData } from '../utils/gamebanana';
+import Tr from '../utils/language';
+import { getModsFolder } from '../utils/mods';
+import { unzip } from '../utils/zipUtils';
+import BigButton from './components/common/BigButton';
+import ProgressBar from './components/common/MainProgressBar';
+import Menu from './components/menu/Menu';
+import { ModHeader } from './components/mods/ModHeader';
+import { ModList } from './components/mods/ModList';
+import TopBar from './components/TopBar';
+
+import './Mods.css';
interface IProps {
- downloadHandler: DownloadHandler
-}
-
-interface IState {
- isDownloading: boolean
- category: string
- downloadList: { name: string; url: string; mod: ModData }[] | null
+ downloadHandler: DownloadHandler;
}
const headers = [
@@ -38,132 +33,121 @@ const headers = [
name: 'installed',
title: 'Installed',
},
-]
+];
/**
* Mods currently install into folder labelled with their GB ID
*
* @TODO Categorizaiton/sorting (by likes, views, etc)
*/
-export class Mods extends React.Component (state.miniDownloadsOpen = !state.miniDownloadsOpen)}>
+
+
+
+
-
-
-
- {this.state.downloadList && (
-
{
- // Create and dispatch a custom "changePage" event
- const event = new CustomEvent('changePage', { detail: 'main' })
- window.dispatchEvent(event)
- }}
- >
- 
-
-