remove content in header, upgrade deps

2 years ago · 8c03b1c521
parent 7f01e2de60
commit 8c03b1c521
6 changed files with 520 additions and 392 deletions
--- a/composer.lock
+++ b/composer.lock
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@ -4,9 +4,9 @@
    <meta charset="UTF-8">
    <base href="/">
    <meta content="width=device-width, initial-scale=1" name="viewport"/>
-    <link href="favicon.ico" rel="icon" type="image/x-icon"/>
-    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap" rel="stylesheet"/>
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/>
+    <link href="img/logo.png" rel="icon" type="image/png"/>
+{#    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap" rel="stylesheet"/>#}
+{#    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/>#}
    <link rel="stylesheet" href="styles.css" crossorigin="anonymous">

    <title>{% block title %}{{ WEBSITE_NAME }}{% endblock %}</title>
@ -22,7 +22,7 @@
    <div class="container">

        {% block body %}
-
+coucou!
        {% endblock %}
    </div>
 {% endblock %}
--- a/templates/index.html.twig
+++ b/templates/index.html.twig
@ -12,56 +12,58 @@
            rel="icon"
            type="image/x-icon">

-    <link
-            rel="stylesheet"
-            href="assets/css/bootstrap-reboot-4.3.1.css">
+{#    <link#}
+{#            rel="stylesheet"#}
+{#            href="/assets/css/bootstrap-reboot-4.3.1.css">#}
    <link
            rel="stylesheet"
            href="styles.css"
            crossorigin="anonymous">
 </head>
 <body>
-<app-root></app-root>
+<app-root>
+    Chargement de l'app, hopla!
+</app-root>
 <footer id="main-footer" class="text-center">
    <a href="https://framagit.org/tykayn/date-poll-api">
        Sources
        <i class="fa fa-gitlab"></i>
    </a>
-    <a href="mailto:contact@cipherbliss.com">
+    <a href="mailto:contact+framadate@cipherbliss.com">
        Contact
        <i class="fa fa-envelope"></i>
    </a>
 </footer>
-<script
-        src="runtime-es2018.js"
-        crossorigin="anonymous"
-        type="module"></script>
-<script
-        src="runtime-es5.js"
-        crossorigin="anonymous"
-        nomodule
-        defer></script>
-<script
-        src="polyfills-es5.js"
-        crossorigin="anonymous"
-        nomodule
-        defer></script>
-<script
-        src="polyfills-es2018.js"
-        crossorigin="anonymous"
-        type="module"></script>
-<script
-        src="scripts.js"
-        crossorigin="anonymous"
-        defer></script>
-<script
-        src="main-es2018.js"
-        crossorigin="anonymous"
-        type="module"></script>
-<script
-        src="main-es5.js"
-        crossorigin="anonymous"
-        nomodule
-        defer></script>
+{#<script#}
+{#        src="/runtime-es2018.js"#}
+{#        crossorigin="anonymous"#}
+{#        type="module"></script>#}
+{#<script#}
+{#        src="runtime-es5.js"#}
+{#        crossorigin="anonymous"#}
+{#        nomodule#}
+{#        defer></script>#}
+{#<script#}
+{#        src="polyfills-es5.js"#}
+{#        crossorigin="anonymous"#}
+{#        nomodule#}
+{#        defer></script>#}
+{#<script#}
+{#        src="polyfills-es2018.js"#}
+{#        crossorigin="anonymous"#}
+{#        type="module"></script>#}
+{#<script#}
+{#        src="scripts.js"#}
+{#        crossorigin="anonymous"#}
+{#        defer></script>#}
+{#<script#}
+{#        src="main-es2018.js"#}
+{#        crossorigin="anonymous"#}
+{#        type="module"></script>#}
+{#<script#}
+{#        src="main-es5.js"#}
+{#        crossorigin="anonymous"#}
+{#        nomodule#}
+{#        defer></script>#}
 </body>
 </html>
--- a/templates/poll/index.html.twig
+++ b/templates/poll/index.html.twig
@ -33,7 +33,7 @@
                <td>{{ poll.title }}</td>
                <td>{{ poll.customUrl }}</td>
                <td>{{ poll.description }}</td>
-                <td>{{ poll.creationDate ? poll.creationDate|date('Y-m-d H:i:s') : '' }}</td>
+                <td>{{ poll.createdAt ? poll.createdAt|date('Y-m-d H:i:s') : '' }}</td>
                <td>{{ poll.expiracyDate ? poll.expiracyDate|date('Y-m-d H:i:s') : '' }}</td>
                <td>{{ poll.kind }}</td>
                <td>{{ poll.allowedAnswers ? poll.allowedAnswers|join(', ') : '' }}</td>
--- a/templates/poll/show.html.twig
+++ b/templates/poll/show.html.twig
@ -25,7 +25,7 @@
            </tr>
            <tr>
                <th>CreationDate</th>
-                <td>{{ poll.creationDate ? poll.creationDate|date('Y-m-d H:i:s') : '' }}</td>
+                <td>{{ poll.createdAt ? poll.createdAt|date('Y-m-d H:i:s') : '' }}</td>
            </tr>
            <tr>
                <th>ExpiracyDate</th>
--- a/templates/split/header.html.twig
+++ b/templates/split/header.html.twig
@ -1,20 +1,6 @@
 {% block header %}

-    <header class="bg-purple-300 p-4 block">
-        <div class="container">
+{#                            <img src="{{ WEBSITE_LOGO }}" alt="logo">#}
+{#                            {{ WEBSITE_NAME }}#}

-            <nav>
-                <ul>
-                    <li>
-                        <a class="btn button rounded bg-purple-200 p-2" href="/">
-                            <i class="fa fa-home"></i>
-                            <img src="{{ WEBSITE_LOGO }}" alt="logo">
-                            {{ WEBSITE_NAME }}
-
-                        </a>
-                    </li>
-                </ul>
-            </nav>
-        </div>
-    </header>
 {% endblock %}