Upload 17 files

app.py

@@ -4,35 +4,40 @@ from interface.rebalancing_interface import (
     output as rebalancing_output,     
     update_output as rebalancing_update_output,
     examples as rebalancing_examples, 
-    component_rows as rebalancing_component_rows
+    component_rows as rebalancing_component_rows,
+    header as rebalancing_title
 )
 from interface.share_price_trend_interface import (
     input as share_price_trend_inputs, 
     output as share_price_trend_output, 
     update_output as share_price_trend_update_output,
     examples as share_price_trend_examples, 
-    component_rows as share_price_trend_component_rows
+    component_rows as share_price_trend_component_rows,
+    header as share_price_trend_title
 )
 from interface.dollar_cost_averaging_interface import (
     input as dollar_cost_averaging_inputs, 
     output as dollar_cost_averaging_output, 
     update_output as dollar_cost_averaging_update_output,
     examples as dollar_cost_averaging_examples,
-    component_rows as dollar_cost_averaging_component_rows
+    component_rows as dollar_cost_averaging_component_rows,
+    header as dollar_cost_averaging_title
 )
 from interface.retirement_planning_interface import (
     input as retirement_planning_inputs, 
     output as retirement_planning_output,
     update_output as retirement_update_output,
     examples as retirement_planning_examples,  
-    component_rows as retirement_planning_component_rows,    
+    component_rows as retirement_planning_component_rows, 
+    header as retirement_planning_title  
 )
+from interface.about_interface import render_about_tab  # "Support Us" 탭 추가
 
 tabs_configuration = [
-    ("🚀 Re-Balancing Calculator", rebalancing_inputs, rebalancing_output, rebalancing_update_output, rebalancing_examples, rebalancing_component_rows),
-    ("📈 Share Price Trend", share_price_trend_inputs, share_price_trend_output, share_price_trend_update_output, share_price_trend_examples, share_price_trend_component_rows),
-    ("📉 Dollar Cost Averaging Calculator", dollar_cost_averaging_inputs, dollar_cost_averaging_output, dollar_cost_averaging_update_output, dollar_cost_averaging_examples, dollar_cost_averaging_component_rows),
-    ("🎯 Retirement Planning", retirement_planning_inputs, retirement_planning_output, retirement_update_output, retirement_planning_examples, retirement_planning_component_rows),
+    ("🚀", rebalancing_inputs, rebalancing_output, rebalancing_update_output, rebalancing_examples, rebalancing_component_rows, rebalancing_title),
+    ("📈", share_price_trend_inputs, share_price_trend_output, share_price_trend_update_output, share_price_trend_examples, share_price_trend_component_rows, share_price_trend_title),
+    ("📉", dollar_cost_averaging_inputs, dollar_cost_averaging_output, dollar_cost_averaging_update_output, dollar_cost_averaging_examples, dollar_cost_averaging_component_rows, dollar_cost_averaging_title),
+    ("💸", retirement_planning_inputs, retirement_planning_output, retirement_update_output, retirement_planning_examples, retirement_planning_component_rows, retirement_planning_title),
 ]
 
 def initial_load(*args):
@@ -48,7 +53,18 @@ def initial_load(*args):
     return (rebalancing_results, share_price_trend_results, dollar_cost_averaging_results, retirement_results)
 
 MARKDOWN = """
-# TuneIt 🔥
+# TuneIt 🔥 Investment Toolkit
+
+Welcome to the **TuneIt Investment Toolkit**! This all-in-one platform is designed to help you optimize your financial strategies, whether you're balancing your portfolio, analyzing market trends, planning for retirement, or maximizing dividends.
+
+Explore the tools below:
+
+- `🚀 Re-Balancing Calculator`: Adjust your portfolio to maintain your desired asset allocation.
+- `📈 Share Price Trend`: Analyze historical share price movements.
+- `📉 Dollar Cost Averaging Calculator`: Assess the benefits of spreading out your investments.
+- `💸 Dividend-Based Retirement Planning`: Calculate the investment required to achieve a dividend-based income stream during retirement.
+
+Dive into each tool to enhance your investment decisions and secure your financial future.
 
 """
 # Helper function to add buttons
