Skip to content

Commit

Permalink
Resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@varunvaatsalya
varunvaatsalya committed Oct 4, 2024
2 parents 9105200 + ad7b085 commit 98a82a8
Show file tree
Hide file tree
Showing 15 changed files with 100 additions and 205 deletions.
10 changes: 10 additions & 0 deletions .env
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<<<<<<< HEAD
# REACT_APP_FIREBASE_API_KEY=""
# REACT_APP_FIREBASE_AUTH_DOMAIN=""
# REACT_APP_FIREBASE_PROJECT_ID=""
Expand All @@ -12,3 +13,12 @@ REACT_APP_FIREBASE_STORAGE_BUCKET="qr-generator-ff212.appspot.com"
REACT_APP_FIREBASE_MESSAGING_SENDER_ID="148362074435"
REACT_APP_FIREBASE_APP_ID="1:148362074435:web:cab629f66a6f3b378d37f6"
REACT_APP_FIREBASE_MEASUREMENT_ID="G-PYJSRKZEFN"
=======
REACT_APP_FIREBASE_API_KEY= ""
REACT_APP_FIREBASE_AUTH_DOMAIN= ""
REACT_APP_FIREBASE_PROJECT_ID= ""
REACT_APP_FIREBASE_STORAGE_BUCKET= ""
REACT_APP_FIREBASE_MESSAGING_SENDER_ID= ""
REACT_APP_FIREBASE_APP_ID= ""
REACT_APP_FIREBASE_MEASUREMENT_ID=""
>>>>>>> ad7b0850fd7779e589a50e8542144f5ef19b0def
71 changes: 49 additions & 22 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,63 @@
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app" />
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.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/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>QR Generator</title>

<style>
/* Scroll to Top button styles */
#scrollToTopBtn {
position: fixed;
bottom: 20px;
right: 30px;
z-index: 100;
border: none;
outline: none;
background-color: #007BFF; /* Button color */
color: white; /* Text color */
cursor: pointer;
padding: 10px 15px;
border-radius: 5px;
font-size: 16px;
display: none; /* Initially hidden */
}

#scrollToTopBtn:hover {
background-color: #0056b3; /* Darker button color on hover */
}
</style>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
<!-- Arrow icon for the Scroll to Top button -->
<button id="scrollToTopBtn" style="display: none;">&uarr;</button>


<script>
// Get the button
const scrollToTopBtn = document.getElementById('scrollToTopBtn');

// Show or hide the button based on scroll position
window.onscroll = function() {
if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
scrollToTopBtn.style.display = 'block'; // Show the button
} else {
scrollToTopBtn.style.display = 'none'; // Hide the button
}
};

To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
// Scroll to the top when the button is clicked
scrollToTopBtn.onclick = function() {
window.scrollTo({
top: 0,
behavior: 'smooth' // Smooth scroll effect
});
};
</script>
</body>
</html>
44 changes: 0 additions & 44 deletions src/App.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<<<<<<< HEAD
import React from "react";
import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
import Navbar from "./components/Navbar";
Expand All @@ -18,33 +17,11 @@ import QRScanner from "./components/QRScanner";
import PdfQRCodeGenerator from "./components/PDFToQR";
import { ThemeProvider } from "./context/ThemeContext";
import { Toaster } from "react-hot-toast";
=======
import React from 'react';
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
import Navbar from './components/Navbar';
import Home from './pages/Home';
import DashboardPage from './pages/DashboardPage';
import QRCodePage from './pages/QRCodePage';
import ProfilePage from './pages/ProfilePage';
import Login from './components/Login';
import Register from './components/Register';
import { AuthProvider } from './context/AuthContext';
import Support from './components/Support';
import Settings from './components/Setting';
import ImageQRCodeGenerator from './components/ImageQRCodeGenerator';
import SocialMedia from './components/SocialMedia';
import BulkQRCode from './components/BulkQRCode';
import QRScanner from './components/QRScanner';
import PdfQRCodeGenerator from './components/PDFToQR';
import { ThemeProvider } from './context/ThemeContext';
import { Toaster } from 'react-hot-toast';
>>>>>>> c0c44062d6d49f810b75cec4038488603368bc6c

