From 96f18ead426e90c28a39d5f72134533ee616d06e Mon Sep 17 00:00:00 2001
From: Divlo <contact@divlo.fr>
Date: Mon, 23 Mar 2020 14:42:26 +0100
Subject: [PATCH] =?UTF-8?q?Hotfix=20et=20Mod=C3=A8le=20(backend)=20complet?=
 =?UTF-8?q?=20d'une=20fonction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controllers/functions.js                    |  5 ++++-
 api/models/functions.js                         | 16 ++++++++++++++--
 website/components/FunctionCard/FunctionCard.js |  7 +++++--
 website/components/HeadTag.js                   |  6 ++++++
 website/pages/functions/[slug].js               | 10 +++++-----
 website/pages/functions/index.js                |  5 ++---
 website/pages/index.js                          | 15 ++++++---------
 7 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/api/controllers/functions.js b/api/controllers/functions.js
index 7a1985d..11a462c 100644
--- a/api/controllers/functions.js
+++ b/api/controllers/functions.js
@@ -35,7 +35,10 @@ exports.getFunctions = (req, res, next) => {
         },
         include: [
             { model: Categories, attributes: ["name", "color"] }
-        ] 
+        ],
+        attributes: {
+            exclude: ["updatedAt", "utilizationForm", "article", "isOnline"]
+        }
     })
         .then((result) => {
             const { count, rows } = result;
diff --git a/api/models/functions.js b/api/models/functions.js
index 1e0c436..dc3fb6e 100644
--- a/api/models/functions.js
+++ b/api/models/functions.js
@@ -9,11 +9,11 @@ module.exports = sequelize.define('function', {
         primaryKey: true
     },
     title: {
-        type: Sequelize.STRING(255),
+        type: Sequelize.STRING,
         allowNull: false,
     },
     slug: {
-        type: Sequelize.STRING(255),
+        type: Sequelize.STRING,
         allowNull: false,
     },
     description: {
@@ -24,6 +24,18 @@ module.exports = sequelize.define('function', {
         type: Sequelize.STRING,
         allowNull: false
     },
+    type: {
+        type: Sequelize.STRING,
+        allowNull: false
+    },
+    article: {
+        type: Sequelize.TEXT,
+        allowNull: true
+    },
+    utilizationForm: {
+        type: Sequelize.JSON,
+        allowNull: true
+    },
     isOnline: {
         type: Sequelize.BOOLEAN,
         allowNull: false,
diff --git a/website/components/FunctionCard/FunctionCard.js b/website/components/FunctionCard/FunctionCard.js
index 49fd57f..27e4152 100644
--- a/website/components/FunctionCard/FunctionCard.js
+++ b/website/components/FunctionCard/FunctionCard.js
@@ -2,6 +2,7 @@ import Link from 'next/link';
 import { useState, forwardRef } from 'react';
 import Loader from '../Loader';
 import './FunctionCard.css';
+import { API_URL } from '../../config/config';
 
 const FunctionCard = forwardRef((props, ref) => {
 
@@ -11,9 +12,11 @@ const FunctionCard = forwardRef((props, ref) => {
         setIsLoading(false);
     }
 
+    const isFormOrArticle = (props.type === 'form' || props.type === 'article');
+
     return (
         <Link 
-            href={"/functions/[slug]"} 
+            href={isFormOrArticle ? "/functions/[slug]" : `/functions/${props.slug}`} 
             as={`/functions/${props.slug}`}
         >
             {/* FunctionCard a une hauteur pendant chargement */}
@@ -23,7 +26,7 @@ const FunctionCard = forwardRef((props, ref) => {
 
                 <div className={`FunctionCard__container ${isLoading ? "d-none" : ""}`}>
                     <div className="FunctionCard__top">
-                        <img onLoad={handleLoad} className="FunctionCard__image" alt={props.title} src={props.image} />
+                        <img onLoad={handleLoad} className="FunctionCard__image" alt={props.title} src={API_URL + props.image} />
                         <h2 className="FunctionCard__title">{props.title}</h2>
                         <p className="FunctionCard__description">{props.description}</p>
                     </div>
diff --git a/website/components/HeadTag.js b/website/components/HeadTag.js
index e7a6bf3..74fd2aa 100644
--- a/website/components/HeadTag.js
+++ b/website/components/HeadTag.js
@@ -34,4 +34,10 @@ const HeadTag = ({ title, image, description }) => (
     </Head>
 );
 
+HeadTag.defaultProps = {
+    title: "FunctionProject", 
+    description: "Apprenez la programmation grâce à l'apprentissage par projet alias fonction.",
+    image: "/images/FunctionProject_icon_small.png"
+}
+
 export default HeadTag;
\ No newline at end of file
diff --git a/website/pages/functions/[slug].js b/website/pages/functions/[slug].js
index ed1b4ac..0ddfa78 100644
--- a/website/pages/functions/[slug].js
+++ b/website/pages/functions/[slug].js
@@ -5,18 +5,18 @@ import { API_URL } from '../../config/config';
 
 const FunctionComponent = () => {
 
-    const router = useRouter();
+    const { slug } = useRouter().query;
 
     return (
         <Fragment>
             <HeadTag 
-                title={router.query.slug}
-                description={router.query.slug}
-                image={`${API_URL}/images/functions/${router.query.slug}.png`} 
+                title={slug}
+                description={slug}
+                image={`${API_URL}/images/functions/${slug}.png`} 
             />
             <div className="container text-center">
                 <div className="row justify-content-center">
-                    <h1>{router.query.slug}</h1>
+                    <h1>{slug}</h1>
                 </div>
             </div>
         </Fragment>
diff --git a/website/pages/functions/index.js b/website/pages/functions/index.js
index 68f858a..f876cef 100644
--- a/website/pages/functions/index.js
+++ b/website/pages/functions/index.js
@@ -3,7 +3,6 @@ import HeadTag from '../../components/HeadTag';
 import FunctionCard from '../../components/FunctionCard/FunctionCard';
 import Loader from '../../components/Loader';
 import '../../public/css/pages/functions.css';
-import { API_URL } from '../../config/config';
 import api from '../../config/api';
 import useAPI from '../../hooks/useAPI';
 
@@ -86,9 +85,9 @@ const Functions = () => {
                     {functionsData.rows.map((f, index) => {
                         // Si c'est le dernier élément
                         if (functionsData.rows.length === index + 1) {
-                            return <FunctionCard ref={lastFunctionCardRef} key={f.id} slug={f.slug} image={API_URL + f.image} title={f.title} description={f.description} category={f.categorie} publicationDate={new Date(f.createdAt).toLocaleDateString('fr-FR')} />;
+                            return <FunctionCard ref={lastFunctionCardRef} key={f.id} slug={f.slug} image={f.image} title={f.title} description={f.description} category={f.categorie} publicationDate={new Date(f.createdAt).toLocaleDateString('fr-FR')} type={f.type} />;
                         }
-                        return <FunctionCard key={f.id} slug={f.slug} image={API_URL + f.image} title={f.title} description={f.description} category={f.categorie} publicationDate={new Date(f.createdAt).toLocaleDateString('fr-FR')} />;
+                        return <FunctionCard key={f.id} slug={f.slug} image={f.image} title={f.title} description={f.description} category={f.categorie} publicationDate={new Date(f.createdAt).toLocaleDateString('fr-FR')} type={f.type} />;
                     })}
                 </div>
                 {isLoadingFunctions && <Loader />}
diff --git a/website/pages/index.js b/website/pages/index.js
index 40d669b..9f3f797 100644
--- a/website/pages/index.js
+++ b/website/pages/index.js
@@ -19,21 +19,17 @@ const Home = () => {
 
     return (
         <Fragment>
-            <HeadTag 
-                title="FunctionProject" 
-                description="FunctionProject est un projet créé par Divlo qui a pour but de rassembler plein de mini-programme permettant de faire plusieurs choses comme savoir la météo, générer un nombre aléatoire, etc." 
-                image="/images/FunctionProject_icon_small.png" 
-            />
+            <HeadTag />
              <div className="Home__container container-fluid text-center">
 
-                <AutoPlaySwipeableViews enableMouseEvents interval={30000}>
+                <AutoPlaySwipeableViews enableMouseEvents interval={15000}>
 
                     {/* Slide 1 */}
                     <div className="row align-items-center justify-content-center">
                         <div className="col-24">
                             <h1 className="Home__title-important important">FunctionProject</h1>
                             <p className="Home__description">
-                                Apprenez la programmation grâce à l'apprentissage par projet.<br/>
+                                Apprenez la programmation grâce à l'apprentissage par projet alias fonction.<br/>
                                 Découvrez la liste des fonctions disponibles : 
                             </p>
                         </div>
@@ -49,8 +45,9 @@ const Home = () => {
                         <div className="col-24">
                             <h1 className="Home__title-important important">Code Source</h1>
                             <p className="Home__description">
-                                Le partage est essentiel afin de progresser tous ensemble. <br/>
-                                Par conséquent le code source du projet est disponible sur mon profil GitHub :
+                                Le partage est essentiel afin de progresser. <br/>
+                                Par conséquent chaque fonction a un article expliquant comment elle fonctionne et <br/>
+                                le code source du projet est disponible sur mon profil GitHub :
                             </p>
                         </div>
                         <div className="col-24">