Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Created new page for Help entry & respective contents added in navbar & homepage + favicons updated #58

Merged
merged 5 commits into from
Apr 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions fight_covid19/maps/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
TemplateView.as_view(template_name="maps/one_shot_health_form.html"),
name="oneshot_health_entry",
),
path(
"help_entry",
TemplateView.as_view(template_name="maps/help_entry_form.html"),
name="health_entry",
),
path(
"generate_unique_key",
map_views.GenerateUniqueKey.as_view(),
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fight_covid19/static/images/favicons/favicon.ico
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 43 additions & 20 deletions fight_covid19/templates/base-uikit.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,10 @@
<!--[if lt IE 9]>
<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
<![endif]-->
<link rel="icon" type="image/png" sizes="48x48" href="{% static 'images/favicons/48_48.png' %}">
<link rel="icon" type="image/png" sizes="57x57" href="{% static 'images/favicons/57_57.png' %}">
<link rel="icon" type="image/png" sizes="60x60" href="{% static 'images/favicons/60_60.png' %}">
<link rel="icon" type="image/png" sizes="70x70" href="{% static 'images/favicons/70_70.png' %}">
<link rel="icon" type="image/png" sizes="120x120" href="{% static 'images/favicons/120_120.png' %}">
<link rel="icon" type="image/png" sizes="144x144" href="{% static 'images/favicons/144_144.png' %}">
<link rel="icon" type="image/png" sizes="150x150" href="{% static 'images/favicons/150_150.png' %}">
<link rel="icon" type="image/png" sizes="1152" href="{% static 'images/favicons/152_152.png' %}">
<link rel="icon" type="image/png" sizes="180x180" href="{% static 'images/favicons/180_180.png' %}">
<link rel="icon" type="image/png" sizes="192x192" href="{% static 'images/favicons/192_192.png' %}">
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'images/favicons/apple-touch-icon.png' %}">
<link rel="icon" type="image/png" sizes="32x32" href="{% static 'images/favicons/favicon-32x32.png' %}">
<link rel="icon" type="image/png" sizes="16x16" href="{% static 'images/favicons/favicon-16x16.png' %}">
<link rel="manifest" href="{% static 'images/favicons/site.webmanifest' %}">
<link href="https://fonts.googleapis.com/css?family=Raleway:900&display=swap" rel="stylesheet">
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-162832950-1"></script>
Expand Down Expand Up @@ -104,35 +98,64 @@
<div class="navbar-brand">
<a class="navbar-item" href="{% url 'home' %}"
style="font-size:1.4rem;text-transform: uppercase;letter-spacing: 1px;">
<img src="{% static 'images/favicons/48_48.png' %}"> &nbsp;Health Of India
<img src="{% static 'images/favicons/hoi-logo-new.png' %}"> &nbsp;Health Of India
</a>
<div id="navbarBurger" class="navbar-burger burger" data-target="navMenuDocumentation">
<span></span>
<span></span>
<span></span>
</div>
</div>

<div id="navMenuDocumentation" class="navbar-menu">
<div class="navbar-end">
<a href="{% url 'maps:oneshot_health_entry' %}" class="navbar-item">
Record Your Health
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link">
Record
</a>

<a href="{% url 'maps' %}" class="navbar-item">

<div class="navbar-dropdown">
<a href="{% url 'maps:oneshot_health_entry' %}" class="navbar-item">
Record Your Health
</a>
<a href="{% url 'maps:health_entry' %}" class="navbar-item">
Record A Help
</a>
</div>
</div>
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link">
Maps
</a>

<div class="navbar-dropdown">
<a href="{% url 'maps' %}" class="navbar-item">
Patient Map
</a>
<a href="{% url 'maps' %}" class="navbar-item">
Grocery Map
</a>
<a href="{% url 'maps' %}" class="navbar-item">
Medical Map
</a>
<a href="{% url 'maps' %}" class="navbar-item">
Food Centers Map
</a>
</div>
</div>


<a href="{% url 'about' %}" class="navbar-item">
About
</a>
<a href="{% url 'news:index' %}" class="navbar-item">
COVID-19 News
</a>
<a href="/#pnm" class="navbar-item">
Patients Near Me
Help Near Me
</a>


</div>
</div>
</div>
Expand Down Expand Up @@ -180,4 +203,4 @@
{% endblock javascript %}
</body>

</html>
</html>
Loading