From 55dbc8ad3b2ce69b9e32a17f4b542fc92902512e Mon Sep 17 00:00:00 2001
From: tzhangchi <terry.zhangchi@outlook.com>
Date: Thu, 5 Jan 2023 17:11:24 +0800
Subject: [PATCH 1/3] feat: adjust modal height

---
 packages/app/src/components/workspace-modal/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/app/src/components/workspace-modal/index.tsx b/packages/app/src/components/workspace-modal/index.tsx
index 05b1f6632b..24d9782c06 100644
--- a/packages/app/src/components/workspace-modal/index.tsx
+++ b/packages/app/src/components/workspace-modal/index.tsx
@@ -29,7 +29,7 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
   return (
     <div>
       <Modal open={open} onClose={onClose}>
-        <ModalWrapper width={620} height={334} style={{ padding: '10px' }}>
+        <ModalWrapper width={620} style={{ padding: '10px' }}>
           <Header>
             <ContentTitle>My Workspace List</ContentTitle>
             <ModalCloseButton

From 3cb91c0f683f30bee88943ad2d4d57100540fb08 Mon Sep 17 00:00:00 2001
From: tzhangchi <terry.zhangchi@outlook.com>
Date: Thu, 5 Jan 2023 17:38:23 +0800
Subject: [PATCH 2/3] feat: improve the ui of workspace item

---
 .../src/components/create-workspace/index.tsx |  1 -
 .../src/components/workspace-modal/index.tsx  | 66 ++++++++++++++++---
 2 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/packages/app/src/components/create-workspace/index.tsx b/packages/app/src/components/create-workspace/index.tsx
index 1a04d3ce9a..9059d9bec1 100644
--- a/packages/app/src/components/create-workspace/index.tsx
+++ b/packages/app/src/components/create-workspace/index.tsx
@@ -4,7 +4,6 @@ import { Button } from '@/ui/button';
 import { useState } from 'react';
 import { createWorkspace } from '@/hooks/mock-data/mock';
 import Input from '@/ui/input';
-
 interface ModalProps {
   open: boolean;
   onClose: () => void;
diff --git a/packages/app/src/components/workspace-modal/index.tsx b/packages/app/src/components/workspace-modal/index.tsx
index 24d9782c06..ab0df439c0 100644
--- a/packages/app/src/components/workspace-modal/index.tsx
+++ b/packages/app/src/components/workspace-modal/index.tsx
@@ -8,6 +8,11 @@ import {
   setActiveWorkspace,
 } from '@/hooks/mock-data/mock';
 import { CreateWorkspaceModal } from '../create-workspace';
+import {
+  CloudUnsyncedIcon,
+  CloudInsyncIcon,
+  UsersIcon,
+} from '@blocksuite/icons';
 
 interface LoginModalProps {
   open: boolean;
@@ -29,9 +34,9 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
   return (
     <div>
       <Modal open={open} onClose={onClose}>
-        <ModalWrapper width={620} style={{ padding: '10px' }}>
+        <ModalWrapper width={820} style={{ padding: '10px' }}>
           <Header>
-            <ContentTitle>My Workspace List</ContentTitle>
+            <ContentTitle>My Workspaces</ContentTitle>
             <ModalCloseButton
               top={6}
               right={6}
@@ -51,11 +56,47 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
                     }}
                     key={item.id}
                   >
-                    <span>{item.name}</span>/
-                    {item.type === 'local' && <b>local</b>}
-                    {item.type === 'join' && <b>join</b>}/
-                    {item.isPublish ? 'isPublish' : 'isPrivate'}/
-                    {item.isLocal ? 'isLocal' : ''}/
+                    <span style={{ width: '100px', marginRight: '20px' }}>
+                      <svg
+                        style={{
+                          float: 'left',
+                          marginTop: '6px',
+                          marginRight: '10px',
+                        }}
+                        width="24"
+                        height="24"
+                        viewBox="0 0 40 40"
+                        fill="none"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <rect
+                          x="0.5"
+                          y="0.5"
+                          width="39"
+                          height="39"
+                          rx="19.5"
+                          stroke="#6880FF"
+                          fill="#FFF"
+                        />
+                        <path
+                          fillRule="evenodd"
+                          clipRule="evenodd"
+                          d="M18.6303 8.79688L11.2559 29.8393H15.5752L20.2661 15.2858L24.959 29.8393H29.2637L21.8881 8.79688H18.6303Z"
+                          fill="#6880FF"
+                        />
+                      </svg>
+                      {item.name}
+                    </span>
+                    <span style={{ position: 'relative', top: '6px' }}>
+                      {item.type === 'local' && (
+                        <CloudUnsyncedIcon fontSize={24} />
+                      )}
+                      {item.type === 'cloud' && (
+                        <CloudInsyncIcon fontSize={24} />
+                      )}
+                      {item.isPublish && <UsersIcon fontSize={24} />}
+                    </span>
+                    {/* {item.isLocal ? 'isLocal' : ''}/ */}
                   </WorkspaceItem>
                 );
               })}
@@ -66,12 +107,16 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
                     setCreateWorkspaceOpen(true);
                   }}
                 >
-                  Create Workspace
+                  Create Or Import
                 </Button>
               </li>
             </WorkspaceList>
           </Content>
           <Footer>
+            <p style={{ fontSize: '14px', color: '#ccc', margin: '12px 0' }}>
+              Tips:Workspace is your virtual space to capture, create and plan
+              as just one person or together as a team.
+            </p>
             <Button>Sign in AFFiNE Cloud</Button>
           </Footer>
           <CreateWorkspaceModal
@@ -124,9 +169,10 @@ const WorkspaceList = styled('div')({
 });
 
 const WorkspaceItem = styled('div')({
-  border: '1px solid #e5e5e5',
-  padding: '10px',
   cursor: 'pointer',
+  padding: '8px',
+  border: '1px solid #eee',
+  fontWeight: 'bold',
   ':hover': {
     background: '#eee',
   },

From 1c19611add6c68d6f2662893c7a7647967772eba Mon Sep 17 00:00:00 2001
From: tzhangchi <terry.zhangchi@outlook.com>
Date: Thu, 5 Jan 2023 17:55:00 +0800
Subject: [PATCH 3/3] feat: add icons

---
 packages/app/src/components/workspace-modal/index.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/app/src/components/workspace-modal/index.tsx b/packages/app/src/components/workspace-modal/index.tsx
index 46cd1a9182..de0ae36fa3 100644
--- a/packages/app/src/components/workspace-modal/index.tsx
+++ b/packages/app/src/components/workspace-modal/index.tsx
@@ -16,10 +16,10 @@ import {
   CloudUnsyncedIcon,
   CloudInsyncIcon,
   UsersIcon,
+  AddIcon,
 } from '@blocksuite/icons';
 import { useConfirm } from '@/providers/confirm-provider';
 import { toast } from '@/ui/toast';
-
 interface LoginModalProps {
   open: boolean;
   onClose: () => void;
@@ -76,6 +76,7 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
                         style={{
                           float: 'left',
                           marginTop: '6px',
+                          marginLeft: '10px',
                           marginRight: '10px',
                         }}
                         width="24"
@@ -122,6 +123,14 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
                     setCreateWorkspaceOpen(true);
                   }}
                 >
+                  <AddIcon
+                    style={{
+                      fontSize: '20px',
+                      top: '4px',
+                      position: 'relative',
+                      marginRight: '10px',
+                    }}
+                  />
                   Create Or Import
                 </Button>
               </li>