Skip to content

Commit 09946c0

Browse files
authored
Merge pull request #50 from rosalindfranklininstitute/adding-documentation-ab
Towards changes for documentation to be repository specific
2 parents ce5feac + b638170 commit 09946c0

File tree

7 files changed

+46
-34
lines changed

7 files changed

+46
-34
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ _site
33
.jekyll-cache
44
.jekyll-metadata
55
vendor
6+
.env

_config.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -178,27 +178,30 @@ efforts:
178178
link: https://github.com/SciCatProject/scitacean
179179

180180

181-
resources:
182-
- name: Official website (aka this one)
183-
url: https://scicatproject.github.io
184-
- name: Documentation
185-
url: https://scicatproject.github.io/documentation
181+
documentation:
182+
186183
- name: Official github project
184+
description: All software packages that are part of the SciCat ecosystem are in the Github project. For documentation see each project.
187185
url: https://github.com/ScicatProject
188-
- name: pySciCat documentation
186+
- name: User Guides
187+
description: Experience SciCat as a user
188+
url: https://scicatproject.github.io/documentation/
189+
- name: Get Started
190+
description: To get started with a standalone installation of SciCat and to know more about how to add it to your infrastructure visit the SciCat Live repository.
191+
url: https://scicatproject.github.io/scicatlive/latest/
192+
- name: Backend
193+
description: For developer documentation on the SciCat backend.
194+
url: https://github.com/ScicatProject/scicat-backend-next
195+
- name: Frontend
196+
description: For more information on the SciCat frontend and developer documentation.
197+
url: https://github.com/ScicatProject/frontend
198+
- name: pySciCat
199+
description: The pyscicat project is a python client library to interact with the SciCat backend.
189200
url: https://scicatproject.github.io/pyscicat/
190-
- name: Scitacean documentation
201+
- name: Scitacean
202+
description: Scictacean is a high level python packaging for uploading and downloading data to and from SciCat.
191203
url: https://scicatproject.github.io/scitacean/
192-
- name: SciCat backend repository
193-
url: https://github.com/ScicatProject/scicat-backend-next
194-
- name: SciCat website repository
195-
url: https://github.com/SciCatProject/scicatproject.github.io
196-
- name: SciCat documentation repository
197-
url: https://github.com/SciCatProject/documentation
198-
- name: pySciCat repository
199-
url: https://github.com/SciCatProject/pyscicat
200-
- name: Scitacean repository
201-
url: https://github.com/SciCatProject/scitacean
204+
202205

203206

204207
# Build settings

_includes/documentation.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<section id="documentation" class="effort text-center bg-light">
2+
<div class="container">
3+
<h1 class="mt-5 mb-5">Documentation</h1>
4+
<div class="row">
5+
{% for document in site.documentation %}
6+
<div class="documentation"> <div class="documentation-name">
7+
<div class="name">{{ document.name }}</div>
8+
</div>
9+
<div class="documentation-info">
10+
<div class="text">{{ document.description }}</div>
11+
<div class="text"><a href="{{ document.link }}" target="_blank">{{ document.link }}</a></div>
12+
<a href="{{ document.url }}" target="_blank">{{ document.name }}</a>
13+
</div>
14+
{% endfor %}
15+
</div>
16+
</div>
17+
</section>
18+

_includes/nav.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<a class="page-scroll nav-link" id="nav-link-effort" href="{{'#effort' | relative_url }}" onclick="onClick(event);">Effort</a>
8282
</li>
8383
<li class="nav-item mx-lg-3">
84-
<a class="page-scroll nav-link" id="nav-link-resources" href="{{'#resources' | relative_url }}" onclick="onClick(event);">Resources</a>
84+
<a class="page-scroll nav-link" id="nav-link-documentation" href="{{'#documentation' | relative_url }}" onclick="onClick(event);">Documentation</a>
8585
</li>
8686
</div>
8787
</nav>

_includes/resources.html

Lines changed: 0 additions & 13 deletions
This file was deleted.

_layouts/home.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{% include breaker.html %}
2020
{% include effort.html %}
2121
{% include breaker.html %}
22-
{% include resources.html %}
22+
{% include documentation.html %}
2323
{% include breaker.html %}
2424
{% include footer.html %}
2525
<script src="/assets/js/main.js"></script>

docker-compose.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ version: '3'
22
services:
33
serve:
44
image: jekyll/jekyll:latest
5-
command: jekyll serve --watch --force_polling --verbose
5+
command: jekyll serve --watch --force_polling --verbose --trace
66
ports:
7-
- 4000:4000
7+
- "4000:4000"
8+
environment:
9+
JEKYLL_UID: $JEKYLL_UID
10+
JEKYLL_GID: $JEKYLL_GID
811
volumes:
912
- .:/srv/jekyll

0 commit comments

Comments
 (0)