From 6035441d27e1840eeeabb82b271e5bd49a092341 Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Fri, 11 Mar 2022 09:37:32 -0500 Subject: [PATCH 1/2] update spawner_ui_config --- samples/spawner_ui_config.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/samples/spawner_ui_config.yaml b/samples/spawner_ui_config.yaml index 98847b7e..6556ab68 100644 --- a/samples/spawner_ui_config.yaml +++ b/samples/spawner_ui_config.yaml @@ -20,21 +20,18 @@ spawnerFormDefaults: value: k8scc01covidacr.azurecr.io/jupyterlab-cpu:58308325 # The list of available standard container Images options: - - k8scc01covidacr.azurecr.io/rstudio:58308325 - k8scc01covidacr.azurecr.io/jupyterlab-cpu:58308325 - k8scc01covidacr.azurecr.io/jupyterlab-pytorch:58308325 - k8scc01covidacr.azurecr.io/jupyterlab-tensorflow:58308325 - - k8scc01covidacr.azurecr.io/remote-desktop:58308325 readOnly: false imageGroupOne: # The container Image for the user's Group One Server # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /` # is applied to notebook in this group, configuring # the Istio rewrite for containers that host their web UI at `/` - value: k8scc01covidacr.azurecr.io/jupyterlab-cpu:58308325 - # The list of available standard container Images + value: k8scc01covidacr.azurecr.io/rstudio:58308325 # The list of available standard container Images options: - - k8scc01covidacr.azurecr.io/jupyterlab-cpu:58308325 + - k8scc01covidacr.azurecr.io/rstudio:58308325 imageGroupTwo: # The container Image for the user's Group Two Server # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /` @@ -43,10 +40,10 @@ spawnerFormDefaults: # The annotation `notebooks.kubeflow.org/http-headers-request-set` # is applied to notebook in this group, configuring Istio # to add the `X-RStudio-Root-Path` header to requests - value: k8scc01covidacr.azurecr.io/rstudio:58308325 + value: k8scc01covidacr.azurecr.io/remote-desktop:58308325 # The list of available standard container Images options: - - k8scc01covidacr.azurecr.io/rstudio:58308325 + - k8scc01covidacr.azurecr.io/remote-desktop:58308325 hideRegistry: true hideTag: true allowCustomImage: true From 59013b7e7e91f97f51d1cad9fadcdb9efb4c9b17 Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Fri, 11 Mar 2022 14:42:25 -0500 Subject: [PATCH 2/2] add logo to assets --- .../src/assets/logos/group-one-icon.svg | 19 ++++ .../src/assets/logos/group-one-logo.svg | 68 ++++++++++++++ .../src/assets/logos/group-two-icon.svg | 27 ++++++ .../src/assets/logos/group-two-logo.svg | 55 ++++++++++++ .../jupyter/src/assets/logos/jupyter-icon.svg | 89 +++++++++++++++++++ .../src/assets/logos/jupyterlab-logo.svg | 42 +++++++++ .../src/environments/environment.prod.ts | 12 +-- .../src/environments/environment.rok.prod.ts | 12 +-- .../jupyter/src/environments/environment.ts | 12 +-- 9 files changed, 318 insertions(+), 18 deletions(-) create mode 100644 frontend/jupyter/src/assets/logos/group-one-icon.svg create mode 100644 frontend/jupyter/src/assets/logos/group-one-logo.svg create mode 100644 frontend/jupyter/src/assets/logos/group-two-icon.svg create mode 100644 frontend/jupyter/src/assets/logos/group-two-logo.svg create mode 100644 frontend/jupyter/src/assets/logos/jupyter-icon.svg create mode 100644 frontend/jupyter/src/assets/logos/jupyterlab-logo.svg diff --git a/frontend/jupyter/src/assets/logos/group-one-icon.svg b/frontend/jupyter/src/assets/logos/group-one-icon.svg new file mode 100644 index 00000000..c186a326 --- /dev/null +++ b/frontend/jupyter/src/assets/logos/group-one-icon.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + diff --git a/frontend/jupyter/src/assets/logos/group-one-logo.svg b/frontend/jupyter/src/assets/logos/group-one-logo.svg new file mode 100644 index 00000000..ed436464 --- /dev/null +++ b/frontend/jupyter/src/assets/logos/group-one-logo.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/jupyter/src/assets/logos/group-two-icon.svg b/frontend/jupyter/src/assets/logos/group-two-icon.svg new file mode 100644 index 00000000..18cc6d81 --- /dev/null +++ b/frontend/jupyter/src/assets/logos/group-two-icon.svg @@ -0,0 +1,27 @@ + + + + + diff --git a/frontend/jupyter/src/assets/logos/group-two-logo.svg b/frontend/jupyter/src/assets/logos/group-two-logo.svg new file mode 100644 index 00000000..a2119dd1 --- /dev/null +++ b/frontend/jupyter/src/assets/logos/group-two-logo.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + diff --git a/frontend/jupyter/src/assets/logos/jupyter-icon.svg b/frontend/jupyter/src/assets/logos/jupyter-icon.svg new file mode 100644 index 00000000..a5fb1cef --- /dev/null +++ b/frontend/jupyter/src/assets/logos/jupyter-icon.svg @@ -0,0 +1,89 @@ + + Created using Figma 0.90 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/jupyter/src/assets/logos/jupyterlab-logo.svg b/frontend/jupyter/src/assets/logos/jupyterlab-logo.svg new file mode 100644 index 00000000..eef17102 --- /dev/null +++ b/frontend/jupyter/src/assets/logos/jupyterlab-logo.svg @@ -0,0 +1,42 @@ + + + + diff --git a/frontend/jupyter/src/environments/environment.prod.ts b/frontend/jupyter/src/environments/environment.prod.ts index 88aa6622..c06cb854 100644 --- a/frontend/jupyter/src/environments/environment.prod.ts +++ b/frontend/jupyter/src/environments/environment.prod.ts @@ -3,12 +3,12 @@ export const environment = { apiUrl: '/jupyter', resource: 'notebooks', ui: 'default', - jupyterlabLogo: 'static/assets/jupyterlab-logo.svg', - jupyterIcon: 'static/assets/jupyter-icon.svg', - groupOneLogo: 'static/assets/group-one-logo.svg', - groupOneIcon: 'static/assets/group-one-icon.svg', - groupTwoLogo: 'static/assets/group-two-logo.svg', - groupTwoIcon: 'static/assets/group-two-icon.svg', + jupyterlabLogo: 'static/assets/logos/jupyterlab-logo.svg', + jupyterIcon: 'static/assets/logos/jupyter-icon.svg', + groupOneLogo: 'static/assets/logos/group-one-logo.svg', + groupOneIcon: 'static/assets/logos/group-one-icon.svg', + groupTwoLogo: 'static/assets/logos/group-two-logo.svg', + groupTwoIcon: 'static/assets/logos/group-two-icon.svg', // Rok rokUrl: '', diff --git a/frontend/jupyter/src/environments/environment.rok.prod.ts b/frontend/jupyter/src/environments/environment.rok.prod.ts index c80b4f1a..8044f24c 100755 --- a/frontend/jupyter/src/environments/environment.rok.prod.ts +++ b/frontend/jupyter/src/environments/environment.rok.prod.ts @@ -2,10 +2,10 @@ export const environment = { production: true, resource: 'notebooks', ui: 'rok', - jupyterlabLogo: 'static/assets/jupyterlab-logo.svg', - jupyterIcon: 'static/assets/jupyter-icon.svg', - groupOneLogo: 'static/assets/group-one-logo.svg', - groupOneIcon: 'static/assets/group-one-icon.svg', - groupTwoLogo: 'static/assets/group-two-logo.svg', - groupTwoIcon: 'static/assets/group-two-icon.svg', + jupyterlabLogo: 'static/assets/logos/jupyterlab-logo.svg', + jupyterIcon: 'static/assets/logos/jupyter-icon.svg', + groupOneLogo: 'static/assets/logos/group-one-logo.svg', + groupOneIcon: 'static/assets/logos/group-one-icon.svg', + groupTwoLogo: 'static/assets/logos/group-two-logo.svg', + groupTwoIcon: 'static/assets/logos/group-two-icon.svg' }; diff --git a/frontend/jupyter/src/environments/environment.ts b/frontend/jupyter/src/environments/environment.ts index ba2db8cc..bbcc4802 100644 --- a/frontend/jupyter/src/environments/environment.ts +++ b/frontend/jupyter/src/environments/environment.ts @@ -7,12 +7,12 @@ export const environment = { apiUrl: 'http://localhost:5000', resource: 'notebooks', ui: 'default', - jupyterlabLogo: 'static/assets/jupyterlab-logo.svg', - jupyterIcon: 'static/assets/jupyter-icon.svg', - groupOneLogo: 'static/assets/group-one-logo.svg', - groupOneIcon: 'static/assets/group-one-icon.svg', - groupTwoLogo: 'static/assets/group-two-logo.svg', - groupTwoIcon: 'static/assets/group-two-icon.svg', + jupyterlabLogo: 'assets/logos/jupyterlab-logo.svg', + jupyterIcon: 'assets/logos/jupyter-icon.svg', + groupOneLogo: 'assets/logos/group-one-logo.svg', + groupOneIcon: 'assets/logos/group-one-icon.svg', + groupTwoLogo: 'assets/logos/group-two-logo.svg', + groupTwoIcon: 'assets/logos/group-two-icon.svg', // Rok specifics rokUrl: '',