Skip to content

Commit ee23a78

Browse files
genomics-geekgenomics-geek
committed
fixed templating issue. Carried over templates from before CRA2
1 parent 666e93e commit ee23a78

4 files changed

Lines changed: 19 additions & 145 deletions

File tree

‎config/settings/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
# https://docs.djangoproject.com/en/dev/ref/settings/#databases
4242

4343
DATABASES = {
44-
'default': env.db('DATABASE_URL', default='sqlite:///exome_slicer'),
44+
'default': env.db('DATABASE_URL', default='sqlite:///exome_slicer.db'),
4545
}
4646
DATABASES['default']['ATOMIC_REQUESTS'] = True
4747

‎exome_slicer/templates/base.html‎

Lines changed: 18 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,46 @@
11
{% load static i18n %}<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<!-- Allows you to inject head elements here -->
5+
{% block head %}
6+
47
<meta charset="utf-8">
58
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>{% block title %}Exome Slicer{% endblock title %}</title>
9+
<title>{% block title %}Nexus{% endblock title %}</title>
710
<meta name="viewport" content="width=device-width, initial-scale=1.0">
8-
<meta name="description" content="">
9-
<meta name="author" content="">
11+
<meta name="description" content="Nexus - DGD Clinical Genome Interpretation Platform">
12+
<meta name="author" content="Michael A. Gonzalez">
1013

1114
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
1215
<!--[if lt IE 9]>
1316
<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
1417
<![endif]-->
1518

16-
<link rel="icon" href="{% static 'images/favicons/favicon.ico' %}">
17-
1819
{% block css %}
19-
20-
<!-- Latest compiled and minified Bootstrap 4.1.1 CSS -->
21-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
22-
20+
21+
<!-- Latest compiled and minified Bootstrap 4 beta CSS -->
2322

2423
<!-- Your stuff: Third-party CSS libraries go here -->
25-
26-
<!-- This file stores project-specific CSS -->
27-
28-
<link href="{% static 'css/project.css' %}" rel="stylesheet">
29-
30-
31-
{% endblock %}
3224

25+
{% endblock css %}
26+
27+
{% endblock head %}
3328
</head>
3429

3530
<body>
36-
37-
<div class="mb-1">
38-
<nav class="navbar navbar-expand-md navbar-light bg-light">
39-
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
40-
<span class="navbar-toggler-icon"></span>
41-
</button>
42-
<a class="navbar-brand" href="{% url 'home' %}">Exome Slicer</a>
43-
44-
<div class="collapse navbar-collapse" id="navbarSupportedContent">
45-
<ul class="navbar-nav mr-auto">
46-
<li class="nav-item active">
47-
<a class="nav-link" href="{% url 'home' %}">Home <span class="sr-only">(current)</span></a>
48-
</li>
49-
<li class="nav-item">
50-
<a class="nav-link" href="{% url 'about' %}">About</a>
51-
</li>
52-
{% if request.user.is_authenticated %}
53-
<li class="nav-item">
54-
{# URL provided by django-allauth/account/urls.py #}
55-
<a class="nav-link" href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a>
56-
</li>
57-
<li class="nav-item">
58-
{# URL provided by django-allauth/account/urls.py #}
59-
<a class="nav-link" href="{% url 'account_logout' %}">{% trans "Sign Out" %}</a>
60-
</li>
61-
{% else %}
62-
<li class="nav-item">
63-
{# URL provided by django-allauth/account/urls.py #}
64-
<a id="sign-up-link" class="nav-link" href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a>
65-
</li>
66-
<li class="nav-item">
67-
{# URL provided by django-allauth/account/urls.py #}
68-
<a id="log-in-link" class="nav-link" href="{% url 'account_login' %}">{% trans "Sign In" %}</a>
69-
</li>
70-
{% endif %}
71-
</ul>
72-
</div>
73-
</nav>
74-
75-
</div>
76-
77-
<div class="container">
78-
79-
{% if messages %}
80-
{% for message in messages %}
81-
<div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %}">{{ message }}</div>
82-
{% endfor %}
83-
{% endif %}
84-
85-
{% block content %}
86-
<p>Use this document as a way to quick start any new project.</p>
87-
{% endblock content %}
88-
89-
</div> <!-- /container -->
90-
91-
{% block modal %}{% endblock modal %}
31+
<!-- Allows you to inject body content here -->
32+
{% block body %}
33+
{% endblock body %}
9234

9335
<!-- Le javascript
9436
================================================== -->
9537
<!-- Placed at the end of the document so the pages load faster -->
9638
{% block javascript %}
97-
98-
<!-- Required by Bootstrap v4.1.1 -->
99-
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
100-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
101-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
102-
10339
<!-- Your stuff: Third-party javascript libraries go here -->
104-
105-
106-
<!-- place project specific Javascript in this file -->
107-
108-
<script src="{% static 'js/project.js' %}"></script>
109-
110-
11140
{% endblock javascript %}
41+
42+
<!-- Google Analytics goes here -->
43+
{% block google_analytics %}
44+
{% endblock google_analytics %}
11245
</body>
11346
</html>
114-

‎exome_slicer/templates/index.html‎

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

‎exome_slicer/templates/react-base.html‎

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

0 commit comments

Comments
 (0)