Merge branch 'dev' into dev-starter

# Conflicts:
#	src/app/app.routing.ts
#	src/app/mock-api/common/navigation/data.ts
#	src/app/modules/admin/apps/academy/academy.service.ts
#	src/app/modules/admin/apps/academy/details/details.component.html
#	src/app/modules/admin/apps/academy/list/list.component.html
#	src/app/modules/admin/apps/mailbox/list/list.component.ts
#	src/app/modules/admin/docs/changelog/changelog.ts
#	src/app/modules/admin/pages/pricing/modern/modern.component.html
#	src/app/modules/admin/pages/pricing/simple/simple.component.html
#	src/app/modules/admin/pages/pricing/single/single.component.html
#	src/app/modules/admin/pages/pricing/table/table.component.html

.eslintrc.json

@@ -0,0 +1,95 @@
+{
+    "root": true,
+    "env": {
+        "es6": true
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018
+    },
+    "ignorePatterns": [
+        "projects/**/*"
+    ],
+    "overrides": [
+        {
+            "files": [
+                "*.ts"
+            ],
+            "parserOptions": {
+                "project": [
+                    "tsconfig.json"
+                ],
+                "createDefaultProgram": true
+            },
+            "extends": [
+                "plugin:@angular-eslint/ng-cli-compat",
+                "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
+                "plugin:@angular-eslint/template/process-inline-templates"
+            ],
+            "rules": {
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": "",
+                        "style": "kebab-case"
+                    }
+                ],
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": "",
+                        "style": "camelCase"
+                    }
+                ],
+                "@typescript-eslint/dot-notation": "off",
+                "@typescript-eslint/explicit-function-return-type": "error",
+                "@typescript-eslint/explicit-member-accessibility": [
+                    "off",
+                    {
+                        "accessibility": "explicit"
+                    }
+                ],
+                "@typescript-eslint/no-inferrable-types": "off",
+                "arrow-parens": [
+                    "error",
+                    "as-needed",
+                    {
+                        "requireForBlockBody": true
+                    }
+                ],
+                "brace-style": [
+                    "off",
+                    "off"
+                ],
+                "import/order": "off",
+                "max-len": [
+                    "error",
+                    {
+                        "ignorePattern": "^import |^export | implements",
+                        "code": 180
+                    }
+                ],
+                "no-underscore-dangle": "off",
+                "object-shorthand": "off",
+                "quote-props": [
+                    "error",
+                    "consistent"
+                ],
+                "quotes": [
+                    "error",
+                    "single"
+                ]
+            }
+        },
+        {
+            "files": [
+                "*.html"
+            ],
+            "extends": [
+                "plugin:@angular-eslint/template/recommended"
+            ],
+            "rules": {}
+        }
+    ]
+}

.nvmrc

@@ -1 +1 @@
-20
+16

.prettierrc

@@ -1,11 +0,0 @@
-{
-    "printWidth": 80,
-    "semi": true,
-    "bracketSameLine": false,
-    "trailingComma": "es5",
-    "tabWidth": 4,
-    "singleQuote": true,
-    "bracketSpacing": true,
-    "arrowParens": "always",
-    "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"]
-}

LICENSE.md

@@ -1,6 +1,6 @@
 Envato Standard License
 
