Skip to content

Commit

Permalink
Fix indentation and reformat certain files
Browse files Browse the repository at this point in the history
- Restore tab indentation on some files which were switched
- Add `.prettierrc` for future files
- Clean up exports for pages and components
  • Loading branch information
taesungh committed Nov 29, 2023
1 parent be41732 commit 45bbb49
Show file tree
Hide file tree
Showing 13 changed files with 1,717 additions and 1,748 deletions.
4 changes: 4 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"useTabs": true,
"semi": true
}
139 changes: 69 additions & 70 deletions src/app/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,100 +2,99 @@ 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";
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 (
<>
{/* <Banner /> */}
<Nav />
<Routes>
<Route path="/" element={<Home />} />
<Route path="join" element={<Join />} />
<Route path="hey" element={<Hey />} />
<Route path="events">
<Route index element={<Events />} />
<Route path="all" element={<EventsAll />} />
</Route>
<Route path="resources">
<Route index element={<Resources />} />
<Route path="featured" element={<ResourcesFeatured />} />
</Route>
<Route path="mentorship">
<Route index element={<Mentorship />} />
</Route>
<Route path="merch">
<Route index element={<Merch />} />
<Route path="shirt22" element={<Shirt22 />} />
</Route>
<Route path="contact" element={<Contact />} />
<Route path="houses" element={<Houses />} />
<Route path="about" element={<About />} />
<Route path="pt" element={<PT />} />
return (
<>
{/* <Banner /> */}
<Nav />
<Routes>
<Route path="/" element={<Home />} />
<Route path="join" element={<Join />} />
<Route path="hey" element={<Hey />} />
<Route path="events">
<Route index element={<Events />} />
<Route path="all" element={<EventsAll />} />
</Route>
<Route path="resources">
<Route index element={<Resources />} />
<Route path="featured" element={<ResourcesFeatured />} />
</Route>
<Route path="mentorship">
<Route index element={<Mentorship />} />
</Route>
<Route path="merch">
<Route index element={<Merch />} />
<Route path="shirt22" element={<Shirt22 />} />
</Route>
<Route path="contact" element={<Contact />} />
<Route path="houses" element={<Houses />} />
<Route path="about" element={<About />} />
<Route path="pt" element={<PT />} />

<Route path="designathon/*" element={<Designathon />} />
<Route path="designathons/*" element={<Designathon />} />
<Route path="designathon/*" element={<Designathon />} />
<Route path="designathons/*" element={<Designathon />} />

<Route path="brand" element={<Brand />} />
<Route path="brand" element={<Brand />} />

{/* Redirects */}
<Route
path="discord"
element={<Navigate to="//discord.com/invite/MBVrKe9" />}
/>
{/* Redirects */}
<Route
path="discord"
element={<Navigate to="//discord.com/invite/MBVrKe9" />}
/>

{/* Leaving this redirect here since that link is posted on our insta */}
<Route path="impact22" element={<Navigate to="/designathon/22" />} />
<Route
path="ptsignup"
element={<Navigate to={PROJECT_TEAMS_GOOGLE_FORM} />}
/>
<Route
path="ptsignups"
element={<Navigate to={PROJECT_TEAMS_GOOGLE_FORM} />}
/>
{/* <Route
{/* Leaving this redirect here since that link is posted on our insta */}
<Route path="impact22" element={<Navigate to="/designathon/22" />} />
<Route
path="ptsignup"
element={<Navigate to={PROJECT_TEAMS_GOOGLE_FORM} />}
/>
<Route
path="ptsignups"
element={<Navigate to={PROJECT_TEAMS_GOOGLE_FORM} />}
/>
{/* <Route
path='buy'
element={<Navigate to='//forms.gle/RVoUbLPQnHYzeWMA6' />}
/> */}
{/* <Route
{/* <Route
path='apply'
element={<Navigate to='//forms.gle/UXpfUfANHZ9m6fR47' />}
/> */}

<Route path="*" element={<NotFound />} />
</Routes>
<Footer />
</>
);
<Route path="*" element={<NotFound />} />
</Routes>
<Footer />
</>
);
}

export default App;
14 changes: 6 additions & 8 deletions src/app/components/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import EmailForm from './EmailForm';
import Footer from './Footer';
import Nav from './Nav';
import Text from './Text';
import WordBreak from './WordBreak';
export { default as Banner } from './Banner';

export { EmailForm, Footer, Nav, Text, WordBreak };
export { default as EmailForm } from "./EmailForm";
export { default as Footer } from "./Footer";
export { default as Nav } from "./Nav";
export { default as Text } from "./Text";
export { default as WordBreak } from "./WordBreak";
export { default as Banner } from "./Banner";
Loading

0 comments on commit 45bbb49

Please sign in to comment.