Skip to content
Snippets Groups Projects
Commit 2785f517 authored by Krishnan R's avatar Krishnan R
Browse files

Address review comments

parent c5929193
No related branches found
No related tags found
No related merge requests found
[bumpversion]
current_version = 0.1.0
commit = True
tag = True
tag_name = SwanHeader/v{new_version}
message = SwanHeader v{new_version}
[bumpversion:file:package.json]
......@@ -45,12 +45,12 @@
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyterlab/application": "^3.1.0",
"@jupyterlab/application": "^3.0.0",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2"
},
"devDependencies": {
"@jupyterlab/builder": "^3.1.0",
"@jupyterlab/builder": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^4.8.1",
"@typescript-eslint/parser": "^4.8.1",
"eslint": "^7.14.0",
......@@ -73,7 +73,7 @@
"jupyter-releaser": {
"hooks": {
"before-build-npm": [
"python -m pip install jupyterlab~=3.1",
"python -m pip install jupyterlab~=3.0",
"jlpm"
]
}
......
[build-system]
requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=3.1"]
requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=3.0"]
build-backend = "jupyter_packaging.build_api"
[tool.jupyter-packaging.options]
......
......@@ -50,7 +50,6 @@ setup_args = dict(
platforms="Linux, Mac OS X, Windows",
keywords=["Jupyter", "JupyterLab", "JupyterLab3"],
classifiers=[
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
......@@ -58,11 +57,10 @@ setup_args = dict(
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Framework :: Jupyter",
# These classifiers will be valid when https://github.com/pypa/warehouse/pull/9882 gets merged
# "Framework :: Jupyter :: JupyterLab",
# "Framework :: Jupyter :: JupyterLab :: 3",
# "Framework :: Jupyter :: JupyterLab :: Extensions",
# "Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt",
"Framework :: Jupyter :: JupyterLab",
"Framework :: Jupyter :: JupyterLab :: 3",
"Framework :: Jupyter :: JupyterLab :: Extensions",
"Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt",
],
)
......
......@@ -16,7 +16,7 @@ export const Header = (props: {
baseUrl: string;
}): React.ReactElement => {
const userName = props.hubUser || 'swanuser';
const shutdownUrl = (props.hubPrefix || props.baseUrl) + 'home?changeconfig';
const changeConfigurationUrl = props.hubPrefix + 'home?changeconfig';
const [menuAnchorElement, setMenuAnchorElement] = React.useState(null);
const isMenuOpen = Boolean(menuAnchorElement);
......@@ -29,11 +29,11 @@ export const Header = (props: {
setMenuAnchorElement(null);
};
const onClickShutdown = async () => {
const onChangeConfiguration = async () => {
handleCloseMenu();
const result = await showDialog({
title: 'Shutdown Session?',
body: 'Do you want to shut down your session? This will close all notebooks and shutdown all running kernels.',
title: 'Change configuration?',
body: 'Do you want to shut down your session and change configuration? This will close all notebooks and shutdown all running kernels.',
buttons: [
Dialog.okButton({
caption: 'Shutdown',
......@@ -47,7 +47,7 @@ export const Header = (props: {
]
});
if (result.button.accept) {
window.location.replace(shutdownUrl);
window.location.replace(changeConfigurationUrl);
}
};
......@@ -107,8 +107,8 @@ export const Header = (props: {
<MenuItem button onClick={onClickLogout} dense divider>
<ListItemText primary="Logout" />
</MenuItem>
<MenuItem button onClick={onClickShutdown} dense>
<ListItemText primary="Shutdown" />
<MenuItem button onClick={onChangeConfiguration} dense>
<ListItemText primary="Change Configuration" />
</MenuItem>
</Menu>
</div>
......
......@@ -47,15 +47,15 @@
.sw-header .sw-nav-item {
box-sizing: border-box;
height: 100%;
padding: 3px 12px;
padding: 2px 12px;
transition: height 2s linear;
display: flex;
align-items: center;
}
.sw-header .sw-nav-item:hover, .sw-header .sw-nav-item-selected {
border-top: 3px solid transparent;
border-bottom: 3px solid transparent;
border-top: 2px solid transparent;
border-bottom: 2px solid transparent;
padding: 0 12px;
border-bottom-color: var(--swan-color-orange);
background-color: var(--swan-color-dark-4);
......@@ -78,6 +78,7 @@
/* .sw-header-menu is not inside .sw-header */
.sw-header-menu .MuiPaper-root {
border: 1px solid #bdbdbd;
border-top: 0;
color: black !important;
}
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment