Skip to content

Commit

Permalink
Updated the index, history, and buy execute pages.
Browse files Browse the repository at this point in the history
  • Loading branch information
jhustles committed Oct 1, 2020
1 parent ee2b0a6 commit a0f09a5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 90 deletions.
76 changes: 0 additions & 76 deletions templates/buyExecute.html
Original file line number Diff line number Diff line change
@@ -1,31 +1,14 @@
{% extends "layout.html" %}

{% block main %}

<!-- ON THE BUY PAGE SEND THE LOOKUP(TICKER).COPY.TEXT on the current page (extract) TO THE API. -->
<!-- This will work if you can figure out how to use python return / make a global variable* check to see if you can do this in FLASK. -->

<!-- <div>
{{ currentSearchHistory }}
{{ searchCounter }}
</div> -->
<div class="tickerSearchBar" style="padding-top: 3%;">
<!-- <h1 style="color: white;">Buy Stocks</h1> -->
<!-- Change to /quote - make sure the quote.html matches this html. will -->
<!-- Html pages: Quote, Trade (Quote, Buy, Sell) -->
<form action="/quote" method="POST">
<div class="form-group d-inline-flex flex-direction-row">
<label for="ticker" style="font-weight: bolder; margin-right: 2%; padding-top: 2%; color: deeppink;">Ticker</label>
<input type="text" class="form-control" style="width: 40%; margin-right: 2%;" name="tickerInput" id="tickerInput" placeholder="Symbol" onkeyup="this.value = this.value.toUpperCase();">
<button class="btn btn-primary"type="submit">Search</button>
</div>
<!-- <div class="form-group">
<input type="text" class="form-control" name="sharesInput" id="sharesInput" placeholder="# Of Shares" type="text">
</div>-->
</form>
</div>


<div class="displayTable">
<div class="bg-light">
<table class="table table-bordered table-hover table-responsive-sm">
Expand All @@ -38,7 +21,6 @@
</tr>
</thead>
</div>

<div class="bg-light">
<table class="table table-bordered table-hover table-responsive-sm">
<thead class="table-borderless th">
Expand All @@ -50,7 +32,6 @@
</tr>
</thead>
</div>

<div class="bg-light" style="color: blueviolet;">
<table class="table table-bordered table-hover table-responsive-sm">
<thead>
Expand Down Expand Up @@ -91,13 +72,10 @@
</table>
</div>
</div>

<div class="d-flex flex-row justify-content-center align-items-center">
<div class="bg-light" style="text-align: center; width: 60%;">{{ message }}</div>
</div>

<div class="d-flex flex-row justify-content-center" id="buy_sell_estimator">
<!-- <div id="buyEstimator" style="padding-right: 2%;"> -->
<div id="buyEstimator">
<form action="/buyEstimator" method="POST">
<table class="table table-bordered table-responsive-sm table-borderless th" style="background: white;">
Expand Down Expand Up @@ -136,58 +114,4 @@
</form>
</div>
</div>


<!-- <div class="d-flex flex-row justify-content-center" id="sell_estimator">
<div id="sellEstimator">
<form action="/sellEstimator" method="POST">
<table class="table table-bordered table-responsive-sm table-borderless th" style="background: white;">
<thead>
<tr>
<th scope="col">Order Type:</th>
<th scope="col">Sell</th>
</tr>
</thead>
<div class="form-group">
<tbody>
<tr>
<th scope="col">(Bid) Price</th>
<th scope="col">{{ latestPrice }}</th>
</tr>
<tr>
<th scope="col">Sell Quantity</th>
<th scope="col"><input type="number" min="1" class="form-control" style="width: 50%;" name="sellSharesInput" id="sellSharesInput" placeholder="#"></th>
<th scope="col">Curr. Qty: {{ sellSharesInput }}</th>
</tr>
<tr>
<th scope="col">Estimated Total</th>
<th scope="col">{{ estimatedSellTotal }}</th>
<th scope="col"><button class="btn btn-primary btn-sm"name="btnSellEstimate" id="btnSellEstimate" type="submit">Estimate</button></th>
</tr>
</tbody>
</div>
</table>
</form>
<div class="d-flex flex-row justify-content-center" id="executeSell">
<form action="/sell" method="POST">
<button class="btn btn-primary btn-sm" type="submit">Execute Order</button>
</form>
</div>
</div> -->

<!-- <div style="color: white;">
{{ tickerInput }}
{{ username }}
{{ current_datetime }}
{{ availableCash }}
{{ companyName }}
{{ price }}
{{ symbol }}
{{ bidPrice }}
{{ askPrice }}
{{ sharesInput }}
{{ estimatedTotal }}
{{ display }}
</div> -->

{% endblock %}
22 changes: 8 additions & 14 deletions templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
<div class="container-fluid d-flex d-md-inline-flex-row justify-content-between">

<h1 class="logo d-flex align-items-center"><a href="/">Bloom$-Trade</a></h1>
<!-- Uncomment below if you prefer to use an image logo -->
<!-- <a href="index.html" class="logo"><img src="assets/img/logo.png" alt="" class="img-fluid"></a>-->


<nav class="nav-menu d-none d-lg-block justify-content-end align-items-center" style=margin-right:8px;>
{% if session.user_id %}
Expand Down Expand Up @@ -64,11 +63,6 @@ <h1 class="logo d-flex align-items-center"><a href="/">Bloom$-Trade</a></h1>

<!-- ======= Hero Section ======= -->
<section id="hero" class="d-flex align-items-center">
<!-- <div class="container d-flex flex-column align-items-center" data-aos="zoom-in" data-aos-delay="100">
<h1>Kelly Adams</h1>
<h2>I'm a professional illustrator from San Francisco</h2>
<a href="about.html" class="btn-about">About Me</a>
</div> -->
{% if get_flashed_messages() %}
<header>
<div class="alert alert-primary border text-center" role="alert">
Expand All @@ -79,17 +73,11 @@ <h2>I'm a professional illustrator from San Francisco</h2>


<div class="container d-flex flex-column align-items-center" data-aos="zoom-in" data-aos-delay="100">

<!-- MAIN BLOCK -->
<main id=main class="container">
{% block main %}{% endblock %}
</main>

<!-- <h1>Kelly Adams</h1>
<h2>I'm a professional illustrator from San Francisco</h2>
<a href="about.html" class="btn-about">Login</a> -->
</div>

</section><!-- End Hero -->


Expand Down Expand Up @@ -126,10 +114,16 @@ <h2>I'm a professional illustrator from San Francisco</h2>
<script src="static/vendor/aos/aos.js"></script>
<!-- Template Main JS File -->
<script src="static/js/main.js"></script>
<script src="static/js/logic.js"></script>
</body>
</html>








<!-- =======================================================
* Template Name: Kelly - v2.0.0
* Template URL: https://bootstrapmade.com/kelly-free-bootstrap-cv-resume-html-template/
Expand Down

0 comments on commit a0f09a5

Please sign in to comment.