Skip to content

ui: MMSettings rewrite using react #3354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martonp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ui: MMSettings rewrite using react #3354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/webserver/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,7 +2008,7 @@ func (s *WebServer) apiStartMarketMakingBot(w http.ResponseWriter, r *http.Reque
return
}
if err = s.mm.StartBot(form.Config, nil, appPW, true); err != nil {
s.writeAPIError(w, fmt.Errorf("error starting market making: %v", err))
s.writeAPIError(w, err)
return
}

Expand Down
550 changes: 419 additions & 131 deletions client/webserver/jsintl.go
View file
Open in desktop

Large diffs are not rendered by default.

632 changes: 457 additions & 175 deletions client/webserver/site/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions client/webserver/site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
"@babel/core": "^7.21.8",
"@babel/plugin-transform-runtime": "^7.21.4",
"@babel/preset-env": "^7.21.5",
"@babel/preset-react": "^7.22.5",
"@babel/preset-typescript": "^7.21.5",
"@babel/runtime": "^7.21.5",
"@types/react": "^18.2.12",
"@types/react-dom": "^18.2.6",
"@typescript-eslint/eslint-plugin": "^5.59.2",
"@typescript-eslint/parser": "^5.59.2",
"babel-loader": "^9.1.2",
Expand All @@ -47,5 +50,9 @@
"webpack-bundle-analyzer": "^4.8.0",
"webpack-cli": "^5.0.2",
"webpack-merge": "^5.8.0"
},
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
}
9 changes: 9 additions & 0 deletions client/webserver/site/src/css/components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ button {
background-color: var(--btn-feature-hover-bg);
border-color: var(--btn-featur-hover-border-color);
}

&:disabled {
opacity: 0.4;

&:hover {
background-color: var(--btn-feature-bg);
border-color: var(--btn-feature-border-color);
}
}
}

&.danger {
Expand Down
84 changes: 83 additions & 1 deletion client/webserver/site/src/css/mm.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,17 @@ div[data-handler=mm] {
border-radius: 5px;
}

#marketFilterInput {
padding-right: 35px;
}

#marketFilterIcon {
position: absolute;
left: 10px;
right: 10px;
top: 50%;
transform: translateY(-50%);
opacity: 0.5;
pointer-events: none;
}

#botTypeForm {
Expand Down Expand Up @@ -196,4 +201,81 @@ div[data-handler=mm] {
#limitOrderBufferSection {
display: none;
}

.configure-bot-content {
width: 100%;
background-color: var(--section-bg);
margin: 20px 0;
display: flex;
flex-direction: column;
// border: 1px solid #dee2e6;
border-radius: 0.375rem;
box-shadow: 0 0.125rem 0.25rem rgb(0 0 0 / 7.5%);
}

.configure-bot-market-box {
padding: 1rem;
border-bottom: 1px solid #dee2e6;
}

.configure-bot-market-display {
flex: 1;
display: flex;
flex-direction: column;
align-items: flex-start;
padding: 0.5rem;
border-radius: 0.25rem;
cursor: pointer;
transition: background-color 0.15s ease-in-out;
}

.configure-bot-market-display:hover {
background-color: rgb(0 123 255 / 10%);
}

.configure-bot-bot-type-display {
flex: 1;
display: flex;
flex-direction: column;
align-items: flex-start;
padding: 0.5rem;
border-radius: 0.25rem;
cursor: pointer;
transition: background-color 0.15s ease-in-out;
}

.configure-bot-bot-type-display:hover {
background-color: rgb(0 123 255 / 10%);
}

.configure-bot-tab-section {
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 0.75rem 1rem;
margin: 0 0.25rem;
border-radius: 0.25rem;
cursor: pointer;
transition: all 0.15s ease-in-out;
background-color: transparent;
color: #6c757d;
border: none;
}

.configure-bot-tab-section:hover {
background-color: rgb(0 123 255 / 10%);
color: #0056b3;
}

.configure-bot-tab-section.active {
background-color: rgb(0 123 255 / 15%);
color: white;
}

.configure-bot-tab-section.active:hover {
background-color: rgb(0 123 255 / 20%);
color: white;
}
}
Loading
Loading