Skip to content

Commit

Permalink
fix: textures and added zoom hover animations
Browse files Browse the repository at this point in the history
  • Loading branch information
@alfrdkang
alfrdkang committed Feb 13, 2024
1 parent 79d1891 commit cef80fc
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h1 class="h-1/5 md:text-6xl text-4xl font-concert text-cream m-12">
<textarea id="message" class="bg-orange font-concert block w-full h-18 rounded-3xl text-cream text-xl p-4" name="message" rows="4" cols="50"></textarea>
</div>
</div>
<button type="submit" id="contactsubmitbtn" class="bg-dblue hover:bg-orange font-concert flex w-1/2 h-20 justify-center items-center rounded-full text-cream text-2xl">Send</button>
<button type="submit" id="contactsubmitbtn" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 bg-dblue hover:bg-orange font-concert flex w-1/2 h-20 justify-center items-center rounded-full text-cream text-2xl">Send</button>
</form>
</div>
</div>
Expand Down
32 changes: 16 additions & 16 deletions main.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<span class="self-center sm:text-5xl text-3xl font-concert text-cream">StudyPal</span>
</a>
<div class="flex items-center lg:order-2 space-x-3 lg:space-x-0 rtl:space-x-reverse">
<button type="button" class="lg:flex hidden text-sm bg-cream rounded-full lg:me-0 focus:ring-4 focus:ring-cream" id="userprofile">
<button type="button" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 lg:flex hidden text-sm bg-dblue rounded-full lg:me-0 focus:ring-4 focus:ring-cream" id="userprofile">
<img id='userpfp' class="w-16 h-16 rounded-full" alt="userpfp">
</button>
<!--dropdown-->
Expand All @@ -46,16 +46,16 @@
</div>
<ul class="py-2">
<li>
<div id="dashboardtoggle" class="block px-4 py-2 text3lg font-concert text-cream hover:bg-orange cursor-pointer">Dashboard</div>
<div id="dashboardtoggle" class="block px-4 py-2 text-lg font-concert text-cream hover:bg-cream hover:text-orange cursor-pointer">Dashboard</div>
</li>
<li>
<div id="logout" class=" block px-4 py-2 text3lg font-concert text-cream hover:bg-orange cursor-pointer">
<div id="logout" class=" block px-4 py-2 text-lg font-concert text-cream hover:bg-cream hover:text-orange cursor-pointer">
Sign Out
</div>
</li>
</ul>
</div>
<button type="button" id="hamburgermenu" class="inline-flex items-center p-2 w-18 h-18 justify-center text-sm text-cream rounded-lg lg:hidden hover:bg-orange focus:outline-none">
<button type="button" id="hamburgermenu" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 inline-flex items-center p-2 w-18 h-18 justify-center text-sm text-cream rounded-lg lg:hidden hover:bg-orange focus:outline-none">
<svg class="w-8 h-8" viewBox="0 0 17 14">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 1h15M1 7h15M1 13h15"/>
</svg>
Expand Down Expand Up @@ -120,7 +120,7 @@ <h1 id="leveldisplay" class="text3xl font-concert text-cream m-4">Level: 1</h1>
<div id="" class="sm:w-2/3 w-full h-full flex flex-col">
<div id="avatarpreview3d" class="w-full h-4/5"></div>
<div id="" class="w-full h-1/5 flex justify-center items-center">
<button id="avatareditsubmit" class="bg-orange hover:bg-dora3ge font-concert flex lg:w-1/4 w-1/2 h-4/5 justify-center items-center rounded-full text-cream text-2xl">Select</button>
<button id="avatareditsubmit" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 bg-orange hover:bg-dora3ge font-concert flex lg:w-1/4 w-1/2 h-4/5 justify-center items-center rounded-full text-cream text-2xl">Select</button>
</div>
</div>

Expand All @@ -129,15 +129,15 @@ <h1 id="leveldisplay" class="text3xl font-concert text-cream m-4">Level: 1</h1>
<div id="selectedavatartext" class="text-cream xl:text-5xl lg:text-3xl text-3xl font-concert">SELECTED: jeremy</div>
</div>
<div id="" class="w-full h-4/5 flex justify-center items-center flex-col sm:my-8 my-4">
<div id="jeremyavatar" class="w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-orange hover:bg-dorange rounded-3xl cursor-pointer">
<div id="jeremyavatar" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-orange hover:bg-dorange rounded-3xl cursor-pointer">
<img class="hidden xl:block w-24 h-24 rounded-full mx-6" src="images/pfps/avatar1pfp.png" alt="jeremy">
<div class="text-cream text-3xl font-concert xl:mx-8 mx-3">Jeremy</div>
</div>
<div id="jerryavatar" class="w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-orange hover:bg-dorange rounded-3xl cursor-pointer">
<div id="jerryavatar" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-orange hover:bg-dorange rounded-3xl cursor-pointer">
<img class="hidden xl:block w-24 h-24 rounded-full mx-6" src="images/pfps/avatar2pfp.png" alt="jerry">
<div class="text-cream text-3xl font-concert xl:mx-8 mx-3">Jerry<i id = 'jerrylock' class="fa-solid fa-lock fa-xs mx-4"></i></div>
</div>
<div id="" class="w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-black rounded-3xl">
<div id="" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-black rounded-3xl">
<img class="hidden xl:block w-24 h-24 rounded-full mx-6" src="images/pfps/lockedavatarpfp.png" alt="timmy">
<div class="text-cream text-3xl font-concert xl:mx-8 mx-3">???</div>
</div>
Expand All @@ -162,7 +162,7 @@ <h1 id="leveldisplay" class="text3xl font-concert text-cream m-4">Level: 1</h1>
<div class="flex flex-col justify-center items-center w-full h-5/6">
<img class="w-54 h-54 rounded-full" src="images/pfps/avatar2pfp.png" alt="jerry">
<div id="purchasetitle" class="text-cream text-3xl font-concert m-8">Purchase JERRY for 100 coins?</div>
<button id="avatarpurchasesubmit" class="bg-orange hover:bg-dora3ge font-concert flex lg:w-1/4 w-1/2 h-1/5 justify-center items-center rounded-full text-cream text-2xl">Purchase!</button>
<button id="avatarpurchasesubmit" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 bg-orange hover:bg-dora3ge font-concert flex lg:w-1/4 w-1/2 h-1/5 justify-center items-center rounded-full text-cream text-2xl">Purchase!</button>
</div>
</div>
</div>
Expand All @@ -185,7 +185,7 @@ <h1 id="leveldisplay" class="text3xl font-concert text-cream m-4">Level: 1</h1>
<div id="" class="sm:w-2/3 w-full h-full flex flex-col">
<div id="roompreview3d" class="w-full h-4/5"></div>
<div id="" class="w-full h-1/5 flex justify-center items-center">
<button id="roomeditsubmit" class="bg-orange hover:bg-dora3ge font-concert flex lg:w-1/4 w-1/2 h-4/5 justify-center items-center rounded-full text-cream text-2xl">Select</button>
<button id="roomeditsubmit" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 bg-orange hover:bg-dora3ge font-concert flex lg:w-1/4 w-1/2 h-4/5 justify-center items-center rounded-full text-cream text-2xl">Select</button>
</div>
</div>

