Skip to content
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.

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

Add: port dashboard from SRC #3680

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added assets/cn/campaign/OCR_COIN_LIMIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/campaign/OCR_OIL_LIMIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/campaign/OCR_COIN_LIMIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/campaign/OCR_OIL_LIMIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/gui/css/alas-mobile.css
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,11 @@
#pywebio-scope-waiting,
#pywebio-scope-log {
overflow-y: auto;
}

[id^="pywebio-scope-dashboard-row-"] {
display: flex;
flex-grow: 1;
min-width: 4rem;
max-width: 50%;
}
10 changes: 10 additions & 0 deletions assets/gui/css/alas-pc.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@
overflow-y: auto;
}

#pywebio-scope-log-bar {
display: flex;
flex-direction: column;
height: 11.4rem;
}

#pywebio-scope-dashboard {
flex: 1;
}

#pywebio-scope-log-bar,
#pywebio-scope-log,
#pywebio-scope-daemon-overview #pywebio-scope-groups {
Expand Down
55 changes: 53 additions & 2 deletions assets/gui/css/alas.css
Original file line number Diff line number Diff line change
Expand Up @@ -376,24 +376,75 @@ pre.rich-traceback-code {
#pywebio-scope-scheduler-bar,
#pywebio-scope-log-bar,
#pywebio-scope-log,
#pywebio-scope-daemon-log-bar,
#pywebio-scope-daemon-overview #pywebio-scope-groups {
font-weight: 500;
margin: 0.3125rem;
padding: 0.625rem;
}

#pywebio-scope-scheduler-bar,
#pywebio-scope-log-bar {
#pywebio-scope-log-title {
display: flex;
align-items: center;
justify-content: space-between;
}

#pywebio-scope-log-bar-btns {
#pywebio-scope-log-title-btns {
display: grid;
grid-auto-flow: column;
}

#pywebio-scope-dashboard {
display: flex;
align-content: space-between;
justify-content: flex-start;
flex-flow: row wrap;
overflow: auto;
margin-top: .5rem;
}

#pywebio-scope-dashboard > i {
flex-grow: 1;
align-self: flex-end;
width: 10rem;
}

[id^="pywebio-scope-dashboard-row-"] {
display: flex;
flex-grow: 1;
width: 10rem;
}

.dashboard-icon {
margin: .6rem .8rem 0 .6rem;
width: .5rem;
height: .5rem;
border-radius: 50%;
}

*[style*="--dashboard-value--"] {
font-size: 1rem;
font-weight: 500;
overflow-wrap: break-word;
}

*[style*="--dashboard-time--"] {
font-size: 0.8rem;
font-weight: 400;
overflow-wrap: break-word;
}

[id^="pywebio-scope-dashboard-row-"] p {
margin-bottom: 0;
}

[id^="pywebio-scope-dashboard-value-"] {
display: flex;
align-items: flex-end;
height: 1.5rem;
}

#pywebio-scope-log {
line-height: 1.2;
font-size: 0.85rem;
Expand Down
5 changes: 5 additions & 0 deletions assets/gui/css/dark-alas.css
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ pre.rich-traceback-code {
#pywebio-scope-running,
#pywebio-scope-pending,
#pywebio-scope-waiting,
#pywebio-scope-daemon-log-bar,
#pywebio-scope-daemon-overview #pywebio-scope-groups {
background-color: #2f3136;
border: 1px solid #21262d;
Expand All @@ -152,4 +153,8 @@ pre.rich-traceback-code {
*[style*="--arg-help--"],
[id^="pywebio-scope-group_"] > p + p {
color: #adb5bd;
}

*[style*="--dashboard-time--"] {
color: #adb5bd;
}
5 changes: 5 additions & 0 deletions assets/gui/css/light-alas.css
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ pre.rich-traceback-code {
#pywebio-scope-running,
#pywebio-scope-pending,
#pywebio-scope-waiting,
#pywebio-scope-daemon-log-bar,
#pywebio-scope-daemon-overview #pywebio-scope-groups {
background-color: white;
border: 1px solid lightgrey;
Expand All @@ -151,4 +152,8 @@ pre.rich-traceback-code {
*[style*="--arg-help--"],
[id^="pywebio-scope-group_"] > p + p {
color: #777777;
}

*[style*="--dashboard-time--"] {
color: #777777;
}
Binary file added assets/jp/campaign/OCR_COIN_LIMIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/jp/campaign/OCR_OIL_LIMIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tw/campaign/OCR_COIN_LIMIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tw/campaign/OCR_OIL_LIMIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions config/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,12 @@
"CoinLimit": 10000,
"TaskCall": "Main"
},
"CampaignStorage": {
"Oil": {},
"Coin": {},
"Gem": {},
"Pt": {}
},
"Storage": {
"Storage": {}
}
Expand Down Expand Up @@ -1510,6 +1516,9 @@
"UseTicket": true,
"UseDrill": false
},
"GachaStorage": {
"Cube": {}
},
"Storage": {
"Storage": {}
}
Expand Down Expand Up @@ -1565,6 +1574,11 @@
"DoRandomMapEvent": true,
"AkashiShopFilter": "ActionPoint > PurpleCoins"
},
"OpsiStorage": {
"YellowCoin": {},
"PurpleCoin": {},
"ActionPoint": {}
},
"Storage": {
"Storage": {}
}
Expand Down
Loading