Upload 18 files

interface/retirement_planning_interface.py

@@ -3,34 +3,34 @@ from modules.retirement_planning import retirement_planning
 
 # Define examples for retirement planning
 examples = [
-    [38, 55, 85, 2000000, 3.0, 10000000, 500000, 0, True, 8, 8, 3.3, 3.3]
+    [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'>Retirement Planning</h2>")
-title_profile = gr.Markdown("<h3 class='h3_title'>PROFILE</h3>")
+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)
 life_expectancy = gr.Slider(label="Life Expectancy (Upto 100 Years)", value=80, minimum=30, maximum=100, step=1)
-title_savings = gr.Markdown("<h3 class='h3_title'>SAVINGS</h3>")
-monthly_income_required = gr.Number(label="Monthly Income Required (CPP)", value=2000000)
+title_2 = gr.Markdown("<h3 class='h3_title'>Contribution</h3>")
+monthly_income_required = gr.Number(label="Current Monthly Expense", value=2000000)
 inflation_rate = gr.Number(label="Inflation Rate (%)", value=3)
-current_investment = gr.Number(label="Current Investment", value=10000000)
-monthly_investment = gr.Number(label="Monthly Investment", value=1000000)
-annual_increase_in_monthly_investment = gr.Number(label="Annual Increase in Monthly Investment", value=0)  # 추가된 입력
+initial_investment = gr.Number(label="Initial Investment", value=10000000)
+monthly_contribution = gr.Number(label="Monthly Contribution", value=1000000)
+annual_increase_in_monthly_contribution = gr.Number(label="Annual Increase in Monthly Contribution", value=0)  # 추가된 입력
 reinvest_dividends = gr.Checkbox(label="Reinvest Dividends", value=True)
-title_growth = gr.Markdown("<h3 class='h3_title'>GROWTH</h3>")
-pre_retirement_roi = gr.Number(label="Return On Investment (Pre-retirement) (%)", value=8)
-post_retirement_roi = gr.Number(label="Return On Investment (Post-retirement) (%)", value=8)
+title_3 = gr.Markdown("<h3 class='h3_title'>Performance</h3>")
+pre_retirement_dividend_growth = gr.Number(label="Dividend Growth (Pre-retirement) (%)", value=8)
+post_retirement_dividend_growth = gr.Number(label="Dividend Growth (Post-retirement) (%)", value=8)
 pre_retirement_dividend_yield = gr.Number(label="Dividend Yield (Pre-retirement) (%)", value=3.3)
 post_retirement_dividend_yield = gr.Number(label="Dividend Yield (Post-retirement) (%)", value=3.3)
 
-input = [current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, annual_increase_in_monthly_investment, reinvest_dividends, pre_retirement_roi, post_retirement_roi, pre_retirement_dividend_yield, post_retirement_dividend_yield]
+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 = [
-    [current_age, retirement_age, life_expectancy],[monthly_income_required, inflation_rate],
-    [current_investment, monthly_investment, annual_increase_in_monthly_investment], [reinvest_dividends],
-    [pre_retirement_roi, post_retirement_roi], [pre_retirement_dividend_yield, post_retirement_dividend_yield]
+component_rows = [title,
+    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]
 ]
 
 # Define the update function

modules/rebalancing.py

@@ -199,22 +199,22 @@ def generate_rebalancing_analysis(portfolio, target_ratios, total_value, main_cu
                 <thead>
                     <tr>
                         <th colspan="1"></th>
-                        <th colspan="2" class="header-bg-before">Your Current Portfolio (Before Trades)</th>
+                        <th colspan="2" class="table-header-bg-before">Your Current Portfolio (Before Trades)</th>
                         <th colspan="1"></th>                        
                         <th colspan="4" style='text-align: center'>Trades to Re-Balance Your Portfolio</th>
-                        <th colspan="2" class="header-bg-after">Your Adjusted Portfolio (After Trades)</th>
+                        <th colspan="2" class="table-header-bg-after">Your Adjusted Portfolio (After Trades)</th>
                     </tr>
                     <tr>
                         <th>Stock Code</th>
-                        <th class="header-bg-before">Total Value - {main_currency} {currency_symbol}</th>
-                        <th class="header-bg-before">% Asset Allocation</th>
+                        <th class="table-header-bg-before">Total Value - {main_currency} {currency_symbol}</th>
+                        <th class="table-header-bg-before">% Asset Allocation</th>
                         <th style='text-align: center !important;'>Your Target Asset Allocation %</th>
                         <th>Buy or Sell?</th>
                         <th>Trade Amount - {main_currency} {currency_symbol}</th>
                         <th>Current Price per Share - {main_currency} {currency_symbol}</th>
                         <th>Estimated # of Shares to Buy or Sell</th>
-                        <th class="header-bg-after">Total Value - {main_currency} {currency_symbol}</th>
-                        <th class="header-bg-after">% Asset Allocation</th>
+                        <th class="table-header-bg-after">Total Value - {main_currency} {currency_symbol}</th>
+                        <th class="table-header-bg-after">% Asset Allocation</th>
                     </tr>
                     <tr style="font-weight: bold;">
                         <td>Total</td>

modules/retirement_planning.py

@@ -69,17 +69,17 @@ def create_retirement_table(post_retirement_investments, monthly_income_required
                 <tr>
                     <th colspan="1"></th>
                     <th colspan="1"></th>
-                    <th colspan="2" class="header-bg-required">Income Required</th>                        
-                    <th colspan="2" class="header-bg-divdend">Dividend Income</th>
+                    <th colspan="2" class="table-header-bg-required">Income Required</th>                        
+                    <th colspan="2" class="table-header-bg-dividend">Dividend Income</th>
                     <th colspan="1">Shortfall</th>
                 </tr>            
                 <tr>
                     <th>Age</th>
-                    <th>Investment</th>
-                    <th class="header-bg-required">Annual</th>
-                    <th class="header-bg-required">Monthly <br>(CPP {monthly_income_required:,.0f})</th>
-                    <th class="header-bg-divdend">Annual</th>
-                    <th class="header-bg-divdend">Monthly</th>
+                    <th>Investment Returns</th>
+                    <th class="table-header-bg-required">Annual</th>
+                    <th class="table-header-bg-required">Monthly <br>(Current {monthly_income_required:,.0f})</th>
+                    <th class="table-header-bg-dividend">Annual</th>
+                    <th class="table-header-bg-dividend">Monthly</th>
                     <th>{format_value(additional_cash_total)}</th>
                 </tr>
             </thead>
@@ -98,7 +98,7 @@ def create_csv_file(post_retirement_investments, monthly_income_required):
         'Age', 
         'Investment', 
         'Annual Income Required', 
-        f'Monthly Income Required (CPP {monthly_income_required:,.0f})', 
+        f'Monthly Income Required (Current {monthly_income_required:,.0f})', 
         'Annual Dividend Income', 
         'Monthly Dividend Income', 
         'Shortfall'
@@ -125,23 +125,23 @@ def retirement_planning(
     life_expectancy=None, 
     monthly_income_required=None, 
     inflation_rate=None, 
-    current_investment=None, 
-    monthly_investment=None, 
-    annual_increase_in_monthly_investment=None, 
+    initial_investment=None, 
+    monthly_contribution=None, 
+    annual_increase_in_monthly_contribution=None, 
     reinvest_dividends=None, 
-    pre_retirement_roi=None, 
-    post_retirement_roi=None, 
+    pre_retirement_dividend_growth=None, 
+    post_retirement_dividend_growth=None, 
     pre_retirement_dividend_yield=None, 
     post_retirement_dividend_yield=None
 ):
     # NoneType일 때 0으로 처리
     current_age = current_age if current_age is not None else 0
     retirement_age = retirement_age if retirement_age is not None else 0
-    current_investment = current_investment if current_investment is not None else 0
-    monthly_investment = monthly_investment if monthly_investment is not None else 0
-    annual_increase_in_monthly_investment = annual_increase_in_monthly_investment if annual_increase_in_monthly_investment is not None else 0
-    pre_retirement_roi = pre_retirement_roi if pre_retirement_roi is not None else 0
-    post_retirement_roi = post_retirement_roi if post_retirement_roi is not None else 0
+    initial_investment = initial_investment if initial_investment is not None else 0
+    monthly_contribution = monthly_contribution if monthly_contribution is not None else 0
+    annual_increase_in_monthly_contribution = annual_increase_in_monthly_contribution if annual_increase_in_monthly_contribution is not None else 0
+    pre_retirement_dividend_growth = pre_retirement_dividend_growth if pre_retirement_dividend_growth is not None else 0
+    post_retirement_dividend_growth = post_retirement_dividend_growth if post_retirement_dividend_growth is not None else 0
     pre_retirement_dividend_yield = pre_retirement_dividend_yield if pre_retirement_dividend_yield is not None else 0
     post_retirement_dividend_yield = post_retirement_dividend_yield if post_retirement_dividend_yield is not None else 0
     life_expectancy = life_expectancy if life_expectancy is not None else 0
@@ -159,21 +159,21 @@ def retirement_planning(
     post_retirement_years = life_expectancy - retirement_age
 
     # 현재 투자액으로 초기 투자 설정
-    total_investment = current_investment
+    total_investment = initial_investment
 
     # 은퇴 전 월간 이자율 계산
-    monthly_return_pre = (1 + pre_retirement_roi / 100) ** (1 / 12) - 1
+    monthly_return_pre = (1 + pre_retirement_dividend_growth / 100) ** (1 / 12) - 1
 
     # 은퇴 시점의 투자 계산
     for year in range(years_to_retirement):
         for month in range(12):
             # 월간 투자액과 이자율을 적용하여 총 투자액 갱신
-            total_investment = (total_investment + monthly_investment) * (1 + monthly_return_pre)
+            total_investment = (total_investment + monthly_contribution) * (1 + monthly_return_pre)
             # 배당금을 재투자할 경우 배당금 추가
             if reinvest_dividends:
                 total_investment += total_investment * (pre_retirement_dividend_yield / 100 / 12)
         # 연간 증가액을 월 투자액에 추가
-        monthly_investment += annual_increase_in_monthly_investment
+        monthly_contribution += annual_increase_in_monthly_contribution
 
     # 은퇴 시작 시점의 총 투자액과 연간 배당 수익 저장
     investment_at_retirement = total_investment
@@ -181,7 +181,7 @@ def retirement_planning(
     monthly_dividend_at_retirement = annual_dividend_at_retirement / 12
 
     # 은퇴 후 월간 이자율 계산
-    monthly_return_post = (1 + post_retirement_roi / 100) ** (1 / 12) - 1
+    monthly_return_post = (1 + post_retirement_dividend_growth / 100) ** (1 / 12) - 1
 
     # 연간 물가상승률을 반영한 월 생활비 계산
     monthly_income_required_inflated = monthly_income_required
@@ -200,7 +200,7 @@ def retirement_planning(
     # 은퇴 후 각 년도의 투자 및 배당 수익 계산
     for year in range(1, post_retirement_years + 1):
         # 은퇴 후 수익률을 적용하여 총 투자액 갱신
-        total_investment *= (1 + post_retirement_roi / 100)
+        total_investment *= (1 + post_retirement_dividend_growth / 100)
         # 연간 배당 수익 계산
         annual_dividend_income = total_investment * (post_retirement_dividend_yield / 100)
         # 월간 배당 수익 계산

style.css

@@ -19,47 +19,6 @@
 @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');
-@import url('https://fonts.googleapis.com/css2?family=Paperlogy&display=swap');
-
-
-#col-container {
-    margin: 0 auto;
-    max-width: 100%;
-    /* font-family: 'Paperlogy', 'ui-sans-serif', 'system-ui', 'sans-serif'; */
-    /* text-transform: uppercase; */
-
-}
-
-.h3_title {
-    padding: .75rem;
-    font-weight: 700;
-    border-bottom: 1px solid rgb(229, 231, 235);
-    /* box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); */
-}
-
-.content {
-    -webkit-text-size-adjust: 100%;
-    tab-size: 4;
-    font-size: 1.125rem;
-    line-height: 1.75rem;
-    box-sizing: border-box;
-    border-width: 0;
-    border-style: solid;
-    border-color: #e5e7eb;
-    margin: 0;
-    margin-top: 1.25em;
-    margin-bottom: 1.25em;
-}
-
-.code {
-    font-family: 'IBM Plex Mono', 'ui-monospace', 'Consolas', 'monospace';
-}
-
-.wrap-text {
-    word-wrap: break-word;
-    overflow-wrap: break-word;
-    white-space: normal;
-}
 
 :root {
     --background-color-light: #ffffff;
@@ -90,32 +49,52 @@
     --total-value-color-dark: #ffeb3b;
 }
 
+#col-container {
+    margin: 0 auto;
+    max-width: 100%;
+    /* font-family: 'Quicksand', 'ui-sans-serif', 'system-ui', 'sans-serif'; */    
+}
+
+.h3_title {
+    padding: .75rem;
+    font-weight: 700;
+    border-bottom: 1px solid rgb(229, 231, 235);
+}
+
+.content {
+    -webkit-text-size-adjust: 100%;
+    tab-size: 4;
+    font-size: 1.125rem;
+    line-height: 1.75rem;
+    margin: 1.25em 0;
+    border: 0 solid #e5e7eb;
+}
+
+.code {
+    font-family: 'IBM Plex Mono', monospace;
+}
+
+.wrap-text {
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+    white-space: normal;
+}
+
 .buy-sell {
-    /* padding: 5px 10px;
-    border-radius: 5px; */
     font-weight: bold;
-    /* display: inline-block;
-    margin: 2px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); */
 }
 
 .buy {
-    /* background-color: var(--buy-color);
-    color: white !important; */
     color: var(--buy-color);
-
 }
 
 .sell {
-    /* background-color: var(--sell-color);
-    color: white !important; */
     color: var(--sell-color);
-
 }
 
 .highlight-edit {
     background-color: var(--highlight-edit-bg-color-light);
-    color: var(--highlight-edit-text-color-light) !important;
+    color: var(--highlight-edit-text-color-light);
     padding: 5px 10px;
     font-weight: bold;
     border-radius: 5px;
@@ -125,7 +104,7 @@
 
 .highlight-black {
     background-color: var(--highlight-black-light);
-    color: var(--text-color-dark) !important;
+    color: var(--text-color-dark);
     padding: 5px 10px;
     font-weight: bold;
     border-radius: 5px;
@@ -135,7 +114,7 @@
 
 .highlight-yellow {
     background-color: var(--highlight-yellow-bg-color-light);
-    color: var(--highlight-yellow-text-color-light) !important;
+    color: var(--highlight-yellow-text-color-light);
     padding: 5px 10px;
     font-weight: bold;
     border-radius: 5px;
@@ -145,7 +124,7 @@
 
 .highlight-sky {
     background-color: var(--highlight-sky-bg-color-light);
-    color: var(--highlight-sky-text-color-light) !important;
+    color: var(--highlight-sky-text-color-light);
     padding: 5px 10px;
     font-weight: bold;
     border-radius: 5px;
@@ -153,60 +132,32 @@
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
 
-@media (prefers-color-scheme: dark) {
-    .highlight-yellow {
-        background-color: var(--highlight-yellow-bg-color-dark);
-        color: var(--highlight-yellow-text-color-dark) !important;
-    }
-
-    .highlight-black {
-        background-color: var(--highlight-black-dark);
-        color: var(--text-color-light) !important;
-    }
+.table-header-bg-before {
+    background-color: #e7f9ef !important;
+    color: #000;
+}
 
-    .highlight-sky {
-        background-color: var(--highlight-sky-bg-color-dark);
-        color: var(--highlight-sky-text-color-dark) !important;
-    }
+.table-header-bg-dividend {
+    background-color: #89c9e6 !important;
+    color: #000;
+}
 
-    .highlight-edit {
-        background-color: var(--highlight-edit-bg-color-dark);
-        color: var(--highlight-edit-text-color-dark) !important;
-    }
+.table-header-bg-required {
+    background-color: #ffca28 !important;
+    color: #000;
+}
 
-    .buy-sell, .highlight-black, .highlight-yellow, .highlight-sky, .highlight-edit {
-        box-shadow: 0 2px 4px rgba(255, 255, 255, 0.1);
-    }
+.table-header-bg-after {
+    background-color: #d9d2e9 !important;
+    color: #000;
 }
 
-/* 기본 테이블 스타일 */
 .table-container {
     width: 100%;
     overflow: auto;
     margin-bottom: 20px;
     position: relative;
     max-height: 100%;
-    /* box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); */
-}
-
-.header-bg-before {
-    background-color: #e7f9ef !important; /* 원하는 색상으로 변경 */
-    color: #000; /* 텍스트 색상 */
-}
-
-.header-bg-divdend {
-    background-color: #89c9e6 !important;
-    color: #000; /* 텍스트 색상 */
-}
-
-.header-bg-required {
-    background-color: #ffca28 !important;
-    color: #000; /* 텍스트 색상 */
-}
-
-.header-bg-after {
-    background-color: #d9d2e9 !important;/* 원하는 색상으로 변경 */
-    color: #000; /* 텍스트 색상 */
 }
 
 .table-container table {
@@ -214,14 +165,6 @@
     border-collapse: collapse;
 }
 
-.table-container td {
-    text-align: right;
-}
-
-.table-container td:first-child {
-    text-align: left;
-}
-
 .table-container th, .table-container td {
     border: 1px solid #ddd;
     padding: 8px;
@@ -230,7 +173,7 @@
 
 .table-container th {
     background-color: var(--highlight-color-light);
-    color: var(--header-color-light); /* 라이트 모드에서 타이틀 색상을 설정 */
+    color: var(--header-color-light);
     position: sticky;
     top: 0;
     z-index: 2;
@@ -240,44 +183,49 @@
     position: sticky;
     left: 0;
     z-index: 1;
-    /* background-color: var(--highlight-color-light); */
 }
 
 .table-container th:first-child {
     position: sticky;
     left: 0;
-    z-index: 1;
-    background-color: var(--highlight-color-light);
-}
-
-.table-container th:first-child {
     z-index: 3;
+    background-color: var(--highlight-color-light);
 }
 
-/* 마우스오버 효과 */
 .table-container tr:hover td {
     background: #e7f9ef;
     color: #000;
     text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
-    cursor: pointer;    
-    /* border: 1px solid #4caf50;
-    transform: scale(1.02);*/
-    transition: all 0.3s ease; 
+    cursor: pointer;
+    transition: all 0.3s ease;
 }
 
-/* 어두운 테마 적용 */
 @media (prefers-color-scheme: dark) {
+    .highlight-yellow {
+        background-color: var(--highlight-yellow-bg-color-dark);
+        color: var(--highlight-yellow-text-color-dark);
+    }
+
+    .highlight-black {
+        background-color: var(--highlight-black-dark);
+        color: var(--text-color-light);
+    }
+
+    .highlight-sky {
+        background-color: var(--highlight-sky-bg-color-dark);
+        color: var(--highlight-sky-text-color-dark);
+    }
+
+    .highlight-edit {
+        background-color: var(--highlight-edit-bg-color-dark);
+        color: var(--highlight-edit-text-color-dark);
+    }
+
     .table-container {
         border: 1px solid #444;
     }
-    .header-bg-before,
-    .header-bg-after,
-    .header-bg-divdend,
-    .header-bg-required {
-        color: #000 !important;        
-    }
-    .table-container th,
-    .table-container td {
+
+    .table-container th, .table-container td {
         border: 1px solid #444;
         background: #333;
         color: #ccc;
@@ -287,16 +235,32 @@
         background: #444;
     }
 
-    .table-container th:first-child,
-    .table-container td:first-child {
+    .table-container th:first-child, .table-container td:first-child {
         background: #444;
     }
 
     .table-container tr:hover td {
         background: #e7f9ef;
         color: #000;
-        /* border: 1px solid #4caf50;
-        transform: scale(1.02);
-        transition: all 0.3s ease; */
+    }
+
+    .table-header-bg-before {
+        background-color: hsl(120, 60%, 80%) !important;
+        color: #000;
+    }
+
+    .table-header-bg-dividend {
+        background-color: hsl(200, 60%, 70%) !important;
+        color: #000;
+    }
+
+    .table-header-bg-required {
+        background-color: hsl(45, 100%, 70%) !important;
+        color: #000;
+    }
+
+    .table-header-bg-after {
+        background-color: hsl(270, 30%, 80%) !important;
+        color: #000;
     }
 }