Merge branch 'develop' into dev-shell-for-windows

msanlli · web-flow · commit b5c54015f8b4 · 2025-06-05T22:28:18.000+02:00
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -393,9 +393,12 @@ jobs:
           # Copy common files
           cp -r artifacts/common-files/* release-linux/
           
+          # Set executable permissions
+          chmod +x release-linux/backend release-linux/updater release-linux/testadj
+          
           # Create Linux release archive
           cd release-linux
-          zip -r ../linux-$VERSION.zip .
+          tar -czf ../linux-$VERSION.tar.gz .
       
       - name: Organize Windows release files
         run: |
@@ -445,9 +448,12 @@ jobs:
           # Copy common files
           cp -r artifacts/common-files/* release-macos/
           
+          # Set executable permissions
+          chmod +x release-macos/backend release-macos/updater release-macos/testadj
+          
           # Create macOS Intel release archive
           cd release-macos
-          zip -r ../macos-intel-$VERSION.zip .
+          tar -czf ../macos-intel-$VERSION.tar.gz .
       
       - name: Organize macOS ARM64 release files
         run: |
@@ -471,15 +477,20 @@ jobs:
           # Copy common files
           cp -r artifacts/common-files/* release-macos-arm64/
           
+          # Set executable permissions
+          chmod +x release-macos-arm64/backend release-macos-arm64/updater release-macos-arm64/testadj
+          
           # Create macOS ARM64 release archive
           cd release-macos-arm64
-          zip -r ../macos-arm64-$VERSION.zip .
+          tar -czf ../macos-arm64-$VERSION.tar.gz .
       
       - name: Upload release packages
         uses: actions/upload-artifact@v4
         with:
           name: releases
-          path: "*.zip"
+          path: |
+            *.tar.gz
+            *.zip
           retention-days: 7
           compression-level: 9
       
@@ -502,9 +513,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./linux-${{ github.event.inputs.version }}.zip
-          asset_name: linux-${{ github.event.inputs.version }}.zip
-          asset_content_type: application/zip
+          asset_path: ./linux-${{ github.event.inputs.version }}.tar.gz
+          asset_name: linux-${{ github.event.inputs.version }}.tar.gz
+          asset_content_type: application/gzip
           
       - name: Upload Windows package to release
         if: github.event_name == 'workflow_dispatch'
@@ -524,9 +535,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./macos-intel-${{ github.event.inputs.version }}.zip
-          asset_name: macos-intel-${{ github.event.inputs.version }}.zip
-          asset_content_type: application/zip
+          asset_path: ./macos-intel-${{ github.event.inputs.version }}.tar.gz
+          asset_name: macos-intel-${{ github.event.inputs.version }}.tar.gz
+          asset_content_type: application/gzip
           
       - name: Upload macOS ARM64 package to release
         if: github.event_name == 'workflow_dispatch'
@@ -535,9 +546,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./macos-arm64-${{ github.event.inputs.version }}.zip
-          asset_name: macos-arm64-${{ github.event.inputs.version }}.zip
-          asset_content_type: application/zip
+          asset_path: ./macos-arm64-${{ github.event.inputs.version }}.tar.gz
+          asset_name: macos-arm64-${{ github.event.inputs.version }}.tar.gz
+          asset_content_type: application/gzip
           
       - name: Upload Linux package to existing release
         if: github.event_name == 'release'
@@ -546,9 +557,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./linux-${{ github.event.release.tag_name }}.zip
-          asset_name: linux-${{ github.event.release.tag_name }}.zip
-          asset_content_type: application/zip
+          asset_path: ./linux-${{ github.event.release.tag_name }}.tar.gz
+          asset_name: linux-${{ github.event.release.tag_name }}.tar.gz
+          asset_content_type: application/gzip
           
       - name: Upload Windows package to existing release
         if: github.event_name == 'release'
@@ -568,9 +579,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./macos-intel-${{ github.event.release.tag_name }}.zip
-          asset_name: macos-intel-${{ github.event.release.tag_name }}.zip
-          asset_content_type: application/zip
+          asset_path: ./macos-intel-${{ github.event.release.tag_name }}.tar.gz
+          asset_name: macos-intel-${{ github.event.release.tag_name }}.tar.gz
+          asset_content_type: application/gzip
           
       - name: Upload macOS ARM64 package to existing release
         if: github.event_name == 'release'
@@ -579,6 +590,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./macos-arm64-${{ github.event.release.tag_name }}.zip
-          asset_name: macos-arm64-${{ github.event.release.tag_name }}.zip
-          asset_content_type: application/zip
+          asset_path: ./macos-arm64-${{ github.event.release.tag_name }}.tar.gz
+          asset_name: macos-arm64-${{ github.event.release.tag_name }}.tar.gz
+          asset_content_type: application/gzip
diff --git a/ethernet-view/index.html b/ethernet-view/index.html
@@ -11,6 +11,10 @@
             rel="stylesheet"
             href="src/styles/globalOverride.scss"
         />
+        <link
+            href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css"
+            rel="stylesheet"
+        />
         <meta
             name="viewport"
             content="width=device-width, initial-scale=1.0"
diff --git a/ethernet-view/src/App.tsx b/ethernet-view/src/App.tsx
@@ -7,7 +7,6 @@ import { AppLayout } from "layouts/AppLayout/AppLayout";
 import { useState } from "react";
 import { LoggerPage } from "pages/LoggerPage/LoggerPage";
 
-
 function App() {
 
     const isProduction = import.meta.env.PROD;
diff --git a/ethernet-view/src/layouts/AppLayout/AppLayout.tsx b/ethernet-view/src/layouts/AppLayout/AppLayout.tsx
@@ -1,9 +1,6 @@
-
 import styles from "./AppLayout.module.scss"
 import Testing from "assets/svg/testing.svg"
 import Logger from "assets/svg/logger.svg"
-import Chart from "assets/svg/chart.svg"
-
 import { Navbar } from "components/Navbar/Navbar"
 import { ReactNode } from "react"
 
@@ -25,10 +22,6 @@ export const AppLayout = ({children, pageShown, setPageShown} : Props) => {
                     icon: Logger,
                     page: "logger"
                 },
-                {
-                    icon: Chart,
-                    page: "chart"
-                }
                 ]}
                 pageShown={pageShown}
                 setPageShown={setPageShown}
diff --git a/ethernet-view/src/pages/TestingPage/TestingPage.tsx b/ethernet-view/src/pages/TestingPage/TestingPage.tsx
@@ -1,41 +1,79 @@
-import { SplitLayout } from "layouts/SplitLayout/SplitLayout";
-import { Orientation } from "hooks/useSplit/Orientation";
+import { useState } from "react";
+// import { SplitLayout } from "layouts/SplitLayout/SplitLayout";
+// import { Orientation } from "hooks/useSplit/Orientation";
 import { ReceiveColumn } from "pages/TestingPage/ReceiveColumn/ReceiveColumn";
 import { OrderColumn } from "pages/TestingPage/OrderColumn/OrderColumn";
 import { MessagesColumn } from "pages/TestingPage/MessagesColumn/MessagesColumn";
 import { ChartsColumn } from "./ChartsColumn/ChartsColumn";
 import styles from "pages/TestingPage/TestingPage.module.scss";
-import incomingMessage from "assets/svg/incoming-message.svg"
-import paperAirplane from "assets/svg/paper-airplane.svg"
-import outgoingMessage from "assets/svg/outgoing-message.svg"
-import chart from "assets/svg/chart.svg"
+import incomingMessage from "assets/svg/incoming-message.svg";
+import paperAirplane from "assets/svg/paper-airplane.svg";
+import outgoingMessage from "assets/svg/outgoing-message.svg";
+import chart from "assets/svg/chart.svg";
 
 export const TestingPage = () => {
-    return (
-        <div id={styles.wrapper}>
-            <div id={styles.body}>
-                <SplitLayout
-                    components={[
-                        {
-                            component: <ChartsColumn />,
-                            collapsedIcon: chart
-                        },
-                        {
-                            component: <ReceiveColumn />,
-                            collapsedIcon: incomingMessage
-                        },
-                        {
-                            component: <OrderColumn />,
-                            collapsedIcon: paperAirplane
-                        },
-                        {
-                            component: <MessagesColumn />,
-                            collapsedIcon: outgoingMessage
-                        },
-                    ]}
-                    orientation={Orientation.HORIZONTAL}
-                ></SplitLayout>
+  const [collapsed, setCollapsed] = useState({
+    charts: false,
+    receive: false,
+    order: false,
+    messages: false,
+  });
+
+  const toggleCollapse = (key: keyof typeof collapsed) => {
+    setCollapsed((prev) => ({ ...prev, [key]: !prev[key] }));
+  };
+
+  const components = [
+    {
+      key: "charts" as const,
+      icon: chart,
+      component: <ChartsColumn />,
+      collapsed: collapsed.charts,
+    },
+    {
+      key: "receive" as const,
+      icon: incomingMessage,
+      component: <ReceiveColumn />,
+      collapsed: collapsed.receive,
+    },
+    {
+      key: "order" as const,
+      icon: paperAirplane,
+      component: <OrderColumn />,
+      collapsed: collapsed.order,
+    },
+    {
+      key: "messages" as const,
+      icon: outgoingMessage,
+      component: <MessagesColumn />,
+      collapsed: collapsed.messages,
+    },
+  ];
+
+  const visibleComponents = components.filter(c => !c.collapsed);
+
+  return (
+    <div id={styles.wrapper}>
+      <div id={styles.body}>
+        <div className="d-flex flex-row gap-2 p-2">
+          {components.map(({ key }) => (
+            <button
+              key={key}
+              className={`btn btn-sm btn-${collapsed[key] ? "outline-primary" : "primary"}`}
+              onClick={() => toggleCollapse(key)}
+            >
+              {collapsed[key] ? `Mostrar ${key}` : `Ocultar ${key}`}
+            </button>
+          ))}
+        </div>
+        <div style={{ display: "flex", height: "100%", gap: "1rem" }}>
+          {visibleComponents.map(({ key, component }) => (
+            <div key={key} style={{ flex: `1 1 ${100 / visibleComponents.length}%`, overflow: "auto" }}>
+              {component}
             </div>
+          ))}
         </div>
-    );
+      </div>
+    </div>
+  );
 };