@@ -87,8 +103,9 @@ def render_components(component_rows):
         else:
             row.render()
 
-def create_tab(tab_name, inputs, outputs, update_fn, examples, component_rows):
-    with gr.TabItem(tab_name):
+def create_tab(tab_name, inputs, outputs, update_fn, examples, component_rows, header):
+    with gr.Tab(tab_name):
+        gr.Markdown(header)
         with gr.Row():
             with gr.Column(elem_classes="input", scale=1):
                 render_components(component_rows)
@@ -100,11 +117,12 @@ def create_tab(tab_name, inputs, outputs, update_fn, examples, component_rows):
         on_change(inputs, update_fn, outputs)
 
 with gr.Blocks(css='style.css') as demo:
-    # gr.Markdown(MARKDOWN)
+    gr.Markdown(MARKDOWN, elem_id="col-container")
     with gr.Column(elem_id="col-container"):
         with gr.Tabs():
             for tab in tabs_configuration:
                 create_tab(*tab)
+            render_about_tab()  # "Support Us" 탭 추가
 
     # demo.load(
     #     initial_load, 

interface/about_interface.py

@@ -504,10 +504,11 @@ def render_about_tab():
 
             [![Donate with PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=M8SBRC396DPBW)
 
-            Or, if you prefer, you can also support us through Toss at:
+            Or, if you prefer, you can also support us through KakaoPay at:
 
-            <a href="https://toss.me/eichijei" target="_blank">
-                <img src="https://static.toss.im/logos/png/1x/logo-toss.png" alt="Donate with Toss" style="width: 150px;">
+            <a href="https://qr.kakaopay.com/Ej7jF6o7B" target="_blank">
+                <img src="https://t1.kakaocdn.net/pay_brand_admin/file/NvAxmhwMItNT4J2Uq1Rxt/ic-pfm.png" alt="Donate with KakaoPay" style="width: 150px;">
             </a>
             """)
 
+

interface/dollar_cost_averaging_interface.py

@@ -1,12 +1,15 @@
 import gradio as gr
 from modules.dollar_cost_averaging import dollar_cost_averaging
 
+header = """
+# 📉 Dollar Cost Averaging Calculator
+Use this calculator to evaluate the potential benefits of dollar-cost averaging as part of your investment strategy. Spread your investments over time to reduce risk.
+"""
 examples = [
     ["AAPL", 200, 9000, 560, 20000]
 ]
 
 # Define the inputs
-title = gr.Markdown("<h2 style='margin: 5px'>Dollar Cost Averaging Calculator</h2>")
 stock_code = gr.Textbox(label="Stock Code", value="368590")
 first_purchase = gr.Markdown("<h3 class='h3_title'>FIRST PURCHASE</h3>")
 old_price = gr.Number(label="Old Price", value=18153)

interface/rebalancing_interface.py

@@ -2,6 +2,10 @@ import gradio as gr
 from modules.rebalancing import rebalancing_tool
 from modules.utils import currency_codes, current_time
 
+header = """
+# 🚀 Re-Balancing Calculator
+Re-balancing your portfolio can help you stay aligned with your investment goals. Use this calculator to determine the necessary adjustments to your current asset allocation.
+"""
 examples = [
     ["KRW", "458730 KRW 769 [4],\n368590 KRW 122 [1],", 0],
     ["KRW", "SCHD USD 9.044802 [8],\nQQQ USD 0.404082 [2],",0],

interface/retirement_planning_interface.py

@@ -1,13 +1,15 @@
 import gradio as gr
 from modules.retirement_planning import retirement_planning
 
+header = """# 💸 Dividend-Based Retirement Planning Calculator
+Plan your retirement around dividend income. This calculator helps you estimate how much you need to invest to generate a desired amount of annual income through dividends, ensuring a stable and predictable income stream during your retirement years.
+"""
 # Define examples for retirement planning
 examples = [
     [38, 55, 85, 2000000, 3.0, 10000000, 1500000, 0, True, 8, 8, 3.3, 3.3]
 ]
 
 # Define the input components
-title = gr.Markdown("<h2 style='margin: 5px'>Dividend-Based Retirement Planning Calculator</h2>")
 title_1 = gr.Markdown("<h3 class='h3_title'>Profile</h3>")
 current_age = gr.Slider(label="Current Age (15-60 Years)", value=38, minimum=15, maximum=60, step=1)
 retirement_age = gr.Slider(label="Retirement Age (Upto 70 Years)", value=55, minimum=15, maximum=70, step=1)
@@ -27,7 +29,7 @@ post_retirement_dividend_yield = gr.Number(label="Dividend Yield (Post-retiremen
 
 input = [current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, initial_investment, monthly_contribution, annual_increase_in_monthly_contribution, reinvest_dividends, pre_retirement_dividend_growth, post_retirement_dividend_growth, pre_retirement_dividend_yield, post_retirement_dividend_yield]
 output = gr.HTML()
-component_rows = [title,
+component_rows = [
     title_1, [current_age, retirement_age, life_expectancy],[monthly_income_required, inflation_rate],
     title_2, [initial_investment, monthly_contribution, annual_increase_in_monthly_contribution], [reinvest_dividends],
     title_3, [pre_retirement_dividend_growth, post_retirement_dividend_growth], [pre_retirement_dividend_yield, post_retirement_dividend_yield]

interface/share_price_trend_interface.py

@@ -1,13 +1,16 @@
 import gradio as gr
 from modules.share_price_trend import share_price_trend, gradio_interface
 
+header = """
+# 📈 Share Price Trend
+Track the trends in share prices over time. This tool helps you analyze historical price movements to inform your investment decisions.
+"""
 examples = [
     ["AAPL,GOOGL,MSFT", 90],
     ["SCHD,QQQ", 365]
 ]
 
 # Define Gradio components for inputs
-title = gr.Markdown("<h2 style='margin: 5px'>Share Price Trend</h2>")
 stock_codes = gr.Textbox(
     label="Stock Codes",
     # info="Enter stock codes separated by comma.",
@@ -18,8 +21,7 @@ period = gr.Slider(
     label="Number of Days",
     value=365,
     minimum=7,
-    step = 1,
-    randomize = True
+    step = 1
 )
 
 # Define output component

modules/rebalancing.py

@@ -248,7 +248,7 @@ def generate_rebalancing_analysis(portfolio, target_ratios, total_value, main_cu
                 <tbody>
                     {''.join(
                         f"<tr>"
-                        f"<td><span class='highlight-black'>{adj['stock_code'].upper()}</span></td>"
+                        f"<td>{adj['stock_code'].upper()}</td>"
                         f"<td>{format_value(adj['current_value'])}</td>"
                         f"<td>{adj['current_value_pct'] * 100:.1f}%</td>"
                         f"<td style='text-align: center !important;'><span class='highlight-edit'>{adj['target_weight'] * 100:.0f}%</span></td>"

modules/utils.py

@@ -73,7 +73,7 @@ def get_color_for_label(index, color_map, num_labels):
         color_map_storage[index] = cmap(1 - index / (num_labels - 1))
     return color_map_storage[index]
 
-def plot_donut_chart(data, color_map='Blues', font_path='Quicksand-Regular.ttf', legend_fontsize=30):
+def plot_donut_chart(data, color_map='Blues', font_path='./font/Quicksand-Regular.ttf', legend_fontsize=30):
     # 데이터 필터링: 비중이 0이 아닌 항목만 추출
     filtered_data = {k: v for k, v in data.items() if v > 0}
     

style.css

@@ -19,6 +19,17 @@
 @import url('https://fonts.googleapis.com/css2?family=Quicksand:wght@300;400;500;700&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap');
+/* @font-face {
+    font-family: 'Paperlogy Light';
+    src: url('/file=font/Paperlogy/Paperlogy-3Light.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+
+body {
+    font-family: 'Paperlogy Light', sans-serif;
+} */
+
 
 :root {
     --background-color-light: #ffffff;
@@ -165,6 +176,10 @@
     border-collapse: collapse;
 }
 
+.table-container td {
+    text-align: end;
+}
+
 .table-container th, .table-container td {
     border: 1px solid #ddd;
     padding: 8px;
@@ -183,6 +198,7 @@
     position: sticky;
     left: 0;
     z-index: 1;
+    text-align: left;
 }
 
 .table-container th:first-child {