Merge remote-tracking branch 'upstream/develop' into develop_backend_yhs

backend-api/.env.ci

@@ -0,0 +1,2 @@
+DOCKER_LOCAL_VOLUME=./backend-api/
+DOCKER_LOCAL_AWS=/home/vanilla/.aws

backend-api/docker-compose-build-dev.yml

@@ -0,0 +1,13 @@
+version: '3.5'
+
+services:
+  serverless-api-dev-build:
+    image: vanillabrain/serverless-docker:1.0
+    restart: on-failure
+    working_dir: /app
+    command: bash -c "npm install && npm run deploy:dev"
+    volumes:
+      - ${DOCKER_LOCAL_VOLUME}:/app
+      - ${DOCKER_LOCAL_AWS}:/root/.aws
+    environment:
+      TZ: Asia/Seoul

backend-api/src/main.ts

@@ -3,9 +3,10 @@ import { AppModule } from './app.module';
 import express from 'express';
 import { ExpressAdapter } from '@nestjs/platform-express';
 import { HttpExceptionFilter } from './nest-utils/http-exception.filter';
+import { ValidationPipe } from '@nestjs/common';
 
 async function bootstrap() {
-const expressApp = express();
+  const expressApp = express();
   const app = await NestFactory.create(AppModule, new ExpressAdapter(expressApp), {
     logger: console,
     cors: {
@@ -16,8 +17,9 @@ const expressApp = express();
     },
   });
   app.useGlobalFilters(new HttpExceptionFilter());
+  // app.useGlobalPipes(new ValidationPipe({ transform: true }));
   // const app = await NestFactory.create(AppModule);
   await app.listen(4000);
 }
 
-bootstrap();
+bootstrap();

backend-api/src/serverless.ts

@@ -38,7 +38,7 @@ async function bootstrapServer(): Promise<Server> {
     nestApp.setGlobalPrefix('v1');
     nestApp.use(cookieParser());
     nestApp.use(eventContext());
-    nestApp.useGlobalPipes(new ValidationPipe({ transform: true }));
+    // nestApp.useGlobalPipes(new ValidationPipe({ transform: true }));
     await nestApp.init();
     cachedServer = createServer(expressApp, undefined, binaryMimeTypes);
   }

frontend-web/src/pages/Dashboard/Components/AddWidgetPopup.tsx

@@ -114,25 +114,7 @@ function AddWidgetPopup({ label, useWidgetIds = [], widgetOpen = false, widgetSe
 
   return (
     <>
-      <Dialog
-        open={open}
-        onClose={handleClose}
-        // scroll={scroll}
-        aria-labelledby="scroll-dialog-title"
-        aria-describedby="scroll-dialog-description"
-        fullWidth={true}
-        sx={{
-          '& .MuiDialog-container': {
-            '& .MuiPaper-root': {
-              width: '100%',
-              maxWidth: '600px', // Set your width here
-              borderRadius: '8px',
-              boxShadow: '5px 5px 8px 0 rgba(0, 28, 71, 0.15)',
-              border: 'solid 1px #ddd',
-            },
-          },
-        }}
-      >
+      <Dialog open={open} onClose={handleClose} fullWidth={true}>
         <DialogTitle
           id="scroll-dialog-title"
           sx={{ width: '100%', paddingLeft: '21px', paddingTop: '13px', height: '87px' }}
@@ -158,8 +140,8 @@ function AddWidgetPopup({ label, useWidgetIds = [], widgetOpen = false, widgetSe
               position: 'absolute',
               right: '0px',
               top: '0px',
-              paddingRight: '18.9px',
-              paddingTop: '20.4px',
+              mr: '12px',
+              mt: '12px',
               cursor: 'pointer',
             }}
             size="medium"

frontend-web/src/pages/Dashboard/Components/RecommendDashboardPopup.tsx

@@ -346,8 +346,10 @@ export const TemplateList = ({ handleWidgetConfirm = null, handleWidgetCancel =
                       color: '#767676',
                       overflow: 'hidden',
                       textOverflow: 'ellipsis',
-                      width: '224px',
-                      // whiteSpace: 'nowrap',
+                      wordBreak: 'break-word',
+                      display: '-webkit-box',
+                      WebkitLineClamp: 2,
+                      WebkitBoxOrient: 'vertical',
                     }}
                   >
                     {item.description}
@@ -479,23 +481,7 @@ function RecommendDashboardPopup({ recommendOpen = false, handleComplete = null
   return (
     <>
       {step == 1 ? (
-        <Dialog
-          open={open}
-          aria-labelledby="scroll-dialog-title"
-          aria-describedby="scroll-dialog-description"
-          fullWidth={true}
-          sx={{
-            '& .MuiDialog-container': {
-              '& .MuiPaper-root': {
-                width: '100%',
-                maxWidth: '600px', // Set your width here
-                borderRadius: '8px',
-                boxShadow: '5px 5px 8px 0 rgba(0, 28, 71, 0.15)',
-                border: 'solid 1px #ddd',
-              },
-            },
-          }}
-        >
+        <Dialog open={open} fullWidth={true}>
           <DialogTitle
             id="scroll-dialog-title"
             sx={{ width: '100%', paddingLeft: '21px', paddingTop: '13px', height: '87px' }}
@@ -562,21 +548,7 @@ function RecommendDashboardPopup({ recommendOpen = false, handleComplete = null
           />
         </Dialog>
       ) : (
-        <Dialog
-          open={open}
-          aria-labelledby="scroll-dialog-title"
-          aria-describedby="scroll-dialog-description"
-          fullWidth={true}
-          sx={{
-            '& .MuiDialog-container': {
-              '& .MuiPaper-root': {
-                width: '100%',
-                minWidth: '1000px', // Set your width here
-                maxWidth: '1392px', // Set your width here
-              },
-            },
-          }}
-        >
+        <Dialog open={open} fullWidth={true} maxWidth={false} sx={{ width: '1392px' }}>
           <DialogTitle
             id="scroll-dialog-title"
             sx={{ width: '100%', paddingLeft: '21px', paddingTop: '13px', height: '87px' }}

frontend-web/src/pages/Dashboard/DashboardModify/index.tsx

@@ -343,7 +343,6 @@ function DashboardModify() {
                 useWidgetIds={useWidgetIds}
                 widgetOpen={widgetOpen}
               />
-              <RecommendDashboardPopup recommendOpen={recommendOpen} handleComplete={handleCompleteRecommend} />
             </>
           }
         >
@@ -369,6 +368,7 @@ function DashboardModify() {
             >
               {generateWidget()}
             </ResponsiveGridLayout>
+            <RecommendDashboardPopup recommendOpen={recommendOpen} handleComplete={handleCompleteRecommend} />
           </Box>
         </DashboardTitleBox>
       </PageTitleBox>