Skip to content

Commit

Permalink
fix icon
Browse files Browse the repository at this point in the history
  • Loading branch information
ahqsoftwares committed Dec 6, 2024
1 parent 3fa9672 commit e7ea276
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 32 deletions.
4 changes: 2 additions & 2 deletions src-service/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ homepage = "https://ahqstore.github.io/"
lazy_static = "1"
reqwest = { version = "0.12", features = ["json", "rustls-tls"] }
serde_json = "1"
sysinfo = "0.32"
sysinfo = "0.33"
tokio = { version = "1", default-features = false, features = [
"net",
"rt",
Expand Down
5 changes: 3 additions & 2 deletions src-service/src/authentication.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub fn is_current_logged_in_user(pid: usize) -> bool {

let mut system = System::new();
let mut users = Users::new();
users.refresh_list();
users.refresh();
system.refresh_processes_specifics(
ProcessesToUpdate::Some(&[Pid::from(pid)]),
true,
Expand Down Expand Up @@ -68,7 +68,8 @@ pub fn authenticate_process(pid: usize, time: bool) -> (bool, bool, String) {

let mut system = System::new();
let mut users = Users::new();
users.refresh_list();

users.refresh();
system.refresh_processes_specifics(
ProcessesToUpdate::Some(&[Pid::from(pid)]),
true,
Expand Down
50 changes: 23 additions & 27 deletions src/app/apps/components/app_modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import { ApplicationPopup } from "../../resources/components/popup";
import { invoke } from "@tauri-apps/api/core";
import { IoCheckmarkCircle, IoWarning } from "react-icons/io5";
import { FaAndroid, FaLinux } from "react-icons/fa6";
import { SiWindows } from "react-icons/si";
import { worker } from "../../resources/core/installer";

import win from "./windows.svg";

import {
Carousel,
CarouselContent,
Expand Down Expand Up @@ -66,13 +67,13 @@ const defAppData: appData = {
displayImages: [],
downloadUrls: [],
install: {
free: () => {},
free: () => { },
linux: undefined,
win32: undefined,
android: undefined,
},
repo: {
free: () => {},
free: () => { },
author: "",
repo: "",
},
Expand Down Expand Up @@ -106,7 +107,7 @@ export default function ShowModal(props: AppDataPropsModal) {
);
const [author, setAuthor] = useState<AuthorObject>({
avatar_url: "",
free: () => {},
free: () => { },
github: "",
id: "",
name: "",
Expand Down Expand Up @@ -156,7 +157,7 @@ export default function ShowModal(props: AppDataPropsModal) {
}
}
}
} catch (_) {}
} catch (_) { }
});

return () => {
Expand Down Expand Up @@ -283,25 +284,22 @@ export default function ShowModal(props: AppDataPropsModal) {
/>
) : (
<div
className={`dui-loading dui-loading-lg dui-loading-ring mt-5 mx-auto mb-[0.75rem] ${
props.dark ? "text-white" : ""
}`}
className={`dui-loading dui-loading-lg dui-loading-ring mt-5 mx-auto mb-[0.75rem] ${props.dark ? "text-white" : ""
}`}
/>
)}

<h1
className={`mt-5 text-3xl text-center ${
dark ? "text-slate-200" : "text-slate-800"
}`}
className={`mt-5 text-3xl text-center ${dark ? "text-slate-200" : "text-slate-800"
}`}
>
{appDisplayName}
</h1>

<div className="w-[95%] mt-3 mb-auto">
<h2
className={`text-2xl text-center ${
dark ? "text-gray-400" : "text-gray-600"
}`}
className={`text-2xl text-center ${dark ? "text-gray-400" : "text-gray-600"
}`}
>
{description.length > 128 ? description.substring(0, 127) : description}
</h2>
Expand Down Expand Up @@ -355,11 +353,10 @@ export default function ShowModal(props: AppDataPropsModal) {
<>
<button
ref={button}
className={`dui-btn ${
updating
className={`dui-btn ${updating
? "bg-transparent hover:bg-transparent border-base-content hover:border-base-content text-base-content"
: "dui-btn-success text-success-content"
} w-[60%] mb-4`}
} w-[60%] mb-4`}
onClick={() => install()}
>
Install {updating && <>(Updating)</>}
Expand All @@ -374,9 +371,8 @@ export default function ShowModal(props: AppDataPropsModal) {
</div>

<div
className={`${
dark ? "text-slate-200" : "text-slate-800"
} div p-4 ml-2 w-[100%] rounded-xl shadow-xl flex flex-col overflow-scroll`}
className={`${dark ? "text-slate-200" : "text-slate-800"
} div p-4 ml-2 w-[100%] rounded-xl shadow-xl flex flex-col overflow-scroll`}
>
<div className="w-full">
<h1 className="text-xl">Description</h1>
Expand Down Expand Up @@ -480,13 +476,13 @@ export default function ShowModal(props: AppDataPropsModal) {
})
}
>
<SiWindows />
<span className="ml-1">
Windows{" "}
{appData.install.win32 == undefined ? "arm64" : ""}
</span>
</div>
)}
<img src={win} width="20px" height="20px" />
<span className="ml-1">
Windows{" "}
{appData.install.win32 == undefined ? "arm64" : ""}
</span>
</div>
)}
{appData.install.linux != undefined && (
<div
className="cursor-pointer flex text-center items-center justify-center border-[1px] border-base-content px-1"
Expand Down
1 change: 1 addition & 0 deletions src/app/apps/components/windows.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e7ea276

Please sign in to comment.