Merge branch 'feature/article' of https://codefirst.iut.uca.fr/git/roxane.rossetto/Php_RSS into feature/article

1 year ago · 90a0708218
parent 6259275f4e fa388c96e1
commit 90a0708218
5 changed files with 2 additions and 4 deletions
--- a/fluxRSS/index.php
+++ b/fluxRSS/index.php
@ -1,7 +1,7 @@
 <?php

 //chargement config
-require_once __DIR__ . '/config/config.php';
+require_once __DIR__ . '/src/config/config.php';

 require __DIR__ . '/vendor/autoload.php';

--- a/fluxRSS/src/templates/.DS_Store
+++ b/fluxRSS/src/templates/.DS_Store
--- a/fluxRSS/src/templates/erreur.html
+++ b/fluxRSS/src/templates/erreur.html
--- a/fluxRSS/src/templates/listArticle.html
+++ b/fluxRSS/src/templates/listArticle.html
@ -6,13 +6,11 @@
 </head>
 <body>
 {% for value in dVue.data %}
-    <p>
-        {% for article in value}
+        {% for article in value %}
            <p>
                {{article}}
            </p>
        {% endfor %}
-    </p>
 {% endfor %}
 </body>
 </html>
--- a/fluxRSS/src/templates/vuephp1.html
+++ b/fluxRSS/src/templates/vuephp1.html