diff --git a/.gitignore b/.gitignore
index d165798..1ebcb4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,17 +15,17 @@ nodemon.json
/front/node_modules/
/front/webpack.config*
-/front/public/.htaccess*
-/front/public/.htpasswd
+/front/public/www/.htaccess*
+/front/public/www/.htpasswd
!/front/webpack.config.js
-/front/public/img/quizs/
-/front/public/JS/*
-/front/public/quiz/
-/front/public/quizs/
-/front/public/themes/
-/front/public/index.html
-/front/public/CGV-CGU.html
-/front/public/mentions-legales.html
-/front/public/robots-*.txt
-/front/public/WikiLerni-pub.asc
-/front/public/*.xml
\ No newline at end of file
+/front/public/www/img/quizs/
+/front/*/www/JS/*
+/front/public/www/quiz/
+/front/public/www/quizs/
+/front/public/www/themes/
+/front/public/www/index.html
+/front/public/www/CGV-CGU.html
+/front/public/www/mentions-legales.html
+/front/*/robots-*.txt
+/front/*/WikiLerni-pub.asc
+/front/public/www/*.xml
\ No newline at end of file
diff --git a/config/illustrations.js b/config/illustrations.js
index 4e0cdac..27f4216 100644
--- a/config/illustrations.js
+++ b/config/illustrations.js
@@ -14,5 +14,5 @@ module.exports =
},
// files upload tempory dir
dirIllustrationsTmp : "temp",
- dirIllustrations: "front/public/img/quizs"
+ dirIllustrations: "front/public/www/img/quizs"
};
\ No newline at end of file
diff --git a/config/main.js b/config/main.js
index f93a283..893c533 100644
--- a/config/main.js
+++ b/config/main.js
@@ -9,7 +9,7 @@ instance.tokenPrivateKey=process.env.TOKEN_PRIVATE_KEY;
instance.maxLoginFail=parseInt(process.env.MAX_LOGIN_FAILS,10);
instance.loginFailTimeInMinutes=parseInt(process.env.LOGIN_FAIL_TIME_IN_MINUTES,10);
instance.dirCache="datas";
-instance.dirHTML="front/public";
+instance.dirHTML="front/public/www";
instance.dirTmp="datas/tmp";
instance.dirTmpLogin="datas/tmp/logins";
diff --git a/config/questionnaires.js b/config/questionnaires.js
index f0767e9..f433ab3 100644
--- a/config/questionnaires.js
+++ b/config/questionnaires.js
@@ -56,10 +56,10 @@ module.exports =
dirCacheTags : "datas/questionnaires/tags",
dirCacheUsersQuestionnaires : "datas/users/questionnaires",
// Emplacement des fichiers HTML générés :
- dirHTMLGroups : "front/public/quiz/gp",
- dirHTMLQuestionnaires : "front/public/quiz",
- dirHTMLNews : "front/public/quizs",
- dirHTMLTags : "front/public/quizs",
+ dirHTMLGroups : "front/public/www/quiz/gp",
+ dirHTMLQuestionnaires : "front/public/www/quiz",
+ dirHTMLNews : "front/public/www/quizs",
+ dirHTMLTags : "front/public/www/quizs",
// Idem mais pour urls :
dirWebGroups : "quiz/gp",
dirWebQuestionnaires : "quiz",
diff --git a/controllers/questionnaire.js b/controllers/questionnaire.js
index 53649b9..694546a 100644
--- a/controllers/questionnaire.js
+++ b/controllers/questionnaire.js
@@ -407,7 +407,6 @@ exports.checkQuestionnairesNeedToBePublished = async (req, res, next) =>
const creaQuestionnaireJson = async (id) =>
{
const db=require("../models/index");
- console.log("j'arrive ici avec "+id);
const Questionnaire=await db["Questionnaire"].findByPk(id);
if(Questionnaire)
{
@@ -543,6 +542,9 @@ const creaQuestionnaireHTML = async (id, preview=false) =>
// deux possibilités :
// -- si élément d'un groupe de quiz : juste le texte sans les questions
// -- si quiz automone : toutes les infos
+
+ console.log("je passe par ici pour créer le fichier du quiz "+id);
+
const questionnaire=await searchQuestionnaireById(id, true);
if(!questionnaire)
return false;
diff --git a/front/package-lock.json b/front/admin/package-lock.json
similarity index 100%
rename from front/package-lock.json
rename to front/admin/package-lock.json
diff --git a/front/admin/package.json b/front/admin/package.json
new file mode 100644
index 0000000..5828ec1
--- /dev/null
+++ b/front/admin/package.json
@@ -0,0 +1,36 @@
+{
+ "name": "wikilerni",
+ "version": "0.2.0",
+ "description": "Admin pages of WikiLerni web application",
+ "main": "index.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "webpack --mode production",
+ "start": "webpack serve --no-live-reload"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://forge.chapril.org/Fab_Blab/WikiLerni"
+ },
+ "keywords": [
+ "quiz",
+ "wikipédia",
+ "questionnaire",
+ "e-learning"
+ ],
+ "author": "Fabrice PENHOËT",
+ "license": "GPL-3.0-or-later",
+ "devDependencies": {
+ "@babel/core": "^7.15.5",
+ "@babel/preset-env": "^7.15.6",
+ "@webpack-cli/serve": "^1.5.2",
+ "babel-loader": "^8.2.2",
+ "babel-polyfill": "^6.26.0",
+ "webpack": "^5.56.1",
+ "webpack-cli": "^4.8.0",
+ "webpack-dev-server": "^4.3.0"
+ },
+ "browserslist": [
+ "> 1%"
+ ]
+}
\ No newline at end of file
diff --git a/front/src/config/general.js b/front/admin/src/config/general.js
similarity index 100%
rename from front/src/config/general.js
rename to front/admin/src/config/general.js
diff --git a/front/src/connection.js b/front/admin/src/connection.js
similarity index 93%
rename from front/src/connection.js
rename to front/admin/src/connection.js
index 8cca535..dcb0e50 100644
--- a/front/src/connection.js
+++ b/front/admin/src/connection.js
@@ -6,24 +6,23 @@
/// Le connexion peut se faire directement ici via la saisie d'un mot de passe ou via l'envoi d'un token par e-mail.
// Fichier de configuration tirés du backend :
-import { apiUrl, availableLangs, siteUrl, theme } from "../../config/instance.js";
+import { apiUrl, availableLangs, siteUrl, theme } from "../../../config/instance.js";
const lang=availableLangs[0];
-import { connectionRoute, getLoginLinkRoute, userRoutes } from "../../config/users.js";
-const configTemplate = require("../../views/"+theme+"/config/"+lang+".js");
+import { connectionRoute, getLoginLinkRoute, userRoutes } from "../../../config/users.js";
+const configTemplate = require("../../../views/"+theme+"/config/"+lang+".js");
// Importation des fonctions utiles au script :
import { getLocaly, removeLocaly, saveLocaly } from "./tools/clientstorage.js";
import { addElement } from "./tools/dom.js";
import { helloDev } from "./tools/everywhere.js";
import { getDatasFromInputs } from "./tools/forms.js";
-import { isEmpty } from "../../tools/main";
-import { loadMatomo } from "./tools/matomo.js";
+import { isEmpty } from "../../../tools/main";
import { checkAnswerDatas, checkSession, getTimeDifference, setSession } from "./tools/users.js";
// Dictionnaires :
-const { serverError } = require("../../lang/"+lang+"/general");
-const { alreadyConnected, needChooseLoginWay } = require("../../lang/"+lang+"/user");
+const { serverError } = require("../../../lang/"+lang+"/general");
+const { alreadyConnected, needChooseLoginWay } = require("../../../lang/"+lang+"/user");
// Principaux éléments du DOM manipulés :
const myForm = document.getElementById("connection");
@@ -43,11 +42,11 @@ const initialise = async () =>
saveLocaly("message", { message: alreadyConnected, color:"info" });// pour l'afficher sur la page suivante
const user=getLocaly("user", true);
const homePage=user.status+"HomePage";
- window.location.assign("/"+configTemplate[homePage]);
+ console.log("./"+configTemplate[homePage]);
+ window.location.assign("./"+configTemplate[homePage]);
}
else
{
- loadMatomo();
myForm.style.display="block";
if(!isEmpty(getLocaly("message")))
{
diff --git a/front/src/deconnection.js b/front/admin/src/deconnection.js
similarity index 78%
rename from front/src/deconnection.js
rename to front/admin/src/deconnection.js
index 639f5e9..f35edc4 100644
--- a/front/src/deconnection.js
+++ b/front/admin/src/deconnection.js
@@ -3,7 +3,7 @@
/// On se contente ici de supprimer la session stockée côté client
// Fichier de configuration côté client :
-import { apiUrl, availableLangs, theme } from "../../config/instance.js";
+import { apiUrl, availableLangs, theme } from "../../../config/instance.js";
const lang=availableLangs[0];
// Importation des fonctions utile au script :
@@ -12,8 +12,8 @@ import { addElement } from "./tools/dom.js";
import { helloDev } from "./tools/everywhere.js";
// Dictionnaires :
-const { serverError } = require("../../lang/"+lang+"/general");
-const { byebyeMessage } = require("../../lang/"+lang+"/user");
+const { serverError } = require("../../../lang/"+lang+"/general");
+const { byebyeMessage } = require("../../../lang/"+lang+"/user");
const divResponse = document.getElementById("response");
diff --git a/front/src/homeManager.js b/front/admin/src/homeManager.js
similarity index 91%
rename from front/src/homeManager.js
rename to front/admin/src/homeManager.js
index 9eaa431..2874e47 100644
--- a/front/src/homeManager.js
+++ b/front/admin/src/homeManager.js
@@ -9,24 +9,24 @@
/// Temporairement, c'est ici aussi que l'on peut régénérer tout le HTML -> à terme dans homeAdmin !
// Fichier de configuration côté client :
-import { apiUrl, availableLangs, theme } from "../../config/instance.js";
+import { apiUrl, availableLangs, theme } from "../../../config/instance.js";
const lang=availableLangs[0];
-import { getAdminStats, userRoutes } from "../../config/users.js";
-import { getListNextQuestionnaires, questionnaireRoutes, regenerateHTML } from "../../config/questionnaires.js";
-const configTemplate = require("../../views/"+theme+"/config/"+lang+".js");
+import { getAdminStats, userRoutes } from "../../../config/users.js";
+import { getListNextQuestionnaires, questionnaireRoutes, regenerateHTML } from "../../../config/questionnaires.js";
+const configTemplate = require("../../../views/"+theme+"/config/"+lang+".js");
// Fonctions utiles au script :
import { getLocaly, removeLocaly } from "./tools/clientstorage.js";
import { addElement } from "./tools/dom.js";
-import { helloDev, updateAccountLink } from "./tools/everywhere.js";
-import { dateFormat, isEmpty, replaceAll } from "../../tools/main";
+import { helloDev } from "./tools/everywhere.js";
+import { dateFormat, isEmpty, replaceAll } from "../../../tools/main";
import { checkSession } from "./tools/users.js";
// Dictionnaires :
-const { notAllowed, serverError, statsAdmin } = require("../../lang/"+lang+"/general");
-const { nextDateWithoutQuestionnaire, nextQuestionnairesList, questionnaireNeedBeCompleted } = require("../../lang/"+lang+"/questionnaire");
-const { welcomeMessage } = require("../../lang/"+lang+"/user");
+const { notAllowed, serverError, statsAdmin } = require("../../../lang/"+lang+"/general");
+const { nextDateWithoutQuestionnaire, nextQuestionnairesList, questionnaireNeedBeCompleted } = require("../../../lang/"+lang+"/questionnaire");
+const { welcomeMessage } = require("../../../lang/"+lang+"/user");
// Principaux éléments du DOM manipulés :
const divMain = document.getElementById("main-content");
@@ -45,7 +45,6 @@ const initialise = async () =>
if(isConnected)
{
const user=getLocaly("user", true);
- updateAccountLink(user.status, configTemplate);
addElement(divMessage, "h2", welcomeMessage.replace("#NAME", user.name));
divMain.style.display="block";
if(!isEmpty(getLocaly("message")))
@@ -143,4 +142,4 @@ const initialise = async () =>
console.error(e);
}
}
-initialise();
\ No newline at end of file
+initialise();
\ No newline at end of file
diff --git a/front/src/manageGroups.js b/front/admin/src/manageGroups.js
similarity index 94%
rename from front/src/manageGroups.js
rename to front/admin/src/manageGroups.js
index 4410697..aa554f7 100644
--- a/front/src/manageGroups.js
+++ b/front/admin/src/manageGroups.js
@@ -6,24 +6,24 @@
/// Si pas d'id passé par l'url, on affiche un formulaire vide permettant d'en saisir un nouveau.
// Fichiers de configuration :
-import { apiUrl, availableLangs, siteUrl, theme } from "../../config/instance.js";
+import { apiUrl, availableLangs, siteUrl, theme } from "../../../config/instance.js";
const lang=availableLangs[0];
-const configQuestionnaires = require("../../config/questionnaires.js");
-const configTemplate = require("../../views/"+theme+"/config/"+lang+".js");
+const configQuestionnaires = require("../../../config/questionnaires.js");
+const configTemplate = require("../../../views/"+theme+"/config/"+lang+".js");
// Fonctions :
import { getLocaly, removeLocaly } from "./tools/clientstorage.js";
import { addElement } from "./tools/dom.js";
-import { helloDev, updateAccountLink } from "./tools/everywhere.js";
+import { helloDev } from "./tools/everywhere.js";
import { empyForm, getDatasFromInputs, setAttributesToInputs } from "./tools/forms.js";
-import { dateFormat, isEmpty, replaceAll } from "../../tools/main";
+import { dateFormat, isEmpty, replaceAll } from "../../../tools/main";
import { getUrlParams } from "./tools/url.js";
import { checkSession } from "./tools/users.js";
// Dictionnaires :
-const { addOkMessage, serverError } = require("../../lang/"+lang+"/general");
-const { groupQuestionnairesList, groupQuestionnairesListWithout, infosGroupForAdmin, searchWithoutResult } = require("../../lang/"+lang+"/group");
-const { needBeConnected } = require("../../lang/"+lang+"/user");
+const { addOkMessage, serverError } = require("../../../lang/"+lang+"/general");
+const { groupQuestionnairesList, groupQuestionnairesListWithout, infosGroupForAdmin, searchWithoutResult } = require("../../../lang/"+lang+"/group");
+const { needBeConnected } = require("../../../lang/"+lang+"/user");
// Principaux éléments du DOM manipulés :
const btnNewGroup = document.getElementById("wantNewGroup");
@@ -116,7 +116,6 @@ const initialise = async () =>
if(isConnected)
{
const user=getLocaly("user", true);
- updateAccountLink(user.status, configTemplate);// lien "Compte" menu header template
divMain.style.display="block";
if(!isEmpty(getLocaly("message")))
{
diff --git a/front/src/manageQuestionnaires.js b/front/admin/src/manageQuestionnaires.js
similarity index 90%
rename from front/src/manageQuestionnaires.js
rename to front/admin/src/manageQuestionnaires.js
index 0e888e2..01be07d 100644
--- a/front/src/manageQuestionnaires.js
+++ b/front/admin/src/manageQuestionnaires.js
@@ -7,30 +7,30 @@
/// Si pas d'id passé par l'url, on affiche un formulaire vide permettant de saisir un nouveau quiz.
// Fichiers de configuration :
-import { apiUrl, availableLangs, theme } from "../../config/instance.js";
+import { apiUrl, availableLangs, theme } from "../../../config/instance.js";
const lang=availableLangs[0];
-const config = require("../../config/instance.js");
-const configIllustrations = require("../../config/illustrations.js");
-const configLinks = require("../../config/links.js");
-const configQuestionnaires = require("../../config/questionnaires.js");
-const configTemplate = require("../../views/"+theme+"/config/"+lang+".js");
+const config = require("../../../config/instance.js");
+const configIllustrations = require("../../../config/illustrations.js");
+const configLinks = require("../../../config/links.js");
+const configQuestionnaires = require("../../../config/questionnaires.js");
+const configTemplate = require("../../../views/"+theme+"/config/"+lang+".js");
// Fonctions :
import { getLocaly, removeLocaly } from "./tools/clientstorage.js";
import { addElement } from "./tools/dom.js";
-import { helloDev, updateAccountLink } from "./tools/everywhere.js";
+import { helloDev } from "./tools/everywhere.js";
import { empyAndHideForm, getDatasFromInputs, setAttributesToInputs } from "./tools/forms.js";
-import { dateFormat, isEmpty } from "../../tools/main";
+import { dateFormat, isEmpty } from "../../../tools/main";
import { getUrlParams } from "./tools/url.js";
import { checkSession } from "./tools/users.js";
// Dictionnaires :
-const { addOkMessage, deleteBtnTxt, serverError, updateBtnTxt } = require("../../lang/"+lang+"/general");
-const { addIllustrationTxt, defaultAlt, introNoIllustration, introTitleForIllustration } = require("../../lang/"+lang+"/illustration");
-const { addLinkTxt, defaultValueForLink, introNoLink, introTitleForLink } = require("../../lang/"+lang+"/link");
-const { addQuestionTxt, introNoQuestion, introTitleForQuestion } = require("../../lang/"+lang+"/question");
-const { needGroupIfRank, nextDateWithoutQuestionnaire, nextQuestionnairesList, questionnaireNeedBeCompleted, searchQuestionnaireWithNoResult } = require("../../lang/"+lang+"/questionnaire");
-const { needBeConnected } = require("../../lang/"+lang+"/user");
+const { addOkMessage, deleteBtnTxt, serverError, updateBtnTxt } = require("../../../lang/"+lang+"/general");
+const { addIllustrationTxt, defaultAlt, introNoIllustration, introTitleForIllustration } = require("../../../lang/"+lang+"/illustration");
+const { addLinkTxt, defaultValueForLink, introNoLink, introTitleForLink } = require("../../../lang/"+lang+"/link");
+const { addQuestionTxt, introNoQuestion, introTitleForQuestion } = require("../../../lang/"+lang+"/question");
+const { needGroupIfRank, nextDateWithoutQuestionnaire, nextQuestionnairesList, questionnaireNeedBeCompleted, searchQuestionnaireWithNoResult } = require("../../../lang/"+lang+"/questionnaire");
+const { needBeConnected } = require("../../../lang/"+lang+"/user");
// Principaux éléments du DOM manipulés :
const btnNewQuestionnaire = document.getElementById("wantNewQuestionnaire");
@@ -196,7 +196,7 @@ const showIllustrationInfos = (Illustrations, token) =>
addElement(divIllustrations, "h2", introTitleForIllustration);
let listIllustrations="";
for(let i in Illustrations)
- listIllustrations+="!["+defaultAlt+"]("+configTemplate.illustrationDir+Illustrations[i].url+")
"+updateBtnTxt+" "+deleteBtnTxt+"";
+ listIllustrations+="!["+defaultAlt+"]("+config.siteUrl+configTemplate.illustrationDir+Illustrations[i].url+")
"+updateBtnTxt+" "+deleteBtnTxt+"";
if(listIllustrations === "")
listIllustrations=""+introNoIllustration+"";
addElement(divIllustrations, "ul", listIllustrations, "", [], "", false);// ! à intégrer d'abord dans le DOM pour pouvoir ajouter les Listeners ensuite
@@ -457,48 +457,6 @@ const showFormQuestionnaireInfos = (id, token) =>
xhrGetInfos.send();
}
-/*
-// Affiche les questionnaires bientôt publiés.
-const showNextQuestionnaires = (token) =>
-{
- const xhrNextQuestionnaires = new XMLHttpRequest();
- xhrNextQuestionnaires.open("GET", apiUrl+configQuestionnaires.questionnaireRoutes+configQuestionnaires.getListNextQuestionnaires);
- xhrNextQuestionnaires.onreadystatechange = function()
- {
- if (this.readyState == XMLHttpRequest.DONE)
- {
- let response=JSON.parse(this.responseText);
- if (this.status === 200 && Array.isArray(response.questionnaires))
- {
- let listHTML="", dayStr, optionsDayStr = { weekday: 'long'};
- for(let i in response.questionnaires)
- {
- dayStr=new Intl.DateTimeFormat(lang, optionsDayStr).format(new Date(response.questionnaires[i].datePublishing));
- listHTML+=""+dayStr+" "+dateFormat(response.questionnaires[i].datePublishing, "fr")+": "+response.questionnaires[i].title+"";
- if(response.questionnaires[i].isPublishable===false)
- listHTML+=" ("+questionnaireNeedBeCompleted+")";
- listHTML+="";
- }
- if(response.questionnaires.length!==0)
- addElement(divQuestionnaires, "h3", nextQuestionnairesList.replace("#NB", response.questionnaires.length));
- addElement(helpPublishingAt, "em", nextDateWithoutQuestionnaire+dateFormat(new Date(response.dateNeeded), "fr"));
- addElement(divQuestionnaires, "ul", listHTML, "", "", "", false);
- for(let i in response.questionnaires)
- {
- document.getElementById("questionnaire_"+response.questionnaires[i].id).addEventListener("click", function(e)
- {
- e.preventDefault();
- showFormQuestionnaireInfos(e.target.id.split("_")[1], token);
- window.location.assign("#questionnaires");
- });
- }
- }// ajouter gestion erreurs reçues du serveur ?
- }
- }
- xhrNextQuestionnaires.setRequestHeader("Authorization", "Bearer "+token);
- xhrNextQuestionnaires.send();
-}*/
-
const initialise = async () =>
{
try
@@ -513,8 +471,6 @@ const initialise = async () =>
removeLocaly("message");
}
const user=getLocaly("user", true);
- /// Mise à jour du lien "compte" du header (plus utile)
- /// updateAccountLink(user.status, configTemplate);
// Initialisation des formulaires :
setAttributesToInputs(configQuestionnaires, formSearch);
setAttributesToInputs(configQuestionnaires.Questionnaire, formQuestionnaire);
diff --git a/front/src/manageUsers.js b/front/admin/src/manageUsers.js
similarity index 97%
rename from front/src/manageUsers.js
rename to front/admin/src/manageUsers.js
index 67cd370..d462542 100644
--- a/front/src/manageUsers.js
+++ b/front/admin/src/manageUsers.js
@@ -10,24 +10,24 @@
/// - attribution d'un parrain à un utilisateur (via un moteur de recherche). Déjà prévu par le contrôleur.
// Fichier de configuration côté client :
-import { apiUrl, availableLangs, theme } from "../../config/instance.js";
+import { apiUrl, availableLangs, theme } from "../../../config/instance.js";
const lang=availableLangs[0];
-const configUsers = require("../../config/users.js");
-const configTemplate = require("../../views/"+theme+"/config/"+lang+".js");
+const configUsers = require("../../../config/users.js");
+const configTemplate = require("../../../views/"+theme+"/config/"+lang+".js");
// Fonctions utiles au script :
import { getLocaly, removeLocaly } from "./tools/clientstorage.js";
import { addElement } from "./tools/dom.js";
-import { helloDev, updateAccountLink } from "./tools/everywhere.js";
+import { helloDev } from "./tools/everywhere.js";
import { empyForm, getDatasFromInputs, setAttributesToInputs } from "./tools/forms.js";
-import { dateFormat, getPassword, isEmpty, replaceAll } from "../../tools/main";
+import { dateFormat, getPassword, isEmpty, replaceAll } from "../../../tools/main";
import { getUrlParams } from "./tools/url.js";
import { checkSession } from "./tools/users.js";
// Dictionnaires :
-const { addOkMessage, serverError } = require("../../lang/"+lang+"/general");
-const { infosAdminGodfather, infosAdminNbGodChilds, infosUserForAdmin, needBeConnected, searchUsersWithoutResult } = require("../../lang/"+lang+"/user");
-const { infosExpiratedAdmin, infosNbDaysAdmin, infosPaymentsAdmin, isNotValided } = require("../../lang/"+lang+"/subscription");
+const { addOkMessage, serverError } = require("../../../lang/"+lang+"/general");
+const { infosAdminGodfather, infosAdminNbGodChilds, infosUserForAdmin, needBeConnected, searchUsersWithoutResult } = require("../../../lang/"+lang+"/user");
+const { infosExpiratedAdmin, infosNbDaysAdmin, infosPaymentsAdmin, isNotValided } = require("../../../lang/"+lang+"/subscription");
// Principaux éléments du DOM manipulés :
const divMain = document.getElementById("main-content");
@@ -56,7 +56,6 @@ const initialise = async () =>
if(isConnected)
{
const user=getLocaly("user", true);
- updateAccountLink(user.status, configTemplate);
divMain.style.display="block";
if(!isEmpty(getLocaly("message")))
{
diff --git a/front/src/tools/clientstorage.js b/front/admin/src/tools/clientstorage.js
similarity index 100%
rename from front/src/tools/clientstorage.js
rename to front/admin/src/tools/clientstorage.js
diff --git a/front/src/tools/dom.js b/front/admin/src/tools/dom.js
similarity index 95%
rename from front/src/tools/dom.js
rename to front/admin/src/tools/dom.js
index 4758e7f..c42cccc 100644
--- a/front/src/tools/dom.js
+++ b/front/admin/src/tools/dom.js
@@ -1,4 +1,4 @@
-import { isEmpty } from "../../../tools/main";
+import { isEmpty } from "../../../../tools/main";
// Fonction associant les attributs fournis à un champ de formulaire
export const addElement = (eltParent, eltType, eltContent="", eltId="", eltClass=[], eltAttributes={}, replace=true) =>
diff --git a/front/src/tools/everywhere.js b/front/admin/src/tools/everywhere.js
similarity index 55%
rename from front/src/tools/everywhere.js
rename to front/admin/src/tools/everywhere.js
index dc22468..67f90c7 100644
--- a/front/src/tools/everywhere.js
+++ b/front/admin/src/tools/everywhere.js
@@ -3,12 +3,4 @@ export const helloDev = () =>
{
console.log("**** Hello les devs :-)\nLe code source de WikiLerni est libre et vous pouvez le trouver à cette adresse :\nhttps://forge.chapril.org/Fab_Blab/WikiLerni\nBonne lecture ! ****");
return true;
-}
-
-export const updateAccountLink = (status, configTemplate) =>
-{
- //const link=document.getElementById("accountHeadLink");
- //const homePage=status+"HomePage";
- //link.href="/"+configTemplate[homePage];
- //console.log("je suis connecté");
}
\ No newline at end of file
diff --git a/front/src/tools/forms.js b/front/admin/src/tools/forms.js
similarity index 96%
rename from front/src/tools/forms.js
rename to front/admin/src/tools/forms.js
index c3df966..88efe4a 100644
--- a/front/src/tools/forms.js
+++ b/front/admin/src/tools/forms.js
@@ -1,4 +1,4 @@
-import { isEmpty } from "../../../tools/main";
+import { isEmpty } from "../../../../tools/main";
// Fonction associant les attributs fournis à un champ de formulaire
export const setAttributesToInputs = (inputsConf, myForm) =>
diff --git a/front/src/tools/url.js b/front/admin/src/tools/url.js
similarity index 90%
rename from front/src/tools/url.js
rename to front/admin/src/tools/url.js
index 38b9ca9..c4ff6e8 100644
--- a/front/src/tools/url.js
+++ b/front/admin/src/tools/url.js
@@ -1,4 +1,4 @@
-import { isEmpty } from "../../../tools/main";
+import { isEmpty } from "../../../../tools/main";
// Fonction récupérant les paramètres passés par l'url
export const getUrlParams = () =>
diff --git a/front/src/tools/users.js b/front/admin/src/tools/users.js
similarity index 95%
rename from front/src/tools/users.js
rename to front/admin/src/tools/users.js
index 8611102..009493f 100644
--- a/front/src/tools/users.js
+++ b/front/admin/src/tools/users.js
@@ -1,12 +1,12 @@
-import { apiUrl, availableLangs, siteUrl, theme } from "../../../config/instance.js";
+import { apiUrl, availableLangs, siteUrl, theme } from "../../../../config/instance.js";
const lang=availableLangs[0];
-const configTemplate = require("../../../views/"+theme+"/config/"+lang+".js");
+const configTemplate = require("../../../../views/"+theme+"/config/"+lang+".js");
-import { checkLoginRoute, timeDifferenceMax, timeDifferenceMin, userRoutes } from "../../../config/users.js";
+import { checkLoginRoute, timeDifferenceMax, timeDifferenceMin, userRoutes } from "../../../../config/users.js";
-import { getLocaly, removeLocaly, saveLocaly } from "./clientstorage.js";
-import { isEmpty } from "../../../tools/main";
+import { getLocaly, removeLocaly, saveLocaly } from "../tools/clientstorage.js";
+import { isEmpty } from "../../../../tools/main";
export const getTimeDifference = () =>
{
diff --git a/front/src/tools/webportage.js b/front/admin/src/tools/webportage.js
similarity index 100%
rename from front/src/tools/webportage.js
rename to front/admin/src/tools/webportage.js
diff --git a/front/webpack.config.js b/front/admin/webpack.config.js
similarity index 52%
rename from front/webpack.config.js
rename to front/admin/webpack.config.js
index 30a47ce..bd594d8 100644
--- a/front/webpack.config.js
+++ b/front/admin/webpack.config.js
@@ -5,29 +5,17 @@ module.exports =
mode: "development",
entry:
{
- accountUser: "./src/accountUser.js",
connection: "./src/connection.js",
deconnection: "./src/deconnection.js",
- deleteValidation: "./src/deleteValidation.js",
- groupElement: "./src/groupElement.js",
homeManager: "./src/homeManager.js",
- homeUser: "./src/homeUser.js",
- index: "./src/index.js",
- loginLink: "./src/loginLink.js",
manageGroups: "./src/manageGroups.js",
manageQuestionnaires: "./src/manageQuestionnaires.js",
manageUsers: "./src/manageUsers.js",
- newLoginValidation: "./src/newLoginValidation.js",
- paymentPage: "./src/paymentPage.js",
- polyfill: "babel-polyfill",
- quiz: "./src/quiz.js",
- subscribe: "./src/subscribe.js",
- subscribeValidation: "./src/subscribeValidation.js",
- unsubscribe: "./src/unsubscribe.js"
+ polyfill: "babel-polyfill"
},
output:
{
- path: path.resolve(__dirname, "public"),
+ path: path.resolve(__dirname, "www"),
filename: "JS/[name].app.js",
},
module:
@@ -47,6 +35,6 @@ module.exports =
},
devServer:
{
- static: path.resolve(__dirname, "./public")
+ static: path.resolve(__dirname, "./www")
},
};
\ No newline at end of file
diff --git a/front/public/admin/gestion-groups.html b/front/admin/www/gestion-groups.html
similarity index 69%
rename from front/public/admin/gestion-groups.html
rename to front/admin/www/gestion-groups.html
index f1a219c..90413ae 100644
--- a/front/public/admin/gestion-groups.html
+++ b/front/admin/www/gestion-groups.html
@@ -6,21 +6,21 @@
Gestion des groupes de quizs
-
-
-
-
+
+
+
+
- 
+ 
@@ -28,13 +28,6 @@
-
-
Les groupes de quizs
@@ -68,14 +61,5 @@
-