conflicts resolved

Aadarsh805 · Feb 18, 2023 · 84f6e7d · 84f6e7d
1 parent f458963
commit 84f6e7d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 53 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
-  "typescript.tsdk": "node_modules\\typescript\\lib",
+  "typescript.tsdk": "node_modules/typescript/lib",
   "typescript.enablePromptUseWorkspaceTsdk": true
 }
diff --git a/app/dashboard/Sidebar.tsx b/app/dashboard/Sidebar.tsx
@@ -38,7 +38,7 @@ function Sidebar() {
   }));
 
   return (
-    <div className="hidden md:block md:h-screen md:w-1/6  top-0 left-0 bg-[#232135] overflow-x-hidden pt-3 border-r-2 border-[#312E47] text-[#c4c4c9]">
+    <div className="hidden md:block md:h-screen md:w-1/6 ">
       <div className="flex flex-col gap-10">
         <div className="flex items-center gap-2 ">
           <div className="relative">

diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
@@ -25,58 +25,45 @@ const dashboardPage = () => {
   }));
 
   return (
-    <div className="md:flex w-full bg-white">
-      <Sidebar />
-      <div className="w-full md:w-5/6 p-9">
-        <div className="md:flex mb-5 md:space-x-5 space-y-5 md:space-y-0">
-          <div className="w-full md:w-2/3 p-8 rounded-md shadow-md shadow-[#bcbcbc] border-[#bcbcbc] border-[1px] bg-white">
-            <p className="text-[#5f6577] text-base font-bold">
-              Saturday, Jan 21
-            </p>
-            <h2 className="text-xl font-bold text-gray-700 font-poppins pt-2 pb-5">
-              Hello, {username}
-            </h2>
+    <div className="px-8">
+      <Navbar />
+      <div className="md:flex w-full bg-white">
+        <Sidebar />
+        <div className="w-full md:w-5/6 p-9">
+          <div className="md:flex mb-5 md:space-x-5 space-y-5 md:space-y-0">
+            <div className="w-full md:w-2/3 p-8 rounded-md shadow-md shadow-[#bcbcbc29] border-[#bcbcbc20] border-[1px] bg-white">
+              <p className="text-[#5f6577] text-base font-bold">
+                Saturday, Jan 21
+              </p>
+              <h2 className="text-xl font-bold text-gray-700 font-poppins pt-2 pb-5">
+                Hello, {username}
+              </h2>
 
-            <div
-              className=" md:flex
+              <div
+                className=" md:flex
             "
-            >
-              <Streak dates={dates} />
-            </div>
-            {/* <div className="w-34 h-[1px] bg-[#5f6577]" />
-            <div className="flex justify-between items-center py-4">
-              <div className="flex items-center">
-                <p className="px-5 ">Cool Users List</p>
-                <div className=" w-[1px] h-[40px] bg-[#5f6577]" />
+              >
+                <Streak dates={dates} />
               </div>
+            </div>
 
-              <div className="px-5">
-                <button className="p-2 rounded-2xl border text-blue-600 font-semibold text-sm border-blue-500 bg-blue-400 bg-opacity-5 font-poppins">
-                  Add yourself in cool user list +
-                </button>
-              </div>
-            </div> */}
-          </div>
-
-          <div className="w-full md:w-1/3 p-8 rounded-md shadow-md shadow-[#bcbcbc] border-[#bcbcbc] border-[1px] bg-white">
-            <p className="text-lg font-bold text-gray-700">Badges</p>
-            {/* <Badges /> */}
+            <div className="w-full md:w-1/3 p-8 rounded-md shadow-md shadow-[#bcbcbc21] border-[#bcbcbc40] border-[1px] bg-white">
+              <p className="text-lg font-bold text-gray-700">Badges</p>
+              {/* <Badges /> */}
+            </div>
           </div>
-        </div>
-        <div className="p-8 rounded-md shadow-md shadow-[#bcbcbc] border-[#bcbcbc] border-[1px] bg-white  flex flex-col gap-12">
-          <p className="text-lg font-bold text-gray-700">Contribution Graph</p>
-          <div>
-            <ContributionGraph
-              dates={dates}
-              tweets={tweets}
-              username={username}
-            />
+          <div className="p-8 rounded-md shadow-md shadow-[#bcbcbc20] border-[#bcbcbc32] border-[1px] bg-white flex flex-col gap-12">
+            <p className="text-lg font-bold text-gray-700">
+              Contribution Graph
+            </p>
+            <div>
+              <ContributionGraph
+                dates={dates}
+                tweets={tweets}
+                username={username}
+              />
+            </div>
           </div>
-          <ContributionGraph
-            dates={dates}
-            tweets={tweets}
-            username={username}
-          />
         </div>
       </div>
     </div>

diff --git a/config/supabase.ts b/config/supabase.ts
@@ -1,10 +1,7 @@
 import { createClient } from "@supabase/supabase-js";
 
-// const supabaseURL = process.env.NEXT_PUBLIC_SUPABASE_URL!;
-// const supabaseKey = process.env.NEXT_PUBLIC_ANON_KEY!;
-
-const supabaseURL = 'https://localhost:8000'
-const supabaseKey = '12345657'
+const supabaseURL = process.env.NEXT_PUBLIC_SUPABASE_URL!;
+const supabaseKey = process.env.NEXT_PUBLIC_ANON_KEY!;
 
 const supabase = createClient(supabaseURL, supabaseKey);