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.

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

Rnd 204 general enhanecements #1449

Merged
merged 13 commits into from
Nov 26, 2023
Merged

Rnd 204 general enhanecements #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b91ae3c
copy from cloud
Nov 26, 2023
151da9b
ui fixes
Nov 26, 2023
62f80fa
Merge branch 'master' into RND-204-general-enhanecements
SvetaMemphis Nov 26, 2023
768052e
ui changes
Nov 26, 2023
c12edd8
Merge branch 'RND-204-general-enhanecements' of https://github.com/me…
Nov 26, 2023
b24d0d5
changes
Nov 26, 2023
30cc61e
Merge branch 'master' into RND-204-general-enhanecements
SvetaMemphis Nov 26, 2023
8570122
Merge branch 'master' of https://github.com/memphisdev/memphis into R…
Nov 26, 2023
0eb0d3f
.
Nov 26, 2023
3880ed4
copy from cloud
Nov 26, 2023
eeda14b
Merge'master'https://github.com/memphisdev/memphis
Nov 26, 2023
8f1f861
copy from cloud
Nov 26, 2023
c40ec07
align cloud
Nov 26, 2023
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 ui_src/src/components/upgradePlans/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ const UpgradePlans = ({ open, onClose, content, isExternal = true }) => {
setTimeout(() => {
showMessages('success', 'Your plan has been successfully updatead.');
}, 1000);
getAllowedActions();
isExternal ? onClose() : setUpgradeModalOpen(false);
localStorage.setItem(LOCAL_STORAGE_PLAN, data.plan);
}
Expand All @@ -104,7 +105,6 @@ const UpgradePlans = ({ open, onClose, content, isExternal = true }) => {
setReasonDowngrade('');
setIsCheck([]);
}
getAllowedActions();
}
};

Expand Down
10 changes: 8 additions & 2 deletions ui_src/src/domain/functions/components/functionBox/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,14 @@ function FunctionBox({ funcDetails, integrated, isTagsOn = true, onClick = null,
}
colorType="white"
radiusType="circle"
backgroundColorType={functionDetails?.installed && !functionDetails?.updates_available ? 'white' : 'purple'}
border={functionDetails?.installed && !functionDetails?.updates_available ? 'gray-light' : null}
backgroundColorType={
(functionDetails?.installed || functionDetails?.installed_in_progress) && !functionDetails?.updates_available ? 'white' : 'purple'
}
border={
(functionDetails?.installed || functionDetails?.installed_in_progress) && !functionDetails?.updates_available
? 'gray-light'
: null
}
fontSize="12px"
fontFamily="InterSemiBold"
disabled={!isValid || functionDetails?.installed_in_progress}
Expand Down
12 changes: 10 additions & 2 deletions ui_src/src/domain/functions/components/functionDetails/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,16 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
? '34px'
: '100px'
}
backgroundColorType={selectedFunction?.installed && !selectedFunction?.updates_available ? 'white' : 'purple'}
border={selectedFunction?.installed && !selectedFunction?.updates_available ? 'gray-light' : null}
backgroundColorType={
(selectedFunction?.installed || selectedFunction?.installed_in_progress) && !selectedFunction?.updates_available
? 'white'
: 'purple'
}
border={
(selectedFunction?.installed || selectedFunction?.installed_in_progress) && !selectedFunction?.updates_available
? 'gray-light'
: null
}
colorType={'white'}
radiusType={'circle'}
fontSize="12px"
Expand Down
4 changes: 2 additions & 2 deletions ui_static_files/build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.dff24125.css",
"main.js": "/static/js/main.ce662364.js",
"main.js": "/static/js/main.c76f5e08.js",
"static/js/617.a5f8c4fc.chunk.js": "/static/js/617.a5f8c4fc.chunk.js",
"static/js/2542.27de8743.chunk.js": "/static/js/2542.27de8743.chunk.js",
"static/js/1737.e134cfd4.chunk.js": "/static/js/1737.e134cfd4.chunk.js",
Expand Down Expand Up @@ -317,6 +317,6 @@
},
"entrypoints": [
"static/css/main.dff24125.css",
"static/js/main.ce662364.js"
"static/js/main.c76f5e08.js"
]
}
2 changes: 1 addition & 1 deletion ui_static_files/build/index.html
View file
Open in desktop
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="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Memphis.dev console is designed to simplify your work and give you a graphical user interface for controlling your stations, security, integrations, and observing your data and other vital metrics"/><link rel="manifest" href="/manifest.json"/><title>Memphis.dev Console</title><link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/static/js/main.ce662364.js"></script><link href="/static/css/main.dff24125.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="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Memphis.dev console is designed to simplify your work and give you a graphical user interface for controlling your stations, security, integrations, and observing your data and other vital metrics"/><link rel="manifest" href="/manifest.json"/><title>Memphis.dev Console</title><link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/static/js/main.c76f5e08.js"></script><link href="/static/css/main.dff24125.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
4 changes: 2 additions & 2 deletions ...ic_files/build/static/js/main.ce662364.js → ...ic_files/build/static/js/main.c76f5e08.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...ld/static/js/main.ce662364.js.LICENSE.txt → ...ld/static/js/main.c76f5e08.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.