Auto-merge master into nphdigital.vn

Author: actions-user

next.config.js

@@ -7,7 +7,10 @@ const nextConfig = {
 	reactStrictMode: true,
 	poweredByHeader: false,
 	sassOptions: {
-		includePaths: [path.join(__dirname, 'src/styles'), path.join(__dirname, 'public/assets/scss')],
+		includePaths: [
+			path.join(__dirname, 'src/styles'),
+			path.join(__dirname, 'public/assets/scss'),
+		],
 	},
 	images: {
 		domains: ['res.cloudinary.com'],
@@ -21,8 +24,8 @@ const nextConfig = {
 			test: /\.(woff|woff2|eot|ttf|otf)$/,
 			type: 'asset/resource',
 			generator: {
-				filename: 'static/fonts/[hash][ext][query]'
-			}
+				filename: 'static/fonts/[hash][ext][query]',
+			},
 		});
 
 		// CSS optimization
@@ -35,7 +38,6 @@ const nextConfig = {
 				priority: 10,
 			};
 
-			// Optimize common chunks
 			config.optimization.splitChunks.cacheGroups.commons = {
 				name: 'commons',
 				chunks: 'all',
@@ -44,19 +46,25 @@ const nextConfig = {
 			};
 		}
 
+		// ✅ Add alias for @ → src/
+		config.resolve.alias['@'] = path.resolve(__dirname, 'src');
+
 		return config;
 	},
 	optimizeFonts: true,
 	swcMinify: true,
 	compiler: {
-		removeConsole: process.env.NODE_ENV === 'production' ? {
-			exclude: ['error', 'warn'],
-		} : false,
+		removeConsole:
+			process.env.NODE_ENV === 'production'
+				? {
+						exclude: ['error', 'warn'],
+				  }
+				: false,
 	},
 	experimental: {
 		optimizeCss: true,
-		scrollRestoration: true
-	}
-}
+		scrollRestoration: true,
+	},
+};
 
 module.exports = nextConfig;

src/assets/imgs/portfolio/1/1.webp

@@ -3,14 +3,24 @@ import { useEffect } from 'react';
 import { gsap } from 'gsap';
 import { ScrollTrigger } from '@/plugins';
 import Link from 'next/link';
-import Portfilio11 from '../../../public/assets/imgs/portfolio/1/1.webp';
-import Portfilio12 from '../../../public/assets/imgs/portfolio/1/2.webp';
-import Portfilio13 from '../../../public/assets/imgs/portfolio/1/3.webp';
-import Portfilio14 from '../../../public/assets/imgs/portfolio/1/4.webp';
-import Portfilio15 from '../../../public/assets/imgs/portfolio/1/5.webp';
-import Portfilio16 from '../../../public/assets/imgs/portfolio/1/6.webp';
-import Portfolio17 from '../../../public/assets/imgs/portfolio/1/7.webp';
-import Portfilio18 from '../../../public/assets/imgs/portfolio/1/8.webp';
+// import Portfilio11 from '../../../public/assets/imgs/portfolio/1/1.webp';
+// import Portfilio12 from '../../../public/assets/imgs/portfolio/1/2.webp';
+// import Portfilio13 from '../../../public/assets/imgs/portfolio/1/3.webp';
+// import Portfilio14 from '../../../public/assets/imgs/portfolio/1/4.webp';
+// import Portfilio15 from '../../../public/assets/imgs/portfolio/1/5.webp';
+// import Portfilio16 from '../../../public/assets/imgs/portfolio/1/6.webp';
+// import Portfolio17 from '../../../public/assets/imgs/portfolio/1/7.webp';
+// import Portfilio18 from '../../../public/assets/imgs/portfolio/1/8.webp';
+
+import Portfilio11 from '@/assets/imgs/portfolio/1/1.webp';
+import Portfilio12 from '@/assets/imgs/portfolio/1/2.webp';
+import Portfilio13 from '@/assets/imgs/portfolio/1/3.webp';
+import Portfilio14 from '@/assets/imgs/portfolio/1/4.webp';
+import Portfilio15 from '@/assets/imgs/portfolio/1/5.webp';
+import Portfilio16 from '@/assets/imgs/portfolio/1/6.webp';
+import Portfolio17 from '@/assets/imgs/portfolio/1/7.webp';
+import Portfilio18 from '@/assets/imgs/portfolio/1/8.webp';
+
 import Image from 'next/image';
 
 gsap.registerPlugin(ScrollTrigger);