Skip to content

Commit b41bdc7

Browse files
authored
Define high-level organizational structure and re-organize into 2-level structure (#276)
1 parent 1c06b70 commit b41bdc7

File tree

108 files changed

+1107
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1107
-432
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,3 @@
11
# Contributing to this repository
22

3-
Most of this repository is structured for **Sphinx**, a documentation engine in Python.
4-
5-
## Build the documentation locally
6-
7-
The easiest way to build the documentation in this repository is to use `nox`, a tool for quickly building environments and running commands within them.
8-
This ensures that your environment has all the dependencies needed to build the documentation.
9-
10-
To do so, follow these steps:
11-
12-
1. Install `nox`
13-
14-
```
15-
pip install nox
16-
```
17-
2. Build the documentation:
18-
19-
```
20-
nox -s docs_build
21-
```
22-
23-
This should create a local environment in a `.nox` folder, build the documentation (as specified in the `noxfile.py` configuration), and the output will be in `_build/html`.
24-
25-
To build live documentation that updates when you update local files, run the following command:
26-
27-
```
28-
nox -s docs_live
29-
```
30-
31-
## Pre-populate the FreshDesk Help widget
32-
33-
We use a [FreshDesk Help Widget](https://support.freshdesk.com/support/solutions/articles/239273-set-up-your-help-widget) to let users quickly submit support tickets from our documentation.
34-
This is the little widget in the bottom-right that you can click on.
35-
36-
Configuration for the JavaScript that loads this widget is in our `conf.py` file.
37-
See the `widget_embed_code` section.
38-
39-
### Create a button to make the widget pop up
40-
41-
Trigger the Help widget by calling the `openWidget()` function in JavaScript.
42-
You can attach it to a button by embedding some raw HTML in MyST Markdown like so:
43-
44-
```html
45-
<button onclick="openWidget()">
46-
Click here to open a support ticket
47-
</button>
48-
```
49-
50-
<button onclick="openWidget()">
51-
Click here to open a support ticket
52-
</button>
53-
54-
### Pre-fill parts of the support widget
55-
56-
You can configure the button to pre-populate fields for the user so that they can ask make their request more quickly.
57-
To do so, use `key:"value"` pairs in the call to `openWidget()`.
58-
59-
See the `widget_embed_code` section of `conf.py` for the list of possible field names.
60-
61-
The example below populates a few extra fields:
62-
63-
```html
64-
<button onclick="openWidget({name:'Jo the Jovyan', description:'This is a cool feature!', type: 'Feature Request'})">
65-
Click here to open a support ticket
66-
</button>
67-
````
68-
69-
<button onclick="openWidget({name:'Jo the Jovyan', description:'This is a cool feature!', type: 'Feature Request'})">
70-
Click here to open a support ticket
71-
</button>
72-
73-
:::{admonition} Things to pay attention to:
74-
75-
- **Note curly brackets!** You need to give the `key:val` pairs inside curly brackets!
76-
- **Type must exactly match a dropdown option**. If you get the case, spacing, etc wrong, then no option will be selected.
77-
:::
78-
79-
## Review and merging guidelines
80-
81-
See the [2i2c team guidelines for reviewing and merging](https://infrastructure.2i2c.org/contributing/code-review/#review-and-merge-guidelines-for-2i2c-engineers). Use your best judgment!
3+
For contributing, see the [getting started guide](./contribute/get-started.md) and the [contributing overview](./contribute/overview.md).
File renamed without changes.

admin/community/index.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Community management
2+
3+
These sections cover operational tasks for managing your community's hub, including running events and workshops.
4+
5+
```{toctree}
6+
events
7+
```

admin/howto/environment/customize.md renamed to admin/environment/customize.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Follow these steps any time you need to update the environment image that is use
4141

4242
1. Open a [2i2c support ticket](https://docs.2i2c.org/support/) to request an update to your hub with the new custom image.
4343

44-
```{image} media/open-support-ticket.png
44+
```{image} images/open-support-ticket.png
4545
:alt: Screenshot of 2i2c support ticket.
4646
```
4747

@@ -58,7 +58,7 @@ To add multiple environments for your hub, take these steps:
5858

5959
1. Follow the steps in [](environment:image) for each environment you wish to offer your hub's users.
6060
You should have one repository per environment, and each one should push to a Docker image registry via the repo2docker action.
61-
2. [Open a support request](../../../support.md) requesting that your hub be set up to serve multiple user environments.
61+
2. [Open a support request](../../support.md) requesting that your hub be set up to serve multiple user environments.
6262
A 2i2c engineer will assist you in configuring the hub to set up multiple environments.
6363

6464
(image-building-setup)=

admin/howto/environment/defaults.md renamed to admin/environment/defaults.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The [original single-document interface](https://jupyter-notebook.readthedocs.io
2828
### JupyterLab
2929

3030

31-
```{figure} ../../../images/jupyterlab.png
31+
```{figure} images/jupyterlab.png
3232
:alt: JupyterLab layout
3333
```
3434

@@ -38,12 +38,12 @@ research organizations use this.
3838

3939
### RStudio
4040

41-
```{figure} ../../../images/rstudio.png
41+
```{figure} images/rstudio.png
4242
:alt: RStudio
4343
```
4444

4545
[RStudio](https://rstudio.com) is an IDE for R, created by the RStudio company.
4646

4747
## Ask for changes to the default environment
4848

49-
If you are using the default environment, and think that one or two packages should be installed by default on it, please [send a support request](../../../support.md) and request an update to the default environment.
49+
If you are using the default environment, and think that one or two packages should be installed by default on it, please [send a support request](../../support.md) and request an update to the default environment.

admin/howto/environment/hub-user-image-template-guide.md renamed to admin/environment/hub-user-image-template-guide.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Create a new repository for your user image from the [`hub-user-image-template`]
1010
1. Go to the [`hub-user-image-template`](https://github.com/2i2c-org/hub-user-image-template) repository.
1111
2. Click the {guilabel}`Use this template` button located at the top of this repository's GitHub page.
1212

13-
```{figure} ../../../images/use-template.png
13+
```{figure} images/use-template.png
1414
:alt: Use this template
1515
```
1616
3. This will generate a **copy** of the repository that you can modify as you wish.
@@ -31,7 +31,7 @@ When you have completed these steps, you should have:
3131
- **`QUAY_USERNAME`**: the user name of the `quay.io` robot account
3232
- **`QUAY_PASSWORD`**: the password of the `quay.io` robot account
3333

34-
```{figure} ../../../images/secrets.png
34+
```{figure} images/secrets.png
3535
:alt: Secrets
3636
```
3737

@@ -53,19 +53,19 @@ To enable pushing to the appropriate quay.io repository, edit line 47 of [build.
5353
2. Replace `<quay-username>/<repository-name>` with the info of the `quay.io` repository created at step 2
5454
3. Commit the changes you've made to `build.yaml`
5555

56-
```{figure} ../../../images/image-name-in-build-workflow.png
56+
```{figure} images/image-name-in-build-workflow.png
5757
:alt: IMAGE_NAME
5858
```
5959

6060
You can checkout the logs of this GitHub Workflow via the Github Actions tab on your image repository.
6161

62-
```{figure} ../../../images/build-workflow.png
62+
```{figure} images/build-workflow.png
6363
:alt: Build workflow
6464
```
6565

6666
If you are triggering this action by merging a PR or directly pushing to the main branch, you should look at the Github Actions tab and this will show a `pushing quay.io/...` message, followed by the image name and tag like in the image below.
6767

68-
```{figure} ../../../images/pushing-to-registry-job-step.png
68+
```{figure} images/pushing-to-registry-job-step.png
6969
:alt: Build logs
7070
```
7171

@@ -108,7 +108,7 @@ In order to be able to pull the image you need to make sure that your repository
108108
This is usually **under the latest tag**.
109109
Use this to find your image name - `quay.io/<quay-username>/<repository-name>:<tag>`.
110110

111-
```{figure} ../../../images/coessing-image-quay.png
111+
```{figure} images/coessing-image-quay.png
112112
:alt: Tags list example
113113
```
114114
2. Modify your hub's configuration to use the updated image Put the image tag you constructed in a previous step into the User docker image text box. Note quay web urls look like `quay.io/repository/2i2c/coessing-image`, but the docker image name in configurator **should not** include the repository part of the URL e.g. `quay.io/2i2c/coessing-image:55adca9b2caa`.
95.1 KB
Loading
82 KB
Loading

0 commit comments

Comments
 (0)