Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added public/connect.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logoText.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
229 changes: 158 additions & 71 deletions src/app/about/page.tsx

Large diffs are not rendered by default.

30 changes: 4 additions & 26 deletions src/app/auth/login/login.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
"use client";

import type React from "react";

import { FcGoogle } from "react-icons/fc";
import { FaApple } from "react-icons/fa";
import { useState, useEffect } from "react";
import {
Card,
Expand Down Expand Up @@ -314,24 +315,7 @@ export default function LoginPage() {
onClick={() => handleSocialLogin("Google")}
disabled={isLoading}
>
<svg className="mr-2 h-4 w-4" viewBox="0 0 24 24">
<path
fill="currentColor"
d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
/>
<path
fill="currentColor"
d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
/>
<path
fill="currentColor"
d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
/>
<path
fill="currentColor"
d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
/>
</svg>
<FcGoogle />
Google
</Button>
<Button
Expand All @@ -340,13 +324,7 @@ export default function LoginPage() {
onClick={() => handleSocialLogin("Apple")}
disabled={isLoading}
>
<svg
className="mr-2 h-4 w-4"
viewBox="0 0 24 24"
fill="currentColor"
>
<path d="M18.71 19.5c-.83 1.24-1.71 2.45-3.05 2.47-1.34.03-1.77-.79-3.29-.79-1.53 0-2 .77-3.27.82-1.31.05-2.3-1.32-3.14-2.53C4.25 17 2.94 12.45 4.7 9.39c.87-1.52 2.43-2.48 4.12-2.51 1.28-.02 2.5.87 3.29.87.78 0 2.26-1.07 3.81-.91.65.03 2.47.26 3.64 1.98-.09.06-2.17 1.28-2.15 3.81.03 3.02 2.65 4.03 2.68 4.04-.03.07-.42 1.44-1.38 2.83M13 3.5c.73-.83 1.94-1.46 2.94-1.5.13 1.17-.34 2.35-1.04 3.19-.69.85-1.83 1.51-2.95 1.42-.15-1.15.41-2.35 1.05-3.11z" />
</svg>
<FaApple />
Apple
</Button>
</div>
Expand Down
32 changes: 4 additions & 28 deletions src/app/auth/signup/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import {
Lock,
User,
Loader2,
Send,
Wallet,
Check,
X,
} from "lucide-react";
Expand All @@ -33,7 +31,8 @@ import { useRouter } from "next/navigation";
import { ThemeToggle } from "@/components/theme-toggle";
import { PhoneInput } from "@/components/auth/phone-input";
import { useWalletContext } from "../../../components/blockchain/walletProvider";

import { FcGoogle } from "react-icons/fc";
import { FaApple } from "react-icons/fa";
import { ConnectButton } from "../../../components/blockchain/connect-button";
import WalletDisconnectModal from "../../../components/blockchain/Wallet-disconnect-modal";
// Utility to shorten wallet address
Expand Down Expand Up @@ -546,24 +545,7 @@ export default function SignUpPage() {
onClick={() => handleSocialSignUp("Google")}
disabled={isLoading}
>
<svg className="mr-2 h-4 w-4" viewBox="0 0 24 24">
<path
fill="currentColor"
d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
/>
<path
fill="currentColor"
d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
/>
<path
fill="currentColor"
d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
/>
<path
fill="currentColor"
d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
/>
</svg>
<FcGoogle />
Google
</Button>
<Button
Expand All @@ -572,13 +554,7 @@ export default function SignUpPage() {
onClick={() => handleSocialSignUp("Apple")}
disabled={isLoading}
>
<svg
className="mr-2 h-4 w-4"
viewBox="0 0 24 24"
fill="currentColor"
>
<path d="M18.71 19.5c-.83 1.24-1.71 2.45-3.05 2.47-1.34.03-1.77-.79-3.29-.79-1.53 0-2 .77-3.27.82-1.31.05-2.3-1.32-3.14-2.53C4.25 17 2.94 12.45 4.7 9.39c.87-1.52 2.43-2.48 4.12-2.51 1.28-.02 2.5.87 3.29.87.78 0 2.26-1.07 3.81-.91.65.03 2.47.26 3.64 1.98-.09.06-2.17 1.28-2.15 3.81.03 3.02 2.65 4.03 2.68 4.04-.03.07-.42 1.44-1.38 2.83M13 3.5c.73-.83 1.94-1.46 2.94-1.5.13 1.17-.34 2.35-1.04 3.19-.69.85-1.83 1.51-2.95 1.42-.15-1.15.41-2.35 1.05-3.11z" />
</svg>
<FaApple />
Apple
</Button>
</div>
Expand Down
14 changes: 9 additions & 5 deletions src/app/contact/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import QuickHelp from "@/components/contact/QuickHelp";
import OfficeLocations from "@/components/contact/OfficeLocations";
import { ThemeToggle } from "@/components/theme-toggle";
import Link from "next/link";
import Image from "next/image";
import { Send } from "lucide-react";

export default function ContactPage() {
Expand All @@ -15,10 +16,13 @@ export default function ContactPage() {
<header className="border-b bg-white/80 backdrop-blur-sm dark:bg-gray-900/80">
<div className="container mx-auto px-4 py-4 flex items-center justify-between">
<Link href="/" className="flex items-center space-x-2">
<div className="w-8 h-8 bg-gradient-to-r from-blue-600 to-purple-600 rounded-lg flex items-center justify-center">
<Send className="w-4 h-4 text-white" />
</div>
<span className="text-xl font-bold">ChainRemit</span>
<Image
src="/Logo and text-3.png"
alt="ChainRemit Logo"
width={150}
height={50}
className="w-[150px] h-[50px] object-fill"
/>
</Link>
<div className="flex items-center space-x-4">
<Link
Expand Down Expand Up @@ -56,4 +60,4 @@ export default function ContactPage() {
</div>
</div>
);
}
}
24 changes: 15 additions & 9 deletions src/app/dashboard/components/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,20 @@ const Sidebar: React.FC<SidebarProps> = ({
isCollapsed ? "justify-center w-full" : "my-6"
}`}
>
{/* <motion.div
className="w-10 h-10 bg-primary rounded-lg flex items-center justify-center flex-shrink-0"
<motion.div
className="rounded-lg flex items-center justify-center flex-shrink-0"
whileHover={{ scale: 1.05 }}
whileTap={{ scale: 0.95 }}
transition={smoothSpring}
>
<Send className="w-6 h-6 text-primary-foreground rotate-45" />
</motion.div> */}
<Image
src="/Logo.png"
alt="ChainRemit Logo"
width={80}
height={60}
className="w-[80px] h-[60px] object-fill"
/>
</motion.div>
<AnimatePresence mode="wait">
{!isCollapsed && (
<motion.div
Expand All @@ -193,18 +199,18 @@ const Sidebar: React.FC<SidebarProps> = ({
initial="hide"
animate="show"
exit="hide"
className="ml-3 my-6 overflow-hidden"
className="-ml-3 my-6 overflow-hidden"
style={{
originX: 0,
willChange: "transform, opacity",
}}
>
<Image
src="/Logo and text-3.png"
src="/logoText.png"
alt="ChainRemit Logo"
width={200}
height={70}
className="w-[200px] h-[70px] object-fill"
width={80}
height={60}
className="w-[80px] h-[60px] object-fill"
/>
</motion.div>
)}
Expand Down
Loading
Loading