Skip to content

Commit

Permalink
Have all the hubs using custom landing pages use a bootstrap5 compati…
Browse files Browse the repository at this point in the history
…ble branch
  • Loading branch information
GeorgianaElena committed Jan 9, 2025
1 parent 533ed48 commit 1d9f4c4
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion config/clusters/2i2c/binderhub-ui-demo.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jupyterhub:
binderhubUI:
enabled: true
homepage:
gitRepoBranch: "no-homepage-subsections"
gitRepoBranch: "bootstrap5-no-homepage-subsection"
templateVars:
org:
name: Demo binderhub UI with binderhub-service
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/2i2c/ohw.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ basehub:
jupyterhubConfigurator:
enabled: false
homepage:
gitRepoBranch: "2i2c-ohw"
gitRepoBranch: "bootstrap5-2i2c-ohw"
templateVars:
org:
name: OceanHackWeek en español
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/catalystproject-latam/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jupyterhub:
add_staff_user_ids_to_admin_users: true
add_staff_user_ids_of_type: "github"
homepage:
gitRepoBranch: "catalystproject-ES"
gitRepoBranch: "bootstrap5-catalystproject-ES"
templateVars:
designed_by:
name: "2i2c"
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/openscapes/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ basehub:
jupyterhubConfigurator:
enabled: false
homepage:
gitRepoBranch: "openscapes"
gitRepoBranch: "bootstrap5-openscapes"
templateVars:
org:
name: NASA Openscapes
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/openscapes/workshop.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ basehub:
jupyterhubConfigurator:
enabled: false
homepage:
gitRepoBranch: "username-and-password-homepage"
gitRepoBranch: "bootstrap5-username-and-password-homepage"
ingress:
hosts: [workshop.openscapes.2i2c.cloud]
tls:
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/opensci/big-binder.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jupyterhub:
add_staff_user_ids_to_admin_users: true
add_staff_user_ids_of_type: github
homepage:
gitRepoBranch: "no-homepage-subsections"
gitRepoBranch: "bootstrap5-no-homepage-subsection"
templateVars:
org:
name: Ephemeral Interactive Computing for NASA Communities
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/opensci/climaterisk.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jupyterhub:
secretName: https-auto-tls
custom:
homepage:
gitRepoBranch: "username-and-password-homepage"
gitRepoBranch: "bootstrap5-username-and-password-homepage"
templateVars:
org:
name: ScienceCore:climaterisk
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/victor/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ basehub:
jupyterhubConfigurator:
enabled: false
homepage:
gitRepoBranch: "victor"
gitRepoBranch: "bootstrap5-victor"
templateVars:
org:
name: VICTOR
Expand Down
4 changes: 2 additions & 2 deletions docs/howto/features/binderhub-ui.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,13 @@ sops config/clusters/<cluster-name>/enc-<hubname>.secret.values.yaml

If accessing binderhub will require users to login first, then the login page, i.e. the page where users land to login into the hub before actually seeing the binderhub UI must be updated to use a simpler version of it.

This is done by having the hub track the `no-homepage-subsections` branch of the default homepage repo
This is done by having the hub track the `bootstrap5-no-homepage-subsection` branch of the default homepage repo

```yaml
jupyterhub:
custom:
homepage:
gitRepoBranch: "no-homepage-subsections"
gitRepoBranch: "bootstrap5-no-homepage-subsection"
```

#### 2. Make sure we don't redirect to singleuser server after login
Expand Down
4 changes: 2 additions & 2 deletions docs/hub-deployment-guide/configure-auth/shared-password.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ export HUB_NAME=hub_name

The Dummy Authenticator requires presenting the user with a username and password input field, rather than the typical "log in" button.
This means we cannot use the default homepage template since this will not provide these input fields.
Instead we use a specialised branch of the homepage repo which allows us to have the username and password input fields, along with providing specific info about and for each community: [`username-and-password-homepage`](https://github.com/2i2c-org/default-hub-homepage/tree/username-and-password-homepage).
Instead we use a specialised branch of the homepage repo which allows us to have the username and password input fields, along with providing specific info about and for each community: [`bootstrap5-username-and-password-homepage`](https://github.com/2i2c-org/default-hub-homepage/tree/bootstrap5-username-and-password-homepage).

In the `${HUB_NAME}.values.yaml` file, include the following config.

```yaml
jupyterhub:
custom:
homepage:
gitRepoBranch: "username-and-password-homepage"
gitRepoBranch: "bootstrap5-username-and-password-homepage"
templateVars: [...] # These values are as normal
```
Expand Down

0 comments on commit 1d9f4c4

Please sign in to comment.