Skip to content

Commit

Permalink
restructure files
Browse files Browse the repository at this point in the history
  • Loading branch information
choden-dev committed Mar 4, 2024
1 parent 1225abb commit 3f559d0
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Booking from "pages/Booking"
import Profile from "pages/Profile"
import Admin from "pages/Admin"
import Thanks from "pages/Thanks"
import AdminBookingsDetailedView from "./pages/AdminBookingsDetailedView"
import AdminBookingsDetailedView from "pages/AdminBookingsDetailedView"
import { BrowserRouter as Router, Route, Routes } from "react-router-dom"
import { ThemeProvider } from "@mui/material"
import { LocalizationProvider } from "@mui/x-date-pickers"
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/AdminBookings/AdminBookings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import "pages/Admin.css"
import { useNavigate } from "react-router-dom"
import React, { useState, useEffect } from "react"
import { collection, getDocs } from "firebase/firestore"
import { db } from "../firebase"
import { db } from "firebase"

const AdminBookings = () => {
const daysOfWeek = ["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"]
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/AdminRequests/AdminRequests.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Grid, Typography, Paper } from "@mui/material"
import RequestBlock from "./RequestBlock"
import RequestBlock from "./RequestBlock/RequestBlock"
import { useState, useEffect } from "react"

const AdminDashboardRequest = ({ setSelectedUser }: any) => {
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Event/Event.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Button
} from "@mui/material"
import { useNavigate } from "react-router-dom"
import { auth } from "../firebase"
import { auth } from "firebase"

const Event = (props: any) => {
const navigate = useNavigate()
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ProfileCard/ProfileCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from "@mui/material"
import React, { useEffect, useState } from "react"

import { useAuthenticatedUser } from "../hooks/useAuthenticatedUser"
import { useAuthenticatedUser } from "hooks/useAuthenticatedUser"

const textType = "body1"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import React, { useEffect, useState } from "react"

import { DatePicker } from "@mui/x-date-pickers/DatePicker"
import dayjs from "dayjs"
import { db } from "../firebase"
import { db } from "firebase"
import { collection, addDoc } from "firebase/firestore"

/**
Expand Down
6 changes: 3 additions & 3 deletions client/src/pages/Admin.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useState } from "react"
import { Typography, Stack } from "@mui/material"
import Requests from "components/AdminRequests"
import RequestDetails from "components/RequestDetails"
import AdminBookings from "components/AdminBookings"
import Requests from "components/AdminRequests/AdminRequests"
import RequestDetails from "components/RequestDetails/RequestDetails"
import AdminBookings from "components/AdminBookings/AdminBookings"
import "./Admin.css"

const Admin = () => {
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Booking.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react"
import BookingForm from "components/BookingForm"
import BookingForm from "components/BookingForm/BookingForm"
import { Typography, Stack } from "@mui/material"

const Booking = () => {
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Contact.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react"
import ContactForm from "components/ContactForm"
import ContactForm from "components/ContactForm/ContactForm"
import { Typography, Stack, Container } from "@mui/material"

const Contact = () => {
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Events.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react"
import Event from "components/Event"
import Event from "components/Event/Event"

const Events = () => {
// dummy state
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react"
import LoginForm from "components/LoginForm"
import LoginForm from "components/LoginForm/LoginForm"
import { Typography, Stack, Container, Link } from "@mui/material"

const Login = () => {
Expand Down
8 changes: 4 additions & 4 deletions client/src/pages/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import {
} from "firebase/firestore"
import { Stack, Typography } from "@mui/material"
import "../styles/Profile.css"
import ProfileCard from "components/ProfileCard"
import ProfileCalendarCard from "components/ProfileCalendarCard"
import ProfileCurrentBookings from "components/ProfileCurrentBookings"
import ProfileBookingHistory from "components/ProfileBookingHistory"
import ProfileCard from "components/ProfileCard/ProfileCard"
import ProfileCalendarCard from "components/ProfileCalendarCard/ProfileCalendarCard"
import ProfileCurrentBookings from "components/ProfileCurrentBookings/ProfileCurrentBookings"
import ProfileBookingHistory from "components/ProfileBookingHistory/ProfileBookingHistory"
import { useAuthenticatedUser } from "../hooks/useAuthenticatedUser"

/**
Expand Down
3 changes: 1 addition & 2 deletions client/src/pages/Register.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from "react"
import SignUpForm from "components/sign-up-form/SignUpForm"
import SignUpForm from "components/SignUpForm/SignUpForm"
import Typography from "@mui/material/Typography"
import Container from "@mui/material/Container"
import Box from "@mui/material/Box"
Expand Down

0 comments on commit 3f559d0

Please sign in to comment.