Merge branch 'feature/paths' into feature/layout

in63119 · Nov 11, 2023 · 50a39ab · 50a39ab
2 parents cb1addb + 19923d9
commit 50a39ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Front-end/src/pages/CheckKidsinfo.tsx b/Front-end/src/pages/CheckKidsinfo.tsx
@@ -10,7 +10,8 @@ import { parentsState } from '../recoil/parentsState';
 import CheckInfo from '../components/CheckKidsInfo/CheckInfo';
 import LongBtn from '../components/Button/LongBtn';
 import { PageUrls } from '../constants/page-urls';
-import Layout from 'components/Layout';
+import Layout from '../components/Layout';
+
 
 const CheckKidsinfo = () => {
 	const [parent] = useRecoilState(parentsState);

diff --git a/Front-end/tsconfig.json b/Front-end/tsconfig.json
@@ -15,10 +15,7 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
-    "baseUrl": "./src",
-    "paths": {
-      "@constants/*": ["constants/*"]
-    }
+    "baseUrl": "./src"
   },
   "include": ["src/**/*"],
   "ignoreCase": true