Merge pull request #1946 from Monilprajapati/releaseFix
Shuffle version change
This commit is contained in:
@@ -72,6 +72,9 @@ import AppExplorer from "./views/AppExplorer.jsx";
|
||||
// Production - backend proxy forwarding in nginx
|
||||
var globalUrl = window.location.origin;
|
||||
|
||||
// Change the Shuffle version on UI from here
|
||||
const SHUFFLE_VERSION = "2.2.0"
|
||||
|
||||
// CORS used for testing purposes. Should only happen with specific port and http
|
||||
if (window.location.port === "3000") {
|
||||
globalUrl = "http://localhost:5001";
|
||||
@@ -350,6 +353,7 @@ const App = (message, props) => {
|
||||
{...props}
|
||||
/> */}
|
||||
<Navbar
|
||||
SHUFFLE_VERSION={SHUFFLE_VERSION}
|
||||
notifications={notifications}
|
||||
setNotifications={setNotifications}
|
||||
userdata={userdata}
|
||||
@@ -365,7 +369,7 @@ const App = (message, props) => {
|
||||
</div>
|
||||
) : (
|
||||
<div style={{ position: 'fixed', top: 32, left: 10, zIndex: 100000 }}>
|
||||
<LeftSideBar checkLogin={checkLogin} userdata={userdata} globalUrl={globalUrl} notifications={notifications} />
|
||||
<LeftSideBar SHUFFLE_VERSION={SHUFFLE_VERSION} checkLogin={checkLogin} userdata={userdata} globalUrl={globalUrl} notifications={notifications} />
|
||||
</div>
|
||||
) }
|
||||
|
||||
|
||||
@@ -748,7 +748,7 @@ const Navbar = (props) => {
|
||||
// isMobile,
|
||||
serverside,
|
||||
billingInfo,
|
||||
|
||||
SHUFFLE_VERSION,
|
||||
notifications,
|
||||
} = props;
|
||||
|
||||
@@ -2624,7 +2624,7 @@ const Navbar = (props) => {
|
||||
margin: 0
|
||||
}}
|
||||
>
|
||||
Version 2.0.2
|
||||
Version {SHUFFLE_VERSION}
|
||||
</Typography>
|
||||
</Box>
|
||||
</Menu>
|
||||
|
||||
Reference in New Issue
Block a user