updates

J-Rebs · Nov 24, 2022 · 016bd31 · 016bd31
2 parents 6061015 + c364831
commit 016bd31
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <main>
-    <h1 class="text-xl font-bold "><a href="/">Mean Rice</a></h1>
+    <h1 class="text-xl font-bold px-6 py-6"><a href="/">Mean Rice</a></h1>
     <slot  /> 
 </main>
 

diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte
@@ -10,7 +10,7 @@
   let listUsersCallCount = 0;
   let userList = [];
   async function listUsers() {
-    // axios format call src: https://rapidapi.com/guides/call-apis-svelte-axios 
+    // axios format call src: https://rapidapi.com/guides/call-apis-svelte-axios
     let error = null;
     try {
       const res = await axios.get(
@@ -43,9 +43,20 @@
         <div class="grid auto-cols-auto auto-rows-auto gap-4">
           <!--each block src: https://svelte.dev/tutorial/each-blocks-->
           {#each userList as { userId, realName, userType, mainGenre, age }}
+<<<<<<< HEAD
             <div class="transition ease-in-out delay-10 hover:-translate-y-1 hover:scale-110 duration-300 bg-white hover:bg-gray-100 text-gray-800 font-semibold py-2 px-4 border border-gray-400 rounded shadow shadow-lg shadow-indigo-500/50">
               userId: {userId} Name: {realName} userType: {userType} mainGenre: {mainGenre}
               age:{age}
+=======
+            <div
+              class="transition ease-in-out delay-10 hover:-translate-y-1 hover:scale-102 duration-300 bg-white hover:bg-gray-100 text-gray-800 font-semibold py-2 px-4 border border-gray-400 rounded shadow shadow-lg shadow-cyan-500/50"
+            >
+              <div>userId: {userId}</div>
+              <div>Name: {realName}</div>
+              <div>userType: {userType}</div>
+              <div>mainGenre: {mainGenre}</div>
+              <div>age:{age}</div>
+>>>>>>> c3648316e026acc3c3141d9fe3951b0932e78891
             </div>
           {/each}
         </div>