Skip to content

Commit

Permalink
updating new vertical nav bar
Browse files Browse the repository at this point in the history
  • Loading branch information
its-a-feature committed Dec 31, 2024
1 parent 2077991 commit 2a43f18
Show file tree
Hide file tree
Showing 13 changed files with 407 additions and 138 deletions.
8 changes: 8 additions & 0 deletions MythicReactUI/CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.2.72] - 2024-12-31

### Changed

- Fixed an issue with the new vertical bar shortcut customization
- Adjusted the design of the vertical bar a bit
- Added a horizontal bar to the top to help separate pages from URL

## [0.2.71] - 2024-12-28

### Changed
Expand Down
164 changes: 164 additions & 0 deletions MythicReactUI/src/assets/Mythic_Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions MythicReactUI/src/components/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,16 @@ export function App(props) {
) : null}
</div>
}
{me?.user?.current_operation_banner_text !== "" &&
{me.loggedIn && (me?.user?.current_operation_banner_text !== "" ||
preferences?.["experiment-newSidebar"])
&&
<Typography style={{
backgroundColor: me?.user?.current_operation_banner_color,
width: "100%",
textAlign: "center",
fontWeight: "600",
color: "white",
borderRadius: "4px",
border: "1px solid grey"
border: `1px solid ${preferences?.topColor || "grey"}`
}}>
{me?.user?.current_operation_banner_text}
</Typography>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ export const Dropdown = React.forwardRef(
absoluteX,
absoluteY,
anchorReference,
style
style,
transformOrigin,
anchorOrigin,
},
ref
) => {
Expand All @@ -27,7 +29,8 @@ export const Dropdown = React.forwardRef(
if (ref) {
anchorRef = ref;
}

console.log(anchorReference, absoluteY, absoluteX)
console.log(anchorReference === "anchorEl" ? undefined : {top: absoluteY, left: absoluteX})
const handleClose = (event) => {
event.stopPropagation();

Expand All @@ -49,7 +52,6 @@ export const Dropdown = React.forwardRef(
parentMenuOpen: isOpen
};
}

return React.createElement(menuItem.type, {
...props,
key: index,
Expand All @@ -69,18 +71,18 @@ export const Dropdown = React.forwardRef(
<>
<Menu
PaperProps={{ sx: { minWidth: minWidth ?? 0 } }}
style={{zIndex: 100000}}
style={{zIndex: 100000, position: "absolute"}}
anchorEl={isOpen}
transition={"true"}
open={!!externallyOpen}
anchorPosition={anchorReference === "anchorEl" ? undefined : {top: absoluteY, left: absoluteX}}
anchorReference={ anchorReference ? anchorReference : "anchorEl"}
onClose={handleClose}
anchorOrigin={{
anchorOrigin={anchorOrigin ? anchorOrigin : {
vertical: 'bottom',
horizontal: 'left',
}}
transformOrigin={{
transformOrigin={transformOrigin ? transformOrigin : {
vertical: 'top',
horizontal: 'left',
}}
Expand Down
332 changes: 213 additions & 119 deletions MythicReactUI/src/components/TopAppBarVertical.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useMemo, useContext} from 'react';
import {MythicTransferListDialog} from '../../MythicComponents/MythicTransferList';
import {MythicDialog, MythicModifyStringDialog} from '../../MythicComponents/MythicDialog';
import {MythicDialog} from '../../MythicComponents/MythicDialog';
import {
exportCallbackConfigQuery,
hideCallbackMutation, lockCallbackMutation, unlockCallbackMutation,
Expand Down
2 changes: 1 addition & 1 deletion MythicReactUI/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import jwt_decode from 'jwt-decode';
import {meState} from './cache';
import {getSkewedNow} from "./components/utilities/Time";

export const mythicUIVersion = "0.2.71";
export const mythicUIVersion = "0.2.72";

let fetchingNewToken = false;

Expand Down
6 changes: 3 additions & 3 deletions mythic-react-docker/mythic/public/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"files": {
"main.css": "/new/static/css/main.602591e6.css",
"main.js": "/new/static/js/main.ef0aad77.js",
"main.js": "/new/static/js/main.a55427c1.js",
"static/media/mythic-red.png": "/new/static/media/mythic-red.203468a4e5240d239aa0.png",
"static/media/graphql.png": "/new/static/media/graphql.8f15978b39b0870a9f0e.png",
"static/media/Mythic_Logo.svg": "/new/static/media/Mythic_Logo.6842c911bebe36d6f83fc7ced4a2cd99.svg",
"static/media/mythic_red_small.svg": "/new/static/media/mythic_red_small.793b41cc7135cdede246661ec232976b.svg",
"index.html": "/new/index.html",
"main.602591e6.css.map": "/new/static/css/main.602591e6.css.map",
"main.ef0aad77.js.map": "/new/static/js/main.ef0aad77.js.map"
"main.a55427c1.js.map": "/new/static/js/main.a55427c1.js.map"
},
"entrypoints": [
"static/css/main.602591e6.css",
"static/js/main.ef0aad77.js"
"static/js/main.a55427c1.js"
]
}
2 changes: 1 addition & 1 deletion mythic-react-docker/mythic/public/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/new/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="apple-touch-icon" href="/new/logo192.png"/><link rel="manifest" href="/new/manifest.json"/><title>Mythic</title><script defer="defer" src="/new/static/js/main.ef0aad77.js"></script><link href="/new/static/css/main.602591e6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/new/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="apple-touch-icon" href="/new/logo192.png"/><link rel="manifest" href="/new/manifest.json"/><title>Mythic</title><script defer="defer" src="/new/static/js/main.a55427c1.js"></script><link href="/new/static/css/main.602591e6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
3 changes: 3 additions & 0 deletions mythic-react-docker/mythic/public/static/js/main.a55427c1.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions mythic-react-docker/mythic/public/static/js/main.ef0aad77.js

This file was deleted.

0 comments on commit 2a43f18

Please sign in to comment.