From f44d1d9d98fb60cede5aa5e6c2119cab0921c482 Mon Sep 17 00:00:00 2001
From: Tanner Collin <git@tannercollin.com>
Date: Thu, 23 Jan 2020 22:44:42 +0000
Subject: [PATCH] Move success messages under submit button

---
 webclient/src/Admin.js        | 30 ++++++++++++++++--------------
 webclient/src/Transactions.js |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/webclient/src/Admin.js b/webclient/src/Admin.js
index 8fc6c76..cd884ea 100644
--- a/webclient/src/Admin.js
+++ b/webclient/src/Admin.js
@@ -44,10 +44,10 @@ export function AdminTransactions(props) {
 
 				<TransactionEditor input={input} setInput={setInput} error={error} />
 
-				{success && <p>Added! <Link to={'/transactions/'+success}>View the transaction.</Link></p>}
 				<Form.Button loading={loading} error={error.non_field_errors}>
 					Submit
 				</Form.Button>
+				{success && <p>Added! <Link to={'/transactions/'+success}>View the transaction.</Link></p>}
 			</Form>
 
 			<Header size='small'>Current Transactions</Header>
@@ -246,10 +246,10 @@ export function AdminMemberCards(props) {
 					/>
 				</Form.Group>
 
-				{success && <p>Success!</p>}
 				<Form.Button loading={loading} error={error.non_field_errors}>
 					Submit
 				</Form.Button>
+				{success && <div>Success!</div>}
 			</Form>
 
 			<Header size='small'>Current Cards</Header>
@@ -332,18 +332,20 @@ export function AdminMemberPause(props) {
 
 			<p>Pause members who are inactive, former, or on vacation.</p>
 
-			{success && <p>Success!</p>}
-			{error && <p>Error, something went wrong.</p>}
+			<p>
+				{result.member.paused_date ?
+					<Button onClick={handleUnpause} loading={loading}>
+						Unpause
+					</Button>
+				:
+					<Button onClick={handlePause} loading={loading}>
+						{yousure ? 'You Sure?' : 'Pause'}
+					</Button>
+				}
+			</p>
 
-			{result.member.paused_date ?
-				<Button onClick={handleUnpause} loading={loading}>
-					Unpause
-				</Button>
-			:
-				<Button onClick={handlePause} loading={loading}>
-					{yousure ? 'You Sure?' : 'Pause'}
-				</Button>
-			}
+			{success && <div>Success!</div>}
+			{error && <p>Error, something went wrong.</p>}
 		</div>
 	);
 };
@@ -462,10 +464,10 @@ export function AdminMemberForm(props) {
 					/>
 				</Form.Field>
 
-				{success && <p>Success!</p>}
 				<Form.Button loading={loading} error={error.non_field_errors}>
 					Submit
 				</Form.Button>
+				{success && <div>Success!</div>}
 			</Form>
 		</div>
 	);
diff --git a/webclient/src/Transactions.js b/webclient/src/Transactions.js
index 2dbd57e..00f1e97 100644
--- a/webclient/src/Transactions.js
+++ b/webclient/src/Transactions.js
@@ -169,10 +169,10 @@ function EditTransaction(props) {
 			<Form onSubmit={handleSubmit}>
 				<TransactionEditor input={input} setInput={setInput} error={error} />
 
-				{success && <p>Success!</p>}
 				<Form.Button loading={loading} error={error.non_field_errors}>
 					Save
 				</Form.Button>
+				{success && <div>Success!</div>}
 			</Form>
 		</div>
 	);