Skip to content

Commit

Permalink
Merge pull request #49 from 0-wook/develop
Browse files Browse the repository at this point in the history
fix: 빌드 오류 수정
  • Loading branch information
0-wook authored Nov 27, 2023
2 parents 3b39ada + 72bd86f commit c5f6ade
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions app/admin-server/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ spring:
spring:
config:
activate:
on-profile: local # local settings
# on-profile: prod
# on-profile: local # local settings
on-profile: prod

datasource:
url: jdbc:mariadb://${DATABASE_URL}:3306/automl
Expand Down
4 changes: 2 additions & 2 deletions app/user-server/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ spring:
spring:
config:
activate:
on-profile: local # local settings
# on-profile: prod
# on-profile: local # local settings
on-profile: prod

datasource:
url: jdbc:mariadb://${DATABASE_URL}:3306/automl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const ModelTimeSeriesProcesser = (props) => {
const [uploadedFileUrl, setUploadedFileUrl] = useState(null);
const [selectData, setSelectData] = useState("");
const [payload, setPayload] = useState([]);
const [predictData, setPredictData] = useState("");
// const [predictData, setPredictData] = useState("");

console.log(payload);

Expand Down Expand Up @@ -87,8 +87,8 @@ const ModelTimeSeriesProcesser = (props) => {
};

const [isLoading, setIsLoading] = useState(false); // 버튼의 로딩 상태를 위한 state 추가
const [predictionResultButtonDisabled, setPredictionResultButtonDisabled] =
useState(true); // 예측 결과 버튼 활성화 상태를 위한 state 추가
// const [predictionResultButtonDisabled, setPredictionResultButtonDisabled] =
useState(true); // 예측 결과 버튼 활성화 상태를 위한 state 추가

const startPrediction = () => {
setIsLoading(true); // 로딩 시작
Expand All @@ -103,13 +103,13 @@ const ModelTimeSeriesProcesser = (props) => {
.then((response) => response.json())
.then((data) => {
console.log("Received data:", data);
setPredictData(data);
// setPredictData(data);
})
.catch((error) => console.error("Error occurred:", error));

setTimeout(() => {
setIsLoading(false); // 5초 후 로딩 상태 종료
setPredictionResultButtonDisabled(false); // 예측 결과 버튼 활성화
// setPredictionResultButtonDisabled(false); // 예측 결과 버튼 활성화
}, 5000);
};

Expand Down

0 comments on commit c5f6ade

Please sign in to comment.