Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 9aaaa8b

Browse files
authored
Merge pull request #184 from VariantEffect/release/2.2.0
Release/2.2.0
2 parents 78370d3 + 79b699a commit 9aaaa8b

File tree

8 files changed

+250
-291
lines changed

8 files changed

+250
-291
lines changed

api/views.py

Lines changed: 222 additions & 182 deletions
Large diffs are not rendered by default.

data/main/site_info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"md_privacy": "",
77
"md_terms": "",
88
"md_usage_guide": "",
9-
"version": "2.1.0"
9+
"version": "2.2.0"
1010
}

main/templates/main/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ <h4 class="modal-title">Method description</h4>
9595
<a class="nav-link text-muted" href="{% url 'search:search' %}">Search</a>
9696
</li>
9797
<li class="nav-item">
98-
<a class="nav-link text-muted" href="{% url 'main:mavedb-documentation' %}">Documentation</a>
98+
<a class="nav-link text-muted" href="{% url 'main:docs-landing' %}">Documentation</a>
9999
</li>
100100
<li class="nav-item">
101101
<a class="nav-link text-muted" href="{% url 'api:api-root' %}">API</a>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{% extends "main/base.html" %}
2+
3+
{% block body %}
4+
<h1>Documentation Home</h1>
5+
<p>Welcome to the documentation page for MaveDB and its associated packages.</p>
6+
<ul>
7+
<li><a href="{% url 'main:mavedb-documentation' %}">MaveDB documentation homepage</a></li>
8+
<ul>
9+
<li>View project on <a href="https://github.com/VariantEffect/MaveDB">GitHub</a></li>
10+
</ul>
11+
<li><a href="{% url 'main:mavehgvs-documentation' %}">MAVE-HGVS documentation homepage</a></li>
12+
<ul>
13+
<li>View project on <a href="https://github.com/VariantEffect/mavehgvs">GitHub</a></li>
14+
<li>View project on <a href="https://pypi.org/project/mavehgvs/">PyPI</a></li>
15+
</ul>
16+
<li><a href="{% url 'main:mavetools-documentation' %}">MaveTools documentation homepage</a></li>
17+
<ul>
18+
<li>View project on <a href="https://github.com/VariantEffect/MaveTools">GitHub</a></li>
19+
<li>View project on <a href="https://pypi.org/project/mavetools/">PyPI</a></li>
20+
</ul>
21+
</ul>
22+
{% endblock %}

main/templates/main/documentation.html

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

main/urls.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
urlpatterns = [
1212
url(r"^$", views.home_view, name="home"),
13+
# ------------ Documentation landing page ---------------------- #
14+
url(r"^docs", views.documentation_view, name="docs-landing"),
1315
# ------------ MaveDB documentation ---------------------- #
1416
url(
1517
r"^docs/mavedb/$",

main/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def home_view(request):
5757
def documentation_view(request):
5858
return render(
5959
request,
60-
"main/documentation.html",
60+
"main/docs_landing.html",
6161
{"site_information": SiteInformation.get_instance()},
6262
)
6363

requirements/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ coverage==4.5.1
2121
idutils==1.1.8
2222
urllib3==1.26.5
2323
metapub==0.5.5
24-
lxml==4.6.3
24+
lxml==4.9.1
2525
psycopg2-binary==2.8.6
2626
pandas==1.1.2
2727
numpy==1.19.1

0 commit comments

Comments
 (0)