+
{
this.setState({ optionsOpen: !this.state.optionsOpen })
@@ -199,10 +216,7 @@ class App extends React.Component {
{
// Download menu
this.state.downloadsOpen ? (
- this.setState({ downloadsOpen: false })}
- />
+ this.setState({ downloadsOpen: false })} />
) : null
}
@@ -219,22 +233,18 @@ class App extends React.Component {
{
// Game downloads menu
this.state.gameDownloadsOpen ? (
- this.setState({ gameDownloadsOpen: false })}
- />
+ this.setState({ gameDownloadsOpen: false })} />
) : null
}
diff --git a/src/ui/Debug.tsx b/src/ui/Debug.tsx
index 4846541..11d78de 100644
--- a/src/ui/Debug.tsx
+++ b/src/ui/Debug.tsx
@@ -3,8 +3,8 @@ import './App.css'
import TopBar from './components/TopBar'
-import {invoke} from '@tauri-apps/api/tauri'
-import {dataDir} from '@tauri-apps/api/path'
+import { invoke } from '@tauri-apps/api/tauri'
+import { dataDir } from '@tauri-apps/api/path'
import TextInput from './components/common/TextInput'
let proxyAddress = ''
@@ -15,7 +15,7 @@ async function setProxyAddress(address: string) {
}
async function startProxy() {
- await invoke('connect', { port: 2222, certificatePath: await dataDir() + '\\cultivation\\ca' })
+ await invoke('connect', { port: 2222, certificatePath: (await dataDir()) + '\\cultivation\\ca' })
await invoke('open_in_browser', { url: 'https://hoyoverse.com' })
}
@@ -24,14 +24,14 @@ async function stopProxy() {
}
async function generateCertificates() {
- await invoke('generate_ca_files', { path: await dataDir() + '\\cultivation' })
+ await invoke('generate_ca_files', { path: (await dataDir()) + '\\cultivation' })
}
async function generateInfo() {
console.log({
- certificatePath: await dataDir() + '\\cultivation\\ca',
+ certificatePath: (await dataDir()) + '\\cultivation\\ca',
isAdmin: await invoke('is_elevated'),
- connectingTo: proxyAddress
+ connectingTo: proxyAddress,
})
alert('check your dev console and send that in #cultivation')
}
@@ -40,7 +40,7 @@ function none() {
alert('none')
}
-class Debug extends React.Component{
+class Debug extends React.Component {
render() {
return (
this.setState({ miniDownloadsOpen: !this.state.miniDownloadsOpen })}
>
- { this.state.isDownloading ?
-
@@ -55,4 +55,4 @@ class Debug extends React.Component{
}
}
-export default Debug
\ No newline at end of file
+export default Debug
diff --git a/src/ui/components/MiniDialog.css b/src/ui/components/MiniDialog.css
index 1a7e0ed..bd47fc2 100644
--- a/src/ui/components/MiniDialog.css
+++ b/src/ui/components/MiniDialog.css
@@ -1,7 +1,7 @@
.MiniDialog {
position: fixed;
z-index: 99;
-
+
/* Len and width */
height: 30%;
width: 30%;
@@ -32,4 +32,4 @@
.MiniDialog .ProgressText {
color: #000;
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/MiniDialog.tsx b/src/ui/components/MiniDialog.tsx
index e7c3bfc..c27089d 100644
--- a/src/ui/components/MiniDialog.tsx
+++ b/src/ui/components/MiniDialog.tsx
@@ -4,10 +4,10 @@ import Close from '../../resources/icons/close.svg'
import './MiniDialog.css'
interface IProps {
- children: React.ReactNode[] | React.ReactNode;
- title?: string;
- closeable?: boolean;
- closeFn: () => void;
+ children: React.ReactNode[] | React.ReactNode
+ title?: string
+ closeable?: boolean
+ closeFn: () => void
}
export default class MiniDialog extends React.Component {
@@ -19,7 +19,7 @@ export default class MiniDialog extends React.Component {
document.addEventListener('mousedown', (evt) => {
const tgt = evt.target as HTMLElement
const isInside = tgt.closest('.MiniDialog') !== null
-
+
if (!isInside) {
this.props.closeFn()
}
@@ -33,13 +33,12 @@ export default class MiniDialog extends React.Component {
render() {
return (
{
@@ -30,7 +30,7 @@ export default class TopBar extends React.Component {
this.state = {
version: '0.0.0',
clicks: 0,
- intv: null
+ intv: null,
}
this.activateClick = this.activateClick.bind(this)
@@ -59,10 +59,10 @@ export default class TopBar extends React.Component {
setTimeout(() => {
// Gotta clear it so it goes back to regular colors
this.setState({
- clicks: 0
+ clicks: 0,
})
}, 600)
-
+
// Activate... SWAG MODE
await setConfigOption('swag_mode', true)
@@ -75,7 +75,7 @@ export default class TopBar extends React.Component {
if (this.state.clicks < 3) {
this.setState({
clicks: this.state.clicks + 1,
- intv: setTimeout(() => this.setState({ clicks: 0 }), 1500)
+ intv: setTimeout(() => this.setState({ clicks: 0 }), 1500),
})
return
@@ -89,29 +89,31 @@ export default class TopBar extends React.Component {
+ {/**
+ * HEY YOU
+ *
+ * If you're looking at the source code to find the swag mode thing, that's okay! If you're not, move along...
+ * Just do me a favor and don't go telling everyone about how you found it. If you are just helping someone who
+ * for some reason needs it, that's fine, but not EVERYONE needs it, which is why it exists in the first place.
+ */}
+
- {
- this.props.closeable !== undefined && this.props.closeable ?
-
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/ServerLaunchSection.css b/src/ui/components/ServerLaunchSection.css
index be805ae..8b6d0c0 100644
--- a/src/ui/components/ServerLaunchSection.css
+++ b/src/ui/components/ServerLaunchSection.css
@@ -109,17 +109,17 @@
}
@media (max-width: 1040px) {
- #playButton {
- right: 5%;
- }
+ #playButton {
+ right: 5%;
+ }
}
@media (max-width: 870px) {
- #playButton {
- min-width: 235px;
- }
+ #playButton {
+ min-width: 235px;
+ }
- #officialPlay {
- width: 40%;
- }
+ #officialPlay {
+ width: 40%;
+ }
}
diff --git a/src/ui/components/ServerLaunchSection.tsx b/src/ui/components/ServerLaunchSection.tsx
index 067ad02..313eebe 100644
--- a/src/ui/components/ServerLaunchSection.tsx
+++ b/src/ui/components/ServerLaunchSection.tsx
@@ -11,26 +11,26 @@ import Server from '../../resources/icons/server.svg'
import Akebi from '../../resources/icons/akebi.svg'
import './ServerLaunchSection.css'
-import {dataDir} from '@tauri-apps/api/path'
+import { dataDir } from '@tauri-apps/api/path'
import { getGameExecutable } from '../../utils/game'
import { patchGame, unpatchGame } from '../../utils/metadata'
interface IState {
- grasscutterEnabled: boolean;
- buttonLabel: string;
- checkboxLabel: string;
- ip: string;
- port: string;
+ grasscutterEnabled: boolean
+ buttonLabel: string
+ checkboxLabel: string
+ ip: string
+ port: string
- ipPlaceholder: string;
- portPlaceholder: string;
+ ipPlaceholder: string
+ portPlaceholder: string
- portHelpText: string;
+ portHelpText: string
- httpsLabel: string;
- httpsEnabled: boolean;
+ httpsLabel: string
+ httpsEnabled: boolean
- swag: boolean;
+ swag: boolean
}
export default class ServerLaunchSection extends React.Component<{}, IState> {
@@ -48,7 +48,7 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
portHelpText: '',
httpsLabel: '',
httpsEnabled: false,
- swag: false
+ swag: false,
}
this.toggleGrasscutter = this.toggleGrasscutter.bind(this)
@@ -74,7 +74,7 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
portHelpText: await translate('help.port_help_text'),
httpsLabel: await translate('main.https_enable'),
httpsEnabled: config.https_enabled || false,
- swag: config.swag_mode || false
+ swag: config.swag_mode || false,
})
}
@@ -85,7 +85,7 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
// Set state as well
this.setState({
- grasscutterEnabled: config.toggle_grasscutter
+ grasscutterEnabled: config.toggle_grasscutter,
})
await saveConfig(config)
@@ -94,11 +94,11 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
async playGame(exe?: string, proc_name?: string) {
const config = await getConfig()
- if(!await getGameExecutable()) {
+ if (!(await getGameExecutable())) {
alert('Game executable not set!')
- return
+ return
}
-
+
// Connect to proxy
if (config.toggle_grasscutter) {
if (config.patch_metadata) {
@@ -117,14 +117,16 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
await setConfigOption('last_port', this.state.port)
await invoke('enable_process_watcher', {
- process: proc_name || game_exe
+ process: proc_name || game_exe,
})
if (config.use_internal_proxy) {
// Set IP
- await invoke('set_proxy_addr', { addr: (this.state.httpsEnabled ? 'https':'http') + '://' + this.state.ip + ':' + this.state.port })
+ await invoke('set_proxy_addr', {
+ addr: (this.state.httpsEnabled ? 'https' : 'http') + '://' + this.state.ip + ':' + this.state.port,
+ })
// Connect to proxy
- await invoke('connect', { port: 8365, certificatePath: await dataDir() + '\\cultivation\\ca' })
+ await invoke('connect', { port: 8365, certificatePath: (await dataDir()) + '\\cultivation\\ca' })
}
// Open server as well if the options are set
@@ -137,21 +139,23 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
await invoke('run_jar', {
path: config.grasscutter_path,
executeIn: jarFolder,
- javaPath: config.java_path || ''
+ javaPath: config.java_path || '',
})
}
} else {
const unpatched = await unpatchGame()
if (!unpatched) {
- alert(`Could not unpatch game, aborting launch! (You can find your metadata backup in ${await dataDir()}\\cultivation\\)`)
+ alert(
+ `Could not unpatch game, aborting launch! (You can find your metadata backup in ${await dataDir()}\\cultivation\\)`
+ )
return
}
}
-
+
// Launch the program
const gameExists = await invoke('dir_exists', {
- path: exe || config.game_install_path
+ path: exe || config.game_install_path,
})
if (gameExists) await invoke('run_program', { path: exe || config.game_install_path })
@@ -175,7 +179,7 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
await invoke('run_jar', {
path: config.grasscutter_path,
executeIn: jarFolder,
- javaPath: config.java_path || ''
+ javaPath: config.java_path || '',
})
}
@@ -194,7 +198,7 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
// First launch 3dm
invoke('run_program', {
- path: config.migoto_path
+ path: config.migoto_path,
})
// Then play the game as normal
@@ -203,13 +207,13 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
setIp(text: string) {
this.setState({
- ip: text
+ ip: text,
})
}
setPort(text: string) {
this.setState({
- port: text
+ port: text,
})
}
@@ -220,7 +224,7 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
// Set state as well
this.setState({
- httpsEnabled: config.https_enabled
+ httpsEnabled: config.https_enabled,
})
await saveConfig(config)
@@ -230,40 +234,59 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
return (
- {this.props?.title}
- 
-
: null
- }
+ {this.props.closeable !== undefined && this.props.closeable ? (
+
+ {this.props?.title}
+
+
+ ) : null}
{this.props.children}
@@ -47,4 +46,4 @@ export default class MiniDialog extends React.Component {
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/RightBar.css b/src/ui/components/RightBar.css
index dd0218b..608064f 100644
--- a/src/ui/components/RightBar.css
+++ b/src/ui/components/RightBar.css
@@ -2,7 +2,7 @@
position: absolute;
transform: translate(0%, 0%);
- display:flex;
+ display: flex;
flex-direction: column;
align-items: center;
justify-content: flex-start;
@@ -36,14 +36,14 @@
filter: invert(75%) sepia(0%) saturate(100%) hue-rotate(0deg) brightness(100%) contrast(100%);
}
-@media(max-height: 580px) {
- .RightBar {
- height: calc(100vh - 180px);
- }
+@media (max-height: 580px) {
+ .RightBar {
+ height: calc(100vh - 180px);
+ }
}
-@media(max-height: 500px) {
- .RightBar {
- height: calc(100vh - 170px);
- }
-}
\ No newline at end of file
+@media (max-height: 500px) {
+ .RightBar {
+ height: calc(100vh - 170px);
+ }
+}
diff --git a/src/ui/components/RightBar.tsx b/src/ui/components/RightBar.tsx
index f3f1ff7..456fde4 100644
--- a/src/ui/components/RightBar.tsx
+++ b/src/ui/components/RightBar.tsx
@@ -1,8 +1,8 @@
import { invoke } from '@tauri-apps/api'
import React from 'react'
-import Discord from '../../resources/icons/discord.svg'
-import Github from '../../resources/icons/github.svg'
+import Discord from '../../resources/icons/discord.svg'
+import Github from '../../resources/icons/github.svg'
import './RightBar.css'
@@ -28,4 +28,4 @@ export default class RightBar extends React.Component {
-
+
- {
- this.state.grasscutterEnabled && (
-
-
+ )}
-
+
- )
- }
-
+
+
+ }}
+ id="port"
+ key="port"
+ placeholder={this.state.portPlaceholder}
+ onChange={this.setPort}
+ initalValue={this.state.port}
+ />
+
- {this.state.buttonLabel}
- {
- this.state.swag && (
- <>
-
- 
-
-
- 3DM
-
-
-
- )
- }
+
+ {this.state.buttonLabel}
+
+ {this.state.swag && (
+ <>
+
+
+
+
+ 3DM
+
+
+ )}
@@ -271,4 +294,4 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/TopBar.css b/src/ui/components/TopBar.css
index 30b3239..a13fd36 100644
--- a/src/ui/components/TopBar.css
+++ b/src/ui/components/TopBar.css
@@ -51,4 +51,4 @@
to {
transform: rotate(360deg);
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/TopBar.tsx b/src/ui/components/TopBar.tsx
index 26a5123..f1db052 100644
--- a/src/ui/components/TopBar.tsx
+++ b/src/ui/components/TopBar.tsx
@@ -12,15 +12,15 @@ import './TopBar.css'
import { getConfig, setConfigOption } from '../../utils/configuration'
interface IProps {
- optFunc: () => void;
- downFunc: () => void;
- gameFunc: () => void;
+ optFunc: () => void
+ downFunc: () => void
+ gameFunc: () => void
}
interface IState {
- version: string;
- clicks: number;
- intv: NodeJS.Timeout | null;
+ version: string
+ clicks: number
+ intv: NodeJS.Timeout | null
}
export default class TopBar extends React.Component
+ ?
- {
- /**
- * HEY YOU
- *
- * If you're looking at the source code to find the swag mode thing, that's okay! If you're not, move along...
- * Just do me a favor and don't go telling everyone about how you found it. If you are just helping someone who
- * for some reason needs it, that's fine, but not EVERYONE needs it, which is why it exists in the first place.
- */
- }
- ?
-
+
-
+
-
+
-
+
{/* {
@@ -17,7 +17,7 @@ export default class BigButton extends React.Component {
super(props)
this.state = {
- disabled: this.props.disabled
+ disabled: this.props.disabled,
}
this.handleClick = this.handleClick.bind(this)
@@ -25,7 +25,7 @@ export default class BigButton extends React.Component {
static getDerivedStateFromProps(props: IProps, _state: IState) {
return {
- disabled: props.disabled
+ disabled: props.disabled,
}
}
@@ -37,9 +37,13 @@ export default class BigButton extends React.Component {
render() {
return (
- {
files,
extracting,
total: totalSize,
- speed: '0 B/s'
+ speed: '0 B/s',
}
}
@@ -51,20 +51,23 @@ export default class ProgressBar extends React.Component {
return (
{
@@ -36,7 +36,7 @@ export default class ProgressBar extends React.Component {
const prog = this.props.downloadManager.getDownloadProgress(this.props.path)
this.setState({
progress: prog?.progress || 0,
- status: await translate(`download_status.${prog?.status || 'stopped'}`) || 'stopped',
+ status: (await translate(`download_status.${prog?.status || 'stopped'}`)) || 'stopped',
total: prog?.total || 0,
})
@@ -54,24 +54,29 @@ export default class ProgressBar extends React.Component {
render() {
return (
@@ -121,4 +123,4 @@ export default class TopBar extends React.Component {
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/BigButton.css b/src/ui/components/common/BigButton.css
index ae4303d..045008d 100644
--- a/src/ui/components/common/BigButton.css
+++ b/src/ui/components/common/BigButton.css
@@ -27,4 +27,4 @@
.BigButton.disabled:hover {
background: linear-gradient(#949494, #9c9c9c);
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/BigButton.tsx b/src/ui/components/common/BigButton.tsx
index 5b6cbe7..6fa10bd 100644
--- a/src/ui/components/common/BigButton.tsx
+++ b/src/ui/components/common/BigButton.tsx
@@ -2,14 +2,14 @@ import React from 'react'
import './BigButton.css'
interface IProps {
- children: React.ReactNode;
- onClick: () => unknown;
- id: string;
- disabled?: boolean;
+ children: React.ReactNode
+ onClick: () => unknown
+ id: string
+ disabled?: boolean
}
interface IState {
- disabled?: boolean;
+ disabled?: boolean
}
export default class BigButton extends React.Component
+
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/Checkbox.css b/src/ui/components/common/Checkbox.css
index b42c027..c485e36 100644
--- a/src/ui/components/common/Checkbox.css
+++ b/src/ui/components/common/Checkbox.css
@@ -1,4 +1,4 @@
-.Checkbox input[type="checkbox"] {
+.Checkbox input[type='checkbox'] {
display: none;
}
@@ -17,10 +17,10 @@
.CheckboxDisplay img {
height: 100%;
- filter: invert(99%) sepia(0%) saturate(1188%) hue-rotate(186deg) brightness(97%) contrast(67%)
+ filter: invert(99%) sepia(0%) saturate(1188%) hue-rotate(186deg) brightness(97%) contrast(67%);
}
.Checkbox label {
display: flex;
flex-direction: row;
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/Checkbox.tsx b/src/ui/components/common/Checkbox.tsx
index 3eefc2c..581392f 100644
--- a/src/ui/components/common/Checkbox.tsx
+++ b/src/ui/components/common/Checkbox.tsx
@@ -4,9 +4,9 @@ import checkmark from '../../../resources/icons/check.svg'
import './Checkbox.css'
interface IProps {
- label?: string,
- checked: boolean,
- onChange: () => void,
+ label?: string
+ checked: boolean
+ onChange: () => void
id: string
}
@@ -19,14 +19,14 @@ export default class Checkbox extends React.Component {
super(props)
this.state = {
- checked: props.checked
+ checked: props.checked,
}
}
static getDerivedStateFromProps(props: IProps, state: IState) {
if (props.checked !== state.checked) {
return {
- checked: props.checked
+ checked: props.checked,
}
}
@@ -41,14 +41,12 @@ export default class Checkbox extends React.Component {
render() {
return (
{
this.state = {
value: props.value || '',
placeholder: this.props.placeholder || 'Select file or folder...',
- folder: this.props.folder || false
+ folder: this.props.folder || false,
}
this.handleIconClick = this.handleIconClick.bind(this)
@@ -54,8 +54,8 @@ export default class DirInput extends React.Component {
async componentDidMount() {
if (!this.props.placeholder) {
const translation = await translate('components.select_file')
- this.setState( {
- placeholder: translation
+ this.setState({
+ placeholder: translation,
})
}
}
@@ -65,15 +65,13 @@ export default class DirInput extends React.Component {
if (this.state.folder) {
path = await open({
- directory: true
+ directory: true,
})
} else {
console.log(this.props.openFolder)
path = await open({
- filters: [
- { name: 'Files', extensions: this.props.extensions || ['*'] }
- ],
- defaultPath: this.props.openFolder
+ filters: [{ name: 'Files', extensions: this.props.extensions || ['*'] }],
+ defaultPath: this.props.openFolder,
})
}
@@ -81,7 +79,7 @@ export default class DirInput extends React.Component {
if (!path) return
this.setState({
- value: path
+ value: path,
})
if (this.props.onChange) this.props.onChange(path)
@@ -89,12 +87,13 @@ export default class DirInput extends React.Component {
render() {
return (
- {
super(props)
this.state = {
- opened: false
+ opened: false,
}
this.setOpen = this.setOpen.bind(this)
@@ -41,14 +41,15 @@ export default class HelpButton extends React.Component {
- {this.props.children}
-
+
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/DirInput.css b/src/ui/components/common/DirInput.css
index 6dff2f2..5d88404 100644
--- a/src/ui/components/common/DirInput.css
+++ b/src/ui/components/common/DirInput.css
@@ -24,4 +24,4 @@
.FileSelectIcon img {
height: 100%;
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/DirInput.tsx b/src/ui/components/common/DirInput.tsx
index 510969b..16de06b 100644
--- a/src/ui/components/common/DirInput.tsx
+++ b/src/ui/components/common/DirInput.tsx
@@ -14,7 +14,7 @@ interface IProps {
readonly?: boolean
placeholder?: string
folder?: boolean
- customClearBehaviour?: () => void,
+ customClearBehaviour?: () => void
openFolder?: string
}
@@ -31,7 +31,7 @@ export default class DirInput extends React.Component
+
{
+ readOnly={this.props.readonly !== undefined ? this.props.readonly : true}
+ onChange={(text: string) => {
this.setState({ value: text })
if (this.props.onChange) this.props.onChange(text)
@@ -108,4 +107,4 @@ export default class DirInput extends React.Component {
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/DownloadList.css b/src/ui/components/common/DownloadList.css
index 5be9bca..7a63fbc 100644
--- a/src/ui/components/common/DownloadList.css
+++ b/src/ui/components/common/DownloadList.css
@@ -4,4 +4,4 @@
flex: 1;
overflow-y: auto;
padding: 10px;
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/DownloadList.tsx b/src/ui/components/common/DownloadList.tsx
index 8d8fe66..6bbd906 100644
--- a/src/ui/components/common/DownloadList.tsx
+++ b/src/ui/components/common/DownloadList.tsx
@@ -5,7 +5,7 @@ import DownloadSection from './DownloadSection'
import './DownloadList.css'
interface IProps {
- downloadManager: DownloadHandler;
+ downloadManager: DownloadHandler
}
export default class DownloadList extends React.Component {
@@ -16,17 +16,14 @@ export default class DownloadList extends React.Component {
render() {
const list = this.props.downloadManager.getDownloads().map((download) => {
return (
- {
@@ -32,4 +32,4 @@ export default class DownloadSection extends React.Component {
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/HelpButton.css b/src/ui/components/common/HelpButton.css
index 6b40109..efade89 100644
--- a/src/ui/components/common/HelpButton.css
+++ b/src/ui/components/common/HelpButton.css
@@ -30,4 +30,4 @@
right: -450%;
width: 200px;
height: 120px;
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/HelpButton.tsx b/src/ui/components/common/HelpButton.tsx
index 3baf1bb..de78c8c 100644
--- a/src/ui/components/common/HelpButton.tsx
+++ b/src/ui/components/common/HelpButton.tsx
@@ -5,7 +5,7 @@ import Help from '../../../resources/icons/help.svg'
import MiniDialog from '../MiniDialog'
interface IProps {
- children?: React.ReactNode[] | React.ReactNode;
+ children?: React.ReactNode[] | React.ReactNode
contents?: string
id?: string
}
@@ -19,7 +19,7 @@ export default class HelpButton extends React.Component
- {
- list.length > 0 ? list : 'No downloads present'
- }
-
- )
+ return {list.length > 0 ? list : 'No downloads present'}
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/DownloadSection.css b/src/ui/components/common/DownloadSection.css
index 0c47ded..f254415 100644
--- a/src/ui/components/common/DownloadSection.css
+++ b/src/ui/components/common/DownloadSection.css
@@ -26,4 +26,4 @@
.DownloadStatus {
text-align: right;
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/DownloadSection.tsx b/src/ui/components/common/DownloadSection.tsx
index 373b238..0b9b4ac 100644
--- a/src/ui/components/common/DownloadSection.tsx
+++ b/src/ui/components/common/DownloadSection.tsx
@@ -5,8 +5,8 @@ import ProgressBar from './ProgressBar'
import './DownloadSection.css'
interface IProps {
- downloadManager: DownloadHandler;
- downloadName: string;
+ downloadManager: DownloadHandler
+ downloadName: string
}
export default class DownloadSection extends React.Component
-
- {this.props.contents || this.props.children}
-
+
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/MainProgressBar.tsx b/src/ui/components/common/MainProgressBar.tsx
index f43fc52..ff6d023 100644
--- a/src/ui/components/common/MainProgressBar.tsx
+++ b/src/ui/components/common/MainProgressBar.tsx
@@ -4,15 +4,15 @@ import Tr from '../../../utils/language'
import './ProgressBar.css'
interface IProps {
- downloadManager: DownloadHandler,
+ downloadManager: DownloadHandler
}
interface IState {
- average: number,
- files: number,
- extracting: number,
- total: number,
- speed: string,
+ average: number
+ files: number
+ extracting: number
+ total: number
+ speed: string
}
/**
@@ -29,7 +29,7 @@ export default class ProgressBar extends React.Component
+ {this.props.contents || this.props.children}
-
{
- // Handles no files downloading
- if (this.state.files === 0) {
- return '100'
- }
+
{
+ // Handles no files downloading
+ if (this.state.files === 0) {
+ return '100'
+ }
- if (this.state.total <= 0) {
- return '0'
- }
+ if (this.state.total <= 0) {
+ return '0'
+ }
- return this.state.average
- })()}%`,
- }}>
+ return this.state.average
+ })()}%`,
+ }}
+ >
@@ -75,4 +78,4 @@ export default class ProgressBar extends React.Component {
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/ProgressBar.css b/src/ui/components/common/ProgressBar.css
index 7e57421..eaed6f1 100644
--- a/src/ui/components/common/ProgressBar.css
+++ b/src/ui/components/common/ProgressBar.css
@@ -1,4 +1,5 @@
-.ProgressBar, .InnerProgress {
+.ProgressBar,
+.InnerProgress {
border-radius: 4px;
}
@@ -91,4 +92,4 @@
.downloadStop:hover {
cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/ProgressBar.tsx b/src/ui/components/common/ProgressBar.tsx
index 6194f04..650dd22 100644
--- a/src/ui/components/common/ProgressBar.tsx
+++ b/src/ui/components/common/ProgressBar.tsx
@@ -1,20 +1,20 @@
import React from 'react'
import { capitalize } from '../../../utils/string'
-import Stop from '../../../resources/icons/close.svg'
+import Stop from '../../../resources/icons/close.svg'
import './ProgressBar.css'
import DownloadHandler from '../../../utils/download'
import { translate } from '../../../utils/language'
interface IProps {
- path: string,
- downloadManager: DownloadHandler,
+ path: string
+ downloadManager: DownloadHandler
}
interface IState {
- progress: number,
- status: string,
- total: number,
+ progress: number
+ status: string
+ total: number
}
export default class ProgressBar extends React.Component
- {
resources_downloading: this.props.downloadManager.downloadingResources(),
repo_downloading: this.props.downloadManager.downloadingRepo(),
grasscutter_set: false,
- resources_exist: false
+ resources_exist: false,
}
this.getGrasscutterFolder = this.getGrasscutterFolder.bind(this)
@@ -63,7 +63,7 @@ export default class Downloads extends React.Component {
if (!gc_path || gc_path === '') {
this.setState({
grasscutter_set: false,
- resources_exist: false
+ resources_exist: false,
})
return
@@ -72,15 +72,17 @@ export default class Downloads extends React.Component {
const path = gc_path.substring(0, gc_path.lastIndexOf('\\'))
if (gc_path) {
- const resources_exist: boolean = await invoke('dir_exists', {
- path: path + '\\resources'
- }) as boolean && !(await invoke('dir_is_empty', {
- path: path + '\\resources'
- })) as boolean
+ const resources_exist: boolean =
+ ((await invoke('dir_exists', {
+ path: path + '\\resources',
+ })) as boolean) &&
+ (!(await invoke('dir_is_empty', {
+ path: path + '\\resources',
+ })) as boolean)
this.setState({
grasscutter_set: gc_path !== '',
- resources_exist
+ resources_exist,
})
}
}
@@ -109,7 +111,7 @@ export default class Downloads extends React.Component {
async downloadGrasscutterStableRepo() {
const folder = await this.getGrasscutterFolder()
- this.props.downloadManager.addDownload(STABLE_REPO_DOWNLOAD, folder + '\\grasscutter_repo.zip', () =>{
+ this.props.downloadManager.addDownload(STABLE_REPO_DOWNLOAD, folder + '\\grasscutter_repo.zip', () => {
unzip(folder + '\\grasscutter_repo.zip', folder + '\\', this.toggleButtons)
})
@@ -118,7 +120,7 @@ export default class Downloads extends React.Component {
async downloadGrasscutterDevRepo() {
const folder = await this.getGrasscutterFolder()
- this.props.downloadManager.addDownload(DEV_REPO_DOWNLOAD, folder + '\\grasscutter_repo.zip', () =>{
+ this.props.downloadManager.addDownload(DEV_REPO_DOWNLOAD, folder + '\\grasscutter_repo.zip', () => {
unzip(folder + '\\grasscutter_repo.zip', folder + '\\', this.toggleButtons)
})
@@ -127,7 +129,7 @@ export default class Downloads extends React.Component {
async downloadGrasscutterStable() {
const folder = await this.getGrasscutterFolder()
- this.props.downloadManager.addDownload(STABLE_DOWNLOAD, folder + '\\grasscutter.zip', () =>{
+ this.props.downloadManager.addDownload(STABLE_DOWNLOAD, folder + '\\grasscutter.zip', () => {
unzip(folder + '\\grasscutter.zip', folder + '\\', this.toggleButtons)
})
@@ -135,11 +137,11 @@ export default class Downloads extends React.Component {
this.downloadGrasscutterStableRepo()
this.toggleButtons()
- }
+ }
async downloadGrasscutterLatest() {
const folder = await this.getGrasscutterFolder()
- this.props.downloadManager.addDownload(DEV_DOWNLOAD, folder + '\\grasscutter.zip', () =>{
+ this.props.downloadManager.addDownload(DEV_DOWNLOAD, folder + '\\grasscutter.zip', () => {
unzip(folder + '\\grasscutter.zip', folder + '\\', this.toggleButtons)
})
@@ -152,12 +154,14 @@ export default class Downloads extends React.Component {
async downloadResources() {
const folder = await this.getGrasscutterFolder()
this.props.downloadManager.addDownload(RESOURCES_DOWNLOAD, folder + '\\resources.zip', async () => {
- // Delete the existing folder if it exists
- if (await invoke('dir_exists', {
- path: folder + '\\resources'
- })) {
+ // Delete the existing folder if it exists
+ if (
+ await invoke('dir_exists', {
+ path: folder + '\\resources',
+ })
+ ) {
await invoke('dir_delete', {
- path: folder + '\\resources'
+ path: folder + '\\resources',
})
}
@@ -165,7 +169,7 @@ export default class Downloads extends React.Component {
// Rename folder to resources
invoke('rename', {
path: folder + '\\Resources',
- newName: 'resources'
+ newName: 'resources',
})
this.toggleButtons()
@@ -190,32 +194,40 @@ export default class Downloads extends React.Component {
render() {
return (
+
-
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/TextInput.css b/src/ui/components/common/TextInput.css
index a952cf0..69e8793 100644
--- a/src/ui/components/common/TextInput.css
+++ b/src/ui/components/common/TextInput.css
@@ -17,7 +17,7 @@
display: inline-block;
position: absolute;
right: 16%;
-
+
filter: invert(99%) sepia(0%) saturate(1188%) hue-rotate(186deg) brightness(97%) contrast(67%);
}
@@ -28,4 +28,4 @@
.TextInputClear {
height: 100%;
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/common/TextInput.tsx b/src/ui/components/common/TextInput.tsx
index 1efac23..22996f9 100644
--- a/src/ui/components/common/TextInput.tsx
+++ b/src/ui/components/common/TextInput.tsx
@@ -4,15 +4,15 @@ import './TextInput.css'
import Close from '../../../resources/icons/close.svg'
interface IProps {
- value?: string;
- initalValue?: string;
- placeholder?: string;
- onChange?: (value: string) => void;
- readOnly?: boolean;
- id?: string;
- clearable?: boolean;
- customClearBehaviour?: () => void;
- style?: React.CSSProperties;
+ value?: string
+ initalValue?: string
+ placeholder?: string
+ onChange?: (value: string) => void
+ readOnly?: boolean
+ id?: string
+ clearable?: boolean
+ customClearBehaviour?: () => void
+ style?: React.CSSProperties
}
interface IState {
@@ -24,14 +24,14 @@ export default class TextInput extends React.Component {
super(props)
this.state = {
- value: props.value || ''
+ value: props.value || '',
}
}
async componentDidMount() {
if (this.props.initalValue) {
this.setState({
- value: this.props.initalValue
+ value: this.props.initalValue,
})
}
}
@@ -43,26 +43,35 @@ export default class TextInput extends React.Component {
render() {
return (
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/menu/Downloads.css b/src/ui/components/menu/Downloads.css
index 60f7c6e..24a954a 100644
--- a/src/ui/components/menu/Downloads.css
+++ b/src/ui/components/menu/Downloads.css
@@ -28,4 +28,4 @@
.DownloadMenuSection .HelpButton img {
filter: none;
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/menu/Downloads.tsx b/src/ui/components/menu/Downloads.tsx
index f4c8f8a..a97b769 100644
--- a/src/ui/components/menu/Downloads.tsx
+++ b/src/ui/components/menu/Downloads.tsx
@@ -20,8 +20,8 @@ const DEV_DOWNLOAD = 'https://nightly.link/Grasscutters/Grasscutter/workflows/bu
const RESOURCES_DOWNLOAD = 'https://gitlab.com/yukiz/GrasscutterResources/-/archive/2.8/GrasscutterResources-2.8.zip'
interface IProps {
- closeFn: () => void;
- downloadManager: DownloadHandler;
+ closeFn: () => void
+ downloadManager: DownloadHandler
}
interface IState {
@@ -41,7 +41,7 @@ export default class Downloads extends React.Component
-
{
- // Handles files with content-lengths of 0
- if (this.state.status === 'finished') {
- return '100'
- }
+
{
+ // Handles files with content-lengths of 0
+ if (this.state.status === 'finished') {
+ return '100'
+ }
- if (this.state.total <= 0) {
- return '0'
- }
+ if (this.state.total <= 0) {
+ return '0'
+ }
- return this.state.progress / this.state.total * 100
- })()}%`,
- }}>
+ return (this.state.progress / this.state.total) * 100
+ })()}%`,
+ }}
+ >
@@ -80,10 +85,8 @@ export default class ProgressBar extends React.Component {
- {capitalize(this.state.status) || 'Waiting'}
-
+ {capitalize(this.state.status) || 'Waiting'}
- {
- this.setState({ value: e.target.value })
- if (this.props.onChange) this.props.onChange(e.target.value)
- }} />
- {
- this.props.clearable ?
-
)
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/menu/Divider.css b/src/ui/components/menu/Divider.css
index a0901ea..03de97f 100644
--- a/src/ui/components/menu/Divider.css
+++ b/src/ui/components/menu/Divider.css
@@ -1,4 +1,3 @@
-
.Divider {
display: flex;
flex-direction: row;
@@ -13,4 +12,4 @@
.DividerLine {
width: 60%;
border-top: 1px solid #ccc;
-}
\ No newline at end of file
+}
diff --git a/src/ui/components/menu/Divider.tsx b/src/ui/components/menu/Divider.tsx
index 6a091cd..c516e6f 100644
--- a/src/ui/components/menu/Divider.tsx
+++ b/src/ui/components/menu/Divider.tsx
@@ -10,4 +10,4 @@ export default class Divider extends React.Component {
{
+ {
+ this.setState({ value: e.target.value })
+ if (this.props.onChange) this.props.onChange(e.target.value)
+ }}
+ />
+ {this.props.clearable ? (
+
+
+ ) : null}
{
// Run custom behaviour first
if (this.props.customClearBehaviour) return this.props.customClearBehaviour()
this.setState({ value: '' })
-
+
if (this.props.onChange) this.props.onChange('')
this.forceUpdate()
- }}>
-
-
: null
- }
+ }}
+ >
+