Merge branch 'dev' of https://github.com/innovationacademy-kr/Cabi in…

…to common/dev/feat_coin#1604
innovationacademy-kr · Jun 11, 2024 · 82ef4ac · 82ef4ac
2 parents cf7d63a + b089cff
commit 82ef4ac
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/backend/src/main/java/org/ftclub/cabinet/presentation/domain/Presentation.java b/backend/src/main/java/org/ftclub/cabinet/presentation/domain/Presentation.java
@@ -60,26 +60,25 @@ public class Presentation {
 	private User user;
 
 	protected Presentation(Category category, LocalDateTime dateTime,
-		PresentationTime presentationTime, String subject, String summary, String detail) {
+			PresentationTime presentationTime, String subject, String summary, String detail) {
 		this.category = category;
 		this.dateTime = dateTime;
 		this.presentationTime = presentationTime;
 		this.subject = subject;
 		this.detail = detail;
 		this.summary = summary;
 		this.presentationStatus = PresentationStatus.EXPECTED;
-		this.presentationLocation = PresentationLocation.THIRD;
+		this.presentationLocation = PresentationLocation.BASEMENT;
 	}
 
 	public static Presentation of(Category category, LocalDateTime dateTime,
-		PresentationTime presentationTime, String subject, String summary, String detail) {
+			PresentationTime presentationTime, String subject, String summary, String detail) {
 
-		return new Presentation(category, dateTime, presentationTime, subject,
-			summary, detail);
+		return new Presentation(category, dateTime, presentationTime, subject, summary, detail);
 	}
 
 	public void adminUpdate(PresentationStatus newStatus, LocalDateTime newDateTime,
-		PresentationLocation newLocation) {
+			PresentationLocation newLocation) {
 		this.presentationStatus = newStatus;
 		this.dateTime = newDateTime;
 		this.presentationLocation = newLocation;

diff --git a/config b/config
diff --git a/frontend/src/Cabinet/components/Common/Dropdown.tsx b/frontend/src/Cabinet/components/Common/Dropdown.tsx
@@ -12,7 +12,7 @@ export interface IDropdownOptions {
   hasNoOptions?: boolean;
 }
 
-export interface IDropdown {
+export interface IDropdownProps {
   options: IDropdownOptions[];
   defaultValue: string;
   defaultImageSrc?: string;
@@ -32,7 +32,8 @@ const Dropdown = ({
   closeOtherDropdown,
 }: IDropdown) => {
   const [currentName, setCurrentName] = useState(defaultValue);
-  const selectedIdx = options.findIndex((op) => op.name === currentName) ?? 0;
+  const idx: number = options.findIndex((op) => op.name === currentName);
+  const selectedIdx: number = idx === -1 ? 0 : idx;
   const DefaultOptionIcon =
     defaultImageSrc &&
     cabinetIconComponentMap[options[selectedIdx].value as CabinetType];

diff --git a/frontend/src/Presentation/components/Modals/EditStatusModal/EditStatusModal.tsx b/frontend/src/Presentation/components/Modals/EditStatusModal/EditStatusModal.tsx
@@ -4,8 +4,8 @@ import { useRecoilState, useSetRecoilState } from "recoil";
 import styled from "styled-components";
 import Button from "@/Cabinet/components/Common/Button";
 import Dropdown, {
-  IDropdown,
   IDropdownOptions,
+  IDropdownProps,
 } from "@/Cabinet/components/Common/Dropdown";
 import ModalPortal from "@/Cabinet/components/Modals/ModalPortal";
 import {