fcad-core-dragon 2.0.0-beta.1 → 2.0.0-beta.2

package/{.eslintrc.js → .eslintrc.cjs}

@@ -6,12 +6,7 @@ module.exports = {
     browser: true
   },
   plugins: ['prettier'],
-  extends: [
-    'plugin:vue/recommended',
-    'eslint:recommended',
-    'prettier',
-    '@vue/prettier'
-  ],
+  extends: ["eslint:recommended", "plugin:vue/vue3-recommended", "prettier"],
   rules: {
     // Only allow debugger in development
     'no-debugger': process.env.PRE_COMMIT ? 'error' : 'off',
@@ -23,10 +18,10 @@ module.exports = {
     'no-alert': 'off',
     //'vue/array-bracket-spacing': 'error',
     //'vue/block-spacing': 'error',
-   // 'vue/comma-dangle': ['error', 'never'],
+    // 'vue/comma-dangle': ['error', 'never'],
     //'vue/object-curly-spacing': ['error', 'always'],
-    'vue/no-v-for-template-key':'off',
-    'vue/valid-template-root':'off',
+    'vue/no-v-for-template-key': 'off',
+    'vue/valid-template-root': 'off',
     // 'vue/no-v-for-template-key-on-child':'off',
     'vue/component-name-in-template-casing': [
       'error',
@@ -35,16 +30,17 @@ module.exports = {
         ignores: []
       }
     ],
-    'vue/no-v-html':'off',
+    'vue/no-v-html': 'off',
     'prettier/prettier': [
       'error',
       {
         singleQuote: true,
-        semi: false,tabWidth: 2,
-        trailingComma: "none",
-        arrowParens: "always",
-        htmlWhitespaceSensitivity: "ignore",
-        endOfLine: 'auto',
+        semi: false,
+        tabWidth: 2,
+        trailingComma: 'none',
+        arrowParens: 'always',
+        htmlWhitespaceSensitivity: 'ignore',
+        endOfLine: 'auto'
       }
     ],
     'no-param-reassign': [0, { allowPassedByValue: true }],
@@ -64,12 +60,11 @@ module.exports = {
     'default-case': 'off',
     'no-plusplus': 'off',
     'no-loop-func': 'off',
-    'no-prototype-builtins':'off',
+    'no-prototype-builtins': 'off',
     'func-names': 'off',
-   'no-unused-vars': ["error", {"args": "none" , "ignoreRestSiblings": true }]
+    'no-unused-vars': ['error', { args: 'none', ignoreRestSiblings: true }]
   },
   parserOptions: {
-    parser: 'babel-eslint',
     sourceType: 'module'
   },
   overrides: [

package/bk.scss

@@ -0,0 +1,117 @@
+    
+
+    .navbar {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 10;
+      display: flex;
+      flex-direction: column;
+      flex-wrap: wrap;
+      align-content: start;
+      width: 67px;
+      height: 100%;
+    }
+
+    .module-wrapper {
+      width: 100%;
+      position: relative;
+
+      #wrapper-content {
+        width: 100%;
+        position: relative;
+        padding-right: 0 !important;
+        padding-left: 0 !important;
+
+        &.active {
+          overflow: hidden;
+        }
+
+        .box {
+          width: 100%;
+          height: 95%;
+
+          .app-page {
+            width: 100%;
+            margin-top: 60px;
+
+            .row {
+              width: 100%;
+              margin-right: 0;
+              margin-left: 0;
+            }
+          }
+        }
+      }
+
+      .app-comp-table-of-content {
+        display: -webkit-flex;
+        display: flex;
+        flex-direction: column;
+        flex-wrap: wrap;
+        position: absolute;
+        top: 0px;
+        min-height: 100%;
+        z-index: 1;
+      }
+    }
+
+    .app-nav {
+      .md-controller {
+        display: -webkit-flex;
+        display: flex;
+        flex-direction: row;
+        align-items: baseline;
+        //width: $widthPlayer;
+        width: 50%;
+
+        .ctrl-play {
+          display: -webkit-flex;
+          display: flex;
+          flex-direction: row;
+          align-items: baseline;
+          //width: $widthPlayer;
+          width: 50%;
+
+          #progress-bar {
+            display: block;
+            //width: $widthProgressBar;
+            width: 150px;
+            //height: $heigthProgressBar;
+            height: 10px;
+            position: relative;
+            overflow: hidden;
+
+            #progress {
+              display: block;
+              height: 100%;
+              background-color: red;
+            }
+
+            #progress-shaddow {
+              display: block;
+              height: 100%;
+              position: absolute;
+              top: 0px;
+              left: 0px;
+              z-index: -1;
+            }
+          }
+        }
+
+        .ctrl-subtitle {
+          //width: $widthCtrSubtitle;
+          width: 10%;
+        }
+
+        .ctrl-sound {
+          display: -webkit-flex;
+          display: flex;
+          flex-direction: row;
+          align-items: baseline;
+          justify-content: space-between;
+          //width: $widthCtrlSound;
+          width: 40%;
+        }
+      }
+    }

