From b4297b9c493780b8bc448ac1f1635e3793e46838 Mon Sep 17 00:00:00 2001 From: choi Date: Tue, 28 Nov 2023 11:01:23 -0800 Subject: [PATCH 1/6] working on sidemenu --- .../components/AlgorithmOptions/index.jsx | 43 +++++++--- lab/webapp/src/components/ChatGPT/SideMenu.js | 3 + .../Datasets/components/DatasetCard/index.jsx | 81 +++---------------- 3 files changed, 43 insertions(+), 84 deletions(-) diff --git a/lab/webapp/src/components/Builder/components/AlgorithmOptions/index.jsx b/lab/webapp/src/components/Builder/components/AlgorithmOptions/index.jsx index a89278a9d..598a017e1 100644 --- a/lab/webapp/src/components/Builder/components/AlgorithmOptions/index.jsx +++ b/lab/webapp/src/components/Builder/components/AlgorithmOptions/index.jsx @@ -49,16 +49,29 @@ function AlgorithmOptions({ function openTrueOrFalse_algorithm_popup() { if (localStorage.getItem("algorithm-popup") == "true") { - // if (document.getElementById("aiTooglePopup")!==null){ - // document.getElementById("aiTooglePopup").style.cssText = "display: block !important"; - // } - return false; } else { return true; } } + // Function to determine the OS type + function getOsType() { + const userAgent = navigator.userAgent.toLowerCase(); + + if (userAgent.includes("win")) return "Windows"; + if (userAgent.includes("mac")) return "macOS"; + if (userAgent.includes("linux")) { + // Check user agent for Raspberry Pi OS identification + if (userAgent.includes("raspberry")) return "Raspberry Pi OS"; + return "Linux"; + } + if (userAgent.includes("iphone") || platform.includes("ipad")) return "iOS"; + if (userAgent.includes("android")) return "Android"; + + return "Unknown OS"; + } + return ( @@ -99,14 +112,20 @@ function AlgorithmOptions({ content={

{algorithm.description}

- {algorithm.url && ( - - - Read more here{" "} - - - - )} + {algorithm.url && + getOsType() !== "Raspberry Pi OS" && ( + // getOsType() === "rasp" && ( + + + Read more here{" "} + + + + )}
} trigger={ diff --git a/lab/webapp/src/components/ChatGPT/SideMenu.js b/lab/webapp/src/components/ChatGPT/SideMenu.js index 407cf6525..2c071fedb 100644 --- a/lab/webapp/src/components/ChatGPT/SideMenu.js +++ b/lab/webapp/src/components/ChatGPT/SideMenu.js @@ -4,6 +4,8 @@ import { ThemeContext } from "./context/ThemeContext"; import { AllContext } from "./context/AllContext"; +import { Icon } from "semantic-ui-react"; + export default function SideMenu() { const { currentModel, @@ -237,6 +239,7 @@ export default function SideMenu() { .slice(3) .forEach((node) => { node.childNodes[1].style.display = "none"; + // node.childNodes[1].innerHTML = "🗑️"; }); } diff --git a/lab/webapp/src/components/Datasets/components/DatasetCard/index.jsx b/lab/webapp/src/components/Datasets/components/DatasetCard/index.jsx index dcc322fcd..3b5c84271 100644 --- a/lab/webapp/src/components/Datasets/components/DatasetCard/index.jsx +++ b/lab/webapp/src/components/Datasets/components/DatasetCard/index.jsx @@ -34,6 +34,7 @@ import * as actions from "data/datasets/dataset/actions"; import DatasetActions from "./components/DatasetActions"; import BestResult from "./components/BestResult"; import ExperimentStatus from "./components/ExperimentStatus"; + import { Grid, Segment, @@ -41,6 +42,7 @@ import { Button, Popup, Message, + Icon, } from "semantic-ui-react"; import { formatDataset, formatDatasetOuter } from "../../../../utils/formatter"; @@ -55,13 +57,6 @@ const DatasetCard = ({ dataset, recommender, toggleAI }) => { icon_type = "line graph"; } - // const [showGrid, setShowGrid] = useState(false); - - // const handleGridClick = () => { - // console.log("handleGridClick"); - // setShowGrid(false); - // }; - function clickDatasetCardDelButton(e) { let parent = e.target.closest(".dataset-card"); // console.log(parent); @@ -278,11 +273,12 @@ const DatasetCard = ({ dataset, recommender, toggleAI }) => { - 🗑 + {/* use trash icon from sementic ui */} + @@ -435,11 +431,11 @@ const DatasetCard = ({ dataset, recommender, toggleAI }) => { - 🗑 + { ); } - - // return ( - // - - // - // - // } - // /> - // - // - // - // - - // - // - //