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.

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

Implementation of Preview Page #269

Open
wants to merge 60 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
6ab4b39
latest update on preview page and generate template page
favouridoko1 Jul 20, 2024
9fa8042
feat(HNG-14):changes made to some components
favouridoko1 Jul 21, 2024
5f00b42
feat(HNG-14):changes made to some components
favouridoko1 Jul 21, 2024
401fce4
latest update on preview page and generate template page
favouridoko1 Jul 20, 2024
d222540
feat(HNG-14):changes made to some components
favouridoko1 Jul 21, 2024
78ea6a5
feat: develop the latest article card component
Adufe-Obanijesu Jul 19, 2024
d8a86fb
fix: fix the image overflow and make the article card into a link
Adufe-Obanijesu Jul 19, 2024
e0398d2
fix: fix conflicts in pnpm-lock.yaml
Adufe-Obanijesu Jul 20, 2024
5b4c1cf
fix: fix the grid layout for desktop view
Adufe-Obanijesu Jul 20, 2024
88f45db
fix: fix the letter spacing of description
Adufe-Obanijesu Jul 20, 2024
df7fdb7
fix: fix lint errors
Adufe-Obanijesu Jul 20, 2024
0b837b1
fix: added id to the article interface
Adufe-Obanijesu Jul 20, 2024
4f1549d
fix: added dot before the creation date
Adufe-Obanijesu Jul 20, 2024
f980ec7
fix: fix lint error
Adufe-Obanijesu Jul 20, 2024
92480c3
fix: use global styles
Adufe-Obanijesu Jul 20, 2024
999f83e
fix: use global styles
Adufe-Obanijesu Jul 20, 2024
d49a095
feat: implement cookie consent banner with custom button styles
KehindeDaniels Jul 20, 2024
576a698
feat: implement floating footer cookie consent component
KehindeDaniels Jul 20, 2024
b2fb12b
fix: resolve merge conflicts with upstream/main
KehindeDaniels Jul 20, 2024
2f98253
integrate existing button component into FooterCookieConsent component
KehindeDaniels Jul 20, 2024
a555a59
chore: remove unused components to clean up the codebase
KehindeDaniels Jul 20, 2024
c87c76b
installed switch components
Jul 20, 2024
67c54a2
feat(116):user-dashboard-password-settings added route for it
Lftobs Jul 20, 2024
d892854
feat(116):user-dashboard-password-settings (added component dir for d…
Lftobs Jul 20, 2024
047d5e4
feat(116):user-dashboard-password-settings (completed password update…
Lftobs Jul 20, 2024
f0a9b33
feat(116):user-dashboard-password-settings (completed password update…
Lftobs Jul 20, 2024
581a5db
feat(116):user-dashboard-password-settings (completed password update…
Lftobs Jul 20, 2024
34592ea
feat(116):user-dashboard-password-settings (completed password update…
Lftobs Jul 20, 2024
944aa05
feat(116):user-dashboard-password-settings (completed password update…
Lftobs Jul 20, 2024
7d94d98
chore: Update @typescript-eslint/parser and @typescript-eslint/eslint…
psalm987 Jul 21, 2024
fcd3980
fix: PNPM lint issues
psalm987 Jul 21, 2024
2cead30
merge conflict resolution
favouridoko1 Jul 21, 2024
0d0530f
resolved merge conflict
favouridoko1 Jul 21, 2024
693c8bd
resolved merge conflict
favouridoko1 Jul 21, 2024
41f86cf
resolved merge conflict
favouridoko1 Jul 21, 2024
2a32706
feat(HNG-14):changes made to some components
favouridoko1 Jul 21, 2024
a89b384
feat: develop the latest article card component
Adufe-Obanijesu Jul 19, 2024
ad70731
fix: fix the image overflow and make the article card into a link
Adufe-Obanijesu Jul 19, 2024
09ee9e3
fix: fix conflicts in pnpm-lock.yaml
Adufe-Obanijesu Jul 20, 2024
95baa2e
fix: fix the grid layout for desktop view
Adufe-Obanijesu Jul 20, 2024
4609e84
fix: fix the letter spacing of description
Adufe-Obanijesu Jul 20, 2024
fabe466
fix: fix lint errors
Adufe-Obanijesu Jul 20, 2024
4b6e521
fix: added id to the article interface
Adufe-Obanijesu Jul 20, 2024
a669529
fix: added dot before the creation date
Adufe-Obanijesu Jul 20, 2024
3e9c0f0
fix: fix lint error
Adufe-Obanijesu Jul 20, 2024
299b4a3
fix: use global styles
Adufe-Obanijesu Jul 20, 2024
8db0c29
fix: lint errors from BlogCards
Adufe-Obanijesu Jul 20, 2024
d6eedad
fix: use global styles
Adufe-Obanijesu Jul 20, 2024
4b345f8
feat: implement cookie consent banner with custom button styles
KehindeDaniels Jul 20, 2024
ddd978c
feat: implement floating footer cookie consent component
KehindeDaniels Jul 20, 2024
27ce9ef
fix: resolve merge conflicts with upstream/main
KehindeDaniels Jul 20, 2024
8450077
chore: remove unused components to clean up the codebase
KehindeDaniels Jul 20, 2024
99685bd
installed switch components
Jul 20, 2024
6a66d88
feat(116):user-dashboard-password-settings (added component dir for d…
Lftobs Jul 20, 2024
347e0d8
feat(116):user-dashboard-password-settings (completed password update…
Lftobs Jul 20, 2024
1b535b3
feat(116):user-dashboard-password-settings (completed password update…
Lftobs Jul 20, 2024
a65228d
feat(116):user-dashboard-password-settings (completed password update…
Lftobs Jul 20, 2024
4dd9eed
feat(116):user-dashboard-password-settings (completed password update…
Lftobs Jul 20, 2024
f6f4051
fix: PNPM lint issues
psalm987 Jul 21, 2024
bb1668c
Merge branch 'feat/HNG-14-create-preview-page' of https://github.com/…
favouridoko1 Jul 21, 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
60 changes: 60 additions & 0 deletions app/components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@

import { getImages } from "~/lib/utils/utils";
const Navbar = () => {
return (
<>
<div className="flex flex-col h-24 borderbtm">

<div className="flex justify-between mx-4">
<ul className="flex justify-between items-center gap-8">
<div className="flex items-center gap-3">
<li>
<img src={getImages[0].icon.imgLocation} alt="hamborger_icon" />
</li>

<li>
<img src={getImages[0].logo.imgLocation} alt="logo" />
</li>
<li className="font-semibold text-2xl">
<p>Boilerplate.</p>
</li>
</div>
<div className="flex gap-2 font-bold text-xs">
<li>Overview</li>
<li className="text-orange">Email</li>
<li>product</li>
</div>
</ul>
<ul className="flex items-center justify-between gap-4">
<li className="borderstyles relative">
<input
type="text"
className="px-7 h-10 focus:outline-0 font-light"
placeholder="Search Option..."
/>
<img
src={getImages[0].search_icon.imgLocation}
alt=""
className="absolute top-3 left-2 outline-none"
/>
</li>
<li>
<img src={getImages[0].bell.imgLocation} alt="" />
</li>
<li>
<img src={getImages[0].questionmark.imgLocation} alt="" />
</li>
<li>
<img src={getImages[0].avatar.imgLocation} alt="" />
</li>
<li>
<img src={getImages[0].dropdown_icon.imgLocation} alt="" />
</li>
</ul>
</div>
</div>
</>
);
};

export default Navbar;
121 changes: 121 additions & 0 deletions app/components/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<!-- <!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Document</title>
</head>
<body style="font-family: 'Poppins', Arial, sans-serif">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="staticSiteContainer">
<tr>
<td align="center" style="padding: 20px">
<table
class="content"
width="600"
border="0"
cellspacing="0"
cellpadding="0"
style="border-collapse: collapse; border: 1px solid #cccccc"
>
<!-- Header -->
Comment on lines +1 to +20
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is going on here???

<tr>
<td
class="header"
style="
background-color: #000000;
padding: 40px;
text-align: center;
color: white;
font-size: 24px;
"
>
<span style="border-bottom: 2px solid #ffffff">IB</span>OUND <span style="padding: 4px; background-color: #f56c6c;">22</span>
</td>
</tr>

<!-- Body -->
<tr>
<td
class="body"
style="
padding: 40px;
text-align: left;
font-size: 16px;
line-height: 1.6;
"
>
Hello, All! <br />
Lorem odio soluta quae dolores sapiente voluptatibus recusandae
aliquam fugit ipsam.
<br /><br />
Lorem ipsum dolor sit amet consectetur adipisicing elit. Veniam
corporis sint eum nemo animi velit exercitationem impedit.
Incidunt, officia facilis atque? Ipsam voluptas fugiat
distinctio blanditiis veritatis.
</td>
</tr>

<!-- Call to action Button -->
<tr>
<td style="padding: 0px 40px 0px 40px; text-align: center">
<!-- CTA Button -->
<table cellspacing="0" cellpadding="0" style="margin: auto">
<tr>
<td
align="center"
style="
background-color: #345c72;
padding: 10px 20px;
border-radius: 5px;
"
>
<a

style="
color: #ffffff;
text-decoration: none;
font-weight: bold;
cursor:pointer;
"
>Register here</a
>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td
class="body"
style="
padding: 40px;
text-align: left;
font-size: 16px;
line-height: 1.6;
"
>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Veniam
corporis sint eum nemo animi velit exercitationem impedit.
</td>
</tr>
<!-- Footer -->
<tr>
<td
class="footer"
style="
background-color: #333333;
padding: 40px;
text-align: center;
color: white;
font-size: 14px;
"
>
Copyright &copy; 2024 | Your brand name
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html> -->
2 changes: 1 addition & 1 deletion app/components/ui/alert-dialog.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"use client";

import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
import { buttonVariants } from "app/components/ui/button";
import { cn } from "app/lib/utils/cn";
import {
ComponentPropsWithoutRef,
ElementRef,
forwardRef,
HTMLAttributes,
} from "react";
import { buttonVariants } from "./button";

const AlertDialog = AlertDialogPrimitive.Root;

Expand Down
4 changes: 2 additions & 2 deletions app/components/ui/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const buttonVariants = cva(
export interface ButtonProperties
extends ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof buttonVariants> {
asChild?: boolean;
asChild?: boolean
}

const Button = forwardRef<HTMLButtonElement, ButtonProperties>(
Expand All @@ -52,4 +52,4 @@ const Button = forwardRef<HTMLButtonElement, ButtonProperties>(
);
Button.displayName = "Button";

export { Button, buttonVariants };
export { Button, buttonVariants }
1 change: 1 addition & 0 deletions app/lib/utils/cn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ import { twMerge } from "tailwind-merge";

export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));

}
54 changes: 54 additions & 0 deletions app/lib/utils/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
export const getImages = [
{
icon: {
id: 1,
type: "online auction site",
imgLocation: "../../../public/icon.png",
},
logo: {
id: 2,
type: "brand logo",
imgLocation: "../../../public/Logo.png",
},
bell: {
id: 3,
type: "notification bell",
imgLocation: "../../../public/notification.png",
},
questionmark: {
id: 4,
type: "question mark icon",
imgLocation: "../../../public/icon_que.png",
},
avatar: {
id: 5,
type: "avatar",
imgLocation: "../../../public/avatar.png",
},
dropdown_icon: {
id: 6,
type: "notification bell",
imgLocation: "../../../public/secondary_icon.png",
},
search_icon: {
id: 7,
type: "search icon",
imgLocation: "../../../public/search_icon.png",
},
note_icon: {
id: 7,
type: "note icon",
imgLocation: "../../../public/note_icon.png",
},
open_close: {
id: 7,
type: "note icon",
imgLocation: "../../../public/open_close.png",
},
arrow_right: {
id: 7,
type: "note icon",
imgLocation: "../../../public/arrow_right.png",
},
},
];
5 changes: 5 additions & 0 deletions app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
import type { ReactNode } from "react";

import styles from "./styles/global.css?url";
import Navbar from "./Components/Navbar/Navbar";

export const links: LinksFunction = () => [
{ rel: "stylesheet", href: styles },
Expand All @@ -26,6 +27,10 @@ export function Layout({ children }: { children: ReactNode }) {
<Links />
</head>
<body>
<header>


</header>
{children}
<ScrollRestoration />
<Scripts />
Expand Down
Loading