Merge pull request #15 from Elgius/main

testing new icons package + shitty navbar done

package-lock.json

@@ -10,7 +10,7 @@
 			"dependencies": {
 				"@iconify/svelte": "^3.1.0",
 				"daisyui": "^2.51.5",
-				"react-icons": "^4.8.0",
+				"svelte-icons-pack": "^2.1.0",
 				"sveltegram": "^1.1.5"
 			},
 			"devDependencies": {
@@ -1775,12 +1775,6 @@
 				"url": "https://opencollective.com/js-sdsl"
 			}
 		},
-		"node_modules/js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"peer": true
-		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -1873,18 +1867,6 @@
 			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
 			"dev": true
 		},
-		"node_modules/loose-envify": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-			"peer": true,
-			"dependencies": {
-				"js-tokens": "^3.0.0 || ^4.0.0"
-			},
-			"bin": {
-				"loose-envify": "cli.js"
-			}
-		},
 		"node_modules/loupe": {
 			"version": "2.3.6",
 			"resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
@@ -2387,26 +2369,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/react": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-			"integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-			"peer": true,
-			"dependencies": {
-				"loose-envify": "^1.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/react-icons": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.8.0.tgz",
-			"integrity": "sha512-N6+kOLcihDiAnj5Czu637waJqSnwlMNROzVZMhfX68V/9bu9qHaMIJC4UdozWoOk57gahFCNHwVvWzm0MTzRjg==",
-			"peerDependencies": {
-				"react": "*"
-			}
-		},
 		"node_modules/read-cache": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -2718,6 +2680,11 @@
 				"svelte": ">=3.19.0"
 			}
 		},
+		"node_modules/svelte-icons-pack": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/svelte-icons-pack/-/svelte-icons-pack-2.1.0.tgz",
+			"integrity": "sha512-6Il0vWi/6MW3wXSorZhCqhkJGH4Pcg1WTcdlfFMPXfJqafZVQgmKdhVFS1c2hXGvs4byttpLC9XmI3okV1uMWA=="
+		},
 		"node_modules/sveltegram": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/sveltegram/-/sveltegram-1.1.5.tgz",
@@ -4254,12 +4221,6 @@
 			"integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
 			"dev": true
 		},
-		"js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"peer": true
-		},
 		"js-yaml": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -4328,15 +4289,6 @@
 			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
 			"dev": true
 		},
-		"loose-envify": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-			"peer": true,
-			"requires": {
-				"js-tokens": "^3.0.0 || ^4.0.0"
-			}
-		},
 		"loupe": {
 			"version": "2.3.6",
 			"resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
@@ -4644,21 +4596,6 @@
 			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
 			"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
 		},
-		"react": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-			"integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-			"peer": true,
-			"requires": {
-				"loose-envify": "^1.1.0"
-			}
-		},
-		"react-icons": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.8.0.tgz",
-			"integrity": "sha512-N6+kOLcihDiAnj5Czu637waJqSnwlMNROzVZMhfX68V/9bu9qHaMIJC4UdozWoOk57gahFCNHwVvWzm0MTzRjg==",
-			"requires": {}
-		},
 		"read-cache": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -4866,6 +4803,11 @@
 			"dev": true,
 			"requires": {}
 		},
+		"svelte-icons-pack": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/svelte-icons-pack/-/svelte-icons-pack-2.1.0.tgz",
+			"integrity": "sha512-6Il0vWi/6MW3wXSorZhCqhkJGH4Pcg1WTcdlfFMPXfJqafZVQgmKdhVFS1c2hXGvs4byttpLC9XmI3okV1uMWA=="
+		},
 		"sveltegram": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/sveltegram/-/sveltegram-1.1.5.tgz",

package.json

@@ -31,7 +31,7 @@
 	"dependencies": {
 		"@iconify/svelte": "^3.1.0",
 		"daisyui": "^2.51.5",
-		"react-icons": "^4.8.0",
+		"svelte-icons-pack": "^2.1.0",
 		"sveltegram": "^1.1.5"
 	}
 }

src/lib/components/navbar.svelte

@@ -1,9 +1,17 @@
 <script>
+	import Icon from 'svelte-icons-pack/Icon.svelte'
+	import BiArrowBack from "svelte-icons-pack/bi/BiArrowBack";
+	import BiSolidHome from "svelte-icons-pack/bi/BiSolidHome";
+	import BsPerson from "svelte-icons-pack/bs/BsPerson";
 
 </script>
 
-<section>
+<div class='border border-black rounded-lg'>
-    <nav>
+<div class="p-2">
-        
+<ul class="flex flex-row gap-2 items-center justify-between">
-    </nav>
+	<li><Icon src ={BiArrowBack} size={20} /></li>
-</section>
+	<li><Icon src={BiSolidHome} size={20} /></li>
+	<li><Icon src={BsPerson} size={20} /></li>
+</ul>
+</div>
+</div>

