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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'frontend/src/components/modals/PasswordModal.js')

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>
-- 
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 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'frontend/src/components/modals/PasswordModal.js')

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');
-- 
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 ++++++++++---------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'frontend/src/components/modals/PasswordModal.js')

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>
     );
 }
-- 
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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'frontend/src/components/modals/PasswordModal.js')

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) => {
-- 
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/PasswordModal.js')

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