Merge pull request #41 from Mujtabaa07/resolved_conflicts

Added Footer
samyakmaitre · Oct 6, 2024 · bd8fabc · bd8fabc
2 parents 908cff0 + b9bf0c0
commit bd8fabc
Show file tree

Hide file tree

Showing 8 changed files with 531 additions and 392 deletions.
diff --git a/package.json b/package.json
@@ -13,13 +13,27 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+
+
+    "@radix-ui/react-slot": "^1.1.0",
+
+
     "@radix-ui/react-accordion": "^1.2.1",
     "@radix-ui/react-slot": "^1.1.0",
+
     "@reduxjs/toolkit": "^2.2.7",
+
     "@testing-library/user-event": "^13.5.0",
     "@types/react-router-dom": "^5.3.3",
     "axios": "^1.7.7",
     "bootstrap": "^5.3.3",
+
+    "framer-motion": "^11.10.0",
+    "lucide-react": "^0.447.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-icons": "^5.3.0",
+
     "concurrently": "^9.0.1",
     "framer-motion": "^11.11.1",
     "lucide-react": "^0.447.0",
@@ -28,6 +42,7 @@
     "react-hot-toast": "^2.4.1",
     "react-icons": "^5.3.0",
     "react-redux": "^9.1.2",
+
     "react-router-dom": "^6.26.2",
     "react-scripts": "^5.0.1",
     "react-slick": "^0.30.2",

diff --git a/public/index.html b/public/index.html
@@ -2,14 +2,14 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="../src/assets/images/theatre.png" />
+    <link rel="icon" href="./theatre.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="Web site created using create-react-app"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="../src/assets/images/theatre.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/theatre.png b/public/theatre.png
diff --git a/src/assets/styles/Footer.css b/src/assets/styles/Footer.css
@@ -1,9 +1,12 @@
+
 /* .footer {
+
   background: linear-gradient(to bottom, #1a202c, #000000);
   color: #d1d5db;
   padding: 3rem 0 0;
 }
 
+
 .container {
   max-width: 1200px;
   margin: 0 auto;
@@ -16,6 +19,20 @@
   gap: 2rem;
 }
 
+
+.container {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 0 1rem;
+}
+
+.footer-grid {
+  display: grid;
+  grid-template-columns: repeat(1, 1fr);
+  gap: 2rem;
+}
+
+
 @media (min-width: 768px) {
   .footer-grid {
     grid-template-columns: repeat(2, 1fr);
@@ -73,10 +90,13 @@
   border-bottom: 1px solid #4a5568;
 }
 
+
+
 .accordion-item {
   border-bottom: 1px solid #4a5568;
 }
 
+
 .accordion-title {
   display: flex;
   justify-content: space-between;
@@ -113,6 +133,40 @@
   color: #d1d5db;
   text-decoration: none;
   transition: color 0.3s;
+
+}
+
+.footer-list a:hover {
+  color: #ffffff;
+}
+
+.section-title {
+  font-size: 1rem;
+  font-weight: 600;
+  color: #ffffff;
+  margin-bottom: 1rem;
+}
+
+.subscribe-form {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.email-input {
+  width: 100%;
+  padding: 0.5rem;
+  background-color: #2d3748;
+  border: 1px solid #4a5568;
+  border-radius: 0.25rem;
+  color: #ffffff;
+}
+
+.email-input::placeholder {
+  color: #a0aec0;
+}
+
+
 }
 
 .footer-list a:hover {
@@ -145,6 +199,7 @@
   color: #a0aec0;
 }
 
+
 .email-input:focus {
   outline: none;
   box-shadow: 0 0 0 2px #8b5cf6;
@@ -176,6 +231,36 @@
   flex-wrap: wrap;
   justify-content: space-between;
   align-items: center;
+
+}
+
+.copyright {
+  font-size: 0.875rem;
+  margin-bottom: 1rem;
+}
+
+.footer-links {
+  display: flex;
+  gap: 1rem;
+}
+
+.footer-links a {
+  font-size: 0.875rem;
+  color: #d1d5db;
+  text-decoration: none;
+  transition: color 0.3s;
+}
+
+.footer-links a:hover {
+  color: #ffffff;
+}
+
+.footer-info {
+  margin-top: 2rem;
+  background-color: #2d3748;
+  padding: 1rem 0;
+}
+
 }
 
 .copyright {
@@ -205,6 +290,7 @@
   padding: 1rem 0;
 }
 
+
 .footer-info-content {
   display: flex;
   flex-wrap: wrap;
@@ -228,6 +314,8 @@
   color: #8b5cf6;
 }
 
+
+
 .back-to-top {
   position: fixed;
   bottom: 20px;
@@ -250,6 +338,7 @@
   background: linear-gradient(to right, #7C3AED, #DB2777);
 }
 
+
 @media (max-width: 768px) {
   .footer-bottom-content, .footer-info-content {
     flex-direction: column;
@@ -259,4 +348,7 @@
   .footer-links, .contact-info {
     margin-top: 1rem;
   }
-} */
+
+}
+} */
+
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -8,7 +8,6 @@ module.exports = {
   plugins: [],
 }
 
-
 /**
  * @format
  * @type {import('tailwindcss').Config}
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ module.exports = { @@
       plugins: [],
     }
     /**
      * @format
      * @type {import('tailwindcss').Config}
@@ Expand Down @@