From c51945b6c6dcb59eedb7f5b4ecd5aa092f96ddde Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 28 Feb 2023 20:25:06 -0300 Subject: [PATCH 01/12] FlowPage refactored --- space_flow/src/App.tsx | 4 ++-- .../{connection => ConnectionLineComponent}/index.tsx | 0 .../{flowManager => components}/tabComponent/index.tsx | 2 +- .../tabsManagerComponent}/index.tsx | 10 ++++------ space_flow/src/pages/FlowPage/index.tsx | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) rename space_flow/src/pages/FlowPage/components/{connection => ConnectionLineComponent}/index.tsx (100%) rename space_flow/src/pages/FlowPage/{flowManager => components}/tabComponent/index.tsx (97%) rename space_flow/src/pages/FlowPage/{flowManager => components/tabsManagerComponent}/index.tsx (81%) diff --git a/space_flow/src/App.tsx b/space_flow/src/App.tsx index 8787b2513..f40fc31ac 100644 --- a/space_flow/src/App.tsx +++ b/space_flow/src/App.tsx @@ -10,7 +10,7 @@ import { alertContext } from "./contexts/alertContext"; import { locationContext } from "./contexts/locationContext"; import Sidebar from "./components/SidebarComponent"; import Header from "./components/HeaderComponent"; -import { TabsManager } from "./pages/FlowPage/flowManager"; +import TabsManagerComponent from "./pages/FlowPage/components/tabsManagerComponent"; export default function App() { var _ = require("lodash"); @@ -105,7 +105,7 @@ export default function App() {
{/* Primary column */}
- +
diff --git a/space_flow/src/pages/FlowPage/components/connection/index.tsx b/space_flow/src/pages/FlowPage/components/ConnectionLineComponent/index.tsx similarity index 100% rename from space_flow/src/pages/FlowPage/components/connection/index.tsx rename to space_flow/src/pages/FlowPage/components/ConnectionLineComponent/index.tsx diff --git a/space_flow/src/pages/FlowPage/flowManager/tabComponent/index.tsx b/space_flow/src/pages/FlowPage/components/tabComponent/index.tsx similarity index 97% rename from space_flow/src/pages/FlowPage/flowManager/tabComponent/index.tsx rename to space_flow/src/pages/FlowPage/components/tabComponent/index.tsx index 138d399b9..49a505a73 100644 --- a/space_flow/src/pages/FlowPage/flowManager/tabComponent/index.tsx +++ b/space_flow/src/pages/FlowPage/components/tabComponent/index.tsx @@ -6,7 +6,7 @@ import { TabsContext } from "../../../../contexts/tabsContext"; var _ = require("lodash"); export default function TabComponent({ selected, flow, onClick }) { - const { removeFlow, updateFlow, flows, downloadFlow } = + const { removeFlow, updateFlow, flows } = useContext(TabsContext); const [isRename, setIsRename] = useState(false); const [value, setValue] = useState(""); diff --git a/space_flow/src/pages/FlowPage/flowManager/index.tsx b/space_flow/src/pages/FlowPage/components/tabsManagerComponent/index.tsx similarity index 81% rename from space_flow/src/pages/FlowPage/flowManager/index.tsx rename to space_flow/src/pages/FlowPage/components/tabsManagerComponent/index.tsx index b444e3edc..4840a0778 100644 --- a/space_flow/src/pages/FlowPage/flowManager/index.tsx +++ b/space_flow/src/pages/FlowPage/components/tabsManagerComponent/index.tsx @@ -1,12 +1,10 @@ import { useContext, useEffect } from "react"; import { ReactFlowProvider } from "reactflow"; -import FlowPage from ".."; -import { TabsContext } from "../../../contexts/tabsContext"; -import TabComponent from "./tabComponent"; -import { example } from "../../../data_assets/example"; -var _ = require("lodash"); +import TabComponent from "../tabComponent"; +import { TabsContext } from "../../../../contexts/tabsContext"; +import FlowPage from "../.."; -export function TabsManager() { +export default function TabsManagerComponent() { const { flows, addFlow, tabIndex, setTabIndex } = useContext(TabsContext); useEffect(() => { if (flows.length === 0) { diff --git a/space_flow/src/pages/FlowPage/index.tsx b/space_flow/src/pages/FlowPage/index.tsx index d0e4538d4..54c02fcd2 100644 --- a/space_flow/src/pages/FlowPage/index.tsx +++ b/space_flow/src/pages/FlowPage/index.tsx @@ -13,7 +13,6 @@ import { locationContext } from "../../contexts/locationContext"; import ExtraSidebar from "./components/extraSidebarComponent"; import Chat from "../../components/chatComponent"; import GenericNode from "../../CustomNodes/GenericNode"; -import connection from "./components/connection"; import ChatInputNode from "../../CustomNodes/ChatInputNode"; import ChatOutputNode from "../../CustomNodes/ChatOutputNode"; import InputNode from "../../CustomNodes/InputNode"; @@ -25,6 +24,7 @@ import { ArrowDownTrayIcon, ArrowUpTrayIcon, } from "@heroicons/react/24/outline"; +import ConnectionLineComponent from "./components/ConnectionLineComponent"; const nodeTypes = { genericNode: GenericNode, @@ -170,7 +170,7 @@ export default function FlowPage({ flow }) { onLoad={setReactFlowInstance} onInit={setReactFlowInstance} nodeTypes={nodeTypes} - connectionLineComponent={connection} + connectionLineComponent={ConnectionLineComponent} onDragOver={onDragOver} onDrop={onDrop} > From d530d04691dd96227b03715d5df22ccf85d87e2c Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Tue, 28 Feb 2023 21:47:20 -0300 Subject: [PATCH 02/12] darkMode context and button implemented --- space_flow/src/App.tsx | 5 +++- .../src/components/HeaderComponent/index.tsx | 12 ++++++++- space_flow/src/contexts/darkContext.tsx | 27 +++++++++++++++++++ space_flow/src/contexts/index.tsx | 21 ++++++++------- space_flow/tailwind.config.js | 1 + 5 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 space_flow/src/contexts/darkContext.tsx diff --git a/space_flow/src/App.tsx b/space_flow/src/App.tsx index f40fc31ac..a4ee9227f 100644 --- a/space_flow/src/App.tsx +++ b/space_flow/src/App.tsx @@ -11,6 +11,7 @@ import { locationContext } from "./contexts/locationContext"; import Sidebar from "./components/SidebarComponent"; import Header from "./components/HeaderComponent"; import TabsManagerComponent from "./pages/FlowPage/components/tabsManagerComponent"; +import { darkContext } from "./contexts/darkContext"; export default function App() { var _ = require("lodash"); @@ -24,6 +25,8 @@ export default function App() { setIsStackedOpen(true); }, [location.pathname, setCurrent, setIsStackedOpen, setShowSideBar]); + const {dark} = useContext(darkContext); + const { errorData, errorOpen, @@ -93,7 +96,7 @@ export default function App() { return ( //need parent component with width and height -
+
diff --git a/space_flow/src/components/HeaderComponent/index.tsx b/space_flow/src/components/HeaderComponent/index.tsx index fc6442161..8f0d40c52 100644 --- a/space_flow/src/components/HeaderComponent/index.tsx +++ b/space_flow/src/components/HeaderComponent/index.tsx @@ -4,6 +4,7 @@ import { MagnifyingGlassIcon } from '@heroicons/react/20/solid' import { BellIcon, MoonIcon, + SunIcon, } from '@heroicons/react/24/outline' import { classNames } from '../../utils' import { Link } from 'react-router-dom' @@ -11,6 +12,7 @@ import Breadcrumb from '../breadcrumbComponent' import { alertContext } from '../../contexts/alertContext' import { useLayer,Arrow } from 'react-laag' import AlertDropdown from '../../alerts/alertDropDown' +import { darkContext } from '../../contexts/darkContext' export default function Header({user, userNavigation}){ const {notificationCenter, setNotificationCenter} = useContext(alertContext) @@ -24,6 +26,7 @@ export default function Header({user, userNavigation}){ containerOffset: 12, arrowOffset: 4, }) + const {dark, setDark} = useContext(darkContext); return (
{/* Logo area */} @@ -47,7 +50,14 @@ export default function Header({user, userNavigation}){
- + + -
) : ( -
+
{isRename ? ( {flows.length > 1 && ( - + )}
@@ -78,10 +78,10 @@ export default function TabComponent({ selected, flow, onClick }) { ) : (
)} diff --git a/space_flow/src/pages/FlowPage/components/tabsManagerComponent/index.tsx b/space_flow/src/pages/FlowPage/components/tabsManagerComponent/index.tsx index 4840a0778..81f19a69d 100644 --- a/space_flow/src/pages/FlowPage/components/tabsManagerComponent/index.tsx +++ b/space_flow/src/pages/FlowPage/components/tabsManagerComponent/index.tsx @@ -14,7 +14,7 @@ export default function TabsManagerComponent() { return (
-
+
{flows.map((flow, index) => { return ( Date: Tue, 28 Feb 2023 22:41:40 -0300 Subject: [PATCH 06/12] sidebar dark mode implemented --- .../ExtraSidebarComponent/index.tsx | 6 ++--- .../src/components/SidebarComponent/index.tsx | 2 +- .../src/components/chatComponent/index.tsx | 24 +++++++++---------- .../components/DisclosureComponent/index.tsx | 8 +++---- .../extraSidebarComponent/index.tsx | 10 ++++---- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/space_flow/src/components/ExtraSidebarComponent/index.tsx b/space_flow/src/components/ExtraSidebarComponent/index.tsx index 8f2220cd0..1f16098e0 100644 --- a/space_flow/src/components/ExtraSidebarComponent/index.tsx +++ b/space_flow/src/components/ExtraSidebarComponent/index.tsx @@ -20,11 +20,11 @@ export default function ExtraSidebar() {