Merge pull request #43 from kookmin-sw/feature/42

feat(CodeEditor): Add validation and load status
kookmin-sw · May 8, 2024 · 81edd16 · 81edd16
2 parents 16ea2b9 + 516d704
commit 81edd16
Show file tree

Hide file tree

Showing 19 changed files with 453 additions and 64 deletions.
diff --git a/frontend/.idea/.gitignore b/frontend/.idea/.gitignore
diff --git a/frontend/.idea/codeStyles/Project.xml b/frontend/.idea/codeStyles/Project.xml
diff --git a/frontend/.idea/codeStyles/codeStyleConfig.xml b/frontend/.idea/codeStyles/codeStyleConfig.xml
diff --git a/frontend/.idea/frontend.iml b/frontend/.idea/frontend.iml
diff --git a/frontend/.idea/inspectionProfiles/Project_Default.xml b/frontend/.idea/inspectionProfiles/Project_Default.xml
diff --git a/frontend/.idea/modules.xml b/frontend/.idea/modules.xml
diff --git a/frontend/.idea/prettier.xml b/frontend/.idea/prettier.xml
diff --git a/frontend/.idea/vcs.xml b/frontend/.idea/vcs.xml
diff --git a/frontend/app/globals.css b/frontend/app/globals.css
@@ -15,7 +15,7 @@
     'Apple SD Gothic Neo',
     'Noto Sans KR',
     'Malgun Gothic',
-    sans-serif;
+    sans-serif !important;
   word-break: keep-all;
 }
 

diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx
@@ -1,22 +1,29 @@
 // 'use client'
 
 import '@mantine/core/styles.css';
-
-import { ColorSchemeScript, MantineProvider } from '@mantine/core';
+import '@mantine/nprogress/styles.css';
+import '@/app/globals.css';
 
 import type { Metadata } from 'next';
 import { Inter } from 'next/font/google';
 import { usePathname } from 'next/navigation';
 import './globals.css';
 import Header from '@/components/Header';
 
-const inter = Inter({ subsets: ['latin'] });
+import { ColorSchemeScript, MantineProvider, createTheme } from '@mantine/core';
+
+import Header from '@/components/Header';
+import { NavigationProgress } from '@mantine/nprogress';
 
 export const metadata: Metadata = {
-  title: 'Create Next App',
-  description: 'Generated by create next app',
+  title: 'StackOrderFlow - 자연어 기반 AWS CloudFormation 템플릿 생성 서비스',
+  description: '자연어 기반 AWS CloudFormation 템플릿 생성 서비스',
 };
 
+const theme = createTheme({
+  fontFamily: 'Pretendard, sans-serif',
+});
+
 export default function RootLayout({
   children,
 }: Readonly<{
@@ -30,9 +37,12 @@ export default function RootLayout({
       <head>
         <ColorSchemeScript />
       </head>
-      <body>
-        <MantineProvider>
-          {true && <Header />}
+      <body
+      //  className={inter.className}>
+      >
+        <MantineProvider theme={theme}>
+          <NavigationProgress />
+          <Header />
           {children}
         </MantineProvider>
       </body>

diff --git a/frontend/app/page.tsx b/frontend/app/page.tsx
@@ -1,5 +1,5 @@
-import CommonTypeWriter from '@/components/CommonTypeWriter';
 import LandingSection from '@/components/LandingSection';
+
 import UsePage from '@/components/UsePage';
 import Image from 'next/image';
 import { Router } from 'next/router';

diff --git a/frontend/components/CodeSpaceEditor/codespace.module.css b/frontend/components/CodeSpaceEditor/codespace.module.css
@@ -0,0 +1,24 @@
+.wrapper {
+  position: relative;
+  box-sizing: border-box;
+  background-color: light-dark(
+    var(--mantine-color-white),
+    var(--mantine-color-dark-8)
+  );
+}
+
+.inner {
+  position: relative;
+  padding-top: rem(200px);
+  padding-bottom: rem(120px);
+
+  @media (max-width: $ mantine-breakpoint-sm) {
+    padding-bottom: rem(80px);
+    padding-top: rem(80px);
+  }
+}
+
+.code-wrapper {
+  background-color: #dedede;
+  border-radius: 8px;
+}