Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/signup #14

Open
wants to merge 62 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
a621120
회원가입 페이지 제작 중
kmyobin Jan 12, 2023
7a9a94d
충돌해결
kmyobin Jan 14, 2023
4249c1d
충돌해결
kmyobin Jan 14, 2023
989a024
전체 동의 제외 GUI 구현
kmyobin Jan 14, 2023
d3260f0
약관 동의 틀 제작
kmyobin Jan 14, 2023
a1be7f1
header margin 수정
kmyobin Jan 14, 2023
e474930
header margin 수정
kmyobin Jan 14, 2023
3985a6d
Merge branch 'dev' of https://github.com/ProjectFRIDAY/Remoa into fea…
kmyobin Jan 14, 2023
55f6711
약관 동의 구현
kmyobin Jan 16, 2023
fda26eb
동의란 width 조정
kmyobin Jan 16, 2023
bd79aca
성별 간격 조정
kmyobin Jan 16, 2023
5795f8c
로그인여부에 따른 헤더
JOO05 Jan 17, 2023
2f7ecf9
Merge branch 'dev' of https://github.com/ProjectFRIDAY/Remoa into dev
JOO05 Jan 17, 2023
02b8f5a
로그인 이벤트 처리, 유효성 검사
kmyobin Jan 17, 2023
816b624
충돌 수정
kmyobin Jan 18, 2023
d1d31c9
유효성 검사, 이벤트 처리
kmyobin Jan 18, 2023
235d33e
layout min-height 수정
kmyobin Jan 19, 2023
d951134
로그인 및 회원가입 초기 구#8
jayrhie Jan 19, 2023
6d3dcc9
로그인 및 회원가입 초기 구현#8
jayrhie Jan 19, 2023
5184291
로그인 및 회원가입, 카카오 로그인 및 회원가입 구현
jayrhie Jan 19, 2023
8361c28
@CrossOrigin 어노테이션 추가 및 SignupController try catch구문 삽입
jayrhie Jan 19, 2023
abeb142
jar파일 업로드
jayrhie Jan 19, 2023
f7e0139
jar파일 업로드
jayrhie Jan 19, 2023
9ac98f9
그림자 제거, 닉네임란 추가
kmyobin Jan 20, 2023
6aaca6e
연락처 유효성 검사 수정
kmyobin Jan 20, 2023
95ec677
이메일 비밀번호 찾기 페이지 GUI 제작 완료
JOO05 Jan 20, 2023
37fb8ec
Merge branch 'dev' of https://github.com/ProjectFRIDAY/Remoa into dev
JOO05 Jan 20, 2023
3006656
도메인 설계 완료, Comment위한 Repository 및 Service 개발 완료
jayrhie Jan 22, 2023
ae62ef1
도메인 설계 완료, Comment위한 Repository 및 Service 개발 완료
jayrhie Jan 22, 2023
65ada8a
도메인 설계 완료, Comment위한 Repository 및 Service 개발 완료
jayrhie Jan 22, 2023
d7c7aae
scroll overview 수정
kmyobin Jan 24, 2023
2519373
scroll 기능 구현
kmyobin Jan 24, 2023
eed8cc1
수정
kmyobin Jan 24, 2023
592d5b4
signup 페이지 추가
kmyobin Jan 24, 2023
638d5d3
닉네임란 수정
kmyobin Jan 24, 2023
23faa8a
충돌 해결
kmyobin Jan 24, 2023
0f4292e
기초적인 CRUD 완성
jayrhie Jan 25, 2023
49c9871
로그인 통신 테스트
kmyobin Jan 25, 2023
1a26a07
DbInit 동작시 db 체크 로직 추가 / jar파일 재업로드
jayrhie Jan 25, 2023
81302e2
닉네임 반환 설정
jeonkwanghwi Jan 26, 2023
92cb8bf
Merge branch 'dev' of https://github.com/ProjectFRIDAY/Remoa into dev
kmyobin Feb 2, 2023
f6e1b51
소셜로그인 페이지 라우팅, 추가
kmyobin Feb 2, 2023
f9a06c5
GUI 구현
kmyobin Feb 2, 2023
976f6dd
Delete .env
kmyobin Feb 2, 2023
5984a01
Delete .env
kmyobin Feb 2, 2023
ebac6ba
카카오 로그인
kmyobin Feb 2, 2023
2dde0b0
카카오 로그인 라우팅 추가
kmyobin Feb 2, 2023
c9585e8
카카오 로그인 라우팅 추가
kmyobin Feb 2, 2023
07b658e
Merge branch 'dev' of https://github.com/ProjectFRIDAY/Remoa into fea…
kmyobin Feb 2, 2023
40474ca
카카오 로그인 인가 코드 받기
kmyobin Feb 2, 2023
cdc81f2
카카오 로그인 BE 연결
kmyobin Feb 3, 2023
ef67c84
jar 재업로드
jayrhie Jan 25, 2023
42fd519
카카오 로그인 관련 오류 수정
jayrhie Feb 3, 2023
cebbf43
카카오 로그인 관련 오류 수정
jayrhie Feb 3, 2023
6b2a330
카카오 로그인 관련 오류 수정
jayrhie Feb 3, 2023
d6dd6f0
jar 업로드
jayrhie Feb 3, 2023
5c7e905
Merge branch 'dev' into feature/login
kmyobin Feb 6, 2023
2c63211
Merge branch 'dev' of https://github.com/ProjectFRIDAY/Remoa into dev
kmyobin Feb 6, 2023
c124cbd
merge 해결
kmyobin Feb 6, 2023
e8f6f94
Merge branch 'dev' into feature/sociallogin
kmyobin Feb 6, 2023
6b4c33f
오타 수정
kmyobin Feb 6, 2023
fd71ac3
글자 색깔 수정
kmyobin Feb 6, 2023
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
Binary file added BE/.DS_Store
Binary file not shown.
37 changes: 37 additions & 0 deletions BE/.gitignore
Original file line number Diff line number Diff line change
@@ -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/
38 changes: 38 additions & 0 deletions BE/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.7'
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
}

group = 'Remoa'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '1.8'

configurations {
compileOnly {
extendsFrom annotationProcessor
}
}

repositories {
mavenCentral()
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-web'
compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.mysql:mysql-connector-j'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'

//json simple
implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
}

tasks.named('test') {
useJUnitPlatform()
}
Binary file added BE/build/libs/.DS_Store
Binary file not shown.
Binary file added BE/build/libs/BE-ver_230125_2.jar
Binary file not shown.
Binary file added BE/build/libs/BE-ver_230203_3.jar
Binary file not shown.
Binary file added BE/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions BE/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
240 changes: 240 additions & 0 deletions BE/gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,240 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################

# Attempt to set APP_HOME

# Resolve links: $0 may be a link
app_path=$0

# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

warn () {
echo "$*"
} >&2

die () {
echo
echo "$*"
echo
exit 1
} >&2

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi

# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

JAVACMD=$( cygpath --unix "$JAVACMD" )

# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#

eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'

exec "$JAVACMD" "$@"
Loading