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

Cloud adjustments #1058

Merged
merged 3 commits into from
Jun 29, 2023
Merged
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
4 changes: 2 additions & 2 deletions ui_src/src/components/sideBar/support.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const Support = ({ closeModal }) => {
setLoader(false);
message.success({
key: 'memphisSuccessMessage',
content: 'We have received your issue and our support team is currently reviewing it.',
content: 'Your ticket has been opened and will be reviewed by our support as soon as possible.',
duration: 5,
style: { cursor: 'pointer' },
onClick: () => message.destroy('memphisSuccessMessage')
Expand Down Expand Up @@ -84,7 +84,7 @@ const Support = ({ closeModal }) => {
<div className="support-content">
<div className="flex">
<img src={mailsendIcon} alt="mailsendIcon" />
<p>Contact Email</p>
<p>Support Email</p>
</div>
<EmailLink email={'[email protected]'} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui_src/src/domain/overview/genericDetails/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const GenericDetails = () => {
<div className="data-box">
<img src={TotalMsg} width={50} height={50} alt="Total stations" className="icon-wrapper" />
<div className="data-wrapper">
<span>Stored events</span>
<span>Stored messages</span>
<p>{state?.monitor_data?.total_messages?.toLocaleString()}</p>
</div>
</div>
Expand Down
25 changes: 20 additions & 5 deletions ui_src/src/domain/overview/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import {
LOCAL_STORAGE_USER_NAME,
LOCAL_STORAGE_SKIP_GET_STARTED,
LOCAL_STORAGE_BROKER_HOST,
LOCAL_STORAGE_ENV
LOCAL_STORAGE_ENV,
LOCAL_STORAGE_ACCOUNT_ID
} from '../../const/localStorageConsts';
import stationImg from '../../assets/images/stationsIconActive.svg';
import CreateStationForm from '../../components/createStationForm';
Expand Down Expand Up @@ -198,11 +199,25 @@ function OverView() {
></img>
</div>
<div className="dynamic-sentences">
{localStorage.getItem(LOCAL_STORAGE_ALREADY_LOGGED_IN) === 'true' ? <h1>Welcome back, {username}</h1> : <h1>Welcome, {username}</h1>}
{localStorage.getItem(LOCAL_STORAGE_ALREADY_LOGGED_IN) === 'true' ? (
<h1>
Welcome back, <span className="username">{username}</span>
</h1>
) : (
<h1>
Welcome, <span className="username">{username}</span>
</h1>
)}
{isCloud() && (
<div className="hostname">
<p>Hostname : </p>
<span>{host}</span>
<div className="org-details">
<div className="hostname">
<p>Account ID : </p>
<span>{localStorage.getItem(LOCAL_STORAGE_ACCOUNT_ID)}</span>
</div>
<div className="hostname">
<p>Broker Hostname : </p>
<span>{host}</span>
</div>
</div>
)}
</div>
Expand Down
35 changes: 21 additions & 14 deletions ui_src/src/domain/overview/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,28 @@
display: flex;
align-self: center;
flex-direction: column;
.hostname{
border-radius: 32px;
border: 0.8px solid #E2DFFF;
background: #F1F0FF;
.username{
text-transform: capitalize
}
.org-details{
display: flex;
width: fit-content;
padding: 0px 10px;
gap: 2px;
font-family: 'InterMedium';
p{
font-size: 12px;
}
span{
color: var(--purple);
font-size: 12px;
gap: 5px;
.hostname{
border-radius: 32px;
border: 0.8px solid #E2DFFF;
background: #F1F0FF;
display: flex;
width: fit-content;
padding: 0px 10px;
gap: 2px;
font-family: 'InterMedium';
p{
font-size: 12px;
}
span{
color: var(--purple);
font-size: 12px;
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ui_src/src/domain/users/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ function Users() {
render: (_, record) => (
<div className="user-action">
<Button
width="105px"
width="115px"
height="30px"
placeholder={
<div className="action-button">
Expand Down Expand Up @@ -288,7 +288,7 @@ function Users() {
)
},
{
title: 'Full Name',
title: 'Full name',
key: 'full_name',
dataIndex: 'full_name',
render: (full_name) => (
Expand Down Expand Up @@ -389,7 +389,7 @@ function Users() {
</>
) : (
<Button
width="105px"
width="115px"
height="30px"
placeholder={
<div className="action-button">
Expand Down
3 changes: 3 additions & 0 deletions ui_src/src/domain/users/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
max-width: 70px;
}
}
.full-name{
text-transform: capitalize;
}
.created-column{
font-family: 'Inter' !important;
color: rgba(74, 73, 92, 0.8);
Expand Down
8 changes: 4 additions & 4 deletions ui_static_files/build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.859666ce.css",
"main.js": "/static/js/main.f46d87c4.js",
"main.css": "/static/css/main.af187824.css",
"main.js": "/static/js/main.25ea4ab3.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 @@ -273,7 +273,7 @@
"static/media/stationsIconActive.svg": "/static/media/stationsIconActive.e26419ca89a74315be8a7f6bf33756f3.svg"
},
"entrypoints": [
"static/css/main.859666ce.css",
"static/js/main.f46d87c4.js"
"static/css/main.af187824.css",
"static/js/main.25ea4ab3.js"
]
}
2 changes: 1 addition & 1 deletion ui_static_files/build/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="/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.f46d87c4.js"></script><link href="/static/css/main.859666ce.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.25ea4ab3.js"></script><link href="/static/css/main.af187824.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.