Merge branch 'main' of https://github.com/sikehish/Blabber

sikehish · Sep 29, 2024 · 444f56e · 444f56e
2 parents 70506f3 e02c4e1
commit 444f56e
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0  1 @@
 AI-backend/__pycache__/report_generator.cpython-310.pyc
diff --git a/blabber-frontend/src/App.jsx b/blabber-frontend/src/App.jsx
@@ -9,6  9,7 @@ import { useAuthContext } from './context/AuthContext';
 import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
 import Dashboard from './pages/Dashboard';
 import Welcome from './pages/Welcme';
 
 function App() {
   const { state } = useAuthContext();
@@ -17,7  18,8 @@ function App() {
     <Router>
       <Navbar />
       <Routes>
-        <Route path="/" element={state?.user ? <Navigate to="/dashboard" /> : <HomePage />} />
         <Route path='/welcome' element={<Welcome />} />
         <Route path="/" element={<HomePage />} />
         <Route path="/success" element={state?.user ? <GoogleSuccess /> : <Navigate to="/" />} />
         <Route path="/failed" element={!state?.user ? <GoogleFailure /> : <Navigate to="/" />} />
         <Route path="/login" element={!state?.user ? <SignInPage /> : <Navigate to="/dashboard" />} />

diff --git a/blabber-frontend/src/assets/Available Chrome Web Store.png b/blabber-frontend/src/assets/Available Chrome Web Store.png
diff --git a/blabber-frontend/src/components/Navbar.jsx b/blabber-frontend/src/components/Navbar.jsx
@@ -24,7  24,7 @@ function Navbar() {
       <div className="flex items-center space-x-4">
         {state?.user ? (
           <>
-           <Link to="/home" className="text-white hover:text-blue-900 hover:rounded-lg hover:bg-white p-1">
            <Link to="/" className="text-white hover:text-blue-900 hover:rounded-lg hover:bg-white p-1">
               Home
             </Link>
              <Link to="/dashboard" className="text-white hover:text-blue-900 hover:rounded-lg hover:bg-white p-1">

diff --git a/blabber-frontend/src/pages/Home.jsx b/blabber-frontend/src/pages/Home.jsx
@@ -1,27  1,33 @@
 import { useNavigate } from "react-router-dom";
 import { useAuthContext } from "../context/AuthContext";
 import useWithGmeet from "../assets/works-with-gmeet.jpg";
 import chromeWebStore from "../assets/Available Chrome Web Store.png";
 
 function Home() {
-  const {state} =useAuthContext()
-  const navigate=useNavigate()
   const { state } = useAuthContext();
   const navigate = useNavigate();
 
   return (
     <div className="flex flex-col min-h-screen">
       {/* Main content */}
       <div className="flex-grow flex items-center justify-center">
-        <main className="flex flex-col items-center mt-8 px-4 text-center">
-          {/* Blabber logo */}
         <main className="flex flex-col items-center px-4 text-center">
           {/* Chrome Web Store image */}
           <img src={chromeWebStore} alt="Available on Chrome Web Store" className="w-1/6 mx-auto" />          {/* Blabber logo */}
           <h1 className="text-9xl mb-4 superlarge logo-bg">Blabber</h1>
           <div className="container mx-auto w-2/3">
             <h2 className="text-2xl font-semibold mb-4">
               Generate custom meeting recaps, reports, and transcripts using AI
             </h2>
-            <p className="mb-8">
-              Use Blabber to generate meeting recaps, reports, and transcripts for your meetings, interviews, and other conversations.
             <p className="mb-4">
               Use Blabber, a <u>Chrome extension</u>, to generate meeting recaps, reports, and transcripts for your meetings, interviews, and other conversations.
             </p>
             <img src={useWithGmeet} alt="Use with Gmeet" className="w-1/4 mx-auto" />
             <p className="mb-8">Other platforms coming soon...</p>
-            <button onClick={() => state?.user ? navigate("/") : navigate("/login")} className="bg-purple-600 text-white py-2 px-4 rounded hover:bg-blue-700">
             <button 
               onClick={() => state?.user ? navigate("/dashboard") : navigate("/login")} 
               className="bg-purple-600 text-white py-2 px-4 rounded hover:bg-blue-700"
             >
               Get Started
             </button>
           </div>

diff --git a/blabber-frontend/src/pages/Welcme.jsx b/blabber-frontend/src/pages/Welcme.jsx
@@ -0,0  1,67 @@
 
 function Welcome() {
   return (
     <div className="flex flex-col items-center justify-center min-h-screen bg-gradient-to-b from-gray-50 to-gray-200 text-gray-800 pt-20">
       <header className="text-center mb-10">
         <h1 className="text-6xl font-bold text-purple-900 mb-4">Welcome to Blabber!</h1>
         <p className="text-xl text-gray-900">Your AI-powered meeting companion</p>
       </header>
 
       <main className="max-w-4xl mx-auto p-4">
         <section className="mb-10">
           <h2 className="text-3xl font-semibold text-purple-700 mb-4">What is Blabber?</h2>
           <p className="text-lg leading-relaxed text-gray-800">
             Blabber is a Chrome extension designed to help you manage and document your meetings seamlessly. With its AI-enabled features, you can easily keep track of your meetings, attendees, and speakers while generating comprehensive reports.
           </p>
         </section>
 
         <section className="mb-10">
           <h2 className="text-3xl font-semibold text-purple-700 mb-4">Key Features</h2>
           <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
             <div className="flex flex-col items-center text-center p-6 border border-purple-300 rounded-lg shadow-lg bg-white hover:shadow-xl transition-shadow duration-300">
               <span className="text-6xl mb-2">📋</span>
               <h3 className="font-semibold text-lg">Track Your Meetings</h3>
               <p className="text-sm text-gray-900">Easily keep track of your meets and attendees.</p>
             </div>
             <div className="flex flex-col items-center text-center p-6 border border-purple-300 rounded-lg shadow-lg bg-white hover:shadow-xl transition-shadow duration-300">
               <span className="text-6xl mb-2">📝</span>
               <h3 className="font-semibold text-lg">Generate Reports</h3>
               <p className="text-sm text-gray-900">Create customizable reports in PDF and DOCX formats.</p>
             </div>
             <div className="flex flex-col items-center text-center p-6 border border-purple-300 rounded-lg shadow-lg bg-white hover:shadow-xl transition-shadow duration-300">
               <span className="text-6xl mb-2">✉️</span>
               <h3 className="font-semibold text-lg">Email Reports</h3>
               <p className="text-sm text-gray-900">Send reports directly to users' email addresses.</p>
             </div>
           </div>
         </section>
 
         <section className="mb-10">
           <h2 className="text-3xl font-semibold text-purple-700 mb-4">Reporting Customizations</h2>
           <p className="text-lg leading-relaxed text-gray-700 mb-4">
             Customize your reports with different styles:
           </p>
           <ul className="list-disc pl-8 text-gray-900 space-y-2">
             <li>📊 <strong>Speaker-Based Reports:</strong> Focus on individual speakers and their contributions.</li>
             <li>⏱️ <strong>Interval-Based Reports:</strong> Analyze discussions based on time intervals.</li>
             <li>💬 <strong>Sentiment-Based Reports:</strong> Get insights into the emotional tone of the meeting.</li>
             <li>🗒️ <strong>General Reports:</strong> Overview of all meeting details and key points.</li>
           </ul>
         </section>
 
         <section>
           <h2 className="text-3xl font-semibold text-purple-700 mb-4">Screenshots Included!</h2>
           <p className="text-lg leading-relaxed text-gray-700">
             Capture screenshots during your meetings and include them in your reports for better context and clarity.
           </p>
         </section>
       </main>
 
       <footer className="mt-10 mb-4">
         <p className="text-sm text-gray-500">Made with ❤️ by the Blabber team</p>
       </footer>
     </div>
   );
 }
 
 export default Welcome;
diff --git a/google-meet-chrome-extension/background.js b/google-meet-chrome-extension/background.js
@@ -45,6  45,11 @@ chrome.runtime.onInstalled.addListener(() => {
             console.error('Error fetching user info:', error);
         });
     });
 
     chrome.tabs.create({
         url: 'http://localhost:5173/welcome' // Replace with your desired URL
       });
 
 });
Original file line number	Diff line number	Diff line change
		@@ -0,0 1 @@
		AI-backend/__pycache__/report_generator.cpython-310.pyc
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,6 45,11 @@ chrome.runtime.onInstalled.addListener(() => { @@
                 console.error('Error fetching user info:', error);
             });
         });
+        chrome.tabs.create({
+            url: 'http://localhost:5173/welcome' // Replace with your desired URL
+          });
     });
@@ Expand Down @@