src/routes/bio/+page.svelte

@@ -36,7 +36,7 @@
         <input type="text" placeholder="Instagram" class="input w-full max-w-xs" />
         <input type="text" placeholder="Discord" class="input w-full max-w-xs" />
         <input type="text" placeholder="Twitter" class="input w-full max-w-xs" />
-        <input type="text" placeholder="Tik Tok" class="input w-full max-w-xs" />
+        <input type="text" placeholder="TikTok" class="input w-full max-w-xs" />
         <input type="text" placeholder="SnapChat" class="input w-full max-w-xs" />
     </div>
 </div>

src/routes/leaderboard/+page.svelte

@@ -1,66 +1,67 @@
 <script>
-
+	import Navbar from '../../lib/components/navbar.svelte';
 </script>
 
-
 <section>
-    <div class="text-center mt-5">
+	<div class="text-center mt-5">
 		<h1 class="text-3xl font-bold">Honesty</h1>
 		<p class="text-sm font-bold">by Fishie</p>
 	</div>
 
-    <div class="mt-10 mb-10 flex justify-center items-center">
+	<div class="mt-10 mb-10 flex justify-center items-center">
-        <p class="text-sm font-bold">Leaderboard</p>
+		<p class="text-sm font-bold">Leaderboard</p>
-    </div>
+	</div>
 
-    <div class="flex flex-col gap-4 items-center justify-center">
+	<div class="flex flex-col gap-4 items-center justify-center">
+		<div class="card w-96 bg-base-100 shadow-xl">
+			<div class="card-body p-10 rounded-lg">
+				<div class="avatar">
+					<div class="w-20 rounded-full">
+						<img
+							src="https://plus.unsplash.com/premium_photo-1679596990314-7296548d8acb?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1170&q=80"
+							alt="profile pic"
+						/>
+						<div />
+					</div>
 
-    <div class="card w-96 bg-base-100 shadow-xl">
+					<h1 class="mr-10">@Username</h1>
-        <div class="card-body p-10 rounded-lg">
+				</div>
-            <div class="avatar">
+			</div>
-                <div class="w-20 rounded-full">
+		</div>
-                    <img
-                        src="https://plus.unsplash.com/premium_photo-1679596990314-7296548d8acb?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1170&q=80"
-                        alt="profile pic"
-                    />
-                    <div />
-                </div>
 
-                <h1 class="mr-10">@Username</h1>
+		<div class="card w-96 bg-base-100 shadow-xl">
-            </div>
+			<div class="card-body p-10 rounded-lg">
+				<div class="avatar">
+					<div class="w-20 rounded-full">
+						<img
+							src="https://plus.unsplash.com/premium_photo-1679596990314-7296548d8acb?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1170&q=80"
+							alt="profile pic"
+						/>
+						<div />
+					</div>
+
+					<h1 class="mr-10">@Username</h1>
+				</div>
+			</div>
+		</div>
+
+		<div class="card w-96 bg-base-100 shadow-xl">
+			<div class="card-body p-10 rounded-lg">
+				<div class="avatar">
+					<div class="w-20 rounded-full">
+						<img
+							src="https://plus.unsplash.com/premium_photo-1679596990314-7296548d8acb?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1170&q=80"
+							alt="profile pic"
+						/>
+						<div />
+					</div>
+
+					<h1 class="mr-10">@Username</h1>
+				</div>
+			</div>
+		</div>
+		<div class="container mt-10">
+            <Navbar />
         </div>
-    </div>
+	</div>
-
+</section>
-    <div class="card w-96 bg-base-100 shadow-xl">
-        <div class="card-body p-10 rounded-lg">
-            <div class="avatar">
-                <div class="w-20 rounded-full">
-                    <img
-                        src="https://plus.unsplash.com/premium_photo-1679596990314-7296548d8acb?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1170&q=80"
-                        alt="profile pic"
-                    />
-                    <div />
-                </div>
-
-                <h1 class="mr-10">@Username</h1>
-            </div>
-        </div>
-    </div>
-
-    <div class="card w-96 bg-base-100 shadow-xl">
-        <div class="card-body p-10 rounded-lg">
-            <div class="avatar">
-                <div class="w-20 rounded-full">
-                    <img
-                        src="https://plus.unsplash.com/premium_photo-1679596990314-7296548d8acb?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1170&q=80"
-                        alt="profile pic"
-                    />
-                    <div />
-                </div>
-
-                <h1 class="mr-10">@Username</h1>
-            </div>
-        </div>
-    </div>
-</div>
-</section>