Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor : 스타일 오류 수정 #82

Merged
merged 1 commit into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions client/src/app/@Modal/(.)new-post/page.tsx

This file was deleted.

4 changes: 2 additions & 2 deletions client/src/app/@Modal/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"use client";

import { NEW_POST, SIGNIN } from "@/const/clientPath";
import { SIGNIN } from "@/const/clientPath";
import { usePathname } from "next/navigation";

export default function Layout({ children }: any) {
const pathname = usePathname();
const allowedPath = [NEW_POST, SIGNIN];
const allowedPath = [SIGNIN];

return allowedPath.some((path) => pathname.startsWith(path))
? children
jobkaeHenry marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/FixedBottomCTA.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const FixedBottomCTA = ({ ...props }: ButtonProps) => {
<>
<Button
sx={{
position: "absolute",
position: "fixed",
bottom: 0,
left: 0,
right: 0,
Expand All @@ -18,7 +18,7 @@ const FixedBottomCTA = ({ ...props }: ButtonProps) => {
/>
<Paper
sx={{
position: "absolute",
position: "fixed",
bottom: 0,
left: 0,
right: 0,
jobkaeHenry marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
1 change: 0 additions & 1 deletion client/src/components/SingleImageInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const SingleImageInput = ({
style={{ display: "none" }}
type="file"
accept="image/*"
capture="environment"
onChange={(e) => {
if (e.target.files) {
onChange(e.target.files[0]);
jobkaeHenry marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
6 changes: 4 additions & 2 deletions client/src/components/layout/CustomAppbar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"use client";
import {
AppBar,
AppBarProps,
Button,
IconButton,
Toolbar,
Expand All @@ -11,7 +12,7 @@ import GoBackIcon from "@/assets/icons/GoBackIcon.svg";
import { MouseEventHandler, ReactNode, memo } from "react";
import { useRouter } from "next/navigation";

interface CustomAppbarInterface {
interface CustomAppbarInterface extends AppBarProps {
title?: string;
prependButton?: ReactNode;
onClickPrepend?: MouseEventHandler<HTMLButtonElement>;
Expand All @@ -28,11 +29,12 @@ const CustomAppbar = ({
onClickPrepend,
disableAppend,
onClickAppend,
position,
}: CustomAppbarInterface) => {
const router = useRouter();

return (
<AppBar position={"fixed"}>
<AppBar position={position ? position : "fixed"}>
<Toolbar sx={{ display: "flex", justifyContent: "space-between" }}>
{/* 프리팬드 버튼 */}
{prependButton ? (
jobkaeHenry marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
4 changes: 4 additions & 0 deletions client/src/components/layout/CustomContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ const CustomContainer = ({
disableMt,
children,
}: CustomContainerInterface) => {
const appbarHeight = '64px'
const navbarHeight = '56px'

return (
<Container
sx={{ ...sx, px: { xs: 0, sm: 4 }, mt: disableMt ? 0 : 8 }}
Expand All @@ -21,6 +24,7 @@ const CustomContainer = ({
flexDirection: "column",
gap: 2,
p: 2,
minHeight:`calc(100vh - ${appbarHeight} - ${navbarHeight})`
}}
>
{children}
jobkaeHenry marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ const UserInfoEditingForm = () => {
onClickAppend={submitHandler}
appendButton={"저장"}
disableAppend={isLoading}
position={'static'}
/>
<Stack
component="form"
jobkaeHenry marked this conversation as resolved.
Show resolved Hide resolved
Expand Down