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

Jump to bottom

Minor cosmetics sidebar icons #1366

Merged
merged 3 commits into from
Oct 19, 2023
Merged

Minor cosmetics sidebar icons #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e3e19e
minor ui fixes
otabek-memphis Oct 19, 2023
4ee5923
ui build added
otabek-memphis Oct 19, 2023
e8f94dd
Merge branch 'master' into minor_cosmetics_sidebar_icons
otabek-memphis Oct 19, 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
11 changes: 4 additions & 7 deletions ui_src/src/components/sideBar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,19 @@ import {
import { ReactComponent as IntegrationColorIcon } from '../../assets/images/integrationIconColor.svg';
import { ReactComponent as OverviewActiveIcon } from '../../assets/images/overviewIconActive.svg';
import { ReactComponent as StationsActiveIcon } from '../../assets/images/stationsIconActive.svg';
import { ReactComponent as DocumentActiveIcon } from '../../assets/images/documentIconActive.svg';
import { compareVersions, isCloud, showUpgradePlan } from '../../services/valueConvertor';
import { ReactComponent as FunctionsActiveIcon } from '../../assets/images/functionsIconActive.svg';
import { ReactComponent as SupportColorIcon } from '../../assets/images/supportIconColor.svg';
import { ReactComponent as SchemaActiveIcon } from '../../assets/images/schemaIconActive.svg';
import { ReactComponent as IntegrationIcon } from '../../assets/images/integrationIcon.svg';
import { ReactComponent as UsersActiveIcon } from '../../assets/images/usersIconActive.svg';
import { ReactComponent as FunctionsIcon } from '../../assets/images/functionsIcon.svg';
import { ReactComponent as DocumentIcon } from '../../assets/images/documentIcon.svg';
import { ReactComponent as OverviewIcon } from '../../assets/images/overviewIcon.svg';
import { ReactComponent as StationsIcon } from '../../assets/images/stationsIcon.svg';
import { ReactComponent as SupportIcon } from '../../assets/images/supportIcon.svg';
import { GithubRequest } from '../../services/githubRequests';
import { ReactComponent as LogsActiveIcon } from '../../assets/images/logsActive.svg';
import { ReactComponent as SchemaIcon } from '../../assets/images/schemaIcon.svg';
import { DOC_URL, LATEST_RELEASE_URL } from '../../config';
import { LATEST_RELEASE_URL } from '../../config';
import { ReactComponent as UsersIcon } from '../../assets/images/usersIcon.svg';
import { ReactComponent as LogsIcon } from '../../assets/images/logsIcon.svg';
import { ApiEndpoints } from '../../const/apiEndpoints';
Expand Down Expand Up @@ -74,7 +71,7 @@ const supportContextMenuStyles = {
marginBottom: '10px'
};
const overlayStylesSupport = {
marginTop: '420px',
marginTop: window.innerHeight > 560 && 'calc(100vh - 560px)',
borderRadius: '8px',
width: '380px',
padding: '15px',
Expand Down Expand Up @@ -233,7 +230,7 @@ function SideBar() {
<div className="menu-content">
<div
className="item-wrap"
onClick={() => window.open('https://memphis.dev/docs', '_blank')}
onClick={() => {setPopoverOpenSupportContextMenu(false); window.open('https://memphis.dev/docs', '_blank')}}
>
<div className="item">
<span className="icons">
Expand All @@ -244,7 +241,7 @@ function SideBar() {
</div>
<div
className="item-wrap"
onClick={() => window.open('https://memphis.dev/discord', '_blank')}
onClick={() => {setPopoverOpenSupportContextMenu(false); window.open('https://memphis.dev/discord', '_blank')}}
>
<div className="item">
<span className="icons">
Expand Down
1 change: 0 additions & 1 deletion ui_src/src/components/sideBar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
display: flex;
flex-direction: column;
align-items: center;
gap: 10px;
.integration-icon-wrapper {
width: 60px;
padding: 3px;
Expand Down
1 change: 0 additions & 1 deletion ui_src/src/domain/overview/stations/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
padding-left: 20px;
display: flex;
flex-direction: column;
display: block;
span {
font-size: 10px;
color: var(--black, rgba(74, 73, 92, 0.8));
Expand Down
9 changes: 4 additions & 5 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.da0ecaa6.css",
"main.js": "/static/js/main.59298b1e.js",
"main.css": "/static/css/main.c70e36e8.css",
"main.js": "/static/js/main.3028e42f.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 @@ -242,7 +242,6 @@
"static/media/notUsedIcon.svg": "/static/media/notUsedIcon.d34b2a8e7cd5f8c760477123f305b2ab.svg",
"static/media/codeIconBlack.svg": "/static/media/codeIconBlack.e0488e37f910267edf5a64ba07c438c6.svg",
"static/media/deleteIcon.svg": "/static/media/deleteIcon.fa438e877ea1cdfbbd5e49624303aecf.svg",
"static/media/documentIconActive.svg": "/static/media/documentIconActive.ab4e72d74aa4241e4fd6c43d35b47a30.svg",
"static/media/collapseArrow.svg": "/static/media/collapseArrow.1eed198efd396a89d429c8ea1c3b6f56.svg",
"static/media/codeIcon.svg": "/static/media/codeIcon.6ddd4e5ba7c67ec8dc850bc8255bbc78.svg",
"static/media/TotalStations.svg": "/static/media/TotalStations.16e95265e663f4e33db9709a800c50c5.svg",
Expand Down Expand Up @@ -306,7 +305,7 @@
"static/media/closeNotification.svg": "/static/media/closeNotification.7551e8366682f9c6585bb1a694c4112a.svg"
},
"entrypoints": [
"static/css/main.da0ecaa6.css",
"static/js/main.59298b1e.js"
"static/css/main.c70e36e8.css",
"static/js/main.3028e42f.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.59298b1e.js"></script><link href="/static/css/main.da0ecaa6.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.3028e42f.js"></script><link href="/static/css/main.c70e36e8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
9 changes: 9 additions & 0 deletions ui_static_files/build/static/css/main.c70e36e8.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions ui_static_files/build/static/js/main.3028e42f.js
View file
Open in desktop

Large diffs are not rendered by default.

297 changes: 297 additions & 0 deletions ui_static_files/build/static/js/main.3028e42f.js.LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
/*
object-assign
(c) Sindre Sorhus
@license MIT
*/

/*
object-assign
(c) Sindre Sorhus
@license MIT
*/

/*!
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/

/*!
* Chart.js v2.9.4
* https://www.chartjs.org
* (c) 2020 Chart.js Contributors
* Released under the MIT License
*/

/*!
* Determine if an object is a Buffer
*
* @author Feross Aboukhadijeh <https://feross.org>
* @license MIT
*/

/*!
* The buffer module from node.js, for the browser.
*
* @author Feross Aboukhadijeh <https://feross.org>
* @license MIT
*/

/*!
* chartjs-plugin-streaming v1.9.0
* https://nagix.github.io/chartjs-plugin-streaming
* (c) 2017-2021 Akihiko Kusanagi
* Released under the MIT license
*/

/*! *****************************************************************************
Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at http://www.apache.org/licenses/LICENSE-2.0
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
MERCHANTABLITY OR NON-INFRINGEMENT.
See the Apache Version 2.0 License for specific language governing permissions
and limitations under the License.
***************************************************************************** */

/*! ./Component */

/*! ./Context */

/*! ./checkPropTypes */

/*! ./cjs/react-is.development.js */

/*! ./factoryWithTypeCheckers */

/*! ./lib/ReactPropTypesSecret */

/*! ./lib/has */

/*! ./mediaQuery */

/*! ./toQuery */

/*! ./useMediaQuery */

/*! @license DOMPurify 2.3.1 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.3.1/LICENSE */

/*! css-mediaquery */

/*! decimal.js-light v2.5.1 https://github.com/MikeMcl/decimal.js-light/LICENCE */

/*! hyphenate-style-name */

/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

/*! matchmediaquery */

/*! object-assign */

/*! prop-types */

/*! react */

/*! react-is */

/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

/*! shallow-equal */

/*!**********************!*\
!*** ./src/index.ts ***!
\**********************/

/*!************************!*\
!*** ./src/Context.ts ***!
\************************/

/*!************************!*\
!*** ./src/toQuery.ts ***!
\************************/

/*!**************************!*\
!*** ./src/Component.ts ***!
\**************************/

/*!***************************!*\
!*** ./src/mediaQuery.ts ***!
\***************************/

/*!******************************!*\
!*** ./src/useMediaQuery.ts ***!
\******************************/

/*!****************************************!*\
!*** ./node_modules/react-is/index.js ***!
\****************************************/

/*!******************************************!*\
!*** ./node_modules/prop-types/index.js ***!
\******************************************/

/*!********************************************!*\
!*** ./node_modules/prop-types/lib/has.js ***!
\********************************************/

/*!*********************************************!*\
!*** ./node_modules/object-assign/index.js ***!
\*********************************************/

/*!**********************************************!*\
!*** ./node_modules/css-mediaquery/index.js ***!
\**********************************************/

/*!***********************************************!*\
!*** ./node_modules/matchmediaquery/index.js ***!
\***********************************************/

/*!***************************************************!*\
!*** ./node_modules/prop-types/checkPropTypes.js ***!
\***************************************************/

/*!****************************************************!*\
!*** ./node_modules/hyphenate-style-name/index.js ***!
\****************************************************/

/*!******************************************************!*\
!*** ./node_modules/shallow-equal/dist/index.esm.js ***!
\******************************************************/

/*!***********************************************************!*\
!*** ./node_modules/react-is/cjs/react-is.development.js ***!
\***********************************************************/

/*!************************************************************!*\
!*** ./node_modules/prop-types/factoryWithTypeCheckers.js ***!
\************************************************************/

/*!*************************************************************!*\
!*** ./node_modules/prop-types/lib/ReactPropTypesSecret.js ***!
\*************************************************************/

/*!**************************************************************************************!*\
!*** external {"commonjs":"react","commonjs2":"react","amd":"react","root":"React"} ***!
\**************************************************************************************/

/*!-----------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Version: 0.34.1(547870b6881302c5b4ff32173c16d06009e3588f)
* Released under the MIT license
* https://github.com/microsoft/monaco-editor/blob/main/LICENSE.txt
*-----------------------------------------------------------------------------*/

/**
* @license React
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* A better abstraction over CSS.
*
* @copyright Oleg Isonen (Slobodskoi) / Isonen 2014-present
* @website https://github.com/cssinjs/jss
* @license MIT
*/

/** @license React v0.20.2
* scheduler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v16.13.1
* react-is.development.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v16.13.1
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react-dom.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react-jsx-runtime.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */

/**!
* @fileOverview Kickass library to create and place poppers near their reference elements.
* @version 1.16.1
* @license
* Copyright (c) 2016 Federico Zivolo and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

//! goToAndStop must be relative to the start of the current segment

//! moment.js
Loading