diff --git a/public/index.html b/public/index.html index 6ed2986..824772b 100644 --- a/public/index.html +++ b/public/index.html @@ -27,6 +27,8 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> + + Budget Buddy diff --git a/src/Main.js b/src/Main.js index abb1232..fd3fed4 100644 --- a/src/Main.js +++ b/src/Main.js @@ -8,6 +8,7 @@ import Privacy from './pages/Privacy' import Settings from './pages/Settings' import Support from './pages/Support' import ContactUs from './pages/Contact-Us' +import Welcome from './pages/Welcome' import Error from './pages/Error-Page' import './styles.css' @@ -27,12 +28,19 @@ export default function Main() { case "/settings": Layout = Settings break; + /* case "/support": Layout = Support break; + */ case "/contact-us": Layout = ContactUs break; + + case "/welcome": + Layout = Welcome + break; + default: Layout = Error break; @@ -41,14 +49,16 @@ export default function Main() { return (
- -
- -
- + {window.location.pathname != "/welcome" ? + +
+ +
+ +
-
- + + : }
) } \ No newline at end of file diff --git a/welcome/budgethero1.png b/src/assets/welcome/budgethero1.png similarity index 100% rename from welcome/budgethero1.png rename to src/assets/welcome/budgethero1.png diff --git a/welcome/money1.png b/src/assets/welcome/money1.png similarity index 100% rename from welcome/money1.png rename to src/assets/welcome/money1.png diff --git a/welcome/money2.png b/src/assets/welcome/money2.png similarity index 100% rename from welcome/money2.png rename to src/assets/welcome/money2.png diff --git a/welcome/money3.png b/src/assets/welcome/money3.png similarity index 100% rename from welcome/money3.png rename to src/assets/welcome/money3.png diff --git a/src/pages/widget_logos/budget_logo.png b/src/assets/widget_logos/budget_logo.png similarity index 100% rename from src/pages/widget_logos/budget_logo.png rename to src/assets/widget_logos/budget_logo.png diff --git a/src/pages/widget_logos/current_balance_logo.png b/src/assets/widget_logos/current_balance_logo.png similarity index 100% rename from src/pages/widget_logos/current_balance_logo.png rename to src/assets/widget_logos/current_balance_logo.png diff --git a/src/pages/widget_logos/expenses_logo.png b/src/assets/widget_logos/expenses_logo.png similarity index 100% rename from src/pages/widget_logos/expenses_logo.png rename to src/assets/widget_logos/expenses_logo.png diff --git a/src/pages/widget_logos/income_logo.png b/src/assets/widget_logos/income_logo.png similarity index 100% rename from src/pages/widget_logos/income_logo.png rename to src/assets/widget_logos/income_logo.png diff --git a/src/pages/AddNewBill.css b/src/components/AddNewBill.css similarity index 100% rename from src/pages/AddNewBill.css rename to src/components/AddNewBill.css diff --git a/src/pages/AddNewBill.js b/src/components/AddNewBill.js similarity index 100% rename from src/pages/AddNewBill.js rename to src/components/AddNewBill.js diff --git a/src/pages/CurrentBalance.css b/src/components/CurrentBalance.css similarity index 100% rename from src/pages/CurrentBalance.css rename to src/components/CurrentBalance.css diff --git a/src/pages/CurrentBalance.js b/src/components/CurrentBalance.js similarity index 85% rename from src/pages/CurrentBalance.js rename to src/components/CurrentBalance.js index b0166b0..9123602 100644 --- a/src/pages/CurrentBalance.js +++ b/src/components/CurrentBalance.js @@ -1,6 +1,6 @@ import React from 'react' import './CurrentBalance.css' -import logo from './widget_logos/current_balance_logo.png'; +import logo from '../assets/widget_logos/current_balance_logo.png'; export default function CurrentBalance() { return ( diff --git a/src/pages/Expenses.css b/src/components/Expenses.css similarity index 100% rename from src/pages/Expenses.css rename to src/components/Expenses.css diff --git a/src/pages/Expenses.js b/src/components/Expenses.js similarity index 86% rename from src/pages/Expenses.js rename to src/components/Expenses.js index c2520da..086b6dd 100644 --- a/src/pages/Expenses.js +++ b/src/components/Expenses.js @@ -1,6 +1,6 @@ import React from 'react' import './Expenses.css' -import logo from './widget_logos/expenses_logo.png'; +import logo from '../assets/widget_logos/expenses_logo.png'; export default function Expenses() { return ( diff --git a/src/pages/Income.css b/src/components/Income.css similarity index 100% rename from src/pages/Income.css rename to src/components/Income.css diff --git a/src/pages/Income.js b/src/components/Income.js similarity index 86% rename from src/pages/Income.js rename to src/components/Income.js index 74b9d51..c1c2112 100644 --- a/src/pages/Income.js +++ b/src/components/Income.js @@ -1,6 +1,6 @@ import React from 'react' import './Income.css' -import logo from './widget_logos/income_logo.png'; +import logo from '../assets/widget_logos/income_logo.png'; export default function Income() { return ( diff --git a/src/pages/RecentTransaction.css b/src/components/RecentTransaction.css similarity index 100% rename from src/pages/RecentTransaction.css rename to src/components/RecentTransaction.css diff --git a/src/pages/RecentTransactions.js b/src/components/RecentTransactions.js similarity index 100% rename from src/pages/RecentTransactions.js rename to src/components/RecentTransactions.js diff --git a/src/components/SideNav.css b/src/components/SideNav.css index e637b76..ab42973 100644 --- a/src/components/SideNav.css +++ b/src/components/SideNav.css @@ -1,3 +1,7 @@ +.sidebar { + padding: 0 12px; +} + .sidebar-header { display: flex; align-items: center; diff --git a/src/components/SideNav.js b/src/components/SideNav.js index 72feec3..ee2142a 100644 --- a/src/components/SideNav.js +++ b/src/components/SideNav.js @@ -12,7 +12,7 @@ import './SideNav.css' export default function SideNav() { return( - +
diff --git a/src/pages/budget.css b/src/components/budget.css similarity index 100% rename from src/pages/budget.css rename to src/components/budget.css diff --git a/src/pages/budget.js b/src/components/budget.js similarity index 86% rename from src/pages/budget.js rename to src/components/budget.js index 12cbe47..4efc95b 100644 --- a/src/pages/budget.js +++ b/src/components/budget.js @@ -1,6 +1,6 @@ import React from 'react' import './budget.css' -import logo from './widget_logos/budget_logo.png'; +import logo from '../assets/widget_logos/budget_logo.png'; export default function Budget() { return ( diff --git a/src/pages/Dashboard.jsx b/src/pages/Dashboard.jsx index 4190a6b..f166210 100644 --- a/src/pages/Dashboard.jsx +++ b/src/pages/Dashboard.jsx @@ -1,9 +1,9 @@ - import AddNewBill from './AddNewBill' - import CurrentBalance from './CurrentBalance' - import Expenses from './Expenses' - import Income from './Income' - import Budget from './budget' -import RecentTransactions from './RecentTransactions' + import AddNewBill from '../components/AddNewBill' + import CurrentBalance from '../components/CurrentBalance' + import Expenses from '../components/Expenses' + import Income from '../components/Income' + import Budget from '../components/budget' +import RecentTransactions from '../components/RecentTransactions' export default function Dashboard() { return ( diff --git a/welcome/index..css b/src/pages/Welcome.css similarity index 100% rename from welcome/index..css rename to src/pages/Welcome.css diff --git a/src/pages/Welcome.jsx b/src/pages/Welcome.jsx new file mode 100644 index 0000000..3775d6d --- /dev/null +++ b/src/pages/Welcome.jsx @@ -0,0 +1,52 @@ +import React from 'react'; +import './Welcome.css'; +import logo from '../assets/BudgetBuddyLogo.png'; +import budgethero from '../assets/welcome/budgethero1.png'; +import money1 from '../assets/welcome/money1.png'; +import money2 from '../assets/welcome/money2.png'; +import money3 from '../assets/welcome/money3.png'; + +export default function Welcome() { + return ( +
+
+
+
+

Start Building Your Wealth

+

BudgetBuddy’s top notch budgeting tools will help you start building wealth, no matter your income or debt.

+ +
+
+ budgethero +
+
+
+
+
+
+
+ money1 +
Track Your Spending
+

Keep track of how much you spend on any number of spending categories.

+
+
+
+
+ money2 +
Plan Your Income
+

Map out your income into savings categories to manage your money faster and easier than ever.

+
+
+
+
+ money3 +
See Your Wealth Grow
+

Use BudgetBuddy’s widgets to visualize your wealth growing and debt shrinking.

+
+
+
+ +
+
+ ); +} \ No newline at end of file