From 14b2f336917b8a76b652649e9a13695c8aeceaaf Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 14 Jun 2022 10:43:19 -0700
Subject: [PATCH] Make the AddLink and HighlightNote modals more consistent

---
 .../templates/article/HighlightNoteModal.tsx  | 107 +++++++-----------
 .../templates/homeFeed/AddLinkModal.tsx       |  16 +--
 2 files changed, 49 insertions(+), 74 deletions(-)

diff --git a/packages/web/components/templates/article/HighlightNoteModal.tsx b/packages/web/components/templates/article/HighlightNoteModal.tsx
index a39209a0c..9ec29b043 100644
--- a/packages/web/components/templates/article/HighlightNoteModal.tsx
+++ b/packages/web/components/templates/article/HighlightNoteModal.tsx
@@ -3,21 +3,19 @@ import {
   ModalContent,
   ModalOverlay,
 } from './../../elements/ModalPrimitives'
-import { Box, HStack, VStack } from '../../elements/LayoutPrimitives'
+import { Box, HStack, SpanBox, VStack } from '../../elements/LayoutPrimitives'
 import { Button } from '../../elements/Button'
 import { StyledText } from '../../elements/StyledText'
 import { CommentIcon } from '../../elements/images/CommentIcon'
 import { theme } from '../../tokens/stitches.config'
 import { Highlight } from '../../../lib/networking/fragments/highlightFragment'
-import { HighlightView } from '../../patterns/HighlightView'
 import { useCallback, useState } from 'react'
 import { StyledTextArea } from '../../elements/StyledTextArea'
 import { updateHighlightMutation } from '../../../lib/networking/mutations/updateHighlightMutation'
 import { readableUpdatedAtMessage } from './../../../lib/dateFormatting'
 import { useConfirmListener } from '../../../lib/keyboardShortcuts/useKeyboardShortcuts'
-import { createHighlight } from '../../../lib/highlights/createHighlight'
-import { createHighlightMutation } from '../../../lib/networking/mutations/createHighlightMutation'
 import { showErrorToast } from '../../../lib/toastHelpers'
+import { CrossIcon } from '../../elements/images/CrossIcon'
 
 type HighlightNoteModalProps = {
   author: string
@@ -82,27 +80,36 @@ export function HighlightNoteModal(
           event.preventDefault()
         }}
       >
-        <HighlightNoteModalHeader
-          headlineText='Notes'
-          saveNoteChanges={saveNoteChanges}
-          onOpenChange={props.onOpenChange}
-        />
-          {props.highlight && (
-            <Box css={{
-              width: '100%',
-              '@mdDown':{
-                display: 'none',
-              },
-            }}>
-              <HighlightView {...props} highlight={props.highlight} />
-            </Box>
-          )}
+        <VStack>
+          <HStack
+            distribution="between"
+            alignment="center"
+            css={{ width: '100%' }}
+          >
+            <StyledText style="modalHeadline" css={{ p: '16px' }}>
+              Notes
+            </StyledText>
+            <Button
+              css={{ pt: '16px', pr: '16px' }}
+              style="ghost"
+              onClick={() => {
+                props.onOpenChange(false)
+              }}
+            >
+              <CrossIcon
+                size={20}
+                strokeColor={theme.colors.grayText.toString()}
+              />
+            </Button>
+          </HStack>
+          <SpanBox css={{ width: '100%', height: '1px', opacity: '0.2', backgroundColor: theme.colors.grayText.toString() }} />
           <StyledTextArea
             css={{
               mt: '$2',
               width: '95%',
-              p: '$1',
+              p: '0px',
               height: '$6',
+              marginLeft: '16px',
             }}
             autoFocus
             placeholder={'Add your note here'}
@@ -110,53 +117,21 @@ export function HighlightNoteModal(
             onChange={handleNoteContentChange}
             maxLength={4000}
           />
-        {updatedAtMessage ? (
-          <StyledText style="caption">{updatedAtMessage}</StyledText>
-        ) : null}
+            <SpanBox css={{ width: '100%', height: '1px', opacity: '0.2', backgroundColor: theme.colors.grayText.toString() }} />
+          <HStack
+            alignment="end"
+            distribution="end"
+            css={{
+              width: '100%',
+              padding: '22px 22px 20px 0',
+            }}
+          >
+            <Button style={'ctaDarkYellow'} onClick={props.saveNoteChanges}>
+              Save
+            </Button>
+          </HStack>
+        </VStack>
       </ModalContent>
     </ModalRoot>
   )
 }
