ETC : 온보딩을 위한 수정

innovationacademy-kr · Dec 26, 2024 · c86a080 · c86a080
1 parent 2c580f1
commit c86a080
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -163,27 +163,7 @@
 
 <div align="center">
 
-| [🐇dongglee](https://github.com/leedonggyu1848) | [🍑 eunbikim](https://github.com/eunbi9n) | [🥔 gyuwlee](https://github.com/gyutato) | [🐬huchoi](https://github.com/hunjin-choi) | [👻 hybae](https://github.com/HyeonsikBae) |
-| ----------------------------------------------- | ----------------------------------------- | ---------------------------------------- | ------------------------------------------ | ------------------------------------------ |
-
-| [🍒 hyoon](https://github.com/kamg2218) | [🍏 hyospark](https://github.com/kyoshong) | [🙉 inshin](https://github.com/42inshin) | [🧑‍✈️ jaesjeon](https://github.com/Oris482) | [🐶 jiwchoi](https://github.com/jiwon-choi) |
-| --------------------------------------- | ------------------------------------------ | ---------------------------------------- | ----------------------------------------- | ------------------------------------------- |
-
-| [🐯 joopark](https://github.com/joohongpark) | [🚀sanan](https://github.com/Ssuamje) | [🐻 seuan](https://github.com/aseungbo) | [🤑seycho](https://github.com/SeyoungCho) | [😺 sichoi](https://github.com/sichoi42) |
-| -------------------------------------------- | ------------------------------------- | --------------------------------------- | ----------------------------------------- | ---------------------------------------- |
-
-| [🍎 skim](https://github.com/subin195-09) | [🍪 spark](https://github.com/Hyunja27) | [✏️yooh](https://github.com/oyhoyhk) | [🪀 yoyoo](https://github.com/Yoowatney) | [🎒 yubchoi](https://github.com/yubinquitous) |
-| ----------------------------------------- | --------------------------------------- | ------------------------------------ | ---------------------------------------- | --------------------------------------------- |
-
-| [ 🌑 daewoole](https://github.com/LeeDaeWook) | [🐝 hyungnoh](https://github.com/YESHYUNGSEOK) | [🐻‍❄️ jpark2](https://github.com/Z1park) | [🎨 jusohn](https://github.com/junyoung2015) | [🤓 seonghmo ](https://github.com/seong-hui) | [🚀 wchae](https://github.com/enaenen) |
-| --------------------------------------------- | ---------------------------------------------- | -------------------------------------- | -------------------------------------------- | -------------------------------------------- | -------------------------------------- |
-
-| [ 🐶 surlee](https://github.com/Elineely) | [ 🐣 hyowchoi](https://github.com/chyo1/) | [ 👽 sohyupar](https://github.com/saewoo1) | [🦝 jimchoi](https://github.com/jimchoi9) | [ 🛼 jeekim](https://github.com/jnkeniaem) | [🍾 miyu](https://github.com/Minkyu01) | [🧸 gykoh](https://github.com/gykoh42) |
-| ----------------------------------------- | ----------------------------------------- | ------------------------------------------ | ----------------------------------------- | ------------------------------------------ | -------------------------------------- | -------------------------------------- |
-
-| [ 🐰 jihykim2](https://github.com/jihyunk03) | [⛄️ seonmiki](https://github.com/seonmiki) | [ 🎱 junsbae ](https://github.com/wet6123) |
-| -------------------------------------------- | ------------------------------------------- | ------------------------------------------ |
-
+[🦝 jimchoi](https://github.com/jimchoi9) |
 | <a href="https://github.com/innovationacademy-kr"><img src="https://img.shields.io/badge/42Seoul-000000?style=flat-square&logo=42&logoColor=white" /></a> |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
 

diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/Cabinet.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/Cabinet.java
@@ -187,13 +187,7 @@ public void writeMemo(String memo) {
 
 	@Override
 	public boolean equals(final Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof Cabinet)) {
-			return false;
-		}
-		return this.id.equals(((Cabinet) other).id);
+		return true;
 	}
 
 	@Override

diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentRedisService.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentRedisService.java
@@ -1,21 +1,5 @@
 package org.ftclub.cabinet.lent.service;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import lombok.RequiredArgsConstructor;
-import org.ftclub.cabinet.config.CabinetProperties;
-import org.ftclub.cabinet.exception.ExceptionStatus;
-import org.ftclub.cabinet.lent.domain.LentHistory;
-import org.ftclub.cabinet.lent.repository.LentRedis;
-import org.ftclub.cabinet.lent.repository.LentRepository;
-import org.ftclub.cabinet.log.LogLevel;
-import org.ftclub.cabinet.log.Logging;
-import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor

diff --git a/config b/config
diff --git a/frontend/index.html b/frontend/index.html
@@ -8,7 +8,7 @@
     <meta charset="UTF-8" />
     <meta
       name="description"
-      content="여러분의 일상을 가볍게: 42서울 학생들을 위한 캐비닛 대여 서비스"
+      content="여러분의 일상을 무겁게: 42서울 학생들을 위한 캐비닛 대여 서비스"
     />
     <meta
       name="keywords"

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -73,6 +73,7 @@ function App(): React.ReactElement {
             <Route path="store/item-use-log" element={<ItemUsageLogPage />} />
             <Route path="store/coin-log" element={<CoinLogPage />} />
           </Route>
+          메롱메롱👅
           <Route path="/presentation/" element={<PresentationLayout />}>
             <Route path="home" element={<PresentationHomePage />} />
             <Route path="register" element={<RegisterPage />} />