Pyotato merge login

.github/workflows/s3Build.yml

@@ -19,11 +19,11 @@ jobs:
           restore-keys: |
             ${{ runner.OS }}-build-
             ${{ runner.OS }}-
-    
-      - name: Install Dependencies    # 의존 파일 설치
+
+      - name: Install Dependencies # 의존 파일 설치
         run: npm install --legacy-peer-deps
-        
-      - name: Build   # React Build
+
+      - name: Build # React Build
         run: npm run build
 
       - name: Deploy # S3에 배포
@@ -34,5 +34,4 @@ jobs:
           aws s3 cp \
             --recursive \
             --region ap-northeast-2 \
-            build s3://roadmakertest
-
+            build s3://http://roadmaker.site.s3-website.ap-northeast-2.amazonaws.com

hydratable.config.json

@@ -0,0 +1,3 @@
+{
+  "crawlingUrls": ["/", "/copyrights"]
+}

package.json

@@ -2,12 +2,10 @@
   "name": "my-app",
   "version": "0.1.0",
   "private": true,
-  "homepage": "http://roadmakertest.s3-website.ap-northeast-2.amazonaws.com",
+  "homepage": "http://roadmaker.site.s3-website.ap-northeast-2.amazonaws.com/",
   "dependencies": {
     "@dagrejs/dagre": "^1.0.2",
-    "@egjs/infinitegrid": "^4.10.1",
-    "@fontsource/roboto": "^5.0.8",
-    "@fristys/masonry": "^1.1.7",
+    "@emotion/react": "^11.11.1",
     "@mantine/carousel": "^6.0.16",
     "@mantine/core": "^6.0.16",
     "@mantine/dates": "^6.0.16",
@@ -20,14 +18,13 @@
     "@mantine/prism": "^6.0.16",
     "@mantine/spotlight": "^6.0.16",
     "@mantine/tiptap": "^6.0.16",
-    "@monaco-editor/react": "^4.5.1",
+    "@reactflow/node-resizer": "^2.1.1",
     "@reactflow/node-toolbar": "^1.2.3",
     "@syncedstore/core": "^0.5.2",
     "@syncedstore/react": "^0.5.2",
     "@tabler/icons-react": "^2.25.0",
     "@tiptap/core": "^2.0.4",
-    "@tiptap/extension-collaboration": "^2.0.4",
-    "@tiptap/extension-collaboration-cursor": "^2.0.4",
+    "@tiptap/extension-code-block": "^2.0.4",
     "@tiptap/extension-color": "^2.0.4",
     "@tiptap/extension-highlight": "^2.0.4",
     "@tiptap/extension-history": "^2.0.4",
@@ -44,39 +41,33 @@
     "@tiptap/react": "^2.0.4",
     "@tiptap/starter-kit": "^2.0.3",
     "@tisoap/react-flow-smart-edge": "^3.0.0",
-    "@types/masonry-layout": "^4.2.5",
     "axios": "^1.4.0",
     "classcat": "^5.0.4",
+    "d3-drag": "^3.0.0",
+    "d3-selection": "^3.0.0",
     "draft-js": "^0.11.7",
     "embla-carousel-react": "^8.0.0-rc11",
     "fast-json-patch": "^3.1.1",
     "formik": "^2.4.2",
     "http-proxy-middleware": "^2.0.6",
     "jsonpatch": "^3.1.0",
     "lowlight": "^2.9.0",
-    "monaco-editor": "^0.40.0",
     "nanoid": "^4.0.2",
-    "prosemirror-keymap": "^1.2.2",
-    "prosemirror-model": "^1.19.3",
-    "prosemirror-state": "^1.4.3",
-    "prosemirror-view": "^1.31.6",
-    "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0",
+    "prop-types": "^15.8.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-draft-wysiwyg": "^1.15.0",
+    "react-hydratable": "^1.2.1",
     "react-infinite-scroller": "^1.2.6",
     "react-query": "^3.39.3",
     "react-router-dom": "^6.14.1",
     "react-scripts": "5.0.1",
     "reactflow": "^11.7.4",
-    "styled-components": "^6.0.7",
+    "styled-components": "^6.0.4",
     "styled-reset": "^4.5.1",
     "tiptap": "^1.32.2",
     "web-vitals": "^2.1.4",
-    "y-leveldb": "^0.1.2",
-    "y-monaco": "^0.1.4",
-    "y-prosemirror": "^1.2.1",
-    "yjs": "^13.6.7",
-    "zustand": "^4.3.9"
+    "zustand": "4.3.9"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -85,7 +76,15 @@
     "test": "env-cmd -f .env.production react-scripts test",
     "eject": "react-scripts eject",
     "lint": "yarn lint:ci --fix",
-    "lint:ci": "eslint src"
+    "lint:ci": "eslint src",
+    "postbuild": "react-hydratable",
+    "preview": "react-hydratable --preview"
+  },
+  "reactSnap": {
+    "include": [
+      "/",
+      "/roadmap/post"
+    ]
   },
   "browserslist": {
     "production": [
@@ -108,7 +107,7 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "@types/jest": "^27.5.2",
-    "@types/node": "^16.18.38",
+    "@types/node": "^20.4.8",
     "@types/react": "^18.2.15",
     "@types/react-dom": "^18.2.7",
     "@types/react-draft-wysiwyg": "^1.13.4",

public/index.html

@@ -1,23 +1,19 @@
 <!doctype html>
 <html lang="en">
   <head>
+    <title>Roadmaker</title>
     <meta charset="utf-8" />
-    <!-- <link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> -->
+    <link rel="icon" href="%PUBLIC_URL%/img/shortLogo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="This is Roadmaker. A roadmap editor made for, and made by aspiring developers from all fields. Create, Autogenerate and share your roadmap journey."
     />
-    <link
-      rel="stylesheet"
-      href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
-    />
-    <!-- Icons to support Material Design -->
-    <link
-      rel="stylesheet"
-      href="https://fonts.googleapis.com/icon?family=Material+Icons"
-    />
+    <meta property="og:title" content="" />
+    <meta property="og:description" content="" />
+    <meta property="og:image" content="./img/logo.png" />
+    <meta name="url" property="og:url" content="" />
     <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a
@@ -33,7 +29,6 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Roadmaker</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

src/App.tsx

@@ -1,5 +1,6 @@
 // import InteractionFlow from './pages/main/userRoadmap';
 import { Notifications } from '@mantine/notifications';
+import RoadMapPostPage from 'pages/roadmap/posts';
 import KeywordSearchRoadmaps from 'pages/roadmap/posts/byKeyword';
 import { ReactElement } from 'react';
 import { QueryClientProvider } from 'react-query';
@@ -12,9 +13,7 @@ import { UserProfile } from './components/user/userProfile';
 import ErrorPage from './pages/error';
 import LoginPage from './pages/login';
 import MainPage from './pages/main';
-import ResetInfoPage from './pages/resetInfo';
 import RoadMapEditor from './pages/roadmap/editor';
-import PostedRoadmap from './pages/roadmap/posts/postedRoadmap';
 import SignupPage from './pages/signup';
 
 function App(): ReactElement {
@@ -29,13 +28,11 @@ function App(): ReactElement {
           element: <LoginPage />,
         },
         { path: 'users/signup', element: <SignupPage /> },
-        { path: 'users/reset', element: <ResetInfoPage /> },
         {
           path: 'roadmap/editor',
           element: <RoadMapEditor />,
         },
-        // { path: '/roadmap/post/:id', element: <PostedRoadmap /> }, // origin initialMerge
-        { path: '/roadmap/post/:Id', element: <PostedRoadmap /> },
+        { path: '/roadmap/post/:Id', element: <RoadMapPostPage /> },
         {
           path: '/roadmap/post/search/:keyword',
           element: <KeywordSearchRoadmaps />,
@@ -50,13 +47,10 @@ function App(): ReactElement {
   ]);
   return (
     <QueryClientProvider client={queryClient}>
-      {/* <MantineProvider withNormalizeCSS withGlobalStyles> */}
       <Notifications />
       <div className="App">
-        {/* <Loading /> */}
         <RouterProvider router={router} />
       </div>
-      {/* </MantineProvider> */}
       <ReactQueryDevtools />
     </QueryClientProvider>
   );