team4-order · qkralsgml78 · Mar 18, 2024 · Mar 18, 2024 · Mar 18, 2024 · Mar 19, 2024
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,37 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/remote-targets.xml b/.idea/remote-targets.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -1,12 +1,71 @@
-# 4team_final_MainSpring
+<<<<<<< HEAD
+m_final_MainSpring
+
 spring 메인 레포
+=======
+# 4team_final_MainSpring
+spring 메인 레포!!
+
+>>>>>>> c66e738dff68eaf9eeb463527fe00f1e25000fd3
+
+
+<<<<<<< HEAD
+## Dependencies
+```
+Spring 3.2.1
+
+jpa, web
+
+jjwt package(api, impl, jackson) 0.12.3
+
+mariadb-client
+
+lombok
+
+oauth2 2.5.2.RELEASE
 
-### 다들 규칙 확인하시고 시작하세요!!
+oauth2-client 6.2.3
 
+json 21211205
+
+gson 2.10.1
+```
+
+전승민 [초기 registerPage branch v0.1.1]
+
+changes
+
+1. delete demo files ( demo, java, src)
+
+2. delete useless dir ( temp)
+
+3. created new project (main-Login)
+> login page, register page
+
+4. branch registerPage/0.1.3/J
+> 0.1.2버전에서 지속되는 문제를 해결하기 위해 새로운 코드로 생성해볼 예정
+> 
+> main-Login-2 <- 메인 프로젝트
+> 
+> main-Login-3, main-Login-4, test => test용 프로젝트 실사용 x
+=======
 | git 컨벤션 규칙 |
 |----------------|
 |[WIKI](https://github.com/team4-order/team4-main/wiki/%EC%BB%A8%EB%B2%A4%EC%85%98-%EA%B7%9C%EC%B9%99)|
+>>>>>>> c66e738dff68eaf9eeb463527fe00f1e25000fd3
+
+
+---------------------------------------------------------
+
+구현 로그인 기능 (24-04-05)
 
+1. jwt 발급을 통한 로그인 기능
+2. 소셜 로그인을 통한 로그인 기능
+3. 회원가입
+4. 로그아웃
 
+구현 예정 기능
+1. 회원 탈퇴
+2. 회원 정보 찾기
 
 
diff --git a/demo/.idea/workspace.xml b/demo/.idea/workspace.xml
diff --git a/demo2/demo2/src/main/resources/static/favicon.ico b/demo2/demo2/src/main/resources/static/favicon.ico
diff --git a/demo2/demo2/src/main/resources/static/index.html b/demo2/demo2/src/main/resources/static/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="/favicon.ico">
+    <title>frontend</title>
+  <script defer src="/js/chunk-vendors.js"></script><script defer src="/js/app.js"></script></head>
+  <body>
+    <noscript>
+      <strong>We're sorry but frontend doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
+</html>