From 27ba75ea172547c1a829bf2c4998eb98fdd9eaae Mon Sep 17 00:00:00 2001 From: 0-wook Date: Wed, 6 Dec 2023 16:44:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EC=83=88=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=A0=81=EC=9A=A9=20=EA=B4=80=EB=A0=A8=20=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=20=EB=B0=8F=20URI=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metadata/api/MetadataCreateApi.java | 34 ------------------- .../metadata/api/MetadataDeleteApi.java | 29 ---------------- .../domain/metadata/api/MetadataReadApi.java | 29 ---------------- .../src/main/resources/application.yml | 1 + .../components/presentational/LoginCard.jsx | 3 +- .../components/presentational/Navigator.jsx | 12 +++---- .../automl/global/config/web/WebConfig.java | 2 +- .../components/presentational/LoginCard.jsx | 7 ++-- .../global/footer/LinkBoxes.jsx | 9 ++--- .../global/header/AdminUsageListItems.jsx | 4 +-- .../main/banner/IntroduceCommentBox.jsx | 2 +- .../main/cards/ContentMediaCards.jsx | 9 ++--- .../ModelDataPredictionBox.jsx | 29 ++-------------- .../ModelUtilizationDataDownloadBox.jsx | 12 +++++++ 14 files changed, 34 insertions(+), 148 deletions(-) delete mode 100644 app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataCreateApi.java delete mode 100644 app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataDeleteApi.java delete mode 100644 app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataReadApi.java create mode 100644 app/user-web/src/components/presentational/model-operation/modelUtilization/ModelUtilizationDataDownloadBox.jsx diff --git a/app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataCreateApi.java b/app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataCreateApi.java deleted file mode 100644 index 2e222ae..0000000 --- a/app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataCreateApi.java +++ /dev/null @@ -1,34 +0,0 @@ -// package kr.co.automl.domain.metadata.api; - -// import kr.co.automl.domain.metadata.dto.CreateMetaDataAttributes; -// import kr.co.automl.domain.metadata.service.MetadataSaver; -// import org.springframework.http.HttpStatus; -// import org.springframework.security.access.prepost.PreAuthorize; -// import org.springframework.web.bind.annotation.PostMapping; -// import org.springframework.web.bind.annotation.RequestBody; -// import org.springframework.web.bind.annotation.RequestMapping; -// import org.springframework.web.bind.annotation.ResponseStatus; -// import org.springframework.web.bind.annotation.RestController; - -// import javax.validation.Valid; -// import java.net.URISyntaxException; - -// @RestController -// @RequestMapping("metadata") -// @PreAuthorize("hasAnyRole('MANAGER', 'ADMIN')") -// public class MetadataCreateApi { - -// private final MetadataSaver metadataSaver; - -// public MetadataCreateApi(MetadataSaver metadataSaver) { -// this.metadataSaver = metadataSaver; -// } - -// @PostMapping -// @ResponseStatus(HttpStatus.CREATED) -// public void create( -// @RequestBody @Valid CreateMetaDataAttributes attribues -// ) throws URISyntaxException { -// metadataSaver.save(attribues); -// } -// } diff --git a/app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataDeleteApi.java b/app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataDeleteApi.java deleted file mode 100644 index 6d3c44a..0000000 --- a/app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataDeleteApi.java +++ /dev/null @@ -1,29 +0,0 @@ -// package kr.co.automl.domain.metadata.api; - -// import kr.co.automl.domain.metadata.service.MetadataRemover; -// import org.springframework.http.ResponseEntity; -// import org.springframework.security.access.prepost.PreAuthorize; -// import org.springframework.web.bind.annotation.DeleteMapping; -// import org.springframework.web.bind.annotation.PathVariable; -// import org.springframework.web.bind.annotation.RestController; - -// @RestController -// public class MetadataDeleteApi { - -// private final MetadataRemover metadataRemover; - -// public MetadataDeleteApi(MetadataRemover metadataRemover) { -// this.metadataRemover = metadataRemover; -// } - -// @DeleteMapping("/metadata/{id}") -// @PreAuthorize("hasAnyRole('MANAGER', 'ADMIN')") -// public ResponseEntity deleteMetadata( -// @PathVariable long id -// ) { -// metadataRemover.remove(id); - -// return ResponseEntity.noContent() -// .build(); -// } -// } diff --git a/app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataReadApi.java b/app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataReadApi.java deleted file mode 100644 index fc26dc1..0000000 --- a/app/admin-server/src/main/java/kr/co/automl/domain/metadata/api/MetadataReadApi.java +++ /dev/null @@ -1,29 +0,0 @@ -// package kr.co.automl.domain.metadata.api; - -// import kr.co.automl.domain.metadata.dto.MetadataResponse; -// import kr.co.automl.domain.metadata.service.MetadataReader; -// import kr.co.automl.global.utils.web.dto.ListToDataResponse; -// import lombok.RequiredArgsConstructor; -// import org.springframework.data.domain.Pageable; -// import org.springframework.security.access.prepost.PreAuthorize; -// import org.springframework.web.bind.annotation.GetMapping; -// import org.springframework.web.bind.annotation.RestController; - -// import java.util.List; - -// @RestController -// @PreAuthorize("hasAnyRole('MANAGER', 'ADMIN')") -// @RequiredArgsConstructor -// public class MetadataReadApi { - -// private final MetadataReader metadataReader; - -// @GetMapping("metadata") -// public ListToDataResponse getAllMetadata(Pageable pageable) -// { -// List metadataResponses = metadataReader.readAll(pageable); - -// return new ListToDataResponse<>(metadataResponses); -// } - -// } diff --git a/app/admin-server/src/main/resources/application.yml b/app/admin-server/src/main/resources/application.yml index 034713a..95dd580 100644 --- a/app/admin-server/src/main/resources/application.yml +++ b/app/admin-server/src/main/resources/application.yml @@ -58,6 +58,7 @@ spring: scope: profile, email client-id: ${GOOGLE_OAUTH2_CLIENT_ID} client-secret: ${GOOGLE_OAUTH2_CLIENT_SECRET} + redirectUri: "http://admin.wsautoml.com/login/oauth2/code/google" session: store-type: jdbc diff --git a/app/admin-web/src/components/presentational/LoginCard.jsx b/app/admin-web/src/components/presentational/LoginCard.jsx index 693a901..6563a8f 100644 --- a/app/admin-web/src/components/presentational/LoginCard.jsx +++ b/app/admin-web/src/components/presentational/LoginCard.jsx @@ -40,8 +40,7 @@ export default function LoginCard() { // "http://localhost:8080/oauth2/authorization/google") // } // local settings onClick={() => - (window.location.href = - "http://automl-main-web-load-balancer-213875655.ap-northeast-2.elb.amazonaws.com/oauth2/authorization/google") + (window.location.href = "/oauth2/authorization/google") } /> diff --git a/app/admin-web/src/components/presentational/Navigator.jsx b/app/admin-web/src/components/presentational/Navigator.jsx index c9bb872..0e9aca0 100644 --- a/app/admin-web/src/components/presentational/Navigator.jsx +++ b/app/admin-web/src/components/presentational/Navigator.jsx @@ -36,26 +36,22 @@ const categories = [ }, { id: "WS-AutoML", - link: - "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com", + link: "https://wsautoml.com", children: [ { id: "검색", icon: , - link: - "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/search", + link: "https://wsautoml.com/search", }, { id: "모델 학습", icon: , - link: - "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/model-learning", + link: "https://wsautoml.com/model-learning", }, { id: "모델 운영", icon: , - link: - "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/model-operation", + link: "https://wsautoml.com/model-operation", }, ], }, diff --git a/app/user-server/src/main/java/kr/co/automl/global/config/web/WebConfig.java b/app/user-server/src/main/java/kr/co/automl/global/config/web/WebConfig.java index 1d5fd52..267a5f5 100644 --- a/app/user-server/src/main/java/kr/co/automl/global/config/web/WebConfig.java +++ b/app/user-server/src/main/java/kr/co/automl/global/config/web/WebConfig.java @@ -31,7 +31,7 @@ public void addArgumentResolvers(List argumentRes @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") // 모든 요청 경로에 대해 - .allowedOrigins("http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com") + .allowedOrigins("https://admin.wsautoml.com") .allowedMethods("*") // 모든 HTTP 메소드 .allowedHeaders("*") // 허용할 헤더 .allowCredentials(true); diff --git a/app/user-web/src/components/presentational/LoginCard.jsx b/app/user-web/src/components/presentational/LoginCard.jsx index 6c46b0d..6eacd01 100644 --- a/app/user-web/src/components/presentational/LoginCard.jsx +++ b/app/user-web/src/components/presentational/LoginCard.jsx @@ -34,9 +34,12 @@ export default function LoginCard() { + // (window.location.href = + // "http://localhost:8080/oauth2/authorization/google") + // } // local settings onClick={() => - (window.location.href = - "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/oauth2/authorization/google") + (window.location.href = "/oauth2/authorization/google") } /> diff --git a/app/user-web/src/components/presentational/global/footer/LinkBoxes.jsx b/app/user-web/src/components/presentational/global/footer/LinkBoxes.jsx index 5e2e447..03b4d00 100644 --- a/app/user-web/src/components/presentational/global/footer/LinkBoxes.jsx +++ b/app/user-web/src/components/presentational/global/footer/LinkBoxes.jsx @@ -10,19 +10,16 @@ const linkBoxInfo = [ { name: "메인페이지", href: "/" }, { name: "데이터 검색", - href: - "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/search", + href: "https://wsautoml.com/search", }, { name: "데이터 활용" }, { name: "- 모델 학습", - href: - "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/model-learning", + href: "https://wsautoml.com/model-learning", }, { name: "- 모델 운영", - href: - "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/model-operation", + href: "https://wsautoml.com/model-operation", }, ], }, diff --git a/app/user-web/src/components/presentational/global/header/AdminUsageListItems.jsx b/app/user-web/src/components/presentational/global/header/AdminUsageListItems.jsx index 6e5bcc1..6191767 100644 --- a/app/user-web/src/components/presentational/global/header/AdminUsageListItems.jsx +++ b/app/user-web/src/components/presentational/global/header/AdminUsageListItems.jsx @@ -12,9 +12,7 @@ export default function AdminUsageListItems() { textAlign: "right", }} > - - 관리자 페이지 - + 관리자 페이지 ); diff --git a/app/user-web/src/components/presentational/main/banner/IntroduceCommentBox.jsx b/app/user-web/src/components/presentational/main/banner/IntroduceCommentBox.jsx index 29f7b51..0af6d31 100644 --- a/app/user-web/src/components/presentational/main/banner/IntroduceCommentBox.jsx +++ b/app/user-web/src/components/presentational/main/banner/IntroduceCommentBox.jsx @@ -10,7 +10,7 @@ export default function IntroduceCommentBox() { color: "white", }} > - Welcome to WS-AutoML.co.kr + Welcome to WS-AutoML { }, [selectedConzon, selectedDate]); return ( <> - {/* - - - 예측 데이터 분석 - - - - - - - - */} { - + @@ -281,9 +259,6 @@ const ModelDataPredictionBox = (props) => { - {/* - - */} ); }; diff --git a/app/user-web/src/components/presentational/model-operation/modelUtilization/ModelUtilizationDataDownloadBox.jsx b/app/user-web/src/components/presentational/model-operation/modelUtilization/ModelUtilizationDataDownloadBox.jsx new file mode 100644 index 0000000..83c6058 --- /dev/null +++ b/app/user-web/src/components/presentational/model-operation/modelUtilization/ModelUtilizationDataDownloadBox.jsx @@ -0,0 +1,12 @@ +import React from "react"; +import { Button } from "@mui/material"; + +const ModelUtilizationDataDownloadBox = () => { + return ( + + ); +}; + +export default ModelUtilizationDataDownloadBox; From 96730bbc46bb4ad5395655043b41636c3d30224d Mon Sep 17 00:00:00 2001 From: 0-wook Date: Wed, 6 Dec 2023 16:51:59 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=B9=8C=EB=93=9C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model-operation/modelUtilization/ModelDataPredictionBox.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/user-web/src/components/presentational/model-operation/modelUtilization/ModelDataPredictionBox.jsx b/app/user-web/src/components/presentational/model-operation/modelUtilization/ModelDataPredictionBox.jsx index e9f71b3..c18b614 100644 --- a/app/user-web/src/components/presentational/model-operation/modelUtilization/ModelDataPredictionBox.jsx +++ b/app/user-web/src/components/presentational/model-operation/modelUtilization/ModelDataPredictionBox.jsx @@ -8,7 +8,6 @@ import { InputLabel, Select, MenuItem, - Button, } from "@mui/material"; import ConzonAreaChartComponent from "../modelChart/ConzonAreaChartComponent"; import ConzonGuageComponent from "../modelChart/ConzonGuageComponent";