From 3e8500d466b641ef34c24f8b0de8163a44ba7a9e Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Fri, 5 Mar 2021 22:17:18 -0800
Subject: refactoring css

---
 frontend/src/components/modals/PasswordModal.js | 4 ++--
 frontend/src/components/modals/PasteModal.js    | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'frontend/src/components/modals')

diff --git a/frontend/src/components/modals/PasswordModal.js b/frontend/src/components/modals/PasswordModal.js
index bf373cc..bf25eeb 100644
--- a/frontend/src/components/modals/PasswordModal.js
+++ b/frontend/src/components/modals/PasswordModal.js
@@ -1,6 +1,6 @@
 import React, { useRef } from 'react';
 import Modal from 'react-modal';
-import { PassInput } from '../Inputs'
+import { Password } from '../Inputs'
 import { RightPad, LeftPad, ModalHeader, Padding } from './shared'
 import Error from '../Err';
 
@@ -36,7 +36,7 @@ const PasswordModal = (props) => {
                     <ModalHeader><span role="img" aria-label="warning">🚧&nbsp;</span>err: password protected</ModalHeader>
                 </LeftPad>
                 <RightPad>
-                    <PassInput
+                    <Password
                         value={props.value}
                         onChange={props.onChange} />
                 </RightPad>
diff --git a/frontend/src/components/modals/PasteModal.js b/frontend/src/components/modals/PasteModal.js
index 7b28abb..6c74e19 100644
--- a/frontend/src/components/modals/PasteModal.js
+++ b/frontend/src/components/modals/PasteModal.js
@@ -2,7 +2,7 @@ import React from 'react';
 import Modal from 'react-modal';
 import { LeftPad, ModalHeader, RightPad } from './shared'
 import { useHistory } from 'react-router-dom';
-import { PasteURLInput } from '../Inputs'
+import { Text } from '../Inputs'
 import { useClipboard } from 'use-clipboard-copy';
 
 const modalStyles = {
@@ -39,11 +39,7 @@ const PasteModal = (props) => {
                     <ModalHeader><span role="img" aria-label="success">📎&nbsp;</span>paste created</ModalHeader>
                 </LeftPad>
                     <RightPad>
-                        <PasteURLInput 
-                            id="paste_modal"
-                            fullURL={fullURL} />
-                        <input 
-                            hidden
+                        <Text
                             type="text"
                             value={fullURL} 
                             readOnly
-- 
cgit v1.2.3


From 37f05def31112563fd9d8f3b0c9bf8cebb607d86 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 15:44:54 -0800
Subject: fix modal zindex

---
 frontend/src/components/modals/PasswordModal.js | 13 +------------
 frontend/src/components/modals/PasteModal.js    | 13 +------------
 frontend/src/components/modals/shared.js        | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 24 deletions(-)

(limited to 'frontend/src/components/modals')

diff --git a/frontend/src/components/modals/PasswordModal.js b/frontend/src/components/modals/PasswordModal.js
index bf25eeb..637e20a 100644
--- a/frontend/src/components/modals/PasswordModal.js
+++ b/frontend/src/components/modals/PasswordModal.js
@@ -1,20 +1,9 @@
 import React, { useRef } from 'react';
 import Modal from 'react-modal';
 import { Password } from '../Inputs'
-import { RightPad, LeftPad, ModalHeader, Padding } from './shared'
+import {RightPad, LeftPad, ModalHeader, Padding, modalStyles} from './shared'
 import Error from '../Err';
 
-const modalStyles = {
-    content: {
-        top: '50%',
-        left: '50%',
-        transform: 'translate(-50%, -50%)',
-        width: '400px',
-        height: '250px',
-        border: '1px solid #11111188'
-    }
-};
-
 const PasswordModal = (props) => {
     const ErrorLabel = useRef(null);
     Modal.setAppElement('body');
diff --git a/frontend/src/components/modals/PasteModal.js b/frontend/src/components/modals/PasteModal.js
index 6c74e19..c91bbb4 100644
--- a/frontend/src/components/modals/PasteModal.js
+++ b/frontend/src/components/modals/PasteModal.js
@@ -1,21 +1,10 @@
 import React from 'react';
 import Modal from 'react-modal';
-import { LeftPad, ModalHeader, RightPad } from './shared'
+import {LeftPad, ModalHeader, modalStyles, RightPad} from './shared'
 import { useHistory } from 'react-router-dom';
 import { Text } from '../Inputs'
 import { useClipboard } from 'use-clipboard-copy';
 
-const modalStyles = {
-    content: {
-        top: '50%',
-        left: '50%',
-        transform: 'translate(-50%, -50%)',
-        width: '500px',
-        height: '250px',
-        border: '1px solid #11111188'
-    }
-};
-
 const PasteModal = (props) => {
     const history = useHistory();
     const fullURL = `${window.location.origin}/${props.hash}`;
diff --git a/frontend/src/components/modals/shared.js b/frontend/src/components/modals/shared.js
index d63be06..7c38dc2 100644
--- a/frontend/src/components/modals/shared.js
+++ b/frontend/src/components/modals/shared.js
@@ -1,5 +1,20 @@
 import styled from 'styled-components'
 
+export const modalStyles = {
+  content: {
+    top: '50%',
+    left: '50%',
+    transform: 'translate(-50%, -50%)',
+    width: '500px',
+    height: '250px',
+    border: '1px solid #11111188',
+  },
+};
+
+export const Form = styled.form`
+  z-index: 999;
+`
+
 export const RightPad = styled.div`
     margin-right: 3em;
 `
-- 
cgit v1.2.3


From dbf726d9e021a692254defdab8b993063b15354f Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 16:09:51 -0800
Subject: update watermark styling

---
 frontend/src/components/modals/PasteModal.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'frontend/src/components/modals')

diff --git a/frontend/src/components/modals/PasteModal.js b/frontend/src/components/modals/PasteModal.js
index c91bbb4..ff2e639 100644
--- a/frontend/src/components/modals/PasteModal.js
+++ b/frontend/src/components/modals/PasteModal.js
@@ -4,6 +4,7 @@ import {LeftPad, ModalHeader, modalStyles, RightPad} from './shared'
 import { useHistory } from 'react-router-dom';
 import { Text } from '../Inputs'
 import { useClipboard } from 'use-clipboard-copy';
+import {Button} from "../Form/Button";
 
 const PasteModal = (props) => {
     const history = useHistory();
@@ -35,17 +36,16 @@ const PasteModal = (props) => {
                             ref={clipboard.target} />
                     </RightPad>
                 <LeftPad>
-                    <button 
-                        className="lt-button lt-shadow lt-hover"
+                    <Button
                         type="submit">
                             view
-                    </button>
-                    <button 
-                        className="lt-button lt-shadow lt-hover"
+                    </Button>
+                    <Button
+                        secondary
                         type="button" 
                         onClick={clipboard.copy}>
                             {clipboard.copied ? 'copied' : 'copy url'}
-                    </button>
+                    </Button>
                 </LeftPad>
             </form>
         </Modal>
-- 
cgit v1.2.3


From 9aab99beea5af56f2329eb6de421617994435354 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 16:18:50 -0800
Subject: paste modal fixes

---
 frontend/src/components/modals/PasswordModal.js | 26 ++++++--------
 frontend/src/components/modals/PasteModal.js    | 47 ++++++++++++-------------
 frontend/src/components/modals/shared.js        | 11 ++----
 3 files changed, 34 insertions(+), 50 deletions(-)

(limited to 'frontend/src/components/modals')

diff --git a/frontend/src/components/modals/PasswordModal.js b/frontend/src/components/modals/PasswordModal.js
index 637e20a..64e984b 100644
--- a/frontend/src/components/modals/PasswordModal.js
+++ b/frontend/src/components/modals/PasswordModal.js
@@ -1,7 +1,7 @@
 import React, { useRef } from 'react';
 import Modal from 'react-modal';
 import { Password } from '../Inputs'
-import {RightPad, LeftPad, ModalHeader, Padding, modalStyles} from './shared'
+import {RightPad, LeftPad, ModalHeader, Padding, modalStyles, Form} from './shared'
 import Error from '../Err';
 
 const PasswordModal = (props) => {
@@ -20,21 +20,15 @@ const PasswordModal = (props) => {
             style={modalStyles}
             contentLabel="enter paste password"
         >
-            <form onSubmit={submitPassword}>
-                <LeftPad>
-                    <ModalHeader><span role="img" aria-label="warning">🚧&nbsp;</span>err: password protected</ModalHeader>
-                </LeftPad>
-                <RightPad>
-                    <Password
-                        value={props.value}
-                        onChange={props.onChange} />
-                </RightPad>
-                <LeftPad>
-                    <input className="lt-button lt-shadow lt-hover" type="submit" value="continue" />
-                    <Padding />
-                    <Error ref={ErrorLabel} />
-                </LeftPad>
-            </form>
+            <Form onSubmit={submitPassword}>
+                <ModalHeader><span role="img" aria-label="warning">🚧&nbsp;</span>err: password protected</ModalHeader>
+                <Password
+                    value={props.value}
+                    onChange={props.onChange} />
+                <input className="lt-button lt-shadow lt-hover" type="submit" value="continue" />
+                <Padding />
+                <Error ref={ErrorLabel} />
+            </Form>
         </Modal>
     );
 }
diff --git a/frontend/src/components/modals/PasteModal.js b/frontend/src/components/modals/PasteModal.js
index ff2e639..a6d637f 100644
--- a/frontend/src/components/modals/PasteModal.js
+++ b/frontend/src/components/modals/PasteModal.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Modal from 'react-modal';
-import {LeftPad, ModalHeader, modalStyles, RightPad} from './shared'
+import {Form, LeftPad, ModalHeader, modalStyles, RightPad} from './shared'
 import { useHistory } from 'react-router-dom';
 import { Text } from '../Inputs'
 import { useClipboard } from 'use-clipboard-copy';
@@ -24,30 +24,27 @@ const PasteModal = (props) => {
             style={modalStyles}
             contentLabel="paste created"
         >
-            <form onSubmit={redir}>
-                <LeftPad>
-                    <ModalHeader><span role="img" aria-label="success">📎&nbsp;</span>paste created</ModalHeader>
-                </LeftPad>
-                    <RightPad>
-                        <Text
-                            type="text"
-                            value={fullURL} 
-                            readOnly
-                            ref={clipboard.target} />
-                    </RightPad>
-                <LeftPad>
-                    <Button
-                        type="submit">
-                            view
-                    </Button>
-                    <Button
-                        secondary
-                        type="button" 
-                        onClick={clipboard.copy}>
-                            {clipboard.copied ? 'copied' : 'copy url'}
-                    </Button>
-                </LeftPad>
-            </form>
+            <Form onSubmit={redir}>
+                <ModalHeader>
+                    <span role="img" aria-label="success">📎&nbsp;</span>paste created
+                </ModalHeader>
+                <Text
+                    label="url"
+                    type="text"
+                    value={fullURL}
+                    readOnly
+                    ref={clipboard.target} />
+                <Button
+                    type="submit">
+                        go to paste
+                </Button>
+                <Button
+                    secondary
+                    type="button"
+                    onClick={clipboard.copy}>
+                        {clipboard.copied ? 'copied' : 'copy url'}
+                </Button>
+            </Form>
         </Modal>
     );
 }
diff --git a/frontend/src/components/modals/shared.js b/frontend/src/components/modals/shared.js
index 7c38dc2..0336818 100644
--- a/frontend/src/components/modals/shared.js
+++ b/frontend/src/components/modals/shared.js
@@ -12,15 +12,8 @@ export const modalStyles = {
 };
 
 export const Form = styled.form`
-  z-index: 999;
-`
-
-export const RightPad = styled.div`
-    margin-right: 3em;
-`
-
-export const LeftPad = styled.div`
-    margin-left: 2em;
+  margin: 2em;
+  margin-right: 3em;
 `
 
 export const ModalHeader = styled.h3`
-- 
cgit v1.2.3


From 75e8bdd2d4cdaefe28ed40a7735c993f98d15754 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 16:32:09 -0800
Subject: refactor form -> common

---
 frontend/src/components/modals/PasswordModal.js | 2 +-
 frontend/src/components/modals/PasteModal.js    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'frontend/src/components/modals')

diff --git a/frontend/src/components/modals/PasswordModal.js b/frontend/src/components/modals/PasswordModal.js
index 64e984b..813c1e3 100644
--- a/frontend/src/components/modals/PasswordModal.js
+++ b/frontend/src/components/modals/PasswordModal.js
@@ -1,7 +1,7 @@
 import React, { useRef } from 'react';
 import Modal from 'react-modal';
 import { Password } from '../Inputs'
-import {RightPad, LeftPad, ModalHeader, Padding, modalStyles, Form} from './shared'
+import {ModalHeader, Padding, modalStyles, Form} from './shared'
 import Error from '../Err';
 
 const PasswordModal = (props) => {
diff --git a/frontend/src/components/modals/PasteModal.js b/frontend/src/components/modals/PasteModal.js
index a6d637f..e7dbed2 100644
--- a/frontend/src/components/modals/PasteModal.js
+++ b/frontend/src/components/modals/PasteModal.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import Modal from 'react-modal';
-import {Form, LeftPad, ModalHeader, modalStyles, RightPad} from './shared'
+import {Form, ModalHeader, modalStyles} from './shared'
 import { useHistory } from 'react-router-dom';
 import { Text } from '../Inputs'
 import { useClipboard } from 'use-clipboard-copy';
-import {Button} from "../Form/Button";
+import {Button} from "../Common/Button";
 
 const PasteModal = (props) => {
     const history = useHistory();
-- 
cgit v1.2.3


From f0767bb21a27d2b963de23e07e2519db204bfa5f Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 17:21:33 -0800
Subject: fix password modal

---
 frontend/src/components/modals/PasswordModal.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'frontend/src/components/modals')

diff --git a/frontend/src/components/modals/PasswordModal.js b/frontend/src/components/modals/PasswordModal.js
index 813c1e3..a829091 100644
--- a/frontend/src/components/modals/PasswordModal.js
+++ b/frontend/src/components/modals/PasswordModal.js
@@ -3,6 +3,7 @@ import Modal from 'react-modal';
 import { Password } from '../Inputs'
 import {ModalHeader, Padding, modalStyles, Form} from './shared'
 import Error from '../Err';
+import {SubmitButton} from "../Common/Button";
 
 const PasswordModal = (props) => {
     const ErrorLabel = useRef(null);
@@ -23,9 +24,10 @@ const PasswordModal = (props) => {
             <Form onSubmit={submitPassword}>
                 <ModalHeader><span role="img" aria-label="warning">🚧&nbsp;</span>err: password protected</ModalHeader>
                 <Password
+                    placeholder="hunter2"
                     value={props.value}
                     onChange={props.onChange} />
-                <input className="lt-button lt-shadow lt-hover" type="submit" value="continue" />
+                <SubmitButton type="submit" value="continue" />
                 <Padding />
                 <Error ref={ErrorLabel} />
             </Form>
-- 
cgit v1.2.3