Merge remote-tracking branch 'upstream/master'

Author: AllyMurray

README.md

@@ -1,3 +1,7 @@
+# Important
+
+Issues of this repository are tracked on https://github.com/aspnetboilerplate/aspnetboilerplate. Please create your issues on https://github.com/aspnetboilerplate/aspnetboilerplate/issues.
+
 # Introduction
 
 This is a template to create **ASP.NET Core MVC / Angular** based startup projects for [ASP.NET Boilerplate](https://aspnetboilerplate.com/Pages/Documents). It has 2 different versions:
@@ -30,4 +34,4 @@ Create & download your project from https://aspnetboilerplate.com/Templates
 
 # License
 
-[MIT](LICENSE).
+[MIT](LICENSE).

angular/src/account/login/login.service.ts

@@ -71,7 +71,7 @@ export class LoginService {
         );
 
         this._utilsService.setCookieValue(
-            AppConsts.authorization.encrptedAuthTokenName,
+            AppConsts.authorization.encryptedAuthTokenName,
             encryptedAccessToken,
             tokenExpireDate,
             abp.appPath

angular/src/shared/AppConsts.ts

@@ -15,6 +15,6 @@ export class AppConsts {
     };
 
     static readonly authorization = {
-        encrptedAuthTokenName: 'enc_auth_token'
+        encryptedAuthTokenName: 'enc_auth_token'
     };
 }

angular/src/shared/auth/app-auth.service.ts

@@ -6,7 +6,7 @@ export class AppAuthService {
 
     logout(reload?: boolean): void {
         abp.auth.clearToken();
-		abp.utils.setCookieValue(AppConsts.authorization.encrptedAuthTokenName, undefined, undefined, abp.appPath);
+		abp.utils.setCookieValue(AppConsts.authorization.encryptedAuthTokenName, undefined, undefined, abp.appPath);
         if (reload !== false) {
             location.href = AppConsts.appBaseUrl;
         }

angular/src/shared/helpers/SignalRAspNetCoreHelper.ts

@@ -2,20 +2,26 @@ import { AppConsts } from '@shared/AppConsts';
 import { UtilsService } from '@abp/utils/utils.service';
 
 export class SignalRAspNetCoreHelper {
-    static initSignalR(): void {
-
-        const encryptedAuthToken = new UtilsService().getCookieValue(AppConsts.authorization.encrptedAuthTokenName);
+    static initSignalR(callback?: () => void): void {
+        const encryptedAuthToken = new UtilsService().getCookieValue(AppConsts.authorization.encryptedAuthTokenName);
 
         abp.signalr = {
             autoConnect: true,
             connect: undefined,
             hubs: undefined,
-            qs: AppConsts.authorization.encrptedAuthTokenName + '=' + encodeURIComponent(encryptedAuthToken),
+            qs: AppConsts.authorization.encryptedAuthTokenName + '=' + encodeURIComponent(encryptedAuthToken),
             remoteServiceBaseUrl: AppConsts.remoteServiceBaseUrl,
             startConnection: undefined,
             url: '/signalr'
         };
 
-        jQuery.getScript(AppConsts.appBaseUrl + '/assets/abp/abp.signalr-client.js');
+        const script = document.createElement('script');
+        if (callback) {
+            script.onload = () => {
+                callback();
+            };
+        }
+        script.src = AppConsts.appBaseUrl + '/assets/abp/abp.signalr-client.js';
+        document.head.appendChild(script);
     }
 }

reactjs/config-overrides.js

@@ -0,0 +1,54 @@
+const { when, whenDev, whenProd, whenCI, whenTest, ESLINT_MODES, POSTCSS_MODES } = require('@craco/craco');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const CracoAntDesignPlugin = require('craco-antd');
+
+module.exports = {
+  plugins: [
+    {
+      plugin: CracoAntDesignPlugin,
+      options: {
+        customizeTheme: {
+          '@primary-color': '#1DA57A',
+          '@link-color': '#1DA57A',
+        },
+      },
+    },
+  ],
+  webpack: {
+    alias: {},
+    plugins: [],
+    configure: (webpackConfig, { env, paths }) => {
+      if (!webpackConfig.plugins) {
+        config.plugins = [];
+      }
+
+      webpackConfig.plugins.push(
+        process.env.NODE_ENV === 'production'
+          ? new CopyWebpackPlugin([
+              {
+                from: 'node_modules/@aspnet/signalr/dist/browser/signalr.min.js',
+              },
+              {
+                from: 'node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js',
+              },
+              {
+                from: 'src/lib/abp.js',
+              },
+            ])
+          : new CopyWebpackPlugin([
+              {
+                from: 'node_modules/@aspnet/signalr/dist/browser/signalr.min.js',
+              },
+              {
+                from: 'node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js',
+              },
+              {
+                from: 'src/lib/abp.js',
+              },
+            ])
+      );
+
+      return webpackConfig;
+    },
+  },
+};