-
-type HighlightNoteModalHeaderProps = {
-  headlineText: string
-  saveNoteChanges: () => void
-  onOpenChange: (open: boolean) => void
-}
-
-function HighlightNoteModalHeader(
-  props: HighlightNoteModalHeaderProps
-): JSX.Element {
-  return (
-    <Box
-      css={{
-        display: 'grid',
-        gridTemplateColumns: '1fr auto 1fr',
-      }}
-    >
-      <Button
-        style="ctaSecondary"
-        onClick={() => {
-          props.onOpenChange(false)
-        }}
-        css={{ justifySelf: 'start' }}
-      >
-        Cancel
-      </Button>
-      <HStack alignment="center">
-        <CommentIcon
-          size={24}
-          strokeColor={theme.colors.grayTextContrast.toString()}
-        />
-        <StyledText>&nbsp; {props.headlineText}</StyledText>
-      </HStack>
-      <Button
-        style="ctaSecondary"
-        onClick={props.saveNoteChanges}
-        css={{ justifySelf: 'end' }}
-      >
-        Save
-      </Button>
-    </Box>
-  )
-}
diff --git a/packages/web/components/templates/homeFeed/AddLinkModal.tsx b/packages/web/components/templates/homeFeed/AddLinkModal.tsx
index baff29452..02b4105ef 100644
--- a/packages/web/components/templates/homeFeed/AddLinkModal.tsx
+++ b/packages/web/components/templates/homeFeed/AddLinkModal.tsx
@@ -3,7 +3,7 @@ import {
   ModalContent,
   ModalOverlay,
 } from '../../elements/ModalPrimitives'
-import { VStack, HStack, Box } from '../../elements/LayoutPrimitives'
+import { VStack, HStack, Box, SpanBox } from '../../elements/LayoutPrimitives'
 import { Button } from '../../elements/Button'
 import { StyledText } from '../../elements/StyledText'
 import { CrossIcon } from '../../elements/images/CrossIcon'
@@ -69,15 +69,15 @@ export function AddLinkModal(props: AddLinkModalProps): JSX.Element {
           ;(document.activeElement as HTMLElement).blur()
         }}
       >
-        <VStack distribution="start" css={{ p: '$2' }}>
+        <VStack distribution="start">
           <HStack
             distribution="between"
             alignment="center"
-            css={{ width: '100%', mt: '4px' }}
+            css={{ width: '100%', mt: '4px', px: '16px', py: '16px' }}
           >
             <StyledText style="modalHeadline">Add a Link</StyledText>
             <Button
-              css={{ p: '10px', cursor: 'pointer', pt: '2px' }}
+              css={{ cursor: 'pointer',  }}
               style="ghost"
               onClick={() => {
                 props.onOpenChange(false)
@@ -89,8 +89,8 @@ export function AddLinkModal(props: AddLinkModalProps): JSX.Element {
               />
             </Button>
           </HStack>
-          <StyledText css={{ mt: '22px', mb: '6px' }}>Link</StyledText>
-          <Box css={{ width: '100%' }}>
+          <SpanBox css={{ width: '100%', height: '1px', opacity: '0.2', backgroundColor: theme.colors.grayText.toString() }} />          
+          <Box css={{ width: '100%',  px: '16px', pt: '42px', pb: '24px' }}>
             <form
               onSubmit={(event) => {
                 event.preventDefault()
@@ -121,10 +121,10 @@ export function AddLinkModal(props: AddLinkModalProps): JSX.Element {
                   borderRadius: '8px',
                   border: '1px solid $grayTextContrast',
                   width: '100%',
-                  p: '$2',
+                  p: '6px',
                 }}
               />
-              <HStack distribution="center" css={{ mt: '12px', width: '100%' }}>
+              <HStack distribution="end" css={{ mt: '16px', width: '100%' }}>
                 <Button style="ctaDarkYellow" css={{ mb: '0px' }}>
                   Add Link
                 </Button>