page curve added, tick and cross item changed with polaris icons, ema…

…il replaced with account name in userMenu topbar
akto-api-security · Dec 28, 2024 · a624d9b · a624d9b
1 parent a348252
commit a624d9b
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 13 deletions.
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js
@@ -110,7 +110,7 @@ export default function Header() {
             }
         }
     })
-
+    
     function createNewAccount() {
         api.saveToAccount(newAccount).then(resp => {
           setShowCreateAccount(false)
@@ -165,7 +165,7 @@ export default function Header() {
                 },
             ]}
             initials={func.initials(username)}
-            name={username}
+            name={accounts[activeAccount]}
             open={isUserMenuOpen}
             onToggle={toggleIsUserMenuOpen}
         />

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/SearchField.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/SearchField.jsx
@@ -5,7 +5,7 @@ import React, { useState } from 'react'
 function SearchField(props) {
 
     const [searchValue, setSearchValue] = useState("")
-    const SearchIcon =  (
+    const SearchFieldIcon =  (
         <Box>
             <Icon source={SearchIcon} />   
         </Box>
@@ -23,7 +23,7 @@ function SearchField(props) {
 
     return (
         <TextField  
-            prefix={SearchIcon} 
+            prefix={SearchFieldIcon} 
             onChange={searchResult} 
             value={searchValue}
             placeholder={props.placeholder}

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/style.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/style.css
@@ -75,7 +75,7 @@
 }
 
 .active {
-    background: #00A47C;
+    /* background: #00A47C; */
 }
 
 .tooltipSpan {

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/home/HomePage.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/home/HomePage.js
@@ -18,7 +18,7 @@ function HomePage() {
 
   return (
     <Frame navigation={leftNavCollapsed? undefined:<LeftNav />} topBar={<Header />} logo={logo} >
-     <Box minHeight="100vh" background="bg" paddingBlockEnd={"2000"}>
+     <Box borderStartEndRadius="300" minHeight="100%" background="bg" paddingBlockEnd={"2000"}>
       <Outlet />
      </Box>
     </Frame>

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/issues/transform.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/issues/transform.js
@@ -30,7 +30,7 @@ const transform = {
             <tr style={{background: "#FAFBFB", padding: '0px !important', borderTop: '1px solid #dde0e4'}}>
                 <td colSpan={'100%'} style={{padding: '0px !important'}}>
                     {urls.map((ele,index)=>{
-                    const borderStyle = index < (urls.length - 1) ? {borderBlockEndWidth : 1} : {}
+                    const borderStyle = index < (urls.length - 1) ? {borderBlockEndWidth : "025"} : {}
                     return (
                         <Box padding={"200"} paddingInlineEnd={"400"} paddingInlineStart={"300"} key={index}
                         borderColor="border-secondary" {...borderStyle}>

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/Settings.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/Settings.jsx
@@ -35,7 +35,7 @@ const Settings = () => {
 
     return (
         <Frame navigation={<SettingsLeftNav />} topBar={<SettingsHeader />}>
-            <Box minHeight="100vh" background="bg" paddingBlockEnd={"2000"}>
+            <Box borderStartEndRadius="300" minHeight="100%" background="bg" paddingBlockEnd={"2000"}>
                 <Outlet />
             </Box>
         </Frame>

diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/test_editor/TestEditor.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/test_editor/TestEditor.jsx
@@ -159,7 +159,7 @@ const TestEditor = () => {
     }
         navigation={ <TestEditorFileExplorer addCustomTest={(e) => addCustomTest(e)}/> }
     >
-        <Box background="bg" paddingInlineStart={1200}>
+        <Box borderStartEndRadius="300" minHeight="100%" background="bg" paddingInlineStart={1200}>
             <InlineGrid columns={2}>
                 <YamlEditor fetchAllTests={fetchAllTests} />
                 <SampleApi />

diff --git a/apps/dashboard/web/polaris_web/web/src/util/func.js b/apps/dashboard/web/polaris_web/web/src/util/func.js
@@ -20,6 +20,8 @@ import {
   MobileIcon,
   CalendarTimeIcon,
   IdentityCardFilledIcon,
+  CheckCircleIcon,
+  XCircleIcon
 } from "@shopify/polaris-icons";
 import { saveAs } from 'file-saver'
 import inventoryApi from "../apps/dashboard/pages/observe/api"
@@ -30,8 +32,6 @@ import homeFunctions from '../apps/dashboard/pages/home/module';
 import {themes} from '@shopify/polaris-tokens'; 
 import PersistStore from '../apps/main/PersistStore';
 
-import { circle_cancel, circle_tick_minor } from "@/apps/dashboard/components/icons";
-
 const iconsUsedMap = {
   CalendarIcon,ClockIcon,AlertCircleIcon,DatabaseIcon, LockIcon, KeyIcon, ProfileIcon, PasskeyIcon,
   EmailIcon, CreditCardIcon, IdentityCardIcon, LocationIcon,PhoneIcon, FileIcon, ImageIcon, BankIcon, HashtagIcon, 
@@ -290,12 +290,14 @@ prettifyEpoch(epoch) {
       case "STOPPED":
         return{
           tooltipContent: "Error occurred while running the test.",
-          icon: circle_cancel,
+          icon: XCircleIcon,
+          icon:"critical"
         }
       case "COMPLETED": 
         return {
           tooltipContent: "Test has been completed.",
-          icon: circle_tick_minor
+          icon: CheckCircleIcon,
+          color:"success"
         }
       default: 
         return {