(v3.0.0-beta.3) Change launcher icon

* Change launcher icon * Add highlight to filtered versions * Added Hidden badge to hidden versions * Bump mantine to 5.1.1
Space-Eternity-3 · Aug 9, 2022 · 5496f4f · 5496f4f
1 parent 0d5b101
commit 5496f4f
Show file tree

Hide file tree

Showing 11 changed files with 128 additions and 104 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "se3-launcher",
     "description": "Launcher for Space Eternity 3",
-    "version": "3.0.0-beta.2",
+    "version": "3.0.0-beta.3",
     "private": true,
     "homepage": "./",
     "main": "src/main/index.js",
@@ -21,6 +21,9 @@
         "react-dom": "^18.2.0",
         "wait-on": "^6.0.1"
     },
+    "repository": {
+        "url": "https://github.com/Space-Eternity-3/SE3-Launcher"
+    },
     "scripts": {
         "start": "concurrently --kill-others \"cross-env BROWSER=none react-app-rewired start\" \"electron .\"",
         "react-build": "react-app-rewired build",
@@ -48,9 +51,9 @@
         ]
     },
     "dependencies": {
-        "@mantine/core": "^5.1.0",
-        "@mantine/modals": "^5.1.0",
-        "@mantine/notifications": "^5.1.0",
+        "@mantine/core": "^5.1.1",
+        "@mantine/modals": "^5.1.1",
+        "@mantine/notifications": "^5.1.1",
         "appdata-path": "^1.0.0",
         "axios": "^0.27.2",
         "custom-electron-titlebar": "^4.1.0",
@@ -66,7 +69,7 @@
     "build": {
         "productName": "SE3 Launcher",
         "extends": null,
-        "icon": "../resources/ikona.ico",
+        "icon": "../resources/icon.ico",
         "files": [
             "**/*",
             "!.github/",
@@ -92,7 +95,7 @@
             "oneClick": false,
             "perMachine": false,
             "allowToChangeInstallationDirectory": true,
-            "installerIcon": "resources/ikona.ico",
+            "installerIcon": "resources/icon.ico",
             "deleteAppDataOnUninstall": true,
             "installerSidebar": "../resources/Sidebar.bmp",
             "differentialPackage": false

diff --git a/public/ikona.png b/public/ikona.png
diff --git a/resources/icon.ico b/resources/icon.ico
diff --git a/resources/icon.png b/resources/icon.png
diff --git a/resources/ikona.ico b/resources/ikona.ico
diff --git a/resources/ikona.png b/resources/ikona.png
diff --git a/src/main/index.js b/src/main/index.js
@@ -13,7 +13,7 @@ async function createWindow() {
         height: 600,
         minWidth: 750,
         minHeight: 500,
-        icon: path.join(__dirname, "resources", "ikona.ico"),
+        icon: path.join(__dirname, "resources", "icon.ico"),
         webPreferences: {
             preload: require.resolve("../preload/preload.js"),
             backgroundThrottling: false,

diff --git a/src/renderer/App.js b/src/renderer/App.js
@@ -268,39 +268,45 @@ export default function App() {
                     <Tabs.Tab value="versions">Versions</Tabs.Tab>
                     <Tabs.Tab value="launcher">Launcher</Tabs.Tab>
                 </Tabs.List>
+
                 <Tabs.Panel value="home">
                     <HomePage openVersionSelector={openVersionSelector} versions={versions} playButtonText={playButtonText} />
                 </Tabs.Panel>
-                <Tabs.Panel style={{
-                    height: "calc(100% - 45px)",
-                    marginTop: "45px",
-                }} value="versions">
-                        <Autocomplete
-                            style={{
-                                width: "calc(100% - 20px)",
-                                margin: "5px 10px 0",
-                            }}
-                            value={versionFilter}
-                            onChange={setVersionFilter}
-                            placeholder="Version filter"
-                            data={["Alpha", "Beta", "Gamma", "Release", "DEV"]}
-                        />
-                        <div className={styles.versionsContainer}>
-                            {installedVersions
-                                .filter((version) => version.name.includes(versionFilter))
-                                .map((version) => <InstalledVersion key={version.tag} version={version} uninstallVersion={uninstallVersion} />)
-                                .reverse()}
-                        </div>
-                        <VersionSelector
-                            onCancel={() => {
-                                setVersionSelectorShown(false);
-                            }}
-                            onInstall={onInstall}
-                            shown={versionSelectorShown}
-                            versions={versionsSelectorVersions}
-                        />
-                        <button onClick={showVersionSelector} className={styles.addButton} />
+
+                <Tabs.Panel
+                    style={{
+                        height: "calc(100% - 45px)",
+                        marginTop: "45px",
+                    }}
+                    value="versions"
+                >
+                    <Autocomplete
+                        style={{
+                            width: "calc(100% - 20px)",
+                            margin: "5px 10px 0",
+                        }}
+                        value={versionFilter}
+                        onChange={setVersionFilter}
+                        placeholder="Version filter"
+                        data={["Alpha", "Beta", "Gamma", "Release", "DEV"]}
+                    />
+                    <div className={styles.versionsContainer}>
+                        {installedVersions
+                            .filter((version) => version.name.includes(versionFilter))
+                            .map((version) => <InstalledVersion versionFilter={versionFilter} key={version.tag} version={version} uninstallVersion={uninstallVersion} />)
+                            .reverse()}
+                    </div>
+                    <VersionSelector
+                        onCancel={() => {
+                            setVersionSelectorShown(false);
+                        }}
+                        onInstall={onInstall}
+                        shown={versionSelectorShown}
+                        versions={versionsSelectorVersions}
+                    />
+                    <button onClick={showVersionSelector} className={styles.addButton} />
                 </Tabs.Panel>
+
                 <Tabs.Panel value="launcher">
                     <div
                         style={{

diff --git a/src/renderer/InstalledVersion.js b/src/renderer/InstalledVersion.js
@@ -1,8 +1,8 @@
-import { Button } from "@mantine/core";
+import { Badge, Button, Highlight } from "@mantine/core";
 import { RunVersion } from "./SE3Api/versionsApi";
 import styles from "./styles/InstalledVersion.module.css";
 
-export default function InstalledVersion({ version, uninstallVersion }) {
+export default function InstalledVersion({ version, uninstallVersion, versionFilter }) {
     return (
         <div
             style={{
@@ -17,7 +17,19 @@ export default function InstalledVersion({ version, uninstallVersion }) {
                     }}
                     className={styles.title}
                 >
-                    {version.name}
+                    <Highlight
+                        style={{
+                            display: "inline",
+                        }}
+                        highlight={versionFilter}
+                    >
+                        {version.name}
+                    </Highlight>
+                    {version.hidden && (
+                        <Badge color="red" size="lg" style={{ float: "right", marginTop: "7px" }}>
+                            Hidden
+                        </Badge>
+                    )}
                 </span>
                 <div className={styles.buttons}>
                     <Button