Skip to content

GitLab

Rex Dri
Rex Dri
Commit 5ecc475c authored by Florent Chehab's avatar Florent Chehab
Browse files
Options

feat(favicon): added website favicon 

* Added all declinaison of favicon
* Linked it in the html template
* Updated folder structure for base_app static assets
* Added credit section in the documentation
* Credited author of the icon

Fixes #89
parent a4d682fe
Pipeline #37116 passed with stages
              in 4 minutes and 55 seconds
              Hide whitespace changes
              Inline Side-by-side
              Showing with 31 additions and 10 deletions
              backend/base_app/settings/main.py
              View file @ 5ecc475c
              ......@@ -100,7 +100,7 @@ REST_FRAMEWORK = {
              WEBPACK_LOADER = {
              "DEFAULT": {
              "BUNDLE_DIR_NAME": "base_app/bundles/",
              "BUNDLE_DIR_NAME": "base_app/frontend_dist/bundles/",
              "STATS_FILE": join(REPO_ROOT_DIR, "frontend/webpack-stats.json"),
              }
              }
              ......
              backend/base_app/static/base_app deleted 120000 → 0
              View file @ a4d682fe
              ../../../frontend/dist
              \ No newline at end of file
              backend/base_app/static/base_app/frontend_dist 0 → 120000
              View file @ 5ecc475c
              ../../../../frontend/dist
              \ No newline at end of file
              backend/base_app/templates/index.html
              View file @ 5ecc475c
              {% load render_bundle from webpack_loader %}
              {% load static %}
              <!DOCTYPE html>
              <html style="font-size:14">
              <head>
              <meta
              charset="utf-8"
              name="viewport"
              content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no"
              />
              <title>Outgoing REX</title>
              charset="utf-8"
              name="viewport"
              content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no"
              />
              <!-- Favicon hell -->
              <link rel="apple-touch-icon-precomposed" sizes="57x57" href="{% static '/base_app/favicon/apple-touch-icon-57x57.png' %}" />
              <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% static '/base_app/favicon/apple-touch-icon-114x114.png' %}" />
              <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% static '/base_app/favicon/apple-touch-icon-72x72.png' %}" />
              <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% static '/base_app/favicon/apple-touch-icon-144x144.png' %}" />
              <link rel="apple-touch-icon-precomposed" sizes="60x60" href="{% static '/base_app/favicon/apple-touch-icon-60x60.png' %}" />
              <link rel="apple-touch-icon-precomposed" sizes="120x120" href="{% static '/base_app/favicon/apple-touch-icon-120x120.png' %}" />
              <link rel="apple-touch-icon-precomposed" sizes="76x76" href="{% static '/base_app/favicon/apple-touch-icon-76x76.png' %}" />
              <link rel="apple-touch-icon-precomposed" sizes="152x152" href="{% static '/base_app/favicon/apple-touch-icon-152x152.png' %}" />
              <link rel="icon" type="image/png" href="{% static '/base_app/favicon/favicon-196x196.png' %}" sizes="196x196" />
              <link rel="icon" type="image/png" href="{% static '/base_app/favicon/favicon-96x96.png' %}" sizes="96x96" />
              <link rel="icon" type="image/png" href="{% static '/base_app/favicon/favicon-32x32.png' %}" sizes="32x32" />
              <link rel="icon" type="image/png" href="{% static '/base_app/favicon/favicon-16x16.png' %}" sizes="16x16" />
              <link rel="icon" type="image/png" href="{% static '/base_app/favicon/favicon-128.png' %}" sizes="128x128" />
              <!-- End of favicon hell -->
              <title>REX-DRI</title>
              </head>
              <body>
              ......@@ -17,9 +33,9 @@
              </div>
              </body>
              {% load static %}
              <link rel="stylesheet" href="{% static '/base_app/leaflet-dist/leaflet.css' %}"/>
              <link rel="stylesheet" href="{% static '/base_app/custom_leaflet.css' %}"/>
              <link rel="stylesheet" href="{% static '/base_app/frontend_dist/leaflet-dist/leaflet.css' %}"/>
              <link rel="stylesheet" href="{% static '/base_app/frontend_dist/custom_leaflet.css' %}"/>
              <script>
              var __AppUserId = {{ user.pk }};
              ......
              documentation/Other/credits.md 0 → 100644
              View file @ 5ecc475c
              Credits
              =================
              - Favicon: Icon made by [Smashicons](https://www.flaticon.com/authors/smashicons) from [flaticon.com](https://www.flaticon.com/). It is licensed under the [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/) license.
              documentation/_sidebar.md
              View file @ 5ecc475c
              ......@@ -37,3 +37,4 @@
              * [About this documentation](Other/this_doc.md)
              * [Contributions](Other/contributions.md)
              * [Credits](Other/credits.md)
              Markdown is supported
              0% or
              You are about to add 0 people to the discussion. Proceed with caution.
              Finish editing this message first!
              Please register or to comment