Merge branch 'OpenLake:main' into main

OpenLake · Aug 15, 2023 · bb32ec6 · bb32ec6
2 parents 84c2b08 + baa1bef
commit bb32ec6
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 24 deletions.
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Pixels</title>
+    <title>PixOss</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "pixels",
+  "name": "PixOss",
   "private": true,
   "version": "0.0.0",
   "type": "module",

diff --git a/src/App.tsx b/src/App.tsx
@@ -8,7 +8,7 @@ function App() {
       <div className="navbar h-[4rem] w-screen">
         <Navbar />
       </div>
-      <div className="overflow-hidden h-[calc(100vh-8rem)]">
+      <div className="overflow-hidden h-[calc(100vh-8rem)] bg-teal-50		">
         <Grid />
       </div>
       <div className="footer h-[4rem]">

diff --git a/src/assets/ashokachakr.png b/src/assets/ashokachakr.png
diff --git a/src/components/Grid/Grid.tsx b/src/components/Grid/Grid.tsx
@@ -20,7 +20,7 @@ function Grid() {
   };
 
   return (
-    <div className="w-screen flex-row  object-fit  p-2">
+    <div className="w-screen flex-row relative parent-component object-fit  p-2">
       <PixelModal
         color={data.color}
         open={open}
@@ -60,6 +60,13 @@ function Grid() {
           </div>
         ))}
       </div>
+      <div>
+        <img
+          src="src/assets/ashokachakr.png"
+          alt="Centered Image"
+          className="absolute lg:h-[32%] lg:w-[11%] h-[32%] w-[40%] l-1/3 lg:top-[36.5%] lg:left-[45.5%] top-[36.5%] left-[35%]"
+        />
+      </div>
     </div>
   );
 }

diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
@@ -7,7 +7,7 @@ function Navbar() {
       const fetchData = async () => {
         try {
           const response = await fetch(
-            'https://api.github.com/repos/OpenLake/pixels/stargazers',
+            'https://api.github.com/repos/OpenLake/PixOss/stargazers',
           );
           const data = await response.json();
           setStars(data.length);
@@ -19,13 +19,13 @@ function Navbar() {
     } catch (error) {}
   }, []);
   return (
-    <div className="flex justify-between items-center px-8 bg-[#CFC7E9] shadow-md py-4">
+    <div className="flex justify-between items-center px-8 bg-cyan-500	 shadow-md py-4">
       <div className="text-center">
-        <span className="text-center text-[24px] font-semibold font-['Handjet']">
-          Pixels
+        <span className="text-center text-[24px] font-semibold font-VT323">
+          PixOss
         </span>
       </div>
-      <a href="https://github.com/JaeAeich/Pixels">
+      <a href="https://github.com/OpenLake/PixOss">
         <div className="flex gap-2 items-center">
           <div>
             <svg

diff --git a/src/data/pixel.ts b/src/data/pixel.ts
@@ -5,11 +5,10 @@ const grid: GridItem[][] = [
     {
       col: 1,
       row: 1,
-      color: 'saffron',
-      name: 'Javed Habib',
-      message:
-        'I wish I knew what I know now, so I could have left when I stayed.',
-      pfp: 'https://media.licdn.com/dms/image/D4D03AQFgthDnt_Zamw/profile-displayphoto-shrink_200_200/0/1688625638904?e=1697673600&v=beta&t=-3kwd33P_IeW1Ezt_3TuIiUrCb06RLZNf8d-8Zi5M1w',
+      color: '',
+      name: '',
+      message: '',
+      pfp: 'https://upload.wikimedia.org/wikipedia/commons/a/ac/Default_pfp.jp',
     },
     {
       col: 2,
@@ -402,7 +401,7 @@ const grid: GridItem[][] = [
       color: '',
       name: '',
       message: '',
-      pfp: 'https://upload.wikimedia.org/wikipedia/commons/a/ac/Default_pfp.jpg',
+      pfp: 'https://upload.wikimedia.org/wikipedia/commons/a/ac/Default_pfp.jp',
     },
     {
       row: 5,
@@ -1165,18 +1164,18 @@ const grid: GridItem[][] = [
     {
       row: 12,
       col: 11,
-      color: 'green',
-      name: 'Aditya Dubey',
-      message: 'Groot',
-      pfp: 'https://avatars.githubusercontent.com/u/102402625?v=4',
+      color: '',
+      name: '',
+      message: '',
+      pfp: 'https://upload.wikimedia.org/wikipedia/commons/a/ac/Default_pfp.jp',
     },
     {
       row: 12,
       col: 12,
-      color: 'green',
-      name: 'Tushar Bansal',
-      message: 'Trust nobody',
-      pfp: 'https://avatars.githubusercontent.com/u/104081946?v=4',
+      color: '',
+      name: '',
+      message: '',
+      pfp: 'https://upload.wikimedia.org/wikipedia/commons/a/ac/Default_pfp.jp',
     },
   ],
 ];

diff --git a/src/index.css b/src/index.css
@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css2?family=Handjet:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=VT323&display=swap');
 @tailwind base;
 @tailwind components;
 @tailwind utilities;