Move some files around to where they should be

src/app/GlobalProvider.tsx

@@ -7,12 +7,12 @@ import {
   Dispatch,
   SetStateAction
 } from 'react'
-import { DownloadProgress } from './types/DownloadProgress'
-import { VersionsConfig } from './types/VersionsConfig'
-import { NormalConfig } from './types/NormalConfig'
-import { ServerVersionsResponse } from './types/ServerVersionsResponse'
-import { GameVersion } from './types/GameVersion'
-import { Game } from './types/Game'
+import { DownloadProgress } from '../types/DownloadProgress'
+import { VersionsConfig } from '../types/VersionsConfig'
+import { NormalConfig } from '../types/NormalConfig'
+import { ServerVersionsResponse } from '../types/ServerVersionsResponse'
+import { GameVersion } from '../types/GameVersion'
+import { Game } from '../types/Game'
 
 type GlobalCtxType = {
   serverVersionList: ServerVersionsResponse | null

src/app/componets/Setting.tsx

@@ -1,7 +1,7 @@
 import './Setting.css'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faCheck } from '@fortawesome/free-solid-svg-icons'
-import { SettingProps } from '../types/SettingProps'
+import { SettingProps } from '../../types/SettingProps'
 
 export function Setting ({
   label,

src/app/game/page.tsx

@@ -10,7 +10,7 @@ import { faWarning } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { ask, message } from '@tauri-apps/plugin-dialog'
 import { BaseDirectory, exists, remove } from '@tauri-apps/plugin-fs'
-import { writeVersionsConfig } from '../util/BazookaManager'
+import { writeVersionsConfig } from '@/lib/BazookaManager'
 
 export default function Installs () {
   const {

src/app/layout.tsx

@@ -3,7 +3,7 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 import Sidebar from './componets/Sidebar'
 import './Globals.css'
-import { DownloadProgress } from './types/DownloadProgress'
+import { DownloadProgress } from '../types/DownloadProgress'
 import { invoke } from '@tauri-apps/api/core'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import {
@@ -22,24 +22,24 @@ import {
   readNormalConfig,
   readVersionsConfig,
   writeVersionsConfig
-} from './util/BazookaManager'
-import { VersionsConfig } from './types/VersionsConfig'
-import { NormalConfig } from './types/NormalConfig'
+} from '@/lib/BazookaManager'
+import { VersionsConfig } from '../types/VersionsConfig'
+import { NormalConfig } from '../types/NormalConfig'
 import { app } from '@tauri-apps/api'
 import axios from 'axios'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import { GlobalProvider } from './GlobalProvider'
 import { Roboto } from 'next/font/google'
-import { ServerVersionsResponse } from './types/ServerVersionsResponse'
-import { GameVersion } from './types/GameVersion'
-import { Game } from './types/Game'
+import { ServerVersionsResponse } from '../types/ServerVersionsResponse'
+import { GameVersion } from '../types/GameVersion'
+import { Game } from '../types/Game'
 import { listen } from '@tauri-apps/api/event'
 import { usePathname } from 'next/navigation'
 import { arch, platform } from '@tauri-apps/plugin-os'
 import VersionInfo from './componets/VersionInfo'
 import prettyBytes from 'pretty-bytes'
 import ProgressBar from './componets/ProgressBar'
-import { notifyUser } from './util/Notifications'
+import { notifyUser } from '@/lib/Notifications'
 import {
   isPermissionGranted,
   requestPermission

src/app/settings/page.tsx

@@ -2,9 +2,9 @@
 
 import { useEffect, useState } from 'react'
 import { Setting } from '../componets/Setting'
-import { writeNormalConfig } from '../util/BazookaManager'
+import { writeNormalConfig } from '@/lib/BazookaManager'
 import { useGlobal } from '../GlobalProvider'
-import { copyToClipboard } from '../util/Clipboard'
+import { copyToClipboard } from '@/lib/Clipboard'
 import { platform } from '@tauri-apps/plugin-os'
 
 export default function Settings () {

src/app/types/DownloadProgress.ts

@@ -1,13 +0,0 @@
-export class DownloadProgress {
-  constructor (
-    public version: string,
-    public progress: number,
-    public progressBytes: number,
-    public failed: boolean,
-    public queued: boolean,
-    public hash_checking: boolean,
-    public finishing: boolean,
-    public speed: number,
-    public etaSecs: number
-  ) {}
-}

src/app/types/Game.ts

@@ -1,8 +0,0 @@
-export interface Game {
-  id: number
-  name: string
-  official: boolean
-  verified: boolean
-  developer: string | null
-  categoryNames: Record<string, string>
-}

src/app/types/GameVersion.ts

@@ -1,15 +0,0 @@
-export interface GameVersion {
-  id: string
-  displayName: string
-  releaseDate: number
-  game: number
-  downloadUrl: string
-  executable: string
-  sha512sum: string
-  size: number
-  place: number
-  changelog: string
-  wine: number | undefined
-  category: number
-  lastRevision: number
-}

src/app/types/LeaderboardEntry.ts

@@ -1,10 +0,0 @@
-export interface LeaderboardEntry {
-  username: string
-  userid: bigint
-  value: bigint
-  icon: number
-  overlay: number
-  birdColor: number[]
-  overlayColor: number[]
-  customIcon: string | null
-}

src/app/types/LeaderboardResponse.ts

@@ -1,6 +0,0 @@
-import { LeaderboardEntry } from './LeaderboardEntry'
-
-export interface LeaderboardResponse {
-  entries: LeaderboardEntry[]
-  customIcons: Record<string, string>
-}

src/app/types/NormalConfig.ts

@@ -1,21 +0,0 @@
-import { SettingsType } from './SettingsType'
-
-type NormalConfigData = {
-  version: string
-  settings?: Partial<SettingsType>
-}
-
-export class NormalConfig {
-  constructor (
-    public version: string,
-    public settings: SettingsType = new SettingsType()
-  ) {}
-
-  static import (data: NormalConfigData) {
-    const cfg = new NormalConfig(data.version)
-    if (data.settings) {
-      cfg.settings = { ...cfg.settings, ...data.settings }
-    }
-    return cfg
-  }
-}

src/app/types/ServerVersionsResponse.ts

@@ -1,7 +0,0 @@
-import { Game } from './Game'
-import { GameVersion } from './GameVersion'
-
-export interface ServerVersionsResponse {
-  versions: GameVersion[]
-  games: Game[]
-}

src/app/types/SettingProps.ts

@@ -1,7 +0,0 @@
-export type SettingProps = {
-  label: string
-  value: boolean
-  onChange: (val: boolean) => void
-  className?: string
-  title?: string
-}

src/app/types/SettingsType.ts

@@ -1,9 +0,0 @@
-export class SettingsType {
-  constructor (
-    public allowNotifications: boolean = true,
-    public alwaysShowGamesInSidebar: boolean = true,
-    public useWineOnUnixWhenNeeded: boolean = false,
-    public wineOnUnixCommand: string = 'wine %path%',
-    public theme: number = 0
-  ) {}
-}

src/app/types/VersionsConfig.ts

@@ -1,17 +0,0 @@
-export type VersionsConfigData = {
-  version: string
-  list: Record<string, number>
-}
-
-export class VersionsConfig {
-  constructor (
-    public version: string,
-    public list: Record<string, number> = {}
-  ) {}
-
-  static import (data: VersionsConfigData) {
-    const cfg = new VersionsConfig(data.version)
-    cfg.list = { ...data.list }
-    return cfg
-  }
-}

src/app/util/BazookaManager.ts

@@ -1,148 +0,0 @@
-import { app } from '@tauri-apps/api'
-import { NormalConfig } from '../types/NormalConfig'
-import {
-  BaseDirectory,
-  create,
-  exists,
-  mkdir,
-  readTextFile,
-  writeFile
-} from '@tauri-apps/plugin-fs'
-import { VersionsConfig } from '../types/VersionsConfig'
-
-export async function readNormalConfig (): Promise<NormalConfig> {
-  const version = await app.getVersion()
-  try {
-    const options = {
-      baseDir: BaseDirectory.AppLocalData
-    }
-    const doesFolderExist = await exists('', options)
-    const doesConfigExist = await exists('config.json', options)
-    if (!doesFolderExist || !doesConfigExist) {
-      if (!doesFolderExist) {
-        await mkdir('', options)
-      }
-      const file = await create('config.json', options)
-      await file.write(
-        new TextEncoder().encode(
-          JSON.stringify(new NormalConfig(version), null, 2)
-        )
-      )
-      await file.close()
-      return new NormalConfig(version)
-    }
-    const config = await readTextFile('config.json', options)
-    const raw = JSON.parse(config)
-    if (
-      raw.settings &&
-      raw.settings.theme &&
-      (raw.version == '1.0.0' ||
-        raw.version == '1.1.0' ||
-        raw.version == '1.1.1' ||
-        raw.version == '1.2.0' ||
-        raw.version == '1.3.0' ||
-        raw.version == '1.3.1' ||
-        raw.version == '1.4.0' ||
-        raw.version == '1.5.0' ||
-        raw.version == '1.5.1' ||
-        raw.version == '1.5.2' ||
-        raw.version == '1.5.3' ||
-        raw.version == '1.5.4')
-    ) {
-      const parsed = Number(raw.settings.theme)
-      if (parsed == 3) raw.settings.theme = 2
-      if (parsed == 4) raw.settings.theme = 3
-      else if (parsed != 0 && parsed != 1) raw.settings.theme = 0
-    }
-    raw.version = version
-    writeNormalConfig(raw)
-    return NormalConfig.import(raw)
-  } catch {
-    return new NormalConfig(version)
-  }
-}
-
-export async function writeNormalConfig (data: NormalConfig) {
-  const options = {
-    baseDir: BaseDirectory.AppLocalData
-  }
-  const doesFolderExist = await exists('', options)
-  const doesConfigExist = await exists('config.json', options)
-  if (!doesFolderExist || !doesConfigExist) {
-    if (!doesFolderExist) {
-      await mkdir('', options)
-    }
-    const file = await create('config.json', options)
-    await file.write(new TextEncoder().encode(JSON.stringify(data, null, 2)))
-    await file.close()
-  } else {
-    await writeFile(
-      'config.json',
-      new TextEncoder().encode(JSON.stringify(data, null, 2)),
-      options
-    )
-  }
-}
-
-export async function readVersionsConfig (): Promise<VersionsConfig> {
-  const version = await app.getVersion()
-  try {
-    const options = {
-      baseDir: BaseDirectory.AppLocalData
-    }
-    const doesFolderExist = await exists('', options)
-    const doesConfigExist = await exists('versions.json', options)
-    if (!doesFolderExist || !doesConfigExist) {
-      if (!doesFolderExist) {
-        await mkdir('', options)
-      }
-      const file = await create('versions.json', options)
-      await file.write(
-        new TextEncoder().encode(
-          JSON.stringify(new VersionsConfig(version), null, 2)
-        )
-      )
-      await file.close()
-      return new VersionsConfig(version)
-    }
-    const config = await readTextFile('versions.json', options)
-    const raw = JSON.parse(config)
-    if (raw.list && raw.timestamps) {
-      raw.list = raw.timestamps
-      delete raw.timestamps
-
-      await writeFile(
-        'versions.json',
-        new TextEncoder().encode(JSON.stringify(raw, null, 2)),
-        options
-      )
-    }
-    raw.version = version
-    writeVersionsConfig(raw)
-    return VersionsConfig.import(raw)
-  } catch {
-    return new VersionsConfig(version)
-  }
-}
-
-export async function writeVersionsConfig (data: VersionsConfig) {
-  const options = {
-    baseDir: BaseDirectory.AppLocalData
-  }
-  const doesFolderExist = await exists('', options)
-  const doesConfigExist = await exists('versions.json', options)
-  if (!doesFolderExist || !doesConfigExist) {
-    if (!doesFolderExist) {
-      await mkdir('', options)
-    }
-    const file = await create('versions.json', options)
-    await file.write(new TextEncoder().encode(JSON.stringify(data, null, 2)))
-    await file.close()
-  } else {
-    await writeFile(
-      'versions.json',
-      new TextEncoder().encode(JSON.stringify(data, null, 2)),
-      options
-    )
-  }
-}

src/app/util/Clipboard.ts

@@ -1,10 +0,0 @@
-import { NormalConfig } from '../types/NormalConfig'
-import { notifyUser } from './Notifications'
-
-export async function copyToClipboard (
-  text: string,
-  normalConfig: NormalConfig | null
-) {
-  if (normalConfig?.settings.allowNotifications)
-    await notifyUser('Copied', 'Text "' + text + '" copied to clipboard')
-}

src/app/util/Notifications.ts

@@ -1,17 +0,0 @@
-import {
-  isPermissionGranted,
-  requestPermission,
-  sendNotification
-} from '@tauri-apps/plugin-notification'
-
-export async function notifyUser (title: string, body: string) {
-  let permissionGranted = await isPermissionGranted()
-  if (!permissionGranted) {
-    const permission = await requestPermission()
-    permissionGranted = permission === 'granted'
-  }
-
-  if (permissionGranted) {
-    sendNotification({ title, body })
-  }
-}