Merge pull request doubtfire-lms#763 from doubtfire-lms/add-tii-integ…

…ration Merge Add-tii-integration into development
thoth-tech · Nov 20, 2023 · 5be88eb · 5be88eb
2 parents 514cfc0 + b0d3232
commit 5be88eb
Show file tree

Hide file tree

Showing 364 changed files with 37,338 additions and 18,956 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -2,11 +2,15 @@
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
 
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-> 0.5%
-last 2 versions
+last 2 Chrome versions
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
 Firefox ESR
-not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -21,6 +21,7 @@
         "@angular-eslint/no-empty-lifecycle-method": "warn",
         "@angular-eslint/component-class-suffix": "warn",
         "@angular-eslint/no-output-on-prefix": "warn",
+        "@typescript-eslint/no-inferrable-types": "off",
         "@angular-eslint/directive-selector": [
           "warn",
           {

diff --git a/.prettierignore b/.prettierignore
@@ -2,3 +2,5 @@ package.json
 package-lock.json
 yarn.lock
 dist
+build
+e2e
diff --git a/.prettierrc b/.prettierrc
@@ -1,8 +1,9 @@
 {
-  "printWidth": 120,
-  "singleQuote": true,
-  "useTabs": false,
+  "printWidth": 100,
   "tabWidth": 2,
-  "semi": true,
-  "bracketSpacing": true
+  "tabs": false,
+  "singleQuote": true,
+  "semicolon": true,
+  "quoteProps": "preserve",
+  "bracketSpacing": false
 }
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -8,12 +8,10 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-browser-sync');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
+
   grunt.loadNpmTasks('grunt-contrib-coffee');
   grunt.loadNpmTasks('grunt-sass');
   grunt.loadNpmTasks('grunt-contrib-connect');
-  grunt.loadNpmTasks('grunt-conventional-changelog');
   grunt.loadNpmTasks('grunt-bump');
   grunt.loadNpmTasks('grunt-coffeelint');
   grunt.loadNpmTasks('grunt-karma');
@@ -339,21 +337,6 @@ module.exports = function (grunt) {
       }
   },
 
-    /**
-     * Minify the sources!
-     */
-    uglify: {
-      compile: {
-        options: {
-          banner: '<%= meta.banner %>',
-          mangle: false
-        },
-        files: {
-          '<%= concat.compile_js.dest %>': '<%= concat.compile_js.dest %>'
-        }
-      }
-    },
-
     /**
      * `jshint` defines the rules of our linter as well as which files we
      * should check. This file, all javascript sources, and all our unit tests
@@ -702,7 +685,6 @@ module.exports = function (grunt) {
     'copy:compile_assets',
     'ngAnnotate',
     'concat',
-    'uglify',
     'index:compile'
   ]);
 

diff --git a/README.md b/README.md
diff --git a/angular.json b/angular.json
@@ -15,19 +15,20 @@
       },
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
             "outputPath": "dist",
             "index": "build/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "browser": "src/main.ts",
+            "polyfills": ["src/polyfills.ts"],
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
               "src/assets",
               "src/manifest.webmanifest"
             ],
             "styles": [
               "src/theme.scss",
+              "src/styles.scss",
               "./node_modules/bootstrap/dist/css/bootstrap.css",
               "./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css",
               "./build/assets/doubtfire.css",
@@ -47,14 +48,12 @@
               "node_modules/codemirror/lib/codemirror.js",
               "node_modules/codemirror/addon/display/placeholder.js",
               "node_modules/codemirror/mode/markdown/markdown.js",
-              "node_modules/showdown/dist/showdown.js"
+              "node_modules/showdown/dist/showdown.js",
+              "node_modules/canvas-confetti/dist/confetti.browser.js"
             ],
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
             "sourceMap": true,
-            "optimization": false,
-            "namedChunks": true
+            "optimization": false
           },
           "configurations": {
             "production": {
@@ -77,38 +76,31 @@
               "optimization": true,
               "outputHashing": "bundles",
               "sourceMap": false,
-              "namedChunks": false,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
-              "serviceWorker": true,
-              "ngswConfigPath": "ngsw-config.json"
+              "serviceWorker": "ngsw-config.json"
             },
             "development": {
-              "buildOptimizer": false,
               "optimization": false,
-              "vendorChunk": true,
               "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
+              "sourceMap": true
             }
           }
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "doubtfire:build"
+            "buildTarget": "doubtfire:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "doubtfire:build:production"
+              "buildTarget": "doubtfire:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "doubtfire:build"
+            "buildTarget": "doubtfire:build"
           }
         },
         "test": {

diff --git a/migration_progress.sh b/migration_progress.sh
@@ -1,3 +1,5 @@
+#!/bin/zsh
+
 function count_to_migrate() { grep -Ril --include \*.coffee "angular.module" ./src/app | sed 's/^/- [ ] /'; }
 function count_migrated() { grep -Ril --include \*.ts "@Component" ./src/app | sed 's/^/- [x] /';}
 function print_progress() { echo $1 / $2 components migrated; }