Skip to content
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
61 changes: 0 additions & 61 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,64 +1,3 @@
# HelFooMe

![프로젝트 로고](https://i.ibb.co/5RDMnP8/Kakao-Talk-20241115-230442579-02.png)


## 🥔 HelFooMe

> 음식을 보다 가치있게 지속가능한 소비를 촉진하는 푸드 라이프스타일 플랫폼</br>
> 소상공인 상생 푸드 테크 </br>
> 환경과 음식을 생각하는 제로웨이스트 서비스

## 🎯 프로젝트의 목적(Purpose)

> 멋쟁이자사처럼 12기 4호선톤 </br>
> "음식 낭비 문제를 해결하고, 지속 가능한 소비와 환경 보호를 촉진하기 위한 서비스 제작"</br>
> 현대 사회에서 식량 자원은 풍요로우면서도 많은 양이 불필요하게 폐기되고 있으며, 이로 인해 발생하는 환경적, 경제적 손실에 대한 문제를 해결하자는 의견으로부터 주제 실현</br>
>
> 프로젝트 기간 : 2024/10/08 ~ 2024/11/16

## 🤩 팀원들(Team Members)

| Lead(FE Developer) | PM | Design | BE Developer | BE Developer | FE Developer |
|:-------------------------------------------------------------------------------:|:------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------:|
| [이세은](https://github.com/sengooooo) | [구도욱](https://github.com/kudowuk) | [김복민](https://github.com/bokminkim) | [윤희준](https://github.com/uni-j-uni) | [조수빈](https://github.com/s0obang) | [조수빈](https://github.com/Jun279) |
| <img src="https://avatars.githubusercontent.com/u/127099876?v=4" width="400" /> | <img src="https://avatars.githubusercontent.com/u/82072961?v=4" width="300" /> | <img src="https://avatars.githubusercontent.com/u/173746566?v=4" width="300" /> | <img src="https://avatars.githubusercontent.com/u/118972548?v=4" width="300" /> | <img src="https://avatars.githubusercontent.com/u/109025445?v=4" width="300" /> | <img src="https://avatars.githubusercontent.com/u/122501996?v=4" width="300" /> |

## 🛠️ 기술 스택(Tech)

### FE
![React](https://img.shields.io/badge/react-61DAFB?style=for-the-badge&logo=react&logoColor=black)
![Bootstrap](https://img.shields.io/badge/bootstrap-7952B3?style=for-the-badge&logo=bootstrap&logoColor=white)
![Recoil](https://img.shields.io/badge/recoil-3578E5?style=for-the-badge&logo=recoil&logoColor=white)

### BE
![Spring Boot](https://img.shields.io/badge/springboot-6DB33F?style=for-the-badge&logo=springboot&logoColor=white)
![MySQL](https://img.shields.io/badge/mysql-4479A1.svg?style=for-the-badge&logo=mysql&logoColor=white)
![JWT](https://img.shields.io/badge/JWT-black?style=for-the-badge&logo=JSON%20web%20tokens)

### Infra
![Amazon AWS](https://img.shields.io/badge/AmazonAWS-f7f7f7?style=for-the-badge&logo=AmazonAWS&logoColor=f89400)
![Linux](https://img.shields.io/badge/Linux-FCC624?style=for-the-badge&logo=linux&logoColor=black)
![Ubuntu](https://img.shields.io/badge/Ubuntu-E95420?style=for-the-badge&logo=ubuntu&logoColor=white)
![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)
![Nginx](https://img.shields.io/badge/nginx-%23009639.svg?style=for-the-badge&logo=nginx&logoColor=white)
![GitHub Actions](https://img.shields.io/badge/github%20actions-%232671E5.svg?style=for-the-badge&logo=githubactions&logoColor=white)

### 협업 툴 (Tools)
![GitHub](https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white)
![Notion](https://img.shields.io/badge/Notion-%23000000.svg?style=for-the-badge&logo=notion&logoColor=white)
![Swagger](https://img.shields.io/badge/-Swagger-%23Clojure?style=for-the-badge&logo=swagger&logoColor=white)

### 디자인
![Figma](https://img.shields.io/badge/figma-%23F24E1E.svg?style=for-the-badge&logo=figma&logoColor=white)
![Adobe Illustrator](https://img.shields.io/badge/adobe%20illustrator-%23FF9A00.svg?style=for-the-badge&logo=adobe%20illustrator&logoColor=white)

## ERD 설계
![erd](https://i.ibb.co/dbgTBtW/Kakao-Talk-20241115-230442579.png)

## API 설계 문서
> 작성중

## GitHub Flow
![github-flow](https://i.ibb.co/p3Gfnvs/Kakao-Talk-20241115-230442579-01.png)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.uggthon.team01.controller;

import com.uggthon.team01.service.S3Service;
import java.io.IOException;

import org.springframework.http.ResponseEntity;
Expand All @@ -18,13 +19,13 @@
@RequestMapping("/api")
public class FileController {

private final FileService fileService;
private final S3Service s3Service;
private final AIService aiService;

@PostMapping("/file")
public ResponseEntity<String> uploadFile(@RequestParam("file") MultipartFile file)
throws IOException {
String imageId = fileService.uploadFile(file);
String imageId = s3Service.upload(file, file.getName());
return ResponseEntity.ok(imageId);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/uggthon/team01/dto/GenerateRequestDto.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
public class GenerateRequestDto {
private List<String> scenario1;
private List<String> scenario2;
private Long scenario3; // img아이디
private List<Long> scenario4;
private String scenario3; // img아이디
private List<String> scenario4;
}
2 changes: 1 addition & 1 deletion src/main/java/com/uggthon/team01/service/S3Service.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public String upload(MultipartFile multipartFile, String dirName) throws IOExcep
File uploadFile = convert(multipartFile);
String uploadImageUrl = putS3(uploadFile, fileName);
removeNewFile(uploadFile);
return uploadImageUrl;
return uuid;
}

private File convert(MultipartFile file) throws IOException {
Expand Down
Loading