From dde47d514c7f8ec7cae0f6289ff96682e0dd905c Mon Sep 17 00:00:00 2001
From: SeanChenTaipei <sean96545@gmail.com>
Date: Tue, 14 Mar 2023 17:46:01 +0800
Subject: [PATCH] f

---
 Procfile                   |   2 +-
 templates/strategy_tw.html | 112 ++++++++++++++-----------------------
 2 files changed, 43 insertions(+), 71 deletions(-)

diff --git a/Procfile b/Procfile
index 9ce81f5..98b314d 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: gunicorn main:app --preload --workers 8
\ No newline at end of file
+web: gunicorn main:app --preload --workers 8 --timeout 60 --log-level debug
\ No newline at end of file
diff --git a/templates/strategy_tw.html b/templates/strategy_tw.html
index 2a94e3d..df13134 100644
--- a/templates/strategy_tw.html
+++ b/templates/strategy_tw.html
@@ -80,79 +80,51 @@ div.card{
             </div>
         </div>
         
-        <div class="row">
-            <!-- <div class="col-lg-6 col-md-6 col-sm-12">
-                <div class="card my-2 font-bold" style="border-radius: 7px;">
-                    <div class="card-header">
-                        <h5 class="card-title text-xl font-bold pt-2">
-                            {% if session.tw == 1 %}台股{% endif %}投資組合策略建立指南</h5>
-                    </div>
-                    <div class="card-body mb-0">
-                        <ol class="list-group list-group-flush list-group-numbered">
-                            <li class="list-group-item">
-                                <span class="ps-2">輸入投資組合名稱。</span>
-                            </li>
-                            <li class="list-group-item">
-                                <span class="ps-2">選擇所參加的課程或競賽。</span>
-                            </li>
-                            <li class="list-group-item"><span class="ps-2">選擇資產後按下 <span class="badge bg-secondary">加入</span>。</li>
-                            <li class="list-group-item"><span class="ps-2">按下 <button type="button" class="btn btn-outline-primary btn-sm" disabled>確認資產</button> 後查看資產價格動態圖表。</span></li>
-                            <li class="list-group-item"><span class="ps-2">刪除不加入投資組合的資產。</span></li>
-                            <li class="list-group-item"><span class="ps-2">選擇建立策略相關參數。</span></li>
-                            <li class="list-group-item"><span class="ps-2">按下 <button type="button" class="btn btn-outline-danger btn-sm" disabled>確認建立</button> 並查看回傳訊息。</span></li>
-                        </ol>
-                    </div>
+        <div class="card my-2 scroll" style="border-radius: 7px;">
+            <div class="card-header d-flex">
+                <div class="py-2 font-bold text-xl">
+                    名稱與選擇資產
                 </div>
-            </div> -->
-            <div class="col-lg-12 col-md-12 col-sm-12">
-                <div class="card my-2 scroll" style="border-radius: 7px;">
-                    <div class="card-header d-flex">
-                        <div class="py-2 font-bold text-xl">
-                            名稱與選擇資產
-                        </div>
-                    </div>
-                    <div class="card-body">
-                        <label for="portName" class="form-label font-bold">輸入投資組合名稱: </label>
-                        <input id="portName" name="portName" type="text" class="form-control mb-3" placeholder="EX. 112最帥" required>
-                        <label for="competition" class="form-label font-bold">選擇所屬課程或競賽: </label>
-                        <select id="competition" class="form-select mb-3" size="1">
-                            {% include 'competitions.html' %}
-                        </select>
-                        <label for="stockAll" class="form-label font-bold">選擇資產: </label>
-                        <div class="d-flex">
-                            <input name="assetSelect" class="form-control" list="datalistOptions" id="stockAll" placeholder="輸入資產名稱...">
-                            <datalist id="datalistOptions">
-                                {% if session.tw==0 %}
-                                    {% for key, data in data_us.items() -%}
-                                    <option value="{{ key|e }}">{{ key|e }} | {{ data|e }}</option>
-                                    {% endfor %}
-                                {% endif %}
-                                {% for key, data in data_tw.items() -%}
-                                <option value="{{ key|e }}">{{ key|e }} | {{ data|e }} </option>
-                                {% endfor %}
-                            </datalist>
-                            <button class="btn btn-secondary btn-sm"
-                                    type="button"
-                                    id="addStockBtn">
-                                加入
-                            </button>
-                        </div>
-                        <div>
-                            <ol class="list-group list-group-numbered py-3" id="stock-list" type="1">
-                                {% for s in stock %}
-                                <li class="list-group-item">
-                                    <span class="px-2">{{ s|safe }}</span> 
-                                    <a class="btn btn-sm btn-danger float-right delete-btn">
-                                        <i class="fas fa-trash-alt"></i>
-                                    </a>
-                                </li>
-                                {% endfor %}
-                            </ol>
-                        </div>
-                    </div>
+            </div>
+            <div class="card-body">
+                <label for="portName" class="form-label font-bold">輸入投資組合名稱: </label>
+                <input id="portName" name="portName" type="text" class="form-control mb-3" placeholder="EX. 112最帥" required>
+                <label for="competition" class="form-label font-bold">選擇所屬課程或競賽: </label>
+                <select id="competition" class="form-select mb-3" size="1">
+                    {% include 'competitions.html' %}
+                </select>
+                <label for="stockAll" class="form-label font-bold">選擇資產: </label>
+                <div class="d-flex">
+                    <input name="assetSelect" class="form-control" list="datalistOptions" id="stockAll" placeholder="輸入資產名稱...">
+                    <datalist id="datalistOptions">
+                        {% if session.tw==0 %}
+                            {% for key, data in data_us.items() -%}
+                            <option value="{{ key|e }}">{{ key|e }} | {{ data|e }}</option>
+                            {% endfor %}
+                        {% endif %}
+                        {% for key, data in data_tw.items() -%}
+                        <option value="{{ key|e }}">{{ key|e }} | {{ data|e }} </option>
+                        {% endfor %}
+                    </datalist>
+                    <button class="btn btn-secondary btn-sm"
+                            type="button"
+                            id="addStockBtn">
+                        加入
+                    </button>
+                </div>
+                <div>
+                    <ol class="list-group list-group-numbered py-3" id="stock-list" type="1">
+                        {% for s in stock %}
+                        <li class="list-group-item">
+                            <span class="px-2">{{ s|safe }}</span> 
+                            <a class="btn btn-sm btn-danger float-right delete-btn">
+                                <i class="fas fa-trash-alt"></i>
+                            </a>
+                        </li>
+                        {% endfor %}
+                    </ol>
                 </div>
             </div>
-            
         </div>
         <div class="card" style="border-radius: 7px;">
             <div class="card-header d-flex">