Merge pull request #52 from 0-wook/develop

feat: 새 도메인 적용 관련 소스 및 URI 수정
ClustProject · Dec 6, 2023 · e8419da · e8419da
2 parents 6c9ddc7 + 96730bb
commit e8419da
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 149 deletions.
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
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
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
diff --git 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
@@ -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")
             }
           />
         </Box>

diff --git 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: <SearchIcon />,
-        link:
-          "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/search",
+        link: "https://wsautoml.com/search",
       },
       {
         id: "모델 학습",
         icon: <ModelTrainingIcon />,
-        link:
-          "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/model-learning",
+        link: "https://wsautoml.com/model-learning",
       },
       {
         id: "모델 운영",
         icon: <QueryStatsIcon />,
-        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
@@ -31,7 +31,7 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> 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
@@ -34,9 +34,12 @@ export default function LoginCard() {
           <GoogleButton
             type='light'
             label='Google로 로그인'
+            // onClick={() =>
+            //   (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")
             }
           />
         </Box>

diff --git 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
@@ -12,9 +12,7 @@ export default function AdminUsageListItems() {
           textAlign: "right",
         }}
       >
-        <Link href='http://automl-main-web-load-balancer-213875655.ap-northeast-2.elb.amazonaws.com/home'>
-          관리자 페이지
-        </Link>
+        <Link href='https://admin.wsautoml.com/home'>관리자 페이지</Link>
       </Typography>
     </>
   );

diff --git 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",
       }}
     >
-      <Typography variant='h4'>Welcome to WS-AutoML.co.kr</Typography>
+      <Typography variant='h4'>Welcome to WS-AutoML</Typography>
       <Divider
         sx={{
           my: "10px",

diff --git a/app/user-web/src/components/presentational/main/cards/ContentMediaCards.jsx b/app/user-web/src/components/presentational/main/cards/ContentMediaCards.jsx
@@ -7,20 +7,17 @@ const cardInfo = [
   {
     name: "검색",
     image: "/static/images/cards/search.jpg",
-    link:
-      "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/search",
+    link: "https://wsautoml.com/search",
   },
   {
     name: "모델 학습",
     image: "/static/images/cards/ai.jpeg",
-    link:
-      "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/model-learning",
+    link: "https://wsautoml.com/model-learning",
   },
   {
     name: "모델 운영",
     image: "/static/images/cards/visualization.png",
-    link:
-      "http://automl-user-load-balancer-366843044.ap-northeast-2.elb.amazonaws.com/model-operation",
+    link: "https://wsautoml.com/model-operation",
   },
   // {
   //   name: "시각화(예정)",

diff --git a/...src/components/presentational/model-operation/modelUtilization/ModelDataPredictionBox.jsx b/...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";
@@ -21,6 +20,7 @@ import {
   getConzonRowDatesById,
   getConzonRowData,
 } from "../../../../api/api";
+import ModelUtilizationDataDownloadBox from "./ModelUtilizationDataDownloadBox";
 
 const SpaceBetweenFlexBox = styled(Box)({
   display: "flex",
@@ -228,27 +228,6 @@ const ModelDataPredictionBox = (props) => {
   }, [selectedConzon, selectedDate]);
   return (
     <>
-      {/* <Dialog open={open} onClose={onClose} fullWidth maxWidth='lg'>
-        <DialogTitle>
-          <Box
-            display='flex'
-            justifyContent='space-between'
-            alignItems='center'
-          >
-            <Typography variant='h5'>예측 데이터 분석</Typography>
-            <IconButton
-              edge='end'
-              color='inherit'
-              onClick={onClose}
-              aria-label='close'
-            >
-              <CloseIcon />
-            </IconButton>
-          </Box>
-        </DialogTitle>
-        <Divider />
-        <DialogContent>
-          <ContentWrappingBox> */}
       <Box
         sx={{
           overflow: "auto",
@@ -260,9 +239,7 @@ const ModelDataPredictionBox = (props) => {
         <SpaceBetweenFlexBox>
           <SelectConzon onChange={setSelectedConzon} />
           <SelectDate value={selectedDate} onChange={handleDateChange} />
-          <Button variant='outlined' sx={{ height: "56px" }} disabled>
-            데이터 다운로드
-          </Button>
+          <ModelUtilizationDataDownloadBox />
         </SpaceBetweenFlexBox>
 
         <SpaceBetweenFlexBox>
@@ -281,9 +258,6 @@ const ModelDataPredictionBox = (props) => {
           </Box>
         </SpaceBetweenFlexBox>
       </Box>
-      {/* </ContentWrappingBox>
-        </DialogContent>
-      </Dialog> */}
     </>
   );
 };

diff --git a/...nents/presentational/model-operation/modelUtilization/ModelUtilizationDataDownloadBox.jsx b/...nents/presentational/model-operation/modelUtilization/ModelUtilizationDataDownloadBox.jsx
@@ -0,0 +1,12 @@
+import React from "react";
+import { Button } from "@mui/material";
+
+const ModelUtilizationDataDownloadBox = () => {
+  return (
+    <Button variant='outlined' sx={{ height: "56px" }} disabled>
+      데이터 다운로드
+    </Button>
+  );
+};
+
+export default ModelUtilizationDataDownloadBox;