Skip to content

Commit

Permalink
chore: move header's files around (#773)
Browse files Browse the repository at this point in the history
  • Loading branch information
ap0nia authored Nov 2, 2023
1 parent 533fa53 commit adeedf7
Show file tree
Hide file tree
Showing 19 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion apps/antalmanac/src/actions/AppStoreActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { VariantType } from 'notistack';
import { TRPCError } from '@trpc/server';
import { WebsocSection } from 'peterportal-api-next-types';
import { ScheduleCourse } from '@packages/antalmanac-types';
import { SnackbarPosition } from '$components/AppBar/NotificationSnackbar';
import { SnackbarPosition } from '$components/NotificationSnackbar';
import { RepeatingCustomEvent } from '$components/Calendar/Toolbar/CustomEventDialog/CustomEventDialog';
import analyticsEnum, { logAnalytics } from '$lib/analytics';
import { warnMultipleTerms } from '$lib/helpers';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { Button, Paper, Popover, Tooltip } from '@mui/material';
import { IosShare } from '@mui/icons-material';
import { useCallback, useMemo, useState } from 'react';

import ExportCalendar from '$components/AppBar/Exports/ExportCalendar';
import ScreenshotButton from '$components/AppBar/Exports/ScreenshotButton';
import ExportCalendar from '$components/buttons/ExportCalendar';
import ScreenshotButton from '$components/buttons/Screenshot';

function Export() {
const [anchorEl, setAnchorEl] = useState<HTMLElement>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ImportStudyList from './ImportStudyList';
import LoadSaveScheduleFunctionality from './LoadSaveFunctionality';
import News from './News';
import SettingsMenu from './SettingsMenu';
import Export from './Exports/Export';
import Export from './Export';
import Logo from './halloween-logo.png';
import MobileLogo from './halloween-mobile-logo.png';

Expand Down Expand Up @@ -51,7 +51,7 @@ const components = [
<AboutPage key="about" />,
];

const CustomAppBar = ({ classes }: CustomAppBarProps) => {
const Header = ({ classes }: CustomAppBarProps) => {
const isMobileScreen = useMediaQuery('(max-width:750px)');

const [anchorEl, setAnchorEl] = useState<Element | null>(null);
Expand Down Expand Up @@ -95,4 +95,4 @@ const CustomAppBar = ({ classes }: CustomAppBarProps) => {
);
};

export default withStyles(styles)(CustomAppBar);
export default withStyles(styles)(Header);
1 change: 1 addition & 0 deletions apps/antalmanac/src/components/Header/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './Header';
6 changes: 3 additions & 3 deletions apps/antalmanac/src/routes/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import DateFnsUtils from '@date-io/date-fns';
import { MuiPickersUtilsProvider } from '@material-ui/pickers';
import { Box, CssBaseline, useMediaQuery, useTheme } from '@material-ui/core';

import Bar from '$components/AppBar/CustomAppBar';
import Header from '$components/Header';
import MobileHome from '$components/MobileHome';
import PatchNotes from '$components/PatchNotes';
import Calendar from '$components/Calendar/CalendarRoot';
import DesktopTabs from '$components/RightPane/RightPaneRoot';
import NotificationSnackbar from '$components/AppBar/NotificationSnackbar';
import NotificationSnackbar from '$components/NotificationSnackbar';

export default function Home() {
const isMobileScreen = useMediaQuery('(max-width: 750px)');
Expand All @@ -18,7 +18,7 @@ export default function Home() {
<MuiPickersUtilsProvider utils={DateFnsUtils}>
<CssBaseline />
<PatchNotes />
<Bar />
<Header />
{isMobileScreen ? (
<MobileHome />
) : (
Expand Down

0 comments on commit adeedf7

Please sign in to comment.