Skip to content

Commit 158da47

Browse files
tonytrinh3tonytrinh3
committed
logo and home page working
1 parent 326e5b0 commit 158da47

File tree

6 files changed

+50
-131
lines changed

6 files changed

+50
-131
lines changed

‎components/LoginHomePage.tsx

+26-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import investmentCardImg3 from "@/public/investment/investment_image3.jpeg";
1818
import airlineLoginHeroBackground from "@/assets/img/airways/airline-login-hero-background.jpeg";
1919

2020
interface LoginHomePageProps {
21-
variant: "bank" | "airlines" | "market" | "investment";
21+
variant: "bank" | "airlines" | "market" | "investment" | "government";
2222
name: string;
2323
}
2424

@@ -31,6 +31,7 @@ export default function LoginHomePage({ variant, name, ...props }: LoginHomePage
3131
airlines:
3232
"Launch into the skies. In the air in milliseconds, reach your destination without risk, and ship your travel dreams faster than ever before",
3333
market: "Shop for the latest tech gadgets and more.",
34+
government: "We improve control, availability, and security of government applications and sites.",
3435
};
3536

3637
const bankingServicesArr = [
@@ -62,7 +63,7 @@ export default function LoginHomePage({ variant, name, ...props }: LoginHomePage
6263
? "bg-gradient-investment"
6364
: variant === "market"
6465
? " bg-market-header grid items-center justify-center"
65-
: ""
66+
: "bg-gradient-releases"
6667
}`}
6768
>
6869
{variant === "market" && (
@@ -179,6 +180,29 @@ export default function LoginHomePage({ variant, name, ...props }: LoginHomePage
179180
</HomePageCardWrapper>
180181
)}
181182

183+
{variant === "government" && (
184+
<HomePageCardWrapper>
185+
<HomePageInfoCard
186+
imgSrc={investmentCardImg1.src}
187+
headerTitleText="Are returns worth the risk in investing in the market?"
188+
subtitleText="Emerging-market local-currency bonds have rallied sharply since last October, along with other risky segments of the global bond market. "
189+
key={1}
190+
/>
191+
<HomePageInfoCard
192+
imgSrc={investmentCardImg2.src}
193+
headerTitleText="Fed to consumers: Inflation trending lower daily."
194+
subtitleText="Inflation looks to still be trending lower, but a relatively stubborn decline will likely inspire the Fed to start cutting rates later (and slower) than expected."
195+
key={2}
196+
/>
197+
<HomePageInfoCard
198+
imgSrc={investmentCardImg3.src}
199+
headerTitleText="Here’s how markets are moving this week."
200+
subtitleText="With thematic investing, you can choose from 40+ customizable themes, each with up to 25 research-backed stocks."
201+
key={3}
202+
/>
203+
</HomePageCardWrapper>
204+
)}
205+
182206
{variant === "airlines" && (
183207
<section
184208
className="flex flex-col gap-y-8 sm:gap-y-0 sm:flex-row sm:gap-x-6 lg:gap-x-14

‎components/ui/csnav.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ export function CSNav() {
133133
<Link href='/architecture' className="text-2xl text-navblue hover:underline" >
134134
Architecture
135135
</Link>
136+
137+
<Link href='/government' className="text-2xl text-navblue hover:underline" >
138+
FedRAMP
139+
</Link>
136140
</div>
137141
</div>
138142
<SheetFooter>

‎components/ui/logincomponent.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ import toggleBankVerticalLogo from '@/public/banking/toggleBank_logo_vertical.sv
1717
import frontierCapitalVerticalLogo from '@/public/investment/frontier_capital_logo_vertical.svg'
1818
import launchAirwaysVerticalLogo from '@/public/airline/launch_airways_logo_vertical.svg'
1919
import galaxyMarketplaceVerticalLogo from '@/public/marketplace/galaxy_marketplace_logo_vertical.svg'
20+
import bureauOfRiskReductionHorizontalLogo from "@/public/government/Bureau_of_Risk_Reduction_Logo_White_Horizontal.svg";
2021

2122
const variantToImageMap = {
2223
bank: toggleBankVerticalLogo.src,
2324
airlines: launchAirwaysVerticalLogo.src,
2425
market: galaxyMarketplaceVerticalLogo.src,
2526
investment: frontierCapitalVerticalLogo.src,
27+
government: bureauOfRiskReductionHorizontalLogo.src
2628
};
2729
interface LoginComponentProps {
2830
isLoggedIn: boolean;

‎components/ui/navbar.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@ import toggleBankHorizontalLogo from "@/public/banking/toggleBank_logo_horizonta
2727
import frontierCapitalHorizontalLogo from "@/public/investment/frontier_capital_logo_horitzonal.svg";
2828
import launchAirwaysHorizontalLogo from "@/public/airline/launch_airways_logo_horizontal.svg";
2929
import galaxyMarketplaceHorizontalLogo from "@/public/marketplace/galaxy_marketplace_logo_horizontal.svg";
30+
import bureauOfRiskReductionHorizontalLogo from "@/public/government/Bureau_of_Risk_Reduction_Logo_White_Horizontal.svg";
3031
import { LoginComponent } from "./logincomponent";
3132

3233
const variantToImageMap = {
3334
bank: toggleBankHorizontalLogo.src,
3435
airlines: launchAirwaysHorizontalLogo.src,
3536
market: galaxyMarketplaceHorizontalLogo.src,
3637
investment: frontierCapitalHorizontalLogo.src,
38+
government: bureauOfRiskReductionHorizontalLogo.src,
3739
undefined: LDLogoWhite.src,
3840
};
3941

‎pages/government.tsx

+2-129
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import MarketCard from "@/components/ui/investmentcomponents/MarketCard";
1818
import StockRecommendationCard from "@/components/ui/investmentcomponents/StockRecommendationCard";
1919
import RecentTradesCard from "@/components/ui/investmentcomponents/RecentTradesCard";
2020

21-
export default function Investment() {
21+
export default function Government() {
2222
const { isLoggedIn, logoutUser } = useContext(LoginContext);
2323

2424
const ldclient = useLDClient();
@@ -39,134 +39,7 @@ export default function Investment() {
3939
<>
4040
<Toaster />
4141
<AnimatePresence mode="wait">
42-
{!isLoggedIn ? (
43-
<LoginHomePage variant="investment" name="Frontier Capital" />
44-
) : (
45-
<motion.main
46-
initial={{ opacity: 0 }}
47-
animate={{ opacity: 1 }}
48-
transition={{ duration: 0.5 }}
49-
className={`flex h-full flex-col bg-investmentbackgroundgrey`}
50-
>
51-
<NavBar variant={"investment"} handleLogout={handleLogout} />
52-
<InvestmentAccountHeader />
53-
<div className="my-8 " data-testid="salient-accounts-test-id">
54-
<div className="mx-auto max-w-7xl font-sohnelight ">
55-
<div
56-
className="main-investment-card-wrapper grid gap-3 grid-cols-1
57-
lg:grid-cols-[repeat(4,minmax(175px,1fr))]
58-
investmentXL:grid-cols-[repeat(6,minmax(180px,1fr))]
59-
lg:grid-rows-[repeat(12,10rem)]
60-
investmentXL:grid-rows-[repeat(9,10rem)]
61-
px-4 xl:px-0"
62-
>
63-
<div
64-
className={`card-1 ${cardStyle}
65-
lg:col-start-1 lg:col-end-3
66-
investmentXL:col-start-1 investmentXL:col-end-3
67-
lg:row-start-1 lg:row-end-5 flex flex-col justify-between `}
68-
data-testid="stock-balance-card-test-id"
69-
>
70-
<BalanceCard />
71-
</div>
72-
<div
73-
className={`card-2 ${cardStyle}
74-
lg:col-start-3 lg:col-end-5
75-
investmentXL:col-start-5 investmentXL:col-end-7
76-
lg:row-start-1 lg:row-end-3
77-
investmentXL:row-start-1 investmentXL:row-end-3
78-
lg:h-[19rem] flex flex-col justify-center `}
79-
data-testid="stock-trading-training-card-test-id"
80-
>
81-
<TradingTrainingCard />
82-
</div>
83-
<div
84-
className={`card-3 ${cardStyle}
85-
lg:col-start-3 lg:col-end-5
86-
investmentXL:col-start-3 investmentXL:col-end-5
87-
lg:row-start-3 lg:row-end-5
88-
investmentXL:row-start-1 investmentXL:row-end-3
89-
lg:mt-[-2rem]
90-
investmentXL:mt-[0rem]
91-
lg:h-[35.5rem] flex flex-col`}
92-
data-testid="recent-trades-card-test-id"
93-
>
94-
<RecentTradesCard />
95-
</div>
96-
97-
<div
98-
className={`card-4 ${cardStyle}
99-
lg:col-start-1 lg:col-end-3
100-
investmentXL:col-start-5 investmentXL:col-end-7
101-
lg:row-start-5 lg:row-end-7
102-
investmentXL:row-start-2 investmentXL:row-end-4
103-
lg:mt-[-.25rem]
104-
investmentXL:mt-[9rem]
105-
lg:h-[23rem] flex flex-col justify-between`}
106-
data-testid="stock-recommendation-card-test-id"
107-
>
108-
<StockRecommendationCard />
109-
</div>
110-
111-
<div
112-
className={`card-5 ${cardStyle}
113-
lg:col-start-3 lg:col-end-5
114-
investmentXL:col-start-1 investmentXL:col-end-3
115-
lg:row-start-6 lg:row-end-8
116-
investmentXL:row-start-5 investmentXL:row-end-7
117-
lg:mt-[2rem]
118-
investmentXL:mt-[0rem]
119-
lg:h-[35rem] flex flex-col justify-between`}
120-
data-testid="stock-movers-card-test-id"
121-
>
122-
<StockMoversCard />
123-
</div>
124-
<div
125-
className={`card-6 ${cardStyle}
126-
lg:col-start-1 lg:col-end-3
127-
investmentXL:col-start-3 investmentXL:col-end-5
128-
lg:row-start-7 lg:row-end-9
129-
investmentXL:row-start-4 investmentXL:row-end-7
130-
lg:mt-[2rem]
131-
investmentXL:mt-[4rem]
132-
lg:h-[31rem]
133-
investmentXL:h-[100%] flex flex-col justify-between
134-
`}
135-
data-testid="stock-news-card-test-id"
136-
>
137-
<NewsCard />
138-
</div>
139-
<div
140-
className={`card-7 ${cardStyle}
141-
lg:col-start-1 lg:col-end-3
142-
investmentXL:col-start-5 investmentXL:col-end-7
143-
lg:row-start-7 lg:row-end-9
144-
investmentXL:row-start-4 investmentXL:row-end-5
145-
lg:mt-[33.5rem]
146-
investmentXL:mt-[11.25rem]
147-
lg:h-[25rem] flex flex-col justify-between items-center`}
148-
data-testid="stock-retirement-card-test-id"
149-
>
150-
<RetirementCard />
151-
</div>
152-
<div
153-
className={`card-8 ${cardStyle}
154-
lg:col-start-3 lg:col-end-5
155-
investmentXL:col-start-3 investmentXL:col-end-5
156-
lg:row-start-7 lg:row-end-9
157-
investmentXL:row-start-7 investmentXL:row-end-8
158-
lg:mt-[27rem]
159-
investmentXL:mt-[4rem]
160-
lg:h-[15rem] flex flex-col justify-between`}
161-
data-testid="stock-market-card-test-id"
162-
>
163-
<MarketCard />
164-
</div>
165-
</div>
166-
</div>
167-
</div>
168-
</motion.main>
169-
)}
42+
<LoginHomePage variant="government" name="The Bureau of Risk Reduction" />
17043
</AnimatePresence>
17144
</>
17245
);

0 commit comments

Comments
 (0)