export default function App() {
return (
<AuthProvider>
<ThemeProvider>
<<<<<<< HEAD
<Router>
<div className="min-h-screen bg-gradient-to-r from-indigo-600 to-purple-600 dark:from-indigo-800 dark:via-purple-800 dark:to-pink-800">
<Navbar />
Expand All @@ -66,27 +43,6 @@ export default function App() {
</div>
<Toaster />
</Router>
=======
<Router>
<Navbar />
<Routes>
<Route path="/" element={<Home />} />
<Route path="/login" element={<Login />} />
<Route path="/register" element={<Register />} />
<Route path="/dashboard" element={<DashboardPage />} />
<Route path="/qr-code" element={<QRCodePage />} />
<Route path="/profile" element={<ProfilePage />} />
<Route path="/support" element={<Support />} />
<Route path="/settings" element={<Settings />} />
<Route path="/image-qr-code" element={<ImageQRCodeGenerator />} />
<Route path="/social-media-qr" element={<SocialMedia />} />
<Route path="/bulk-qr-code" element={<BulkQRCode />} />
<Route path="/qr-scanner" element={<QRScanner />} />
<Route path="/pdf-qr-code" element={<PdfQRCodeGenerator />} />
</Routes>
<Toaster />
</Router>
>>>>>>> c0c44062d6d49f810b75cec4038488603368bc6c
</ThemeProvider>
</AuthProvider>
);
Expand Down
9 changes: 1 addition & 8 deletions src/components/CategorySelector.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,7 @@ export default function CategorySelector({ category, handleCategoryChange }) {
}}
>
<motion.div
className={`text-2xl mb-2 p-2 rounded-full bg-white${
category === name ? 'text-blue-500' : ' text-gray-700'
}`}
whileHover={{
// scale: 1.25,
backgroundColor: category === name ? '#FFFFFF' : '#E5E7EB',
// transition: { duration: 0.1 },
}}
className={`text-2xl mb-2 p-2 rounded-full bg-white text-gray-700`}
>
<FontAwesomeIcon icon={icon} />
</motion.div>
Expand Down
26 changes: 13 additions & 13 deletions src/components/ColorPicker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,58 @@ import { FaPalette, FaSquare, FaCircle, FaBorderStyle } from 'react-icons/fa';

export default function ColorPicker({ color, setColor, bgColor, setBgColor, eyeColor, setEyeColor, shape, setShape, frame, setFrame, eyeShape, setEyeShape }) {
return (
<div className="grid grid-cols-1 sm:grid-cols-2 gap-6 mb-8 p-4 bg-white dark:bg-[#2b2661] rounded-xl shadow-lg">
<div className="grid grid-cols-1 sm:grid-cols-2 gap-6 mb-8 p-4 bg-gray-100 dark:bg-[#2b2661] rounded-xl shadow-lg">

<div>
<label className="flex items-center mb-2 text-gray-800 font-bold">
<label className="flex items-center mb-2 text-gray-800 dark:text-gray-200 font-bold">
<FaPalette className="mr-2 text-blue-500" /> QR Code Color
</label>
<motion.input
type="color"
value={color}
onChange={(e) => setColor(e.target.value)}
className="w-full h-12 p-2 border border-gray-300 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
className="w-full h-12 p-2 border border-gray-500 dark:bg-indigo-950 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
whileHover={{ scale: 1.05, boxShadow: "0 0 10px rgba(99, 102, 241, 0.5)" }}
whileTap={{ scale: 0.95 }}
/>
</div>

<div>
<label className="flex items-center mb-2 text-gray-800 font-bold">
<label className="flex items-center mb-2 text-gray-800 dark:text-gray-200 font-bold">
<FaPalette className="mr-2 text-blue-500" /> Background Color
</label>
<motion.input
type="color"
value={bgColor}
onChange={(e) => setBgColor(e.target.value)}
className="w-full h-12 p-2 border border-gray-300 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
className="w-full h-12 p-2 border border-gray-500 dark:bg-indigo-950 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
whileHover={{ scale: 1.05, boxShadow: "0 0 10px rgba(99, 102, 241, 0.5)" }}
whileTap={{ scale: 0.95 }}
/>
</div>

<div>
<label className="flex items-center mb-2 text-gray-800 font-bold">
<label className="flex items-center mb-2 text-gray-800 dark:text-gray-200 font-bold">
<FaPalette className="mr-2 text-blue-500" /> Eye Color
</label>
<motion.input
type="color"
value={eyeColor}
onChange={(e) => setEyeColor(e.target.value)}
className="w-full h-12 p-2 border border-gray-300 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
className="w-full h-12 p-2 border border-gray-500 dark:bg-indigo-950 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
whileHover={{ scale: 1.05, boxShadow: "0 0 10px rgba(99, 102, 241, 0.5)" }}
whileTap={{ scale: 0.95 }}
/>
</div>

<div>
<label className="flex items-center mb-2 text-gray-800 font-bold">
<label className="flex items-center mb-2 text-gray-800 dark:text-gray-200 font-bold">
<FaSquare className="mr-2 text-blue-500" /> Shape
</label>
<motion.select
value={shape}
onChange={(e) => setShape(e.target.value)}
className="w-full h-12 p-2 border border-gray-300 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
className="w-full h-12 p-2 border border-gray-500 dark:text-gray-200 dark:bg-indigo-950 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
whileHover={{ scale: 1.05, boxShadow: "0 0 10px rgba(99, 102, 241, 0.5)" }}
whileTap={{ scale: 0.95 }}
>
Expand All @@ -66,13 +66,13 @@ export default function ColorPicker({ color, setColor, bgColor, setBgColor, eyeC
</div>

<div>
<label className="flex items-center mb-2 text-gray-800 font-bold">
<label className="flex items-center mb-2 text-gray-800 dark:text-gray-200 font-bold">
<FaBorderStyle className="mr-2 text-blue-500" /> Frame
</label>
<motion.select
value={frame}
onChange={(e) => setFrame(e.target.value)}
className="w-full h-12 p-2 border border-gray-300 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
className="w-full h-12 p-2 border border-gray-500 dark:text-gray-200 dark:bg-indigo-950 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
whileHover={{ scale: 1.05, boxShadow: "0 0 10px rgba(99, 102, 241, 0.5)" }}
whileTap={{ scale: 0.95 }}
>
Expand All @@ -83,13 +83,13 @@ export default function ColorPicker({ color, setColor, bgColor, setBgColor, eyeC
</div>

<div>
<label className="flex items-center mb-2 text-gray-800 font-bold">
<label className="flex items-center mb-2 text-gray-800 dark:text-gray-200 font-bold">
<FaCircle className="mr-2 text-blue-500" /> Eye Shape
</label>
<motion.select
value={eyeShape}
onChange={(e) => setEyeShape(e.target.value)}
className="w-full h-12 p-2 border border-gray-300 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
className="w-full h-12 p-2 border border-gray-500 dark:text-gray-200 dark:bg-indigo-950 rounded-lg cursor-pointer transition-colors focus:ring-2 focus:ring-blue-500"
whileHover={{ scale: 1.05, boxShadow: "0 0 10px rgba(99, 102, 241, 0.5)" }}
whileTap={{ scale: 0.95 }}
>
Expand Down
Loading

0 comments on commit 98a82a8

Please sign in to comment.