Merge pull request #116 from us3r-network/dashboard-dev

Dashboard dev
us3r-network · Jun 15, 2023 · b64c4f1 · b64c4f1
2 parents 7576ee5 + 85154d3
commit b64c4f1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/packages/client/dashboard/src/components/CreateNewModel.tsx b/packages/client/dashboard/src/components/CreateNewModel.tsx
@@ -86,8 +86,7 @@ export default function CreateNewModel({
   )
 }
 const EditorBox = styled.div`
-  height: calc(100vh - 88px);
-  /* max-height: 800px; */
+  height: calc(100vh - 230px);
   background: #14171a;
   border: 1px solid #39424c;
   border-radius: 20px;

diff --git a/packages/client/dashboard/src/components/DelDappConfirmModal.tsx b/packages/client/dashboard/src/components/DelDappConfirmModal.tsx
@@ -8,7 +8,7 @@ import { delDapp } from '../api'
 export default function DelConfirmModal({
   closeModal,
 }: {
-  closeModal: () => void
+  closeModal: (withDel: boolean) => void
 }) {
   const { selectedDapp } = useSelectedDapp()
   const session = useSession()
@@ -21,7 +21,7 @@ export default function DelConfirmModal({
       setDelting(true)
       await delDapp(selectedDapp, session.serialize())
       await loadDapps()
-      closeModal()
+      closeModal(true)
     } catch (error) {
       console.error(error)
     } finally {
@@ -41,7 +41,7 @@ export default function DelConfirmModal({
         </p>
       </div>
       <div className="btns">
-        <button onClick={closeModal}>Cancel</button>
+        <button onClick={() => closeModal(false)}>Cancel</button>
         {delting ? (
           <button className="del">
             <img src="/loading.gif" alt="" />

diff --git a/packages/client/dashboard/src/components/FavoriteModal.tsx b/packages/client/dashboard/src/components/FavoriteModal.tsx
@@ -235,7 +235,7 @@ const FavoriteBox = styled.div`
   flex-direction: column;
   padding: 20px;
   gap: 20px;
-
+  min-height: calc(100vh - 300px);
   position: relative;
   width: 1240px;
   margin: 0 auto;

diff --git a/packages/client/dashboard/src/container/DappInfo.tsx b/packages/client/dashboard/src/container/DappInfo.tsx
@@ -94,8 +94,9 @@ export default function DappInfo() {
                   <Dialog>
                     {({ close }) => (
                       <DelConfirmModal
-                        closeModal={() => {
+                        closeModal={(del) => {
                           close()
+                          if (!del) return
                           setTimeout(() => {
                             navigate('/')
                           }, 1)