Skip to content
Merged

step7 #154

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
2 changes: 0 additions & 2 deletions src/main/java/codesquad/domain/Answer.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ public class Answer extends AbstractEntity {
@JoinColumn(foreignKey = @ForeignKey(name = "fk_answer_issue"))
private Issue issue;



private String answer;

private boolean deleted = false;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/codesquad/domain/Attachment.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ public class Attachment extends AbstractEntity {
private User writer;

@Size(max = 260)
private
String originalFileName;

@Size(max = 32)
private
String storedFileName;

String path;
private String path;

public Attachment() {

Expand Down
1 change: 0 additions & 1 deletion src/main/java/codesquad/domain/Label.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public class Label extends AbstractEntity {
@Column(nullable = false)
private String label;


public String getLabel() {
return label;
}
Expand Down
16 changes: 0 additions & 16 deletions src/main/java/codesquad/domain/response/UploadFileResponse.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,15 @@ public String getFileName() {
return fileName;
}

public void setFileName(String fileName) {
this.fileName = fileName;
}

public String getFileDownloadUri() {
return fileDownloadUri;
}

public void setFileDownloadUri(String fileDownloadUri) {
this.fileDownloadUri = fileDownloadUri;
}

public String getFileType() {
return fileType;
}

public void setFileType(String fileType) {
this.fileType = fileType;
}

public long getSize() {
return size;
}

public void setSize(long size) {
this.size = size;
}
}
2 changes: 2 additions & 0 deletions src/main/java/codesquad/web/ApiUserController.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public class ApiUserController {

@PostMapping("")
public ResponseEntity<Void> create(@Valid @RequestBody UserDto user) {
log.debug("##### create user api");
log.debug("user : {}", user.toString());
User savedUser = userService.add(user);

HttpHeaders headers = new HttpHeaders();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/codesquad/web/UserController.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Controller
@RequestMapping("/users")
public class UserController {
private static final Logger log = LoggerFactory.getLogger(UserController.class);
private static final Logger logger = LoggerFactory.getLogger(UserController.class);

@Resource(name = "userService")
private UserService userService;
Expand All @@ -36,7 +36,7 @@ public String create(@Valid UserDto userDto) {

@GetMapping("/{id}/form")
public String updateForm(@LoginUser User loginUser, @PathVariable long id, Model model) {
log.debug("LoginUser : {}", loginUser);
logger.debug("LoginUser : {}", loginUser);
model.addAttribute("user", userService.findById(loginUser, id));
return "/user/updateForm";
}
Expand Down
Binary file added src/main/resources/static/css/images/avatar.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/main/resources/static/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ body .issues {
.issues .minilogo {
width: 44px;
height: 44px;
background-image: url('images/avatar.png');
background-image: url('images/avatar.jpeg');
background-position: center;
background-repeat: no-repeat;
background-size: 50%;
Expand Down
100 changes: 100 additions & 0 deletions src/main/resources/static/js/scripts.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,105 @@
'use strict';

// create users
$("#createUser button[type=submit]").click(create);
function create(e) {
e.preventDefault();

var url = $('#createUser').attr("action");
console.log(url);

var user = {
userId : $('#userId').val(),
name : $('#name').val(),
password : $('#password').val()
};

console.log(JSON.stringify(user));

$.ajax({
url : url,
method : 'POST',
data : JSON.stringify(user),
contentType : "application/json",
success : function() {
location.href="/";
},
error : function(response) {
console.log(response);
makingErrorField(response);
}
});

var makingErrorField = function(response) {
const errorFields = response.responseJSON.errors;

if (!errorFields) {
alert(response);
return;
}

console.log(errorFields);

var $field, error;

for (var i = 0, length = errorFields.length; i < length; i++) {
error = errorFields[i];

console.log(error.errorMessage);


//document.querySelector(".answer-error").innerHTML = error.fieldName + error.errorMessage;

$field = $('#' + error['fieldName']);

if($field && $field.length > 0){
$field.siblings('.error-message').remove();
$field.after('<span class="error-message text-muted taxt-small text-danger">'+error.errorMessage+'</span>');
}

}
}
}

/*
let formId = document.querySelector(".check-userId");
let formName = document.querySelector(".check-name");
let formPassword = document.querySelector(".check-password");

formId.addEventListener("change", function(evt) {

if(evt.target.name === "userId" && evt.target.value.length >= 5) {
let answerName = document.querySelector(".answer-userId").innerHTML = "올바른 아이디입니다.";
} else {
let answerName = document.querySelector(".answer-userId").innerHTML = "아이디는 5자리 이상이어야 합니다.";
}

});

formName.addEventListener("change", function(evt) {

if(evt.target.name === "name" && evt.target.value.length >= 3) {
let answerName = document.querySelector(".answer-name").innerHTML = "올바른 이름입니다.";
} else {
let answerName = document.querySelector(".answer-name").innerHTML = "이름은 3자 이상이어야 합니다.";
}

});

formPassword.addEventListener("change", function(evt) {

if(evt.target.name === "password" && evt.target.value.length >= 8) {
let answerName = document.querySelector(".answer-password").innerHTML = "올바른 비밀번호입니다.";
} else {
let answerName = document.querySelector(".answer-password").innerHTML = "비밀번호는 8자리 이상이어야 합니다.";
}

});
*/




// ## Login
$("#login button[type=submit]").click(login);

Expand Down
15 changes: 11 additions & 4 deletions src/main/resources/templates/user/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,29 @@
</div>
<div class="issues__posts mdl-grid">
<div class="mdl-card mdl-shadow--4dp mdl-cell mdl-cell--12-col">
<form action="/users" enctype="multipart/form-data" method="post">
<form id="createUser" action="/api/users" enctype="multipart/form-data" method="post">
<div class="mdl-card__title mdl-color-text--grey-50" style="height:100px;">
<h4>Join Member</h4>
</div>
<div class="mdl-card__supporting-text">
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" style="margin:0 auto">
<input class="mdl-textfield__input" type="text" id="userId" name="userId" required>
<input class ="mdl-textfield__input check-userId" type="text" placeholder="아이디를 입력하십시오." id="userId" name="userId" required>
<label class="mdl-textfield__label" for="userId">User ID</label>
<p class="answer-userId"></p>
</div>
</div>
<div class="mdl-card__supporting-text">
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" style="margin:0 auto">
<input class="mdl-textfield__input" type="text" id="name" name="name" required>
<input class="mdl-textfield__input check-name" type="text" placeholder="이름을 입력하십시오." id="name" name="name" required>
<label class="mdl-textfield__label" for="name">Name</label>
<p class="answer-name"></p>
</div>
</div>
<div class="mdl-card__supporting-text">
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" style="margin:0 auto">
<input class="mdl-textfield__input" type="password" id="password" name="password" required>
<input class="mdl-textfield__input check-password" type="password" placeholder="비밀번호를 입력하십시오." id="password" name="password" required>
<label class="mdl-textfield__label" for="password">Password</label>
<p class="answer-password"></p>
</div>
</div>
<div class="mdl-card__supporting-text">
Expand All @@ -36,6 +39,10 @@ <h4>Join Member</h4>
</div>
</div>
<div class="mdl-card__supporting-text">

<p class="answer-error"></p>


<button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored" type="submit"
style="margin:10px auto; width:200px;" >Submit
</button>
Expand Down