解决冲突

.gitignore

@@ -10,7 +10,6 @@ lerna-debug.log*
 node_modules
 dist
 dist-ssr
-secret.js
 *.local
 .vscode
 # Editor directories and files

src/main.ts

@@ -1,21 +1,19 @@
-// 引入私钥
-import { DO_MAIN, CLIENT_ID } from "@/utils/secret";
+import { DO_MAIN, CLIENT_ID }from '@/utils/secret';
 // 样式引入
 import "@/assets/styles/reset.scss";
 import "@/assets/styles/common.scss";
 // 引入仓库
-import pinia from "@/store";
+import pinia from '@/store';
 //引入路由
 import router from "@/router";
 // 引入UI组件库相关
-import naive from "naive-ui";
-import "vfonts/Lato.css"; // 通用字体
-import "vfonts/FiraCode.css"; // 等宽字体
+import naive from 'naive-ui';
+import 'vfonts/Lato.css'// 通用字体
+import 'vfonts/FiraCode.css'// 等宽字体
 // 登录授权相关
-import { createAuth0 } from "@auth0/auth0-vue";
-
-import { createApp } from "vue";
-import App from "./App.vue";
+import { createAuth0 } from '@auth0/auth0-vue';
+import { createApp } from 'vue'
+import App from './App.vue';
 
 const app = createApp(App);
 
@@ -34,4 +32,4 @@ app.use(
 app.use(pinia);
 app.use(router);
 app.use(naive);
-app.mount("#app");
+app.mount('#app')

src/router/index.ts

@@ -1,7 +1,5 @@
 import { createRouter, createWebHistory, RouteRecordRaw } from "vue-router";
 import Login from "@/views/login/index.vue"; //登录组件
-import Layout from '@/views/layout/index.vue';
-import CallBack from '@/views/login/OauthCallBack.vue';
 
 const routes: Array<RouteRecordRaw> = [
   {
@@ -9,16 +7,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "Login",
     component: Login,
   },
-  {
-    path:'/callback',
-    name:'CallBack',
-    component:CallBack
-  },
-  {
-    path: "/layout",
-    name: "Layout",
-    component: Layout,
-  },
 ];
 
 const router = createRouter({

src/utils/secret.ts

@@ -1,3 +0,0 @@
-export const DO_MAIN = 'dev-f8lrenkd107vqnti.us.auth0.com';
-export const CLIENT_ID = 'VasF4bqvT7iC5Va2ibBT39hu71gdtA9K';
-export const CLINET_KEY = 'hIdwcnNLmc6fPIBxHKqP16LYo3q7hCtB_Cg2R3enylHH28AHM1SEAkOky5zFUTI5';

src/views/layout/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <div>首页</div>
-</template>
-
-<script setup>
-
-</script>
-
-<style lang="scss" scoped></style>

vite.config.ts

@@ -11,7 +11,7 @@ export default defineConfig({
       imports: ["vue", "vue-router"],
       defaultExportByFilename: true,
       dirs: ["./src/api"],
-    })
+    }),
   ],
   css: {
     preprocessorOptions: {