Skip to content

Commit

Permalink
Merge branch 'main' of github.com:boostcampwm2023/web09-MagicConch
Browse files Browse the repository at this point in the history
  • Loading branch information
kimyu0218 committed Nov 13, 2023
2 parents 2b3ca35 + 3a06987 commit b3b7b0c
Show file tree
Hide file tree
Showing 33 changed files with 1,371 additions and 1,253 deletions.
3 changes: 2 additions & 1 deletion FrontEnd/.prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
"extends": ["airbnb", "prettier"],
"plugins": ["@trivago/prettier-plugin-sort-imports"],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true
"importOrderSortSpecifiers": true,
"importOrder": ["^@pages/(.*)$", "^@components/(.*)$", "^@assets/(.*)$", "^[./]"]
}
12 changes: 10 additions & 2 deletions FrontEnd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,20 @@
},
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"react-router-dom": "^6.18.0"
},
"devDependencies": {
"@iconify/react": "^4.1.1",
"@trivago/prettier-plugin-sort-imports": "^4.2.1",
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.9.0",
"@vitejs/plugin-react-swc": "^3.3.2",
"autoprefixer": "^10.4.16",
"daisyui": "^3.9.4",
"eslint": "^8.52.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.0.0",
Expand All @@ -28,8 +33,11 @@
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"husky": "^8.0.3",
"postcss": "^8.4.31",
"prettier": "^3.0.3",
"tailwindcss": "^3.3.5",
"typescript": "^5.0.2",
"vite": "^4.4.5"
"vite": "^4.4.5",
"vite-tsconfig-paths": "^4.2.1"
}
}
Loading

0 comments on commit b3b7b0c

Please sign in to comment.