Skip to content

Commit

Permalink
feat: resolved conflicted files
Browse files Browse the repository at this point in the history
  • Loading branch information
@devasMartins-Tmd
devasMartins-Tmd committed Jul 22, 2024
1 parent ba4bdf0 commit 670abce
Show file tree
Hide file tree
Showing 6 changed files with 377 additions and 413 deletions.
4 changes: 2 additions & 2 deletions app/components/dashboard/userdashboard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import avatar from "/images/avatar.png";
import drop from "/images/drop.png";
import logo from "/images/logo.png";
import menu from "/images/menu.png";
import notification from "/images/notification.png";
import menu from "/images/Menu.png";
import notification from "/images/Notification.png";
import question from "/images/question.png";
import search from "/images/search.png";
import { useEffect, useState } from "react";
Expand Down
18 changes: 12 additions & 6 deletions app/components/ui/footerCookieConsent.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
import { Button } from "./button";

const FooterCookieConsent: React.FC = () => {
const handleAccept = () => console.log("Cookie consent accepted");
const handleAccept = () => {
console.log("Cookie consent accepted");
};

const handleReject = () => console.log("Cookie consent rejected");
const handleReject = () => {
console.log("Cookie consent rejected");
};

const handleSettings = () => console.log("Cookie settings opened");
const handleSettings = () => {
console.log("Cookie settings opened");
};

const FooterCookieConsent: React.FC = () => {
return (
<div className="fixed bottom-0 w-full border-t border-gray-200 bg-white p-6 text-gray-900">
<div className="fixed bottom-0 left-0 w-full border-t border-gray-200 bg-white p-6 text-gray-900">
<div className="flex flex-col items-start space-y-4 md:flex-row md:items-center md:justify-between md:space-x-4 md:space-y-0">
<p className="flex flex-1 flex-col text-left text-sm">
<span className="text-sm font-bold sm:text-xl">
Expand All @@ -17,7 +23,7 @@ const FooterCookieConsent: React.FC = () => {
<span className="text-xs sm:text-base">
Our website uses cookies to enhance your browsing experience,
provide personalized content, and analyze site traffic. By clicking
"Accept All", you consent to our use of cookies.
&quot;Accept All&quot;, you consent to our use of cookies.
</span>
</p>
<div className="grid grid-cols-2 place-content-center gap-2 sm:grid-cols-3">
Expand Down
2 changes: 1 addition & 1 deletion app/components/userdashboard/barchart.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default function BarComponent() {
<ChartTooltip content={<ChartTooltipContent />} />
<Bar
dataKey="desktop"
fill="var(--color-desktop)"
fill="#F97316"
radius={4}
width={20}
barSize={300}
Expand Down
147 changes: 98 additions & 49 deletions app/styles/global.css
View file
Original file line number Diff line number Diff line change
@@ -1,75 +1,93 @@
@import url("https://fonts.googleapis.com/css2?family=Inter:[email protected]&display=swap");

@tailwind base;
@tailwind components;
@tailwind utilities;
#shadxs {
box-shadow: 0 0 1px rgba(77, 77, 77, 0.5);
}

#shadsm {
box-shadow: 0 0 3px rgba(77, 77, 77, 0.5);
}
#shadlg {
box-shadow: 0 0 6px rgba(77, 77, 77, 0.5);
}

::-webkit-scrollbar {
width: 0;
}

@layer base {
:root {
--background: 0 0% 100%;
--foreground: 224 71.4% 4.1%;
--background: 0 0% 98%;
--foreground: 222.2 84% 4.9%;
--card: 0 0% 100%;
--card-foreground: 224 71.4% 4.1%;
--card-foreground: 222.2 84% 4.9%;
--popover: 0 0% 100%;
--popover-foreground: 224 71.4% 4.1%;
--primary: 220.9 39.3% 11%;
--primary-foreground: 210 20% 98%;
--secondary: 220 14.3% 95.9%;
--secondary-foreground: 220.9 39.3% 11%;
--muted: 220 14.3% 95.9%;
--muted-foreground: 220 8.9% 46.1%;
--accent: 220 14.3% 95.9%;
--accent-foreground: 220.9 39.3% 11%;
--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 20% 98%;
--border: 220 13% 91%;
--input: 220 13% 91%;
--ring: 224 71.4% 4.1%;
--popover-foreground: 222.2 84% 4.9%;
--default: 222 47% 11%;
--default-foreground: 0 0% 100%;
--primary: 25 95% 53%;
--primary-foreground: 0 0% 100%;
--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;
--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;
--accent: 210 40% 96.1%;
--accent-foreground: 222.2 47.4% 11.2%;
--destructive: 30, 100%, 50%;

--destructive-hover: 0 72% 51%;
--destructive-foreground: 0 0% 100%;
--subtle: 210 40% 96%;
--subtle-hover: 214 32% 91%;
--subtle-foreground: 222 47% 11%;
--loading: 222 47% 11%;
--loading-hover: 215 25% 27%;
--loading-foreground: 0 0% 100%;
--outline: 0 0% 100%;
--outline-hover: 210 40% 96%;
--outline-foreground: 222 47% 11%;
--link: 222 47% 11%;
--error: 0 72% 51%;
--success: 102 51% 52%;
--warning: 45 93% 47%;
--border: 214 32% 91%;
--input: 214 32% 91%;
--ring: 222.2 84% 4.9%;
--radius: 0.5rem;
--chart-1: 12 76% 61%;
--chart-2: 173 58% 39%;
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
--backgroundColor: 0 15% 95%;
--darkText: 0 0% 6.67%;
--customOrange: 24 95% 53%;
--neutral-1: 0, 0%, 32%;
--neutral-2: 0, 0%, 4%;
}

.dark {
--background: 224 71.4% 4.1%;
--foreground: 210 20% 98%;
--card: 224 71.4% 4.1%;
--card-foreground: 210 20% 98%;
--popover: 224 71.4% 4.1%;
--popover-foreground: 210 20% 98%;
--primary: 210 20% 98%;
--primary-foreground: 220.9 39.3% 11%;
--secondary: 215 27.9% 16.9%;
--secondary-foreground: 210 20% 98%;
--muted: 215 27.9% 16.9%;
--muted-foreground: 217.9 10.6% 64.9%;
--accent: 215 27.9% 16.9%;
--accent-foreground: 210 20% 98%;
--background: 222.2 84% 4.9%;
--foreground: 210 40% 98%;
--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;
--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;
--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;
--secondary: 217.2 32.6% 17.5%;
--secondary-foreground: 210 40% 98%;
--muted: 217.2 32.6% 17.5%;
--muted-foreground: 215 20.2% 65.1%;
--accent: 217.2 32.6% 17.5%;
--accent-foreground: 210 40% 98%;
--destructive: 0 62.8% 30.6%;
--destructive-foreground: 210 20% 98%;
--border: 215 27.9% 16.9%;
--input: 215 27.9% 16.9%;
--ring: 216 12.2% 83.9%;
--destructive-foreground: 210 40% 98%;
--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;
--ring: 212.7 26.8% 83.9%;
--chart-1: 220 70% 50%;
--chart-2: 160 60% 45%;
--chart-3: 30 80% 55%;
--chart-4: 280 65% 60%;
--backgroundColor: 0 15% 95%;
--customOrange: 24 95% 53%;
--darkText: 0 0% 6.67%;
--chart-5: 340 75% 55%;
--neutral-1: 0, 0%, 32%;
--neutral-2: 0, 0%, 4%;
}
body {
font-family: "Inter", sans-serif;
}
}

Expand All @@ -80,4 +98,35 @@
body {
@apply bg-background text-foreground;
}
.input_style {
@apply flex h-14 w-full flex-col rounded-md border border-gray-300 pb-3 pl-3 pr-16 pt-3 text-gray-400 shadow-sm outline-none;
}
.error-text {
@apply text-xs text-red-500;
}
.success-text {
@apply text-green-500;
}
}

@layer components {
.form-section {
@apply flex flex-col rounded-md border p-7;
}

.button {
@apply flex items-center justify-center rounded-md bg-[#f97316] px-5 py-2 text-sm font-bold text-white shadow-sm;
}

.waitlist-success {
@apply flex flex-col items-center justify-center gap-5 rounded-md border p-7;
}

.waitlist-success img {
@apply opacity-25;
}

.waitlist-success .thumbs-up {
@apply absolute left-10 top-20 -rotate-6;
}
}
14 changes: 9 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@
},
"dependencies": {
"@hookform/resolvers": "^3.9.0",
"@mertasan/tailwindcss-variables": "^2.7.0",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-alert-dialog": "^1.1.1",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-tabs": "^1.1.0",
Expand All @@ -32,13 +36,13 @@
"@remix-run/serve": "^2.10.3",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"isbot": "^4.1.0",
"isbot": "^4.4.0",
"lucide-react": "^0.408.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-email": "^2.1.5",
"react-hook-form": "^7.52.1",
"recharts": "^2.12.7",
"swiper": "^11.1.5",
"tailwind-merge": "^2.4.0",
"tailwindcss-animate": "^1.0.7",
"zod": "^3.23.8"
Expand All @@ -48,8 +52,8 @@
"@remix-run/dev": "^2.10.3",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"autoprefixer": "^10.4.19",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -73,4 +77,4 @@
"engines": {
"node": ">=20.0.0"
}
}
}
Loading

0 comments on commit 670abce

Please sign in to comment.