package/package.json

@@ -1,56 +1,40 @@
 {
   "name": "fcad-core-dragon",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "private": false,
+  "type": "module",
   "main": "./src/main.js",
   "config": {
     "projname": ""
   },
   "scripts": {
     "watch": "nodemon -e js,vue,html,json -x yalc push",
-    "build": "vue-cli-service build --target lib --name fcadCoreNext ./src/main.js",
-    "lint": "vue-cli-service lint",
+    "lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src",
     "vue": "vue"
   },
   "dependencies": {
-    "axios": "^0.27.2",
-    "core-js": "~3.9.1",
-    "crypto-js": "^4.0.0",
-    "gsap": "^3.12.2",
-    "idb": "^6.1.2",
-    "mobile-detect": "^1.4.4",
-    "portal-vue": "^2.1.7"
-  },
-  "peerDependencies": {
-    "vuex": "~3.0.1",
-    "vue-axios": "~3.3.7",
-    "vue-router": "~3.2.0",
-    "vue-i18n": "~8.26.3",
-    "vue": "~2.6.11"
+    "axios": "^1.6.8",
+    "gsap": "^3.12.5",
+    "idb": "^8.0.0",
+    "mobile-detect": "^1.4.5",
+    "portal-vue": "^2.1.7",
+    "vue-axios": "^3.5.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.11",
-    "@vue/cli-plugin-eslint": "^4.5.11",
-    "@vue/cli-service": "^4.5.11",
-    "@vue/eslint-config-prettier": "^5.0.0",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^6.7.2",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-config-prettier": "^6.12.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-vue": "^6.2.2",
-    "prettier": "^1.19.1",
-    "sass": "~1.26.5",
-    "sass-loader": "~8.0.2",
-    "vue-loader": "~15.9.8",
-    "vue-template-compiler": "~2.6.14",
-    "bootstrap-vue": "~2.21.2",
-    "vuex": "~3.0.1",
-    "vue-axios": "~3.3.7",
-    "vue-router": "~3.2.0",
-    "vue-i18n": "~8.26.3",
-    "vue": "~2.6.11"
+    "@vue/eslint-config-prettier": "^9.0.0",
+    "bootstrap-vue": "^2.23.1",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-vue": "^9.26.0",
+    "nodemon": "^3.1.0",
+    "prettier": "^3.2.5",
+    "prettier-eslint": "^16.3.0",
+    "vue": "~2.7.16",
+    "vue-i18n": "^8.28.2",
+    "vue-loader": "^15.11.1",
+    "vue-router": "^3.6.5",
+    "vuex": "~3.6.2"
   },
   "browserslist": [
     "> 1%",

package/src/$locales/en.json

@@ -3,7 +3,6 @@
     "accessibility":"Subtitles and text alternative",
     "alert_close":"Close this window",
     "back_to_branching":"Go back to the main page",
-    "back_to_first_page": "Go back to the first page",
     "back_to_menu": "Back to the menu",
     "btn_branch":"Explore this topic further",
     "cancel_pop": "Cancel",
@@ -15,15 +14,19 @@
     "full_screen_on": "Full-screen",
     "full_screen_off": "Exit full-screen",
     "go_to_conclusion": "Go to the lesson conclusion",
+    "go_to_next_page": "Go to the next page",
+    "go_to_previous_page": "Go to the previous page",
+    "go_to_first_page": "Go to the first page",
     "go_to_introduction": "Go to the lesson introduction",
     "go_to_branch":"Go to the next topic",
     "go_to_module_conclusion":"Go to the module conclusion",
     "go_to_lesson" : "Go to the next lesson",
     "go_to_menu": "Go to the lesson contents page",
+    "go_to_first_page": "Go to the first page",
     "hide_nav_bar": "Hide navigation bar",
-    "info": "infos",
+    "info": "Info",
     "instructions": "technical instruction",
-    "menu": "Lesson contents",
+    "menu": "Start",
     "menu_anchor": "Menu anchors",
     "menu_item": {
       "end": "Pick up where I left off",
@@ -31,14 +34,14 @@
       "start": "Start the lesson"
     },
     "mute": "Mute",
-    "next": "Go to the next page",
+    "next": "Next",
     "next_activity": "Go to the next activity",
     "note_call":"Revenir plus haut",
     "note_call_in_page":"Atteindre la note de bas de page",
     "pause": "Pause",
     "play": "Play",
     "previous": "Go to the previous page",
-    "previous_activity": "Go to the previous activity",
+    "previous_activity": "Previous",
     "quiz_close_no_answer": "Stay and complete the exercise",
     "quiz_confirm": "Confirm",
     "quiz_multiple": "my answers",
@@ -116,6 +119,10 @@
     "first_option_dropdown": "Choose an option",
     "no_answer": "You did not answer.",
     "no_attempts": "You have no more attempts.",
+    "loading_state_msg":"Loading. Please wait...",
+    "progress_card":"État d’avancement:",
+    "recall_done":"You have answered the question :",
+    "recall_undone":"You have not answered the question.",
     "skip_content":"Skip to the main content."
   },
   "popup": {
@@ -130,9 +137,11 @@
   "text": {
     "activity": "Activity",
     "activity_title":"My activitys",
-    "activity_progress":"Progress in the activity",
+    "activity_progress":"Progress status:",
     "anchors":"Section",
+    "carousel":"Carousel",
     "conclusion": "Conclusion",
+    "complete":"Completed",
     "introduction": "Introduction",
     "lesson": "Lesson",
     "quiz":"Words to complete the sentence",
@@ -143,17 +152,20 @@
       "for_download_file_name":"file",
       "for_title_btn_progress":"Click to discover the content"
     },
-    "title_note": "Notes",
-    "title_credit": "Credits",
-    "title_end_activity": "What do you wish to do?",
-    "title_link_bas": "Revenir plus haut",
-    "title_link_call": "Atteindre la note de bas de page",
-    "no_credit":"Il n'y a pas de crédit.",
+    "of":"of",
     "no_note":"Il n'y a pas de note.",
-    "you_are_here":"You are in : ",
-    "carousel":"Carousel",
+    "no_credit":"Il n'y a pas de crédit.",
     "slide":"Slide",
-    "of":"of"
+    "title_note": "Note(s)",
+    "title_credit": "Credit(s)",
+    "err_credit": "Le texte de la page ne comporte pas d’appel de note correspondant à cette note-ci. Un appel de note doit être ajouté.",
+    "title_end_activity": "What do you wish to do?",
+    "title_link_bas": "Go back to the text",
+    "title_link_call": "Go to the footnote",
+    "toc":"Contents",
+    "title_content_view":"Lesson contents",
+    "transcript": "Transcript",
+    "you_are_here":"You are in : "
   },
   "user_settings": {
     "autoplay": "Automatic playback of multimedia content",
@@ -165,7 +177,9 @@
   "quizState":{
     "selected":"Option selected",
     "goodAnswer":"Good answer",
-    "badAnswer":"Wrong answer"
+    "badAnswer":"Wrong answer",
+    "neutralAnswer":"Neutral answer",
+    "answers" : "Answer choices"
   },
   "a11y_sr":{
     "time": {

package/src/$locales/fr.json

@@ -3,7 +3,6 @@
     "accessibility":"Sous-titres et version texte",
     "alert_close":"Fermer cette fenêtre",
     "back_to_branching":"Retourner à la page d’origine",
-    "back_to_first_page": "Retourner à la première page",
     "back_to_menu": "Retour au sommaire",
     "btn_branch":"Approfondir ce sujet",
     "cancel_pop": "Annuler",
@@ -15,15 +14,19 @@
     "full_screen_on": "Plein-écran",
     "full_screen_off": "Quitter le mode plein-écran",
     "go_to_conclusion": "Aller à la conclusion de la leçon",
+    "go_to_first_page": "Aller à la première page",
+    "go_to_next_page": "Aller à la page suivante",
+    "go_to_previous_page": "Aller à la page précédente",
     "go_to_introduction": "Aller à l'introduction de la leçon",
     "go_to_branch":"Aller au sujet suivant",
     "go_to_module_conclusion":"Aller à la conclusion du module",
     "go_to_lesson" : "Aller à la leçon suivante",
     "go_to_menu": "Aller au sommaire de la leçon",
+    "go_to_first_page": "Aller à la première page",
     "hide_nav_bar": "Masquer la barre de navigation",
     "instructions": "consigne technique",
-    "info": "infos",
-    "menu": "Menu",
+    "info": "Info",
+    "menu": "Début",
     "menu_anchor": "Menu des ancres",
     "menu_item": {
       "end": "Reprendre là où j’étais",
@@ -31,13 +34,13 @@
       "start": "Commencer la leçon"
     },
     "mute": "Désactiver le son",
-    "next": "Aller à la page suivante",
+    "next": "Suivant",
     "next_activity": "Aller à l’activité suivante",
     "note_call":"Revenir plus haut",
     "note_call_in_page":"Atteindre la note de bas de page",
     "pause": "Pause",
     "play": "Jouer",
-    "previous": "Aller à la page précédente",
+    "previous": "Précédent",
     "previous_activity": "Aller à l’activité précédente",
     "quiz_close_no_answer": "Rester et faire cet exercice",
     "quiz_confirm": "Confirmer",
@@ -53,7 +56,7 @@
     "skip_nav_content": "Passer au contenu principal",
     "subtitle_off": "Masquer les sous-titres",
     "subtitle_on": "Afficher les sous-titres",
-    "submit": "Vérifier ma réponse",
+    "submit": "Valider",
     "stay_on_page":"Rester sur cette page",
     "switch_off": "off",
     "switch_on": "on",
@@ -116,8 +119,11 @@
     "first_option_dropdown": "Choisir une option",
     "no_answer": "Vous n'avez pas répondu.",
     "no_attempts": "Vous n'avez plus d'essai.",
+    "loading_state_msg":"Chargement. Veuillez patienter...",
+    "progress_card":"État d’avancement:",
+    "recall_done":"Vous avez répondu précédemment à la question :",
+    "recall_undone":"Vous n'avez pas répondu à la question concernée.",
     "skip_content":"Passer au contenu principal"
-
   },
   "popup": {
     "text_congratulation": "Félicitation",
@@ -132,10 +138,11 @@
   "text": {
     "activity": "Activité",
     "activity_title": "Mes activités",
-    "activity_progress":"Progression dans l'activité",
+    "activity_progress":"État d’avancement :",
     "anchors":"Section",
     "carousel":"Carrousel",
     "conclusion": "Conclusion",
+    "complete":"Terminé",
     "introduction": "Introduction",
     "lesson": "Leçon",
     "quiz": "Mot complétant la phrase",
@@ -146,15 +153,19 @@
       "for_download_file_name": "fichier",
       "for_title_btn_progress": "Cliquer pour découvrir le contenu"
     },
-    "title_note": "Notes",
-    "title_credit": "Crédits",
-    "title_end_activity": "Que souhaitez-vous faire?",
-    "title_link_bas": "Revenir plus haut",
-    "title_link_call": "Atteindre la note de bas de page",
-    "no_credit": "Il n'y a pas de crédit.",
-    "no_note": "Il n'y a pas de note.",
     "of":"de",
+    "no_note": "Il n'y a pas de note.",
+    "no_credit": "Il n'y a pas de crédit.",
     "slide":"Diapositive",
+    "title_note": "Note(s)",
+    "title_credit": "Source(s)",
+    "err_credit": "Le texte de la page ne comporte pas d’appel de note correspondant à cette note-ci. Un appel de note doit être ajouté.",
+    "title_end_activity": "Que souhaitez-vous faire?",
+    "title_link_bas": "Revenir au texte",
+    "title_link_call": "Accéder à la note",
+    "title_content_view":"sommaire des activités",
+    "toc":"Table des matières",
+    "transcript": "Transcription",
     "you_are_here":"Vous êtes dans : "
   },
   "user_settings": {
@@ -167,7 +178,9 @@
   "quizState":{
     "selected":"Réponse sélectionnée",
     "goodAnswer":"Bonne réponse",
-    "badAnswer":"Mauvaise réponse"
+    "badAnswer":"Mauvaise réponse",
+    "neutralAnswer":"Réponse neutre",
+    "answers" : "Choix de réponses"
   },
   "a11y_sr":{
     "time": {