Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
YGwan committed Aug 16, 2023
2 parents dee8f50 + b03a54c commit 0f41467
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 32 deletions.
11 changes: 2 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,7 @@ sonarqube {
property "sonar.login", "admin"
property "sonar.password", "0520"
property "sonar.sources", "src"
property "sonar.language", "java" // 분석을 Java로 제한
property "sonar.language", "java"
property "sonar.sourceEncoding", "UTF-8"
// property "sonar.exclusions", "**/*Test*.*, **/Q*.JAVA"
// property "sonar.test.inclusions", "**/*Test.groovy, **/*Test.java"
// property "sonar.coverage.exclusions", "**/*Test*.*, **/Q*.java"
// property "sonar.java.junit.reportPaths", "${buildDir}/test-results"
// property "sonar.jacoco.reportPaths", "${buildDir}/jacoco/jacoco.exec"
// property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/coverageReport/coverageReport.xml" // Test Coverage Report 생성한 경우 사용
// property 'sonar.exclusions', 'com/xxx/**/*_.java,com/**/QMyEntity.java,....'
}
}
}
5 changes: 3 additions & 2 deletions src/main/resources/static/js/dashboard.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
const currentDomain = window.location.origin
// const currentDomain = "http://localhost:8080"

const settingContainer = document.getElementById("settingContainer");
settingContainer.addEventListener("click", function (e) {
window.location.href = "../html/setting-account.html";
Expand All @@ -19,8 +22,6 @@ menu04Container.addEventListener("click", function (e) {
});


// const currentDomain = window.location.origin
const currentDomain = "http://localhost:8080"

// 사용자의 applicationTypeName값
let applicationTypeName;
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/static/js/personal-information.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const currentDomain = "http://localhost:8080"
const currentDomain = window.location.origin
// const currentDomain = "http://localhost:8080"
var imgElement = document.querySelector('.frame-icon59');

async function fetchMyInfo() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/static/js/record.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//const currentDomain = window.location.origin
const currentDomain = "http://localhost:8080"
const currentDomain = window.location.origin
// const currentDomain = "http://localhost:8080"
const scorePattern = /^(?!-)(?!.*[a-zA-Z])(?!.*[!@#$%^&*()])(?!.*\d{5,})(?=.*\d)[^\s]+$/;

async function fetchEvaluationItem() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/static/js/reset-password-auth.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// const currentDomain = window.location.origin
const currentDomain = "http://localhost:8080"
const currentDomain = window.location.origin
// const currentDomain = "http://localhost:8080"

// reset-password-auth.html 페이지의 JavaScript 부분
document.addEventListener("DOMContentLoaded", function () {
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/static/js/reset-password.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const currentDomain = window.location.origin
// const currentDomain = "http://localhost:8080"

const emailInput = document.getElementById("email"); // 변경된 이메일 입력 요소 가져오기
const mergedEmailResult = document.getElementById("mergedEmail");
const sendEmail = document.getElementById("sendEmail");

emailInput.addEventListener("input", updateMergedEmail);

// const currentDomain = window.location.origin
const currentDomain = "http://localhost:8080"

let mail_result = 0

// 정규식
Expand Down
8 changes: 3 additions & 5 deletions src/main/resources/static/js/setting-account.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
const currentDomain = window.location.origin
// const currentDomain = "http://localhost:8080"

// dropdown
const dropdown = document.querySelector(".dropdown");
const dropdownText = dropdown.querySelector(".text704");
Expand All @@ -6,11 +9,6 @@ const nameInput = document.getElementById("full-name")
const emailInput = document.getElementById("email")
var imgElement = document.querySelector('.frame-icon69');


// const currentDomain = window.location.origin
const currentDomain = "http://localhost:8080"


document.addEventListener("DOMContentLoaded", function () {

// application type 드롭 다운 데이터 처리
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/static/js/sign-in.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// const currentDomain = window.location.origin
const currentDomain = "http://localhost:8080"
const currentDomain = window.location.origin
// const currentDomain = "http://localhost:8080"

const emailInput = document.getElementById("email"); // 변경된 이메일 입력 요소 가져오기
const passwordInput = document.getElementById("password1");
Expand Down
5 changes: 2 additions & 3 deletions src/main/resources/static/js/sign-up-email-auth.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// const currentDomain = window.location.origin
const currentDomain = "http://localhost:8080"

const currentDomain = window.location.origin
// const currentDomain = "http://localhost:8080"

const codeInput = document.getElementById("code");
const timerSpan = document.getElementById("timer");
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/static/js/sign-up.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
const currentDomain = window.location.origin
// const currentDomain = "http://localhost:8080"

const emailInput = document.getElementById("email"); // 변경된 이메일 입력 요소 가져오기
const passwordInput = document.getElementById("password1");
const passwordInput2 = document.getElementById("password2");
Expand All @@ -13,9 +16,6 @@ const dropdown = document.querySelector(".dropdown");
const dropdownText = dropdown.querySelector(".text704");
const dropdownContent = dropdown.querySelector(".dropdown-content");

// const currentDomain = window.location.origin
const currentDomain = "http://localhost:8080"

let mail_result = 0
let passwordMachResult = false;

Expand Down

0 comments on commit 0f41467

Please sign in to comment.