From 619e3c31747504e298e3ac4b2bacada7842c51b4 Mon Sep 17 00:00:00 2001 From: shanehull Date: Fri, 6 Sep 2024 10:14:14 +1000 Subject: [PATCH 1/8] fix: info modal breaks --- internal/templates/Hero.templ | 10 +++++++--- internal/templates/Hero_templ.go | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/templates/Hero.templ b/internal/templates/Hero.templ index 02cfc82..8c38820 100644 --- a/internal/templates/Hero.templ +++ b/internal/templates/Hero.templ @@ -20,7 +20,7 @@ templ Hero() { ") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
♻️

Reduce, Reuse, Recycle!

Calculate your debt recycling scenario by entering your details below.

ℹ️ Information

What is debt recycling?

Debt recycling involves refinancing or redrawing funds from your offset account to invest in income producing assets. The idea is to turn your \"bad debt\" into tax-deductible \"good debt\".

The key requirement for the interest to qualify as deductible is that the funds must be used to earn income.


While this can be a very effective strategy for building wealth, it's important to consider the risks, such as the possibility of losing money if your investments underperform, or worse, go to zero.


Further reading...


What do all of the fields mean?

Descriptions and examples for all fields are provided below.

FieldDescriptionExample
SalaryYour annual salary. This, along with any dividends income will be used to determine your bracket.150000
Initial InvestmentThe initial amount you will pay down, recycle and invest. This is the available cash you have now, e.g. in the bank or in your offset account.100000
Annual InvestmentThe annual amount you will pay down, recycle and invest. This should take into account regular payments as well as any additional payments you expect to make.50000
MortgageThe total size of your mortgage loan.600000
Mortgage Interest RateThe projected annual mortgage interest rate.5
Dividend Return RateThe projected annual dividend return rate.2
Capital Growth RateThe projected annual capital growth rate.8
YearsThe number of years to project the scenario.10
CountrySelect the country you live in. Used to determine your tax bracket alobng with your salary and dividend income.Australia
Reinvest DividendsWhether to reinvest your dividend income via debt recycling.✔️
Reinvest Tax RefundsWhether to reinvest your tax refunds via debt recycling.✔️

DISCLAIMER

This calculator is for illustrative purposes only and is not to be misconstrued as financial advice.


It does not take into account your individual needs, goals and objectives.


The results are simply assumptions based on the information provided and are not guaranteed to be accurate.


In particular, it does not take into account any changes in the market, rates of return, interest rates, tax legislation or any extraordinary occurrences that may impact your results.


It also does not take into account franking credits, or the (hopefully) increasing value of your property and the subsequent increase in available equity.


It is better to be roughly right than precisely wrong.

John Manyard Keynes
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } From 715f7c915b1b05890da745215bd2869be92c7a6b Mon Sep 17 00:00:00 2001 From: shanehull Date: Fri, 6 Sep 2024 10:14:33 +1000 Subject: [PATCH 2/8] chore: remove unused tw conf --- tailwind.config.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tailwind.config.js b/tailwind.config.js index 9feda01..bfff986 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,5 +1,3 @@ -const colors = require("tailwindcss/colors"); - /** @type {import('tailwindcss').Config} */ module.exports = { content: ["internal/templates/*.templ"], @@ -13,13 +11,6 @@ module.exports = { desktop: "5rem", }, }, - extend: { - colors: { - primary: colors.blue, - secondary: colors.yellow, - neutral: colors.gray, - }, - }, }, plugins: [require("@tailwindcss/forms"), require("@tailwindcss/typography")], }; From ebc32c669fc7db3cdee24ef5ef3fa2ecce9449ca Mon Sep 17 00:00:00 2001 From: shanehull Date: Fri, 6 Sep 2024 10:14:45 +1000 Subject: [PATCH 3/8] chore: tw cmd on one line --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 826fa25..9954dcc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,9 @@ RUN update-ca-certificates RUN go install github.com/a-h/templ/cmd/templ@latest RUN curl -sLO \ - https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 - -RUN mv tailwindcss-linux-x64 tailwindcss && chmod +x tailwindcss + https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 && \ + mv tailwindcss-linux-x64 tailwindcss \ + && chmod +x tailwindcss RUN templ generate From e87ebbb430696191fe181c0f6f7de1b41a6f8da2 Mon Sep 17 00:00:00 2001 From: shanehull Date: Fri, 6 Sep 2024 14:05:04 +1000 Subject: [PATCH 4/8] fix: info and table styling --- internal/templates/Hero.templ | 29 +++---- internal/templates/Hero_templ.go | 2 +- internal/templates/cards.templ | 22 ++--- internal/templates/cards_templ.go | 32 ++++---- internal/templates/table.templ | 32 +++++--- internal/templates/table_templ.go | 130 +++++++++++++++++++++--------- static/css/style.min.css | 2 +- 7 files changed, 158 insertions(+), 91 deletions(-) diff --git a/internal/templates/Hero.templ b/internal/templates/Hero.templ index 8c38820..e27641a 100644 --- a/internal/templates/Hero.templ +++ b/internal/templates/Hero.templ @@ -20,10 +20,10 @@ templ Hero() {