Skip to content

Commit

Permalink
Merge pull request #87 from Cavdy/ft-connect-api-to-ui-transactions-1…
Browse files Browse the repository at this point in the history 
…65482791

#165482791 connect api to ui transactions
  • Loading branch information
@Cavdy
Cavdy committed Apr 22, 2019
2 parents 8ad3780 + af2b3b2 commit a1ea24e
Show file tree
Hide file tree
Showing 8 changed files with 447 additions and 56 deletions.
71 changes: 42 additions & 29 deletions frontend-app/credit.html → frontend-app/accounts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1 class="logo">Banka</h1>
<a href="./dashboard.html" class="sidebar-link">Dashboard</a>
</li>
<li class="sidebar-item sidebar-item-active">
<a href="./credit.html" class="sidebar-link">Credit / Debit</a>
<a href="./accounts.html" class="sidebar-link">Accounts</a>
</li>
<li class="sidebar-item">
<a href="./users.html" class="sidebar-link">Users Accounts</a>
Expand Down Expand Up @@ -120,40 +120,47 @@ <h1 class="logo">Banka</h1>

<!--Main Body-->
<main class="main-body">
<p class="errorMessage"></p>
<!--Accounts Limit-->
<div class="accounts">
<div class="card">
<form action="" class="accounts-form">
<div class="form-group">
<select class="accounts-select" id="accounts">
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
</div>

<input type="submit" id="submit" class="btn-go" value="Go">
</form>
<div class="accountsQuery">
<div class="queryForm">
<div class="card">
<form action="" class="accounts-form">
<div class="form-group">
<select class="accounts-select" id="limit">
<option value="5">5</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
</div>

<input type="submit" id="go" class="btn-go" value="Go">
</form>
</div>

<div class="card">
<form action="" class="accounts-form">
<div class="form-group">
<input type="number" class="accounts-input" placeholder="account number">
</div>

<input type="submit" id="ac-go" class="btn-go" value="Go">
</form>
</div>
</div>
</div>
<div class="card">
<h1 class="content-title">Credit / Debit Accounts</h1>

<div class="table">
<div class="table-row">
<div class="account-index">Index</div>
<div class="account-name">Account Name</div>
<div class="amount">Amount</div>
<div class="account-index">AC Number</div>
<div class="account-name">AC Name</div>
<div class="amount">Balance</div>
<div class="edit">Debit</div>
<div class="edit">Credit</div>
</div>
<div class="table-row">
<div class="account-index">1</div>
<div class="account-name">Fred Matthew</div>
<div class="amount">10000</div>
<div class="edit"><a href="#" class="delete-btn" id="show-modal">Debit</a></div>
<div class="edit"><a href="#" class="edit-btn" id="show-modal2">Credit</a></div>
</div>
</div>
</div>
</main>
Expand All @@ -165,17 +172,20 @@ <h1 class="content-title">Credit / Debit Accounts</h1>
<div class="modal-content">
<div class="card">
<h1 class="content-title">Debit Account</h1>
<p class="successMessage"></p>
<p class="errMessage"></p>
<!--Account Name and Balance-->
<h4 class="username">Account name: <span id="username"></span></h4>
<h4 class="username">Account Name: <span id="username"></span></h4>
<h4 class="username">Account Number: <span id="acnumber"></span></h4>
<h4 class="balance">Balance: <span id="balance"></span></h4>
<!--Debit Form-->
<form action="" class="form">
<div class="form-group">
<label for="debit" class="form-label">Debit</label>
<input type="number" placeholder="Debit" id="debit" class="form-input">
<input type="text" placeholder="Debit" id="debit" class="form-input">
</div>

<input type="submit" class="btn btn-block btn-primary" value="Debit">
<input type="submit" id="debitbtn" class="btn btn-block btn-primary" value="Debit">
</form>
</div>
</div>
Expand All @@ -186,17 +196,20 @@ <h4 class="balance">Balance: <span id="balance"></span></h4>
<div class="modal-content">
<div class="card">
<h1 class="content-title">Credit Account</h1>
<p class="successMessage"></p>
<p class="errMessage"></p>
<!--Account Name and Balance-->
<h4 class="username">Account name: <span id="username"></span></h4>
<h4 class="username">Account Number: <span id="acnumber"></span></h4>
<h4 class="balance">Balance: <span id="balance"></span></h4>
<!--Credit Form-->
<form action="" class="form">
<div class="form-group">
<label for="credit" class="form-label">Credit</label>
<input type="number" placeholder="Credit" id="credit" class="form-input">
<input type="text" placeholder="Credit" id="credit" class="form-input">
</div>

<input type="submit" class="btn btn-block btn-primary" value="Credit">
<input type="submit" id="creditbtn" class="btn btn-block btn-primary" value="Credit">
</form>
</div>
</div>
Expand Down
36 changes: 34 additions & 2 deletions frontend-app/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -938,9 +938,9 @@ body,
accounts dropdown
=======================
*/
.accounts {
.accounts,
.accountsQuery {
margin-bottom: .5rem;
width: 15rem;
height: 3rem;
}

Expand All @@ -965,6 +965,30 @@ body,
color: var(--color-blue);
}

.queryForm {
display: flex;
justify-content: space-between;
}

.accounts-input {
width: 10rem;
height: 2rem;
font-size: 1rem;
border: 1px solid var(--color-blue);
padding-left: .5rem;
}

.errorMessage,
.errMessage {
font-size: 1rem;
color: var(--color-red);
}

.successMessage {
font-size: 1rem;
color: var(--color-green);
}

/*
=======================
Responsiveness
Expand Down Expand Up @@ -1124,4 +1148,12 @@ body,
height: 20rem;
font-size: 1rem;
}

.queryForm {
flex-direction: column;
}

.accountsQuery {
margin-bottom: 4rem;
}
}
2 changes: 1 addition & 1 deletion frontend-app/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1 class="logo">Banka</h1>
<a href="./dashboard.html" class="sidebar-link">Dashboard</a>
</li>
<li class="sidebar-item">
<a href="./credit.html" class="sidebar-link">Credit / Debit</a>
<a href="./accounts.html" class="sidebar-link">Accounts</a>
</li>
<li class="sidebar-item">
<a href="./users.html" class="sidebar-link">Users Accounts</a>
Expand Down
Loading

0 comments on commit a1ea24e

Please sign in to comment.