atlp-rwanda · Salim-54 · Sep 25, 2024 · Aug 28, 2024 · Sep 11, 2024 · Sep 12, 2024
diff --git a/index.html b/index.html
@@ -4,6 +4,7 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="icon" href="assets/favicon.ico" type="image/x-icon">
     <title>Devpulse</title>
     <script src="https://npmcdn.com/axios/dist/axios.min.js"></script>
     <script src="https://accounts.google.com/gsi/client" async defer></script>

diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "@typescript-eslint/eslint-plugin": "^5.47.0",
     "autoprefixer": "^10.4.7",
     "babel-loader": "^8.2.5",
+    "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^6.7.1",
     "dotenv": "^16.0.3",
     "eslint": "^8.30.0",
@@ -49,7 +50,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-react": "^7.31.11",
     "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^5.5.0",
+    "html-webpack-plugin": "^5.6.0",
     "i": "^0.3.7",
     "node-polyfill-webpack-plugin": "^2.0.1",
     "npm": "^8.19.2",
@@ -89,6 +90,7 @@
     "browser": "^0.2.6",
     "date-fns": "^2.29.3",
     "dotenv": "^16.0.3",
+    "express": "^4.21.0",
     "flowbite": "^1.5.3",
     "flowbite-react": "^0.6.4",
     "formik": "^2.4.3",
@@ -103,8 +105,9 @@
     "jwt-decode": "^3.1.2",
     "mini-css-extract-plugin": "^2.6.1",
     "moment": "^2.29.4",
-    "next-link": "^2.0.0",
+    "next-preload-headers": "^3.0.4",
     "patch-package": "^6.4.7",
+    "path": "^0.12.7",
     "popper.js": "^1.16.1",
     "react-datepicker": "^4.8.0",
     "react-hook-form": "^7.45.4",

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -2,13 +2,8 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, shrink-to-fit=no"
-    />
     <meta name="theme-color" content="#000000" />
-
+    <link rel="icon" href="favicon.ico" type="image/x-icon">
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
 
     <title>React App</title>

diff --git a/src/assets/favicon.ico b/src/assets/favicon.ico
diff --git a/src/components/roles&permissions/ListAllUsers.tsx b/src/components/roles&permissions/ListAllUsers.tsx
@@ -880,4 +880,4 @@ const ListAllUsers: FunctionComponent<Props> = (props) => {
   );
 };
 
-export default ListAllUsers;
+export default ListAllUsers;
diff --git a/src/pages/updateTrainee/traineUpdate.tsx b/src/pages/updateTrainee/traineUpdate.tsx
@@ -723,4 +723,4 @@ const mapState = (allCycles: any) => ({
 
 export default connect(mapState, {
   getAllCycles,
-})(TraineeUpdate);
+})(TraineeUpdate);
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,71 +1,82 @@
 const HtmlWebpackPlugin = require("html-webpack-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 const path = require("path");
 const dotenv = require("dotenv");
 const webpack = require("webpack");
-module.exports = () => {
-  dotenv.config();
-  const prod = process.env.NODE_ENV === "production";
-  return {
-    mode: prod ? "production" : "development",
-    entry: "./src/index.tsx",
-    output: {
-      path: path.resolve(__dirname, "build/"),
-      publicPath: "/",
+
+dotenv.config();
+
+const prod = process.env.NODE_ENV === "production";
+
+module.exports = {
+  mode: prod ? "production" : "development",
+  entry: "./src/index.tsx",
+  output: {
+    path: path.resolve(__dirname, "build/"), 
+    filename: "bundle.js",
+    publicPath: "/",
+  },
+  devServer: {
+    historyApiFallback: true,
+    port: 3000,
+    compress: true,
+    allowedHosts: "all", 
+  },
+  resolve: {
+    extensions: [".js", ".json", ".tsx", ".ts", ".svg"],
+    fallback: {
+      zlib: require.resolve("browserify-zlib"),
+      https: require.resolve("https-browserify"),
+      http: require.resolve("stream-http"),
     },
-    devServer: {
-      historyApiFallback: true,
-      port: 3000,
-      compress: true,
-      allowedHosts: ["all"],
+    alias: {
+      process: "process/browser",
+      stream: "stream-browserify", 
     },
-    resolve: {
-      fallback: {
-        zlib: require.resolve("browserify-zlib"),
-        https: require.resolve("https-browserify"),
-        http: require.resolve("stream-http"),
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(tsx|ts)$/,
+        exclude: /node_modules/,
+        use: "ts-loader",
       },
-      alias: {
-        process: "process/browser",
-        stream: "stream-browserify",
+      {
+        test: /\.css$/,
+        use: [MiniCssExtractPlugin.loader, "css-loader", "postcss-loader"],
       },
-      alias: {
-        process: "process/browser",
-        stream: "stream-browserify",
-      },
-    },
-    module: {
-      rules: [
-        {
-          test: /\.(tsx|ts)$/,
-          exclude: /node_modules/,
-          resolve: {
-            extensions: [".js", ".json", ".tsx", ".ts", ".svg"],
+      {
+        test: /\.(png|jpe?g|svg|gif)$/, 
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: 'assets/[name].[hash].[ext]', 
+              outputPath: 'assets/', 
+              publicPath: 'assets/', 
+            },
           },
-          use: "ts-loader",
-        },
-        {
-          test: /\.css$/,
-          use: [MiniCssExtractPlugin.loader, "css-loader", "postcss-loader"],
-        },
-        {
-          test: /\.(png|jp(e*)g|svg|gif)$/,
-          use: ["file-loader"],
-        },
-      ],
-    },
-    devtool: prod ? undefined : "source-map",
-    plugins: [
-      new HtmlWebpackPlugin({
-        template: "index.html",
-      }),
-      new MiniCssExtractPlugin(),
-      new webpack.DefinePlugin({
-        "process.env": JSON.stringify(process.env),
-      }),
-      new webpack.ProvidePlugin({
-        process: "process/browser",
-      }),
+        ],
+      },
     ],
-  };
+  },
+  devtool: prod ? undefined : "source-map",
+  plugins: [
+    new HtmlWebpackPlugin({
+      template: path.resolve(__dirname, "index.html"), 
+    }),
+    new MiniCssExtractPlugin(),
+    new webpack.DefinePlugin({
+      "process.env": JSON.stringify(process.env),
+    }),
+    new webpack.ProvidePlugin({
+      process: "process/browser",
+    }),
+    new CopyWebpackPlugin({
+      patterns: [
+        { from: 'src/assets/', to: 'assets/' }, 
+      ],
+    }),
+  ],
 };