From 45bbb49cf70ac066e3ccf2cc502a77293456adbd Mon Sep 17 00:00:00 2001 From: Taesung Hwang Date: Tue, 28 Nov 2023 22:39:32 -0800 Subject: [PATCH] Fix indentation and reformat certain files - Restore tab indentation on some files which were switched - Add `.prettierrc` for future files - Clean up exports for pages and components --- .prettierrc | 4 + src/app/App.js | 139 +- src/app/components/index.js | 14 +- src/app/pages/About/About.js | 304 +-- .../pages/About/components/Profile/Profile.js | 54 +- src/app/pages/About/components/index.js | 6 +- src/app/pages/Events/index.js | 9 +- src/app/pages/Houses/Houses.jsx | 624 +++--- src/app/pages/Houses/Houses.module.scss | 385 ++-- src/app/pages/Merch/pages/index.js | 6 +- src/app/pages/index.js | 46 +- src/assets/data/events/all.json | 1678 ++++++++--------- src/assets/data/resourceList.json | 196 +- 13 files changed, 1717 insertions(+), 1748 deletions(-) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 00000000..e510c85c --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "useTabs": true, + "semi": true +} diff --git a/src/app/App.js b/src/app/App.js index 292df93a..9f7dc008 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -2,25 +2,23 @@ import { Route, Routes, Navigate } from "react-router-dom"; import { Footer, Nav } from "./components"; import { useScroll } from "./controllers"; -import Hey from "./pages/Hey"; import { - About, - Brand, - Contact, - Events, - EventsAll, - Home, - Houses, - Join, - Mentorship, - Merch, - NotFound, - PT, - Resources, - ResourcesFeatured, - Shirt22, + About, + Brand, + Contact, + Events, + EventsAll, + Home, + Houses, + Join, + Mentorship, + Merch, + NotFound, + PT, + Resources, + ResourcesFeatured, + Shirt22, } from "./pages"; - import "./styles/global.scss"; import "./styles/colors.scss"; import "./styles/layout.scss"; @@ -28,74 +26,75 @@ import "./styles/components.scss"; import "./styles/animations.scss"; import "./styles/forms.scss"; import Designathon from "./pages/Designathons"; +import Hey from "./pages/Hey"; import { PROJECT_TEAMS_GOOGLE_FORM } from "./pages/PT/PT"; function App() { - useScroll(); + useScroll(); - return ( - <> - {/* */} -