Merge pull request #52 from nebari-dev/more-misc-fixes

Disable JupyterLab and move theme config to module

jhub_apps/spawner/types.py

@@ -69,11 +69,11 @@ def values(cls):
         display_name="Gradio",
         logo="https://www.gradio.app/_app/immutable/assets/gradio.8a5e8876.svg",
     ),
-    FrameworkConf(
-        name=Framework.jupyterlab.value,
-        display_name="JupyterLab",
-        logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/38/Jupyter_logo.svg/1200px-Jupyter_logo.svg.png",
-    ),
+    # FrameworkConf(
+    #     name=Framework.jupyterlab.value,
+    #     display_name="JupyterLab",
+    #     logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/38/Jupyter_logo.svg/1200px-Jupyter_logo.svg.png",
+    # ),
     FrameworkConf(
         name=Framework.custom.value,
         display_name="Custom Command",

jhub_apps/themes/__init__.py

@@ -0,0 +1,17 @@
+LOGO = "/services/japps/static/img/Nebari-Logo-Horizontal-Lockup-White-text.svg"
+
+DEFAULT_THEME = {
+    "logo": LOGO,
+    "primary_color": "#C316E9",
+    "primary_color_dark": "#79158a",
+    "secondary_color": "#18817A",
+    "secondary_color_dark": "#12635E",
+    "accent_color": "#eda61d",
+    "accent_color_dark": "#a16d14",
+    "text_color": "#1c1d26",
+    "h1_color": "#0f1015",
+    "h2_color": "#0f1015",
+    "navbar_text_color": "#ffffff",
+    "navbar_hover_color": "#20b1a8",
+    "navbar_color": "#1c1d26",
+}

jupyterhub_config.py

@@ -1,6 +1,6 @@
 from jupyterhub.spawner import SimpleLocalProcessSpawner
 
-from jhub_apps import theme_template_paths
+from jhub_apps import theme_template_paths, themes
 from jhub_apps.configuration import install_jhub_apps
 
 c = get_config()  # noqa
@@ -51,17 +51,5 @@ def service_for_jhub_apps(name, url):
     "hub_title": "Welcome to Nebari",
     "hub_subtitle": "your open source data science platform",
     "welcome": "Running in dev mode",
-    "logo": "/services/japps/static/img/Nebari-Logo-Horizontal-Lockup-White-text.svg",
-    "primary_color": "#C316E9",
-    "primary_color_dark": "#79158a",
-    "secondary_color": "#18817A",
-    "secondary_color_dark": "#12635E",
-    "accent_color": "#eda61d",
-    "accent_color_dark": "#a16d14",
-    "text_color": "#1c1d26",
-    "h1_color": "#0f1015",
-    "h2_color": "#0f1015",
-    "navbar_text_color": "#ffffff",
-    "navbar_hover_color": "#20b1a8",
-    "navbar_color": "#1c1d26",
+    **themes.DEFAULT_THEME
 }