Merge remote-tracking branch 'origin/main'

Team-KHPT · Jun 28, 2023 · a34d90d · a34d90d
2 parents 6b7350c + cac460b
commit a34d90d
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 21 deletions.
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -22,7 +22,7 @@ jobs:
       env:
         OCCUPY_SECRET: ${{ secrets.OCCUPY_SECRET }}
         OCCUPY_SECRET_DIR: src/main/resources
-        OCCUPY_SECRET_DIR_FILE_NAME: application-secret.yml
+        OCCUPY_SECRET_DIR_FILE_NAME: application.yml
       run: echo $OCCUPY_SECRET | base64 --decode > $OCCUPY_SECRET_DIR/$OCCUPY_SECRET_DIR_FILE_NAME
 
     - name: Cache Gradle packages

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+application-secret.yml
+
 HELP.md
 .gradle
 build/

diff --git a/src/main/java/com/khpt/projectkim/entity/Result.java b/src/main/java/com/khpt/projectkim/entity/Result.java
@@ -20,6 +20,8 @@ public class Result {
     // 회사 정보들 모두 적어 (회사명, 지역, 등등)
     private String company;  // 회사이름
 
+    private String title;  // 제목
+
     private String region; // 지역
 
     private String salary;  // 급여

diff --git a/src/main/java/com/khpt/projectkim/entity/User.java b/src/main/java/com/khpt/projectkim/entity/User.java
@@ -1,10 +1,12 @@
 package com.khpt.projectkim.entity;
 
 import lombok.*;
+import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Getter
@@ -20,10 +22,10 @@ public class User implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(unique = true)
-    private String email;
+    @CreationTimestamp
+    private Date createdAt;
 
-    @Column(nullable = false)
+    @Column(unique = true, nullable = false)
     private String login;
 
     private String picture;

diff --git a/src/main/resources/application-secret.yml b/src/main/resources/application-secret.yml
diff --git a/src/main/resources/templates/chat.mustache b/src/main/resources/templates/chat.mustache
@@ -25,13 +25,15 @@
 
     <!--Right Appbar contents-->
     <div class="flex space-x-5">
-    {{^name}}
+    {{^ name }}
       <a href="/login?redirect={{ current_url }}" class="text-stone-800 font-bold cursor-pointer">로그인</a>
-      <a href="#" class="text-stone-800 font-bold cursor-pointer">회원가입</a>
-    {{/name}}
-    {{#name}}
-      <a href="#" class="text-stone-800 font-bold cursor-pointer underline">{{name}}</a>
-    {{/name}}
+    {{/ name }}
+    {{# recent_results }}
+      <a href="#" class="text-stone-800 font-bold cursor-pointer">이전 기록</a>
+    {{/ recent_results }}
+    {{# name }}
+      <a href="#" class="text-stone-800 font-bold cursor-pointer underline">{{ name }}</a>
+    {{/ name }}
     </div>
 
   </div>
@@ -92,25 +94,26 @@
 
       <!--Analysis items-->
       <div class="h-full p-5 border rounded-lg shadow-md flex flex-col space-y-2 overflow-y-scroll no-scrollbar">
-
+        {{#results}}
         <div class="p-2 flex flex-col border rounded-lg space-y-2 text-stone-600">
-          <div class="text-xs truncate text-ellipsis">회사명</div>
-          <div class="text-black font-bold truncate text-ellipsis">IT 개발 어쩌고 저쩌고 어쩌고 저쩌고 어쩌고 저쩌고 어쩌고 저쩌고 어쩌고 저쩌고 </div>
+          <div class="text-xs truncate text-ellipsis">{{company}}</div>
+          <div class="text-black font-bold truncate text-ellipsis">{{title}}</div>
           <div class="flex justify-between">
             <div class="w-1/3 flex justify-start">
               <img class="w-4 h-4" src="/icons/location.png" alt="loc">
-              <span class="w-full text-xs truncate text-ellipsis">경기 화성시 화성시화성시화성시화성시화성시</span>
+              <span class="w-full text-xs truncate text-ellipsis">{{region}}</span>
             </div>
             <div class="w-1/3 flex justify-start">
               <img class="w-4 h-4" src="/icons/profile.png" alt="edu">
-              <span class="text-xs truncate text-ellipsis">대졸(2,3년제) 이상111111111111111111111111</span>
+              <span class="text-xs truncate text-ellipsis">{{education}}</span>
             </div>
             <div class="w-1/3 flex justify-start">
               <img class="w-4 h-4" src="/icons/approval.png" alt="years">
-              <span class="text-xs truncate text-ellipsis">경력 무관1111111111111111111111111</span>
+              <span class="text-xs truncate text-ellipsis">{{career}}</span>
             </div>
           </div>
         </div>
+        {{/results}}
         <div class="p-2 flex flex-col border rounded-lg space-y-2 text-stone-600">
           <div class="text-xs truncate text-ellipsis">회사명</div>
           <div class="text-black font-bold truncate text-ellipsis">IT 개발</div>

diff --git a/src/test/java/com/khpt/projectkim/ProjectKimApplicationTests.java b/src/test/java/com/khpt/projectkim/ProjectKimApplicationTests.java
@@ -6,8 +6,4 @@
 @SpringBootTest
 class ProjectKimApplicationTests {
 
-	@Test
-	void contextLoads() {
-	}
-
 }