🚀 RELEASE: Version 2.0

README.md

@@ -24,7 +24,7 @@ Si vous aimez le projet, vous pouvez aider à **le faire connaître** en utilisa
 
 Les dernières versions publiées : [https://github.com/Divlo/FunctionProject/releases](https://github.com/Divlo/FunctionProject/releases)
 
-Le projet est disponible sur [function.divlo.fr](https://function.divlo.fr/) (actuellement en version 1.0).
+Le projet est disponible sur [function.divlo.fr](https://function.divlo.fr/) (actuellement en version 2.0).
 
 ## 🚀 Open Source 
 

api/controllers/admin.js

@@ -69,6 +69,7 @@ exports.getFunctionBySlug = (req, res, next) => {
             if (!result) {
                 return errorHandling(next, { message: "La fonction n'existe pas.", statusCode: 404 });
             }
+            try { result.utilizationForm = JSON.parse(result.utilizationForm); } catch {}
             return res.status(200).json(result);
         })
         .catch((error) => {
@@ -185,7 +186,7 @@ exports.putFunctionForm = async (req, res, next) => {
         if (!resultFunction) {
             return errorHandling(next, { message: "La fonction n'existe pas.", statusCode: 404 });
         }
-        resultFunction.utilizationForm = form;
+        resultFunction.utilizationForm = JSON.stringify(form);
         const result = await resultFunction.save();
         return res.status(200).json(result);
     } catch (error) {

api/controllers/functions.js

@@ -51,6 +51,7 @@ exports.getFunctionBySlug = (req, res, next) => {
             if (!result) {
                 return errorHandling(next, { message: "La fonction n'existe pas.", statusCode: 404 });
             }
+            try { result.utilizationForm = JSON.parse(result.utilizationForm); } catch {}
             return res.status(200).json(result);
         })
         .catch((error) => {

api/models/categories.js

@@ -2,12 +2,6 @@ const Sequelize = require('sequelize');
 const sequelize = require('../assets/utils/database');
 
 module.exports = sequelize.define('categorie', {
-    id: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        autoIncrement: true,
-        primaryKey: true
-    },
     name: {
         type: Sequelize.STRING,
         allowNull: false,

api/models/comments.js

@@ -2,12 +2,6 @@ const Sequelize = require('sequelize');
 const sequelize = require('../assets/utils/database');
 
 module.exports = sequelize.define('comment', {
-    id: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        autoIncrement: true,
-        primaryKey: true
-    },
     message: {
         type: Sequelize.TEXT,
         allowNull: false

api/models/favorites.js

@@ -1,11 +1,4 @@
 const Sequelize = require('sequelize');
 const sequelize = require('../assets/utils/database');
 
-module.exports = sequelize.define('favorite', {
+module.exports = sequelize.define('favorite', {});
-    id: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        autoIncrement: true,
-        primaryKey: true
-    }
-});

api/models/functions.js

@@ -2,12 +2,6 @@ const Sequelize = require('sequelize');
 const sequelize = require('../assets/utils/database');
 
 module.exports = sequelize.define('function', {
-    id: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        autoIncrement: true,
-        primaryKey: true
-    },
     title: {
         type: Sequelize.STRING,
         allowNull: false,
@@ -34,7 +28,7 @@ module.exports = sequelize.define('function', {
         allowNull: true
     },
     utilizationForm: {
-        type: Sequelize.JSON,
+        type: Sequelize.TEXT,
         allowNull: true
     },
     isOnline: {

api/models/quotes.js

@@ -2,12 +2,6 @@ const Sequelize = require('sequelize');
 const sequelize = require('../assets/utils/database');
 
 module.exports = sequelize.define('quote', {
-    id: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        autoIncrement: true,
-        primaryKey: true
-    },
     quote: {
         type: Sequelize.STRING,
         allowNull: false,

api/models/short_links.js

@@ -2,12 +2,6 @@ const Sequelize = require('sequelize');
 const sequelize = require('../assets/utils/database');
 
 module.exports = sequelize.define('short_link', {
-    id: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        autoIncrement: true,
-        primaryKey: true
-    },
     url: {
         type: Sequelize.TEXT,
         allowNull: false,

api/models/tasks.js

@@ -2,12 +2,6 @@ const Sequelize = require('sequelize');
 const sequelize = require('../assets/utils/database');
 
 module.exports = sequelize.define('task', {
-    id: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        autoIncrement: true,
-        primaryKey: true
-    },
     task: {
         type: Sequelize.STRING,
         allowNull: false,

api/models/users.js

@@ -2,12 +2,6 @@ const Sequelize = require('sequelize');
 const sequelize = require('../assets/utils/database');
 
 module.exports = sequelize.define('user', {
-    id: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        autoIncrement: true,
-        primaryKey: true
-    },
     name: {
         type: Sequelize.STRING,
         allowNull: false,

website/pages/users/newPassword.js

@@ -68,9 +68,13 @@ const newPassword = (props) => {
     );
 }
 
-newPassword.getInitialProps = (context) => {
+export async function getServerSideProps(context) {
     if (context.query.token != undefined) {
-        return context.query;
+        return {
+            props: {
+                token: context.query.token
+            }
+        };
     }
     return redirect(context, '/404');
 }