Merge pull request #13 from osdc/revert-8-main

Revert "make repo react compatible"
osdc · Jan 8, 2024 · 45c442a · 45c442a
2 parents b71d891 + c10cba0
commit 45c442a
Show file tree

Hide file tree

Showing 20 changed files with 471 additions and 447 deletions.
diff --git a/public/images/bottom left blob.png → images/bottom left blob.png b/public/images/bottom left blob.png → images/bottom left blob.png
diff --git a/public/images/bottom right blob.png → images/bottom right blob.png b/public/images/bottom right blob.png → images/bottom right blob.png
diff --git a/public/images/discord_5968759 1.png → images/discord_5968759 1.png b/public/images/discord_5968759 1.png → images/discord_5968759 1.png
diff --git a/public/images/facebook_1051309 1.png → images/facebook_1051309 1.png b/public/images/facebook_1051309 1.png → images/facebook_1051309 1.png
diff --git a/public/images/github_3488425 1.png → images/github_3488425 1.png b/public/images/github_3488425 1.png → images/github_3488425 1.png
diff --git a/public/images/left blob.png → images/left blob.png b/public/images/left blob.png → images/left blob.png
diff --git a/public/images/logo.png → images/logo.png b/public/images/logo.png → images/logo.png
diff --git a/public/images/osdc.png → images/osdc.png b/public/images/osdc.png → images/osdc.png
diff --git a/public/images/right blob lower.png → images/right blob lower.png b/public/images/right blob lower.png → images/right blob lower.png
diff --git a/public/images/right blob upper.png → images/right blob upper.png b/public/images/right blob upper.png → images/right blob upper.png
diff --git a/public/images/telegram_3536705 1.png → images/telegram_3536705 1.png b/public/images/telegram_3536705 1.png → images/telegram_3536705 1.png
diff --git a/public/images/twitter_5968830 1.png → images/twitter_5968830 1.png b/public/images/twitter_5968830 1.png → images/twitter_5968830 1.png
diff --git a/index.html b/index.html
@@ -1,13 +1,111 @@
-<!DOCTYPE html>
+<<<<<<< HEAD
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>OSDC - open source developers community</title>
+    <title>Vite + React + TS</title>
   </head>
   <body>
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
+=======
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>OSDC-open source developers community</title>
+    <link rel="stylesheet" href="style.css" />
+  </head>
+  <body>
+    <header>
+      <div class="header">
+        <div class="logo">
+          <img src="./images/osdc.png" alt="osdc logo" />
+        </div>
+        <div class="navbar">
+          <li>ABOUT</li>
+          <li>CONTACT</li>
+        </div>
+      </div>
+    </header>
+
+    <section class="logosection">
+      <div class="osdclogo">
+        <img src="./images/logo.png" alt="OSDC DESIGN" />
+        <div class="society">OPEN SOURCE DEVELOPERS COMMUNITY</div>
+        <div class="joindiscord">
+          <div class="invitition">Join our Discord Server</div>
+          <div class="button">
+            <div class="discordbutton">JODC Discord</div>
+          </div>
+        </div>
+      </div>
+    </section>
+
+    <section>
+      <div class="about">
+        <div class="div1">About OSDC</div>
+        <div class="div2">
+          We are an Open Source Community based in and around Jaypee Institute
+          of Information Technology, Noida, India. A community of web
+          developers, android freaks, machine learning enthusiasts, hackers,
+          designers, game developers and most significantly Explorers. We
+          welcome those who believe in the open source philosophy and are
+          willing to sacrifice their naps in order to change the world.
+        </div>
+        <div class="div3">
+          We also organize various workshops, talks and hackathons in an effort
+          towards encouraging more people to lean into the open source world! We
+          love having late night conversations on tech and building new things.
+          If you love the same just hop in, we are looking forward for your
+          participation.
+        </div>
+      </div>
+    </section>
+
+    <section class="findus">
+        <div class="socials">
+            <p>Find us on</p>
+            <div class="socialicons">
+                <img src="./images/discord_5968759 1.png"></img>
+                <img src="./images/github_3488425 1.png"></img>
+                <img src="./images/telegram_3536705 1.png"></img>
+                <img src="./images/twitter_5968830 1.png"></img>
+                <img src="./images/facebook_1051309 1.png"></img>
+            </div>
+        </div>
+    </section>
+
+    <section>
+        <div class="subscribe">
+            <div class="subscribe-message">Subscribe to our Newsletter</div>
+        <div class="emailinput">
+            <div class="bg">
+                <input class="email" type="email" placeholder="Drop your mail here...">
+                <label>Subscribe</label>
+            </div>
+        </div>
+        </div>
+    </section>
+
+    <div class="left-blob">
+        <img src="./images/left blob.png" alt="Left Blob Image">
+    </div>
+    <div class="right-upper-blob">
+        <img src="./images/right blob upper.png" alt="Right upper Blob Image">
+    </div>
+    <div class="right-lower-blob">
+        <img src="./images/right blob lower.png" alt="Right lower Blob Image">
+    </div>
+    <div class="bottom-left-blob">
+        <img src="./images/bottom left blob.png" alt="Bottom left Blob Image">
+    </div>
+    <div class="bottom-right-blob">
+        <img src="./images/bottom right blob.png" alt="Bottom right Blob Image">
+    </div>
+>>>>>>> main
   </body>
 </html>
diff --git a/public/images/logo-removebg-preview.png b/public/images/logo-removebg-preview.png
diff --git a/src/App.css b/src/App.css
@@ -0,0 +1,42 @@
+#root {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.react:hover {
+  filter: drop-shadow(0 0 2em #61dafbaa);
+}
+
+@keyframes logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  a:nth-of-type(2) .logo {
+    animation: logo-spin infinite 20s linear;
+  }
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,11 +1,35 @@
-import Homepage from "./components/Homepage/Homepage";
+import { useState } from 'react'
+import reactLogo from './assets/react.svg'
+import viteLogo from '/vite.svg'
+import './App.css'
+
+function App() {
+  const [count, setCount] = useState(0)
 
-const App = () => {
   return (
     <>
-      <Homepage />
+    <div>
+        <a href="https://vitejs.dev" target="_blank">
+          <img src={viteLogo} className="logo" alt="Vite logo" />
+        </a>
+        <a href="https://react.dev" target="_blank">
+          <img src={reactLogo} className="logo react" alt="React logo" />
+        </a>
+      </div>
+      <h1>Vite + React</h1>
+      <div className="card">
+        <button onClick={() => setCount((count) => count + 1)}>
+          count is {count}
+        </button>
+        <p>
+          Edit <code>src/App.tsx</code> and save to test HMR
+        </p>
+      </div>
+      <p className="read-the-docs">
+        Click on the Vite and React logos to learn more
+      </p>
     </>
-  );
-};
+  )
+}
 
-export default App;
+export default App