From 99126bfd515bcf97983f326c95819f145d8cccd2 Mon Sep 17 00:00:00 2001 From: Chris Vanderloo Date: Sun, 20 Sep 2020 09:17:20 -0400 Subject: [PATCH] small changes --- client/main.css | 59 +++++++ client/routes.jsx | 8 +- data_service/index.py | 45 ++---- imports/api/returns.js | 44 ++++- imports/courses/benefitsOfDiversification.mdx | 32 ++++ imports/courses/correlation.mdx | 11 ++ imports/courses/courseThree.mdx | 43 ----- imports/courses/courseTwo.mdx | 37 ----- .../{courseOne.mdx => introToInvesting.mdx} | 21 ++- imports/courses/introToSaving.mdx | 42 +++++ imports/courses/portfolioConstruction.mdx | 19 +++ imports/experiments/portfolio.mdx | 7 + imports/ui/Courses.jsx | 58 +++++++ imports/ui/Dashboard.jsx | 152 +++++++++--------- imports/ui/{Course.jsx => Experiments.jsx} | 17 +- imports/ui/Footer.jsx | 7 +- imports/ui/GetStarted.jsx | 93 +++++------ imports/ui/InterestGraph.jsx | 96 ++++++++++- imports/ui/LoginPage.jsx | 2 +- imports/ui/PortfolioManager.jsx | 78 ++++++--- imports/ui/Profile.jsx | 8 +- imports/ui/WelcomePage.jsx | 67 +++++--- imports/ui/components/Dictionary.jsx | 25 +++ imports/ui/components/UserName.jsx | 11 +- imports/ui/data/catalog.jsx | 78 +++++++++ imports/ui/data/reasons.jsx | 26 +++ imports/ui/{ => graphs}/FixedIncome.jsx | 0 imports/ui/{ => graphs}/OilPrices.jsx | 0 imports/ui/{ => graphs}/RiskGraph.jsx | 0 imports/ui/{ => graphs}/StockGraph.jsx | 38 +++-- package-lock.json | 29 ++++ package.json | 4 +- public/computer.png | Bin 0 -> 335007 bytes server/accounts.js | 6 +- 34 files changed, 818 insertions(+), 345 deletions(-) create mode 100644 imports/courses/benefitsOfDiversification.mdx create mode 100644 imports/courses/correlation.mdx delete mode 100644 imports/courses/courseThree.mdx delete mode 100644 imports/courses/courseTwo.mdx rename imports/courses/{courseOne.mdx => introToInvesting.mdx} (78%) create mode 100644 imports/courses/introToSaving.mdx create mode 100644 imports/courses/portfolioConstruction.mdx create mode 100644 imports/experiments/portfolio.mdx create mode 100644 imports/ui/Courses.jsx rename imports/ui/{Course.jsx => Experiments.jsx} (50%) create mode 100644 imports/ui/components/Dictionary.jsx create mode 100644 imports/ui/data/catalog.jsx create mode 100644 imports/ui/data/reasons.jsx rename imports/ui/{ => graphs}/FixedIncome.jsx (100%) rename imports/ui/{ => graphs}/OilPrices.jsx (100%) rename imports/ui/{ => graphs}/RiskGraph.jsx (100%) rename imports/ui/{ => graphs}/StockGraph.jsx (74%) create mode 100644 public/computer.png diff --git a/client/main.css b/client/main.css index 0afca36..98aa02f 100644 --- a/client/main.css +++ b/client/main.css @@ -24,6 +24,65 @@ body { .js-plotly-plot { width: 100%; } +.footer-bg { + min-height: 120px; + width: 100%; + background-color: #EBEBEB; +} + +.btn-primary { + border-color: #F64C72 !important; + background-color: #F64C72 !important; +} + +.btn-danger { + border-color: #553D67 !important; + background-color: #553D67 !important; +} + +.hoverable-text { + text-decoration: underline dashed rgb(63, 154, 223); + text-decoration-thickness: 2px; + -webkit-text-decoration: underline dashed rgb(63, 154, 223); + -webkit-text-decoration-thickness: 2px; +} + +.tooltip { + max-width: 300px; +} + +.floating-pink-card { + border-width: 3px !important; + border-color: black !important; + padding: 1em; + border-radius: 10px !important; + z-index: 4 !important; + position: relative; + min-height: 260px; + margin-top: 20px; +} + +.pink-bg::before { + content: '.'; + display: block; + position: absolute; + background-color: #F64C72; + color: #F64C72; + height: 90%; + width: 90%; + margin: -1.5em; + margin-top: 2.4em; + border-radius: 10px; + z-index: 1; +} + +.wavy-bg { + padding-top: 2em; + min-height: 700px; + background-image: url("/wavylines.svg"); + background-size: cover; + background-position-y: center; +} @media only screen and (max-width: 780px) { .hide-mobile { diff --git a/client/routes.jsx b/client/routes.jsx index 6ff16bb..9753095 100644 --- a/client/routes.jsx +++ b/client/routes.jsx @@ -11,7 +11,9 @@ import { Dashboard } from '../imports/ui/Dashboard'; import { Logout } from '../imports/ui/Logout'; import { Error } from '../imports/ui/Error'; import { UEFANavbar } from '../imports/ui/Navbar'; -import { Course } from '../imports/ui/Course'; +import { Footer } from '../imports/ui/Footer'; +import { Courses } from '../imports/ui/Courses'; +import { Experiments } from '../imports/ui/Experiments'; import { Profile } from '../imports/ui/Profile'; const browserHistory = createBrowserHistory({ forceRefresh: true }); @@ -24,11 +26,13 @@ const UntrackedRoutes = () => ( - } /> + } /> + } /> +