Merge branch 'main' of github.com:ProCO-Ewha/BSTI-test

.github/ISSUE_TEMPLATE/default.md

@@ -0,0 +1,10 @@
+---
+name: DEFAULT
+about: Default Template
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/✔todo.md

@@ -0,0 +1,14 @@
+---
+name: "✔TODO"
+about: ToDo to Feat or other else
+title: "✔[TODO]"
+labels: schedule
+assignees: ''
+
+---
+
+## Due date (expected)
+
+## ToDo
+
+## Ect

.github/ISSUE_TEMPLATE/✨feat.md

@@ -0,0 +1,17 @@
+---
+name: "✨FEAT"
+about: Suggest an idea for this project
+title: "✨[FEAT]"
+labels: documentation, schedule
+assignees: ''
+
+---
+
+## Feature
+
+
+## ToDo
+- [ ] 소기능
+- [ ] 소기능
+
+## Ect

.github/ISSUE_TEMPLATE/🧨bug.md

@@ -0,0 +1,14 @@
+---
+name: "\U0001F9E8BUG"
+about: Create a report to help us improve
+title: "\U0001F9E8[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+## Describe
+
+## Solution
+
+## Ect

.github/workflows/deploy.yml

@@ -0,0 +1,69 @@
+name: CI-CD
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+
+env:
+  S3_BUCKET_NAME: bsti-jar-cdci
+  RESOURCE_PATH: ./src/main/resources/application.yaml
+  CODE_DEPLOY_APPLICATION_NAME: BSTI-jar-Release
+  CODE_DEPLOY_DEPLOYMENT_GROUP_NAME: Spring-Server
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v1
+        with:
+          java-version: 21
+
+        # [1]
+      - name: Set yaml file 
+        uses: microsoft/variable-substitution@v1
+        with:
+          files: ${{ env.RESOURCE_PATH }} 
+        env:
+          override.value: 'from deploy.yaml'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
+        shell: bash
+
+        # [2]
+      - name: Build with Gradle
+        run: ./gradlew build
+        shell: bash
+
+        # [3]
+      - name: Make zip file
+        run: zip -r ./$GITHUB_SHA.zip .
+        shell: bash
+
+        # [4]
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }} 
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }} 
+          aws-region: ${{ secrets.AWS_REGION }} 
+
+        # [5]
+      - name: Upload to S3
+        run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip
+
+        # [6]
+      - name: Code Deploy
+        run: | 
+          aws deploy create-deployment \
+          --deployment-config-name CodeDeployDefault.AllAtOnce \
+          --application-name ${{ env.CODE_DEPLOY_APPLICATION_NAME }} \
+          --deployment-group-name ${{ env.CODE_DEPLOY_DEPLOYMENT_GROUP_NAME }} \
+          --s3-location bucket=$S3_BUCKET_NAME,bundleType=zip,key=$GITHUB_SHA.zip

README.md

@@ -1 +1,14 @@
-# test
+# 🛠BSTI
+블랙서바이벌 캐릭터 테스트 웹사이트입니다.
+
+나와 플레이 성향이 가장 어울리는 블랙서바이벌 캐릭터는?
+캐릭터 유형으로 확인해보세요!
+
+## Contributors
+
+| front | back |
+|---|---|
+| 한사랑 | 강승연 |
+
+## 현재 최종 보고
+[중중간발표 PPT](https://docs.google.com/presentation/d/1krOS0x8B541HuvMMCdtNhVaXYY_DY-0_/edit?usp=sharing&ouid=106009116602613498747&rtpof=true&sd=true)

backend/BSTI/.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+**src/main/resources/application.properties
 
 ### STS ###
 .apt_generated

backend/BSTI/build.gradle

@@ -34,6 +34,7 @@ dependencies {
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
 }
 
 tasks.named('test') {

backend/BSTI/src/main/java/com/BlackSurvival/BSTI/controller/TestController.java

@@ -18,7 +18,9 @@
 @RequestMapping("/test")
 public class TestController {
 
+
     private final TestService service;
+
     @GetMapping("show/{id}")
     //@ResponseBody
     public String getTest(@PathVariable Integer id, Model model){

backend/BSTI/src/main/java/com/BlackSurvival/BSTI/entity/BS_Character.java

@@ -6,6 +6,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.net.URL;
+
 @Data
 @Entity
 @NoArgsConstructor
@@ -18,4 +20,4 @@ public class BS_Character {
     private String eng_name;
     private String description;
     private String main_quote;
-}
+}

backend/BSTI/src/test/java/com/BlackSurvival/BSTI/BstiApplicationTests.java

@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest
+//@SpringBootTest
 class BstiApplicationTests {
 
 	@Test

frontend/.gitignore

@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*