Expand All @@ -194,13 +194,13 @@ <h1 id="leveldisplay" class="text3xl font-concert text-cream m-4">Level: 1</h1>
<div id="selectedroomtext" class="text-cream xl:text-5xl lg:text-3xl text-3xl font-concert">SELECTED: bedroom</div>
</div>
<div id="" class="w-full h-4/5 flex justify-center items-center flex-col sm:my-8 my-4">
<div id="bedroomroom" class="w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-orange hover:bg-dorange rounded-3xl cursor-pointer">
<div id="bedroomroom" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-orange hover:bg-dorange rounded-3xl cursor-pointer">
<div class="text-cream lg:text-3xl text-2xl font-concert xl:mx-8 mx-3">Bedroom</div>
</div>
<div id="roomroom" class="w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-orange hover:bg-dorange rounded-3xl cursor-pointer">
<div id="roomroom" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-orange hover:bg-dorange rounded-3xl cursor-pointer">
<div class="text-cream lg:text-3xl text-2xl font-concert xl:mx-8 mx-3">Room<i id = 'roomlock' class="fa-solid fa-lock fa-xs mx-4"></i></div>
</div>
<div id="" class="w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-black rounded-3xl">
<div id="" class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 w-5/6 sm:h-1/3 h-full flex xl:justify-between justify-center items-center sm:m-2 m-1 bg-black rounded-3xl">
<div class="text-cream text-3xl font-concert xl:mx-8 mx-3">???</div>
</div>
</div>
Expand Down Expand Up @@ -286,7 +286,7 @@ <h1 id="leveldisplay" class="text3xl font-concert text-cream m-4">Level: 1</h1>
[&::-webkit-slider-runnable-track]:rounded-full" min="1" max="8" step="1">
<div class="bg-orange md:w-1/2 w-11/12 h-auto rounded-3xl flex justify-center items-center flex-row p-4">
<div class="font-concert md:text-4xl text-2xl text-cream m-4 w-1/3">
Rewards:
REWARDS
</div>
<div class="flex w-1/3 justify-center items-center flex-col m-2">
<i class="fa-solid fa-coins text-cream fa-2xl m-4"></i>
Expand All @@ -304,7 +304,7 @@ <h1 id="leveldisplay" class="text3xl font-concert text-cream m-4">Level: 1</h1>
</div>

<div class="flex flex-row justify-center items-center h-2/6">
<div id='startstudybtn' class="bg-cream p-8 rounded-full text-dblue text-3xl font-concert cursor-pointer hover:bg-orange hover:text-cream">Start Studying!</div>
<div id='startstudybtn' class="transition ease-in-out delay-50 hover:-translate-y-1 hover:scale-110 bg-cream p-8 rounded-full text-dblue text-3xl font-concert cursor-pointer hover:bg-orange hover:text-cream">Start Studying!</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -382,7 +382,7 @@ <h1 class="text-dblue font-concert text-6xl">Stop</h1>
</div>
<div class="bg-orange w-3/4 h-full rounded-3xl my-4 flex justify-center items-center lg:flex-row flex-col p-6">
<div class="flex justify-center items-center font-concert lg:text-6xl text-4xl text-cream w-1/2 h-full">
Rewards:
REWARDS
</div>
<div class="flex w-1/4 h-full justify-center items-center lg:flex-col flex-row m-2">
<i class="fa-solid fa-coins text-cream fa-2xl my-4"></i>
Expand Down
Binary file removed models/.DS_Store
View file
Binary file not shown.
Binary file modified models/avatar1.glb
View file
Binary file not shown.
Binary file modified models/avatar2.glb
View file
Binary file not shown.
Binary file modified models/room1-avatar1.glb
View file
Binary file not shown.
Binary file modified models/room1-avatar2.glb
View file
Binary file not shown.
Binary file modified models/room1.glb
View file
Binary file not shown.
Binary file modified models/room2-avatar1.glb
View file
Binary file not shown.
Binary file modified models/room2-avatar2.glb
View file
Binary file not shown.
Binary file modified models/room2.glb
View file
Binary file not shown.

0 comments on commit cef80fc

Please sign in to comment.