Merge branch 'main' of http://work.gct.com.vn/minhnt/NSG_PORTAL_V2

components/dynamic-page/page-component/templates/articles/collections/BasicCollection.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import DynamicComponent from "~/components/dynamic-page/page-component/templates/index.vue";
 import { getInputValue } from '@/utils/parseSQL';
-import { isEmpty } from "lodash";
+import isEmpty from "lodash/isEmpty";
 
 const _props = defineProps<{
   dataResult?: any[];

components/dynamic-page/page-component/templates/other/breadcrumb/Default.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { isEmpty } from 'lodash';
+import isEmpty from "lodash/isEmpty";
 const emit = defineEmits(['dropData', 'selectComponent'])
 
 const _props = defineProps<{

components/dynamic-page/page-component/templates/pageCategories/collection_page.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { isEmpty } from "lodash";
+import isEmpty from "lodash/isEmpty";
 import DynamicComponent from "~/components/dynamic-page/page-component/templates/index.vue";
 import { COLLECTION_PAGING_QUERY_DROP, getInputValue } from "@/utils/parseSQL";
 const router = useRouter();

components/dynamic-page/page/layouts/Default.vue

@@ -8,25 +8,25 @@ const CLASS_FOR_LAYOUT = computed(() => {
     switch (props.layout) {
         case 'Full_Page':
             _classForLayout = {
-                page_container: 'page_container w-full px-2',
+                page_container: 'page_container mx-auto w-full px-2',
                 layout_container: 'layout_container px-5',
             };
             break;
         case 'Center_Page':
             _classForLayout = {
-                page_container: 'page_container w-full px-2 container ',
+                page_container: 'page_container mx-auto w-full px-2 container ',
                 layout_container: 'layout_container container-xxl mx-auto',
             };
             break;
         case 'Background_Page':
             _classForLayout = {
-                page_container: 'page_container w-full background-container ',
+                page_container: 'page_container mx-auto w-full background-container px-2',
                 layout_container: 'layout_container mx-auto',
             };
             break;
         default: 
             _classForLayout = {
-                page_container: 'page_container px-2',
+                page_container: 'page_container mx-auto px-2',
                 layout_container: 'layout_container',
             };
             break;

nuxt.config.ts

@@ -18,15 +18,10 @@ export default defineNuxtConfig({
     "@vueuse/nuxt",
     "@pinia/nuxt",
     "nuxt-delay-hydration",
-    // "@nuxtjs/critters",
     "nuxt-icon",
-    // "nuxt-custom-elements",
     "dayjs-nuxt",
-    "nuxt-swiper",
     "nuxt-lodash",
-    // "nuxt-headlessui",
     '@ant-design-vue/nuxt',
-    // "@sidebase/nuxt-auth",
   ],
 
   runtimeConfig: {

package.json

@@ -5,56 +5,34 @@
     "build": "nuxt build --dotenv .env.production",
     "dev": "nuxt dev",
     "generate": "nuxt generate",
-    "preview": "nuxt preview",
+    "preview": "nuxt preview"
-    "postinstall": "nuxt prepare"
   },
   "devDependencies": {
     "@ant-design-vue/nuxt": "^1.4.1",
     "@nuxt/devtools": "1.0.0",
     "@nuxt/image": "^1.1.0",
     "@pinia/nuxt": "latest",
-    "@remix-run/web-file": "^3.1.0",
-    "@sidebase/nuxt-auth": "^0.6.4",
-    "@types/glidejs__glide": "latest",
     "@unocss/postcss": "latest",
-    "cva": "beta",
     "dayjs-nuxt": "^2.1.8",
     "nuxt": "latest",
-    "nuxt-custom-elements": "beta",
-    "nuxt-headlessui": "^1.1.4",
     "nuxt-icon": "latest",
     "nuxt-lodash": "latest",
     "typescript": "^5.3.3",
     "vue-tsc": "^1.8.27"
   },
   "dependencies": {
-    "@glidejs/glide": "^3.6.0",
+    "@types/lodash": "^4.17.4",
     "@unocss/nuxt": "latest",
     "@unocss/reset": "latest",
     "@vueuse/core": "^10.8.0",
     "@vueuse/nuxt": "10.5.0",
-    "aos": "latest",
     "axios": "^1.5.1",
     "cheerio": "^1.0.0-rc.12",
-    "clsx": "^2.1.0",
+    "lodash": "^4.17.21",
-    "defu": "^6.1.4",
-    "ipx": "^3.0.1",
-    "mitt": "^3.0.1",
-    "next-auth": "4.21.1",
-    "node-html-parser": "latest",
     "nuxt-delay-hydration": "latest",
-    "nuxt-swiper": "latest",
-    "parse-nested-form-data": "^1.0.0",
-    "request": "^2.88.2",
-    "request-promise": "^0.0.1",
-    "require": "^0.4.4",
     "sass": "latest",
     "sass-loader": "latest",
-    "tailwind-merge": "latest",
+    "tailwind-merge": "latest"
-    "vite-svg-loader": "latest",
-    "vue-advanced-cropper": "^2.8.8",
-    "winston": "^3.11.0",
-    "zod": "^3.22.4"
   },
   "overrides": {
     "vue": "latest"

utils/parseSQL.ts

@@ -1,9 +1,4 @@
-/* Bộ query mẫu */
+import isEmpty from "lodash/isEmpty";
-// Sql[SELECT * FROM Table WHERE Id=1] Key[xxx]
-// Uri[link-api] Method[Post] Params[{"param1":"value1","param2":"value2"}] Headers[{"Authorization":"12345678","Content-Type":"application/json"}] Content[{"data1":"value1","data2":"value2"}] Key[xxx]
-// Get[Article] Top[10] With[Topics:1,2,3] Sort[Views-,Shares+]
-
-import { isEmpty } from "lodash";
 
 const keyMapping = {
     // 3 query key để phân loại