Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/hng 36 external static page=pricing page payment page #369

Merged
merged 11 commits into from
Jul 22, 2024
Merged

Feat/hng 36 external static page=pricing page payment page #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a65e81b
Small changes
OWK50GA Jul 22, 2024
20893e5
Merge remote-tracking branch 'upstream/dev'
OWK50GA Jul 22, 2024
e237483
changes made
OWK50GA Jul 22, 2024
340b391
added breadcrumbs
OWK50GA Jul 22, 2024
7b7c65a
breadcrubms
OWK50GA Jul 22, 2024
5eb3709
breadcrumbs
OWK50GA Jul 22, 2024
67a3afb
kk
OWK50GA Jul 22, 2024
7651364
Merge remote-tracking branch 'upstream/dev' into feat/HNG-36-external…
OWK50GA Jul 22, 2024
d26b58e
I no understand
OWK50GA Jul 22, 2024
b2d9fb2
Merge branch 'feat/HNG-36-external-static-page=pricing-page-payment-p…
OWK50GA Jul 22, 2024
0cf5bb8
last commit
OWK50GA Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions app/components/PaymentForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ const PaymentForm = (properties: PaymentFormProperties) => {
value={"Debit/Credit Card"}
className="h-5 w-5 border bg-white checked:border-primary checked:accent-primary"
/>
<label htmlFor="">Debit/Credit Card</label>
<label htmlFor="" className="text-gray-600">
Debit/Credit Card
</label>
</div>
<hr />
<div className="flex gap-2 p-3">
Expand All @@ -70,7 +72,9 @@ const PaymentForm = (properties: PaymentFormProperties) => {
value={"Paypal"}
className="h-5 w-5 border accent-primary checked:bg-white"
/>
<label htmlFor="">Paypal</label>
<label htmlFor="" className="text-gray-600">
Paypal
</label>
</div>
</div>
<div className="mb-4">
Expand Down Expand Up @@ -158,6 +162,13 @@ const PaymentForm = (properties: PaymentFormProperties) => {
</div>
<div>
<Button className="m-auto w-full">Confirm and Pay</Button>
<small className="text-gray-800">
Your subscription will renew automatically every month as one payment
of $800. <br />
Cancel it anytime from your subscription settings. By clicking
&quot;Confirm and Pay&quot;, you agree to the
<span className="text-primary"> Terms and Conditions</span>
</small>
</div>
</form>
);
Expand Down
2 changes: 0 additions & 2 deletions app/root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
} from "@remix-run/react";
import type { ReactNode } from "react";

import { AdminSideNavBar } from "./components/SuperAdminSideBar/SuperAdminSideNavBar";
import styles from "./styles/global.css?url";

export const links: LinksFunction = () => [
Expand All @@ -28,7 +27,6 @@ export function Layout({ children }: { children: ReactNode }) {
</head>
<body>
<div className="flex">
<AdminSideNavBar />
<main className="flex-1">{children}</main>,
<ScrollRestoration />
<Scripts />
Expand Down
2 changes: 1 addition & 1 deletion app/routes/pricing.payment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const Payment = () => {
<div className="mx-auto flex w-10/12 flex-col gap-6 py-[5%] md:flex-row md:justify-between">
<div className="w-full">
<h2 className="mb-4">Order Details</h2>
<div className="w-full rounded bg-[#fff] px-6 py-3">
<div className="w-full rounded bg-[#ffffff] px-6 py-3">
<h2 className="text-lg font-semibold">Basic Plan</h2>
<div className="flex justify-between leading-loose md:w-full">
<span className="leading-loose">Monthly Subscription</span>
Expand Down