Skip to content

Commit

Permalink
ui updates and build (#1378)
Browse files Browse the repository at this point in the history 
* ui updates and build

* build files

---------

Co-authored-by: idanasulinStrech <[email protected]>
  • Loading branch information
@SvetaMemphis @idanasulin2706
SvetaMemphis and idanasulin2706 authored Nov 2, 2023
1 parent b7f8ccb commit f44a42f
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 177 deletions.
2 changes: 1 addition & 1 deletion ui_src/src/components/button/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const Button = ({
background,
width,
height,
borderColor,
border: border === 'none' ? 'none' : '1px solid ' + borderColor,
fontSize,
fontWeight,
fontFamily,
Expand Down
6 changes: 5 additions & 1 deletion ui_src/src/components/cloudModal/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ const CloudModal = ({ type, open, handleClose }) => {
const content = {
bundle: {
title: <label className="cloud-gradient">Enhance Your Journey</label>,
subtitle: 'Get Your Open-Source Support Bundle Today!',
subtitle: (
<>
Get Your Open-Source <label className="bold"> Support Bundle </label> Today!
</>
),
banner: BundleBanner,
leftBtn: 'Learn More',
leftBtnLink: 'https://docs.memphis.dev/memphis/open-source-installation/open-source-support-bundle/',
Expand Down
4 changes: 4 additions & 0 deletions ui_src/src/components/cloudModal/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
text-align: center;
font-family: 'Inter';
font-size: 14px;
.bold {
font-family: 'InterSemiBold';
margin: 0px 4px;
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion ui_src/src/components/sideBar/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ function SideBar() {
/>
<EditIcon alt="edit" className="edit-logo" onClick={() => history.replace(`${pathDomains.administration}/profile`)} />
</span>

<Popover
overlayInnerStyle={overlayStyles}
placement="right"
Expand Down Expand Up @@ -532,7 +533,7 @@ function SideBar() {
<label>A station is a distributed unit that stores the produced data.</label>
</div>
}
height="65vh"
height="70vh"
width="1020px"
rBtnText="Create"
lBtnText="Cancel"
Expand Down
200 changes: 39 additions & 161 deletions ui_src/src/components/sideBar/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
flex-direction: column;
justify-content: space-between;

.mb-15 {
margin-bottom: 15px;
}

.sidebar-title {
font-size: 11px;
color: rgba(74, 73, 92, 0.8);
Expand All @@ -24,8 +20,41 @@
}
}

.upper-icons,
.bottom-icons {
.item-wrapper {
margin-bottom: 15px;
cursor: pointer;
display: flex;
flex-direction: column;
align-items: center;
p {
font-size: 80%;
color: rgba(74, 73, 92, 0.8);
font-family: 'InterSemiBold';
margin: 0;
}
.checked {
color: var(--purple);
}
}
.item-wrapper:hover {
.name {
color: var(--purple);
}
}
.not-available {
cursor: not-allowed;
}
.coming-soon {
background-color: var(--purple);
color: var(--white) !important;
font-size: 10px;
position: relative;
border-radius: 32px;
cursor: not-allowed;
width: 70%;
}

.upper-icons {
.logo-wrapper {
position: relative;
.edit-logo {
Expand All @@ -47,40 +76,8 @@
cursor: pointer;
margin-bottom: 5vh;
}
.item-wrapper {
margin-bottom: 15px;
cursor: pointer;
display: flex;
flex-direction: column;
align-items: center;
p {
font-size: 80%;
color: rgba(74, 73, 92, 0.8);
font-family: 'InterSemiBold';
margin: 0;
}
.checked {
color: var(--purple);
}
}
.item-wrapper:hover {
.name {
color: var(--purple);
}
}
.not-available {
cursor: not-allowed;
}
.coming-soon {
background-color: var(--purple);
color: var(--white) !important;
font-size: 10px;
position: relative;
border-radius: 32px;
cursor: not-allowed;
width: 70%;
}
}

.sandboxUserImg {
border-radius: 50%;
margin-top: 5px;
Expand All @@ -101,34 +98,6 @@
display: flex;
flex-direction: column;
align-items: center;
.integration-icon-wrapper {
width: 60px;
padding: 3px;
cursor: pointer;
height: 30px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
margin-bottom: 15px;
height: auto;
.icon-name {
font-size: 11px;
color: rgba(74, 73, 92, 0.8);
font-family: 'InterSemiBold';
margin: 0;
cursor: pointer;
}
svg {
width: 20px;
height: 20px;
}
}
.integration-icon-wrapper:hover {
.icon-name {
color: var(--purple);
}
}
.version {
margin-bottom: 10px;
background: rgba(132, 129, 138, 0.1);
Expand Down Expand Up @@ -178,11 +147,7 @@
}
}
}
.support-header {
display: flex;
gap: 15px;
font-size: 13px;
}

.menu-content {
.ant-divider-horizontal {
margin: 0;
Expand Down Expand Up @@ -302,93 +267,6 @@
flex-direction: column;
gap: 8px;
}

.support-container {
a {
color: #6557ff;
}
a:hover {
text-decoration: underline;
}
p {
margin-bottom: 0;
}
.support-image {
width: 40px;
height: 40px;
background-color: #e2e0fc;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 5px;
img,
svg {
width: 20px;
height: 20px;
}
}
.popover-header {
color: #101828;
font-weight: 'InterSemiBold';
font-size: 18px;
margin: 0;
}
label {
color: var(--purple);
font-family: 'Inter';
}
.support-span {
border-radius: 8px;
background: rgba(74, 73, 92, 0.05);
padding: 10px 10px;
margin: 15px 0;
display: flex;
flex-direction: column;
justify-content: space-between;
height: 65px;
}
.support-content-header {
color: #475467;
font-family: 'Inter';
margin: 20px 0;
}
.support-content {
color: #475467;
font-weight: 400;
margin-bottom: 0;
display: flex;
justify-content: space-between;
.flex {
display: flex;
gap: 5px;
}
.align-items-center {
align-items: center;
}
a {
text-decoration: underline;
font-family: 'InterSemiBold';
}
span {
font-family: 'InterSemiBold';
}
}
.support-title {
color: #101828;
font-size: 16px;
font-family: 'InterMedium';
margin-top: 15px;
margin-bottom: 5px;
}
.close-button {
margin-top: 25px;
margin-bottom: 10px;
display: flex;
justify-content: space-between;
.button-container button {
font-size: 12px !important;
font-family: 'InterSemiBold' !important;
}
}
.ant-popover-placement-right {
left: 80px !important;
}
4 changes: 2 additions & 2 deletions ui_src/src/domain/overview/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ function OverView() {
<label>Create a new station</label>
</span>
}
border={'none'}
border="none"
colorType="white"
radiusType="circle"
backgroundColorType="gradient"
Expand Down Expand Up @@ -346,7 +346,7 @@ function OverView() {
<label>A station is a distributed unit that stores the produced data.</label>
</div>
}
height="65vh"
height="70vh"
width="1020px"
rBtnText="Create"
lBtnText="Cancel"
Expand Down
2 changes: 1 addition & 1 deletion ui_src/src/domain/schema/components/attachStationModal/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ function AttachStationModal({ close, handleAttachedStations, attachedStations, s
<label>A station is a distributed unit that stores the produced data.</label>
</div>
}
height="65vh"
height="70vh"
width="1020px"
rBtnText="Create"
lBtnText="Cancel"
Expand Down
2 changes: 1 addition & 1 deletion ui_src/src/domain/stationOverview/components/useSchemaModal/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ const UseSchemaModal = ({ stationName, handleSetSchema, close, type = 'schema' }
<label>A station is a distributed unit that stores the produced data.</label>
</div>
}
height="65vh"
height="70vh"
width="1020px"
rBtnText="Create"
lBtnText="Cancel"
Expand Down
2 changes: 1 addition & 1 deletion ui_src/src/domain/stationsList/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ const StationsList = () => {
<label>A station is a distributed unit that stores the produced data.</label>
</div>
}
height="65vh"
height="70vh"
width="1020px"
rBtnText="Create"
lBtnText="Cancel"
Expand Down
8 changes: 4 additions & 4 deletions ui_static_files/build/asset-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.ea261fa3.css",
"main.js": "/static/js/main.f1829900.js",
"main.css": "/static/css/main.e45d978e.css",
"main.js": "/static/js/main.73acef6d.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 @@ -302,7 +302,7 @@
"static/media/closeNotification.svg": "/static/media/closeNotification.7551e8366682f9c6585bb1a694c4112a.svg"
},
"entrypoints": [
"static/css/main.ea261fa3.css",
"static/js/main.f1829900.js"
"static/css/main.e45d978e.css",
"static/js/main.73acef6d.js"
]
}
2 changes: 1 addition & 1 deletion ui_static_files/build/index.html
View file
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.f1829900.js"></script><link href="/static/css/main.ea261fa3.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.73acef6d.js"></script><link href="/static/css/main.e45d978e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
2 changes: 1 addition & 1 deletion ..._files/build/static/css/main.ea261fa3.css → ..._files/build/static/css/main.e45d978e.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...ic_files/build/static/js/main.f1829900.js → ...ic_files/build/static/js/main.73acef6d.js
View file

Large diffs are not rendered by default.

0 ...ld/static/js/main.f1829900.js.LICENSE.txt → ...ld/static/js/main.73acef6d.js.LICENSE.txt
View file
File renamed without changes.

0 comments on commit f44a42f

Please sign in to comment.