merge: merge conflics

nuxt.config.ts

@@ -1,11 +1,11 @@
 import tailwindcss from "@tailwindcss/vite";
 
-// https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-    compatibilityDate: "2025-07-15",
+<<<<<<< HEAD
+    compatibilityDate: "2026-01-01",
     devtools: { enabled: true },
 
-    css: [ 
+    css: [
         "~/assets/css/main.css",
         "~/assets/css/tailwind.css"
     ],
@@ -13,18 +13,22 @@ export default defineNuxtConfig({
         plugins: [tailwindcss()],
     },
 
+    runtimeConfig: {
+        public: {
+            apiBase: "http://localhost:8080/academics/api/v1",
+        },
+    },
+
     modules: [
         "@nuxt/fonts",
         "@nuxt/icon",
         "@nuxt/image",
         "@nuxt/eslint",
         "shadcn-nuxt",
+        "@pinia/nuxt",
     ],
 
     shadcn: {
-        /**
-         * Prefix for all the imported component
-         */
         prefix: "",
         /**
          * Directory that the component lives in.