-Copyright (c) Withinpixels <hi@withinpixels.com>
+Copyright (c) Sercan Yemen <sercanyemen@gmail.com>
 
 This project is protected by Envato's Standard License. For more information,
 check the official license page at [https://themeforest.net/licenses/standard](https://themeforest.net/licenses/standard)

angular.json

@@ -15,26 +15,29 @@
             "prefix": "app",
             "architect": {
                 "build": {
-                    "builder": "@angular-devkit/build-angular:application",
+                    "builder": "@angular-devkit/build-angular:browser",
                     "options": {
                         "outputPath": "dist/fuse",
                         "index": "src/index.html",
-                        "browser": "src/main.ts",
+                        "main": "src/main.ts",
-                        "polyfills": ["zone.js"],
+                        "polyfills": [
+                            "zone.js"
+                        ],
                         "tsConfig": "tsconfig.app.json",
                         "inlineStyleLanguage": "scss",
                         "allowedCommonJsDependencies": [
                             "apexcharts",
+                            "highlight.js",
                             "crypto-js/enc-utf8",
                             "crypto-js/hmac-sha256",
                             "crypto-js/enc-base64",
-                            "quill-delta"
+                            "flat",
+                            "quill"
                         ],
                         "assets": [
-                            {
+                            "src/favicon-16x16.png",
-                                "glob": "**/*",
+                            "src/favicon-32x32.png",
-                                "input": "public"
+                            "src/assets",
-                            },
                             {
                                 "glob": "_redirects",
                                 "input": "src",
@@ -42,11 +45,11 @@
                             }
                         ],
                         "stylePreprocessorOptions": {
-                            "includePaths": ["src/@fuse/styles"]
+                            "includePaths": [
+                                "src/@fuse/styles"
+                            ]
                         },
                         "styles": [
-                            "src/styles/splash-screen.css",
-                            "src/styles/inter.css",
                             "src/@fuse/styles/tailwind.scss",
                             "src/@fuse/styles/themes.scss",
                             "src/styles/vendors.scss",
@@ -73,9 +76,12 @@
                             "outputHashing": "all"
                         },
                         "development": {
+                            "buildOptimizer": false,
                             "optimization": false,
+                            "vendorChunk": true,
                             "extractLicenses": false,
-                            "sourceMap": true
+                            "sourceMap": true,
+                            "namedChunks": true
                         }
                     },
                     "defaultConfiguration": "production"
@@ -84,30 +90,37 @@
                     "builder": "@angular-devkit/build-angular:dev-server",
                     "configurations": {
                         "production": {
-                            "buildTarget": "fuse:build:production"
+                            "browserTarget": "fuse:build:production"
                         },
                         "development": {
-                            "buildTarget": "fuse:build:development"
+                            "browserTarget": "fuse:build:development"
                         }
                     },
                     "defaultConfiguration": "development"
                 },
                 "extract-i18n": {
-                    "builder": "@angular-devkit/build-angular:extract-i18n"
+                    "builder": "@angular-devkit/build-angular:extract-i18n",
+                    "options": {
+                        "browserTarget": "fuse:build"
+                    }
                 },
                 "test": {
                     "builder": "@angular-devkit/build-angular:karma",
                     "options": {
-                        "polyfills": ["zone.js", "zone.js/testing"],
+                        "polyfills": [
+                            "zone.js",
+                            "zone.js/testing"
+                        ],
                         "tsConfig": "tsconfig.spec.json",
                         "inlineStyleLanguage": "scss",
                         "assets": [
-                            {
+                            "src/favicon-16x16.png",
-                                "glob": "**/*",
+                            "src/favicon-32x32.png",
-                                "input": "public"
+                            "src/assets"
-                            }
+                        ],
+                        "styles": [
+                            "src/styles/styles.scss"
                         ],
-                        "styles": ["src/styles/styles.scss"],
                         "scripts": []
                     }
                 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "fuse-angular",
-    "version": "21.0.0",
+    "version": "18.0.0",
     "description": "Fuse - Angular Admin Template and Starter Project",
     "author": "https://themeforest.net/user/srcn",
     "license": "https://themeforest.net/licenses/standard",
@@ -13,57 +13,54 @@
         "test": "ng test"
     },
     "dependencies": {
-        "@angular/animations": "19.0.5",
+        "@angular/animations": "16.0.3",
-        "@angular/cdk": "19.0.4",
+        "@angular/cdk": "16.0.2",
-        "@angular/common": "19.0.5",
+        "@angular/common": "16.0.3",
-        "@angular/compiler": "19.0.5",
+        "@angular/compiler": "16.0.3",
-        "@angular/core": "19.0.5",
+        "@angular/core": "16.0.3",
-        "@angular/forms": "19.0.5",
+        "@angular/forms": "16.0.3",
-        "@angular/material": "19.0.4",
+        "@angular/material": "16.0.2",
-        "@angular/material-luxon-adapter": "19.0.4",
+        "@angular/material-luxon-adapter": "16.0.2",
-        "@angular/platform-browser": "19.0.5",
+        "@angular/platform-browser": "16.0.3",
-        "@angular/platform-browser-dynamic": "19.0.5",
+        "@angular/platform-browser-dynamic": "16.0.3",
-        "@angular/router": "19.0.5",
+        "@angular/router": "16.0.3",
-        "@jsverse/transloco": "7.5.1",
+        "@ngneat/transloco": "4.2.7",
-        "apexcharts": "4.3.0",
+        "apexcharts": "3.40.0",
-        "crypto-js": "4.2.0",
+        "crypto-js": "3.3.0",
-        "highlight.js": "11.11.1",
+        "highlight.js": "11.8.0",
         "lodash-es": "4.17.21",
-        "luxon": "3.5.0",
+        "luxon": "3.3.0",
-        "ng-apexcharts": "1.15.0",
+        "ng-apexcharts": "1.7.6",
-        "ngx-quill": "27.0.0",
+        "ngx-quill": "22.0.0",
-        "perfect-scrollbar": "1.5.6",
+        "perfect-scrollbar": "1.5.5",
-        "quill": "2.0.3",
+        "quill": "1.3.7",
         "rxjs": "7.8.1",
-        "tslib": "2.8.1",
+        "tslib": "2.5.2",
-        "zone.js": "0.15.0"
+        "zone.js": "0.13.0"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "19.0.6",
+        "@angular-devkit/build-angular": "16.0.3",
-        "@angular/cli": "19.0.6",
+        "@angular/cli": "16.0.3",
-        "@angular/compiler-cli": "19.0.5",
+        "@angular/compiler-cli": "16.0.3",
-        "@tailwindcss/typography": "0.5.15",
+        "@tailwindcss/typography": "0.5.9",
-        "@types/chroma-js": "2.4.5",
+        "@types/chroma-js": "2.4.0",
-        "@types/crypto-js": "4.2.2",
+        "@types/crypto-js": "3.1.47",
         "@types/highlight.js": "10.1.0",
-        "@types/jasmine": "5.1.5",
+        "@types/jasmine": "4.3.2",
-        "@types/lodash": "4.17.13",
+        "@types/lodash": "4.14.195",
-        "@types/lodash-es": "4.17.12",
+        "@types/lodash-es": "4.17.7",
-        "@types/luxon": "3.4.2",
+        "@types/luxon": "3.3.0",
-        "autoprefixer": "10.4.20",
+        "autoprefixer": "10.4.14",
         "chroma-js": "2.4.2",
-        "jasmine-core": "5.1.2",
+        "jasmine-core": "5.0.0",
-        "karma": "6.4.4",
+        "karma": "6.4.2",
         "karma-chrome-launcher": "3.2.0",
-        "karma-coverage": "2.2.1",
+        "karma-coverage": "2.2.0",
         "karma-jasmine": "5.1.0",
-        "karma-jasmine-html-reporter": "2.1.0",
+        "karma-jasmine-html-reporter": "2.0.0",
         "lodash": "4.17.21",
-        "postcss": "8.4.49",
+        "postcss": "8.4.24",
-        "prettier": "3.4.2",
+        "tailwindcss": "3.3.2",
-        "prettier-plugin-organize-imports": "4.1.0",
+        "typescript": "5.0.4"
-        "prettier-plugin-tailwindcss": "0.6.9",
-        "tailwindcss": "3.4.17",
-        "typescript": "5.6.3"
     }
 }