From b898d7fe6f9d1c9585c719d874893767be8bc56b Mon Sep 17 00:00:00 2001 From: Jarrett Fok Date: Mon, 10 Apr 2023 14:21:46 -0400 Subject: [PATCH 1/8] store basic interface --- src/routes/Homepage.svelte | 24 ++++- src/routes/ModalManager.svelte | 5 + src/routes/components/StoreModal.svelte | 134 ++++++++++++++++++++++++ 3 files changed, 158 insertions(+), 5 deletions(-) create mode 100644 src/routes/components/StoreModal.svelte diff --git a/src/routes/Homepage.svelte b/src/routes/Homepage.svelte index af35cd7..c28cadd 100644 --- a/src/routes/Homepage.svelte +++ b/src/routes/Homepage.svelte @@ -46,6 +46,16 @@ }); }; + const storeModal = () => { + SessionStore.set({ + inSession: false, + sessionLength: 0, + modalType: "store", + counter: $SessionStore.counter+1, + sessionActivity: "" + }); + }; + const logout = () => { SessionStore.set({ inSession: false, @@ -193,17 +203,21 @@ {:else if currentRoom == "Gray"} isometric {/if} +
+ coin-icon +
{ $UserInfoStore.coins }
+
+
- + +
+
-
- coin-icon -
{ $UserInfoStore.coins }
-
+ {/if} diff --git a/src/routes/ModalManager.svelte b/src/routes/ModalManager.svelte index 84a7632..0e52f2d 100644 --- a/src/routes/ModalManager.svelte +++ b/src/routes/ModalManager.svelte @@ -4,6 +4,7 @@ import FinishedSessionModal from './components/FinishedSessionModal.svelte'; import ActivitiesModal from './components/ActivitiesModal.svelte'; import CustomizationModal from './components/CustomizationModal.svelte'; + import StoreModal from './components/StoreModal.svelte'; import { writable } from 'svelte/store'; import Modal from 'svelte-simple-modal'; @@ -32,6 +33,10 @@ // @ts-ignore modal.set(CustomizationModal); } + if ($SessionStore.modalType == "store") { + // @ts-ignore + modal.set(StoreModal); + } currModal = $SessionStore.modalType; counter = $SessionStore.counter; } diff --git a/src/routes/components/StoreModal.svelte b/src/routes/components/StoreModal.svelte new file mode 100644 index 0000000..74563d0 --- /dev/null +++ b/src/routes/components/StoreModal.svelte @@ -0,0 +1,134 @@ + + + + +
+

Store

+
+
+ +
+
+ +
+ +
+ +
+
+ {#if currentRoom=="Bed_Room"} + {#each bed_room_inventory as decoration} + {#if !$UserInfoStore.decorations.includes(decoration.item_name)} + + {/if} + {/each} + {:else if currentRoom=="Living_Room"} + {#each living_room_inventory as decoration} + {#if !$UserInfoStore.decorations.includes(decoration.item_name)} + + {/if} + {/each} + {:else} + {#each library_inventory as decoration} + {#if !$UserInfoStore.decorations.includes(decoration.item_name)} + + {/if} + {/each} + {/if} + + + + + +
From 8197c9ae24d841d2025d804c975368b0e30c8f90 Mon Sep 17 00:00:00 2001 From: Jarrett Fok Date: Thu, 13 Apr 2023 19:27:36 -0400 Subject: [PATCH 2/8] old store design if needed --- src/Firebase.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Firebase.js b/src/Firebase.js index 0f46104..309b335 100644 --- a/src/Firebase.js +++ b/src/Firebase.js @@ -167,11 +167,31 @@ async function buyRoom(room, price) { console.log(e); } } +/** + * @param {string} decoration + * @param {number} price + */ +async function buyDecoration(decoration, price) { + try { + let decorations = get(UserInfoStore).rooms; + decorations.push(decoration); + await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), { + "uid": get(UserInfoStore).uid, + "coins": get(UserInfoStore).coins - price, + "rooms": get(UserInfoStore).rooms, + "decorations": decorations + }); + } + catch (e) { + console.log(e); + } +} export { loginWithGoogle, logoutFromGoogle, addActivity, getActivities, - buyRoom + buyRoom, + buyDecoration } \ No newline at end of file From b4d8125a8675f1e15114eca586550e71ab3b2ada Mon Sep 17 00:00:00 2001 From: Jarrett Fok Date: Sat, 15 Apr 2023 12:01:02 -0400 Subject: [PATCH 3/8] store with styling --- src/routes/components/StoreModal.svelte | 108 +++++++++++++++++------- 1 file changed, 77 insertions(+), 31 deletions(-) diff --git a/src/routes/components/StoreModal.svelte b/src/routes/components/StoreModal.svelte index 74563d0..282a0b7 100644 --- a/src/routes/components/StoreModal.svelte +++ b/src/routes/components/StoreModal.svelte @@ -5,44 +5,58 @@ const bed_room_inventory = [ { - item_name: "Bedroom-Bed-1", + item_name: "Bed-1", + item_type: "Bed", price: 100 }, { - item_name: "Bedroom-BBed-2", + item_name: "Bed-2", + item_type: "Bed", price: 500 }, { - item_name: "Bedroom-BBed-3", - price: 999999 - } - ] - const living_room_inventory = [ - { - item_name: "Living-Bed-1", + item_name: "Desk-1", + item_type: "Desk", price: 100 }, { - item_name: "Living-BBed-2", - price: 500 - }, + item_name: "Desk-2", + item_type: "Desk", + price: 300 + } + , + { + item_name: "wallpaper-blue", + item_type: "Wallpaper", + price: 200 + } + , { - item_name: "Living-BBed-3", - price: 999999 + item_name: "wallpaper-pink", + item_type: "Wallpaper", + price: 500 } ] const library_inventory = [ { - item_name: "library-Bed-1", + item_name: "Bookshelf-1", + item_type: "Bookshelf", price: 100 }, { - item_name: "library-BBed-2", - price: 500 + item_name: "Bookshelf-2", + item_type: "Bookshelf", + price: 200 + }, + { + item_name: "Chair-1", + item_type: "Chair", + price: 100 }, { - item_name: "library-BBed-3", - price: 999999 + item_name: "Chair-2", + item_type: "Chair", + price: 200 } ] @@ -89,7 +103,27 @@ display: flex; } .room-options{ - width: 33%; + width: 50%; + } + + .underlined { + padding-bottom: 0.25rem; + border-bottom: solid 1px white; + margin-bottom: 0.75rem; + font-size: 1.25rem; + } + .store { + overflow-y: scroll; + max-height: 60vh; + } + + ::-webkit-scrollbar { + width: 0.4rem; + } + + ::-webkit-scrollbar-thumb { + background: white; + border-radius: 0.2rem; } @@ -97,35 +131,47 @@

Store

- +
-
- -
-
- +
+
{#if currentRoom=="Bed_Room"} +
Desk
{#each bed_room_inventory as decoration} - {#if !$UserInfoStore.decorations.includes(decoration.item_name)} + {#if !$UserInfoStore.decorations.includes(decoration.item_name) && decoration.item_type == "Desk"} {/if} {/each} - {:else if currentRoom=="Living_Room"} - {#each living_room_inventory as decoration} - {#if !$UserInfoStore.decorations.includes(decoration.item_name)} +
Bed
+ {#each bed_room_inventory as decoration} + {#if !$UserInfoStore.decorations.includes(decoration.item_name) && decoration.item_type == "Bed"} + + {/if} + {/each} +
Wallpaper
+ {#each bed_room_inventory as decoration} + {#if !$UserInfoStore.decorations.includes(decoration.item_name) && decoration.item_type == "Wallpaper"} {/if} {/each} {:else} +
Bookshelf
{#each library_inventory as decoration} - {#if !$UserInfoStore.decorations.includes(decoration.item_name)} + {#if !$UserInfoStore.decorations.includes(decoration.item_name) && decoration.item_type == "Bookshelf"} + + {/if} + {/each} +
Chair
+ {#each library_inventory as decoration} + {#if !$UserInfoStore.decorations.includes(decoration.item_name) && decoration.item_type == "Chair"} {/if} {/each} {/if} +
From 627746e08536dbdad8c5a2f92a2b86958e1deba0 Mon Sep 17 00:00:00 2001 From: Jarrett Fok Date: Mon, 24 Apr 2023 12:03:31 -0400 Subject: [PATCH 4/8] daily reward with a twist --- src/Firebase.js | 53 +++++++++++++++++++++--- src/UserInfoStore.ts | 5 ++- src/routes/Homepage.svelte | 52 ++++++++++++++++++++++- src/routes/ModalManager.svelte | 5 +++ src/routes/components/DailyReward.svelte | 21 ++++++++++ 5 files changed, 127 insertions(+), 9 deletions(-) create mode 100644 src/routes/components/DailyReward.svelte diff --git a/src/Firebase.js b/src/Firebase.js index 309b335..7a4db95 100644 --- a/src/Firebase.js +++ b/src/Firebase.js @@ -41,7 +41,8 @@ async function loginWithGoogle() { "uid": uid_str, "coins": 0, "rooms": ["Gray"], - "decorations": [] + "decorations": [], + "lastLogin": Date.now() }); } catch (e) { @@ -60,7 +61,9 @@ async function loginWithGoogle() { // @ts-ignore rooms: doc.data().rooms, // @ts-ignore - decorations: doc.data().decorations + decorations: doc.data().decorations, + // @ts-ignore + lastLogin: doc.data().lastLogin }); } } @@ -117,7 +120,8 @@ async function addActivity(activity, date, length) { "uid": get(UserInfoStore).uid, "coins": get(UserInfoStore).coins + Math.round(length/1000), "rooms": get(UserInfoStore).rooms, - "decorations": get(UserInfoStore).decorations + "decorations": get(UserInfoStore).decorations, + "lastLogin": get(UserInfoStore).lastLogin }); } catch (e) { @@ -160,7 +164,9 @@ async function buyRoom(room, price) { "uid": get(UserInfoStore).uid, "coins": get(UserInfoStore).coins - price, "rooms": rooms, - "decorations": get(UserInfoStore).decorations + "decorations": get(UserInfoStore).decorations, + "lastLogin": get(UserInfoStore).lastLogin + }); } catch (e) { @@ -179,7 +185,8 @@ async function buyDecoration(decoration, price) { "uid": get(UserInfoStore).uid, "coins": get(UserInfoStore).coins - price, "rooms": get(UserInfoStore).rooms, - "decorations": decorations + "decorations": decorations, + "lastLogin": get(UserInfoStore).lastLogin }); } catch (e) { @@ -187,11 +194,45 @@ async function buyDecoration(decoration, price) { } } +/** + * + * @param {number} newTime + */ +async function addLastLogin(newTime){ + try{ + let currentime = Date.now(); + await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), { + "uid": get(UserInfoStore).uid, + "coins": get(UserInfoStore).coins + 100, + "rooms": get(UserInfoStore).rooms, + "decorations": get(UserInfoStore).decorations, + "lastLogin": newTime + }); + } + catch (e){ + console.log(e); + } +} +/* + +Adding daily reward function + + ->at the mount portion + +Friend list func + +Add +Delete +Reject + +*/ + export { loginWithGoogle, logoutFromGoogle, addActivity, getActivities, buyRoom, - buyDecoration + buyDecoration, + addLastLogin } \ No newline at end of file diff --git a/src/UserInfoStore.ts b/src/UserInfoStore.ts index 48b95d0..d90f464 100644 --- a/src/UserInfoStore.ts +++ b/src/UserInfoStore.ts @@ -5,11 +5,14 @@ const UserInfoStore = writable<{ coins: number, rooms: [string], decorations: [string] + lastLogin: number }>({ uid: "", coins: 0, rooms: [""], - decorations: [""] + decorations: [""], + lastLogin: 0 + // Date.now() }); export default { diff --git a/src/routes/Homepage.svelte b/src/routes/Homepage.svelte index c28cadd..c7021a4 100644 --- a/src/routes/Homepage.svelte +++ b/src/routes/Homepage.svelte @@ -12,10 +12,25 @@ */ let currentRoom; + /** + * @type {boolean} + */ + let visible = true; + onMount(() => { - currentRoom = "Gray"; + currentRoom = "Gray"; + }); + const dailyRewardModal = () =>{ + SessionStore.set({ + inSession: false, + sessionLength: 0, + modalType: "dailyReward", + counter: $SessionStore.counter+1, + sessionActivity: "" + }); + } const startSessionModal = () => { SessionStore.set({ inSession: false, @@ -88,6 +103,10 @@ } } } + + const clicked = () => { + visible = false + } -logout +
+ {#if visible} + + {/if} + logout +
+ {#if $SessionStore.inSession} {:else} diff --git a/src/routes/ModalManager.svelte b/src/routes/ModalManager.svelte index 0e52f2d..881ee3b 100644 --- a/src/routes/ModalManager.svelte +++ b/src/routes/ModalManager.svelte @@ -7,6 +7,7 @@ import StoreModal from './components/StoreModal.svelte'; import { writable } from 'svelte/store'; import Modal from 'svelte-simple-modal'; + import DailyReward from './components/DailyReward.svelte'; const modal = writable(null); let currModal = ""; @@ -37,6 +38,10 @@ // @ts-ignore modal.set(StoreModal); } + if ($SessionStore.modalType == "dailyReward") { + // @ts-ignore + modal.set(DailyReward); + } currModal = $SessionStore.modalType; counter = $SessionStore.counter; } diff --git a/src/routes/components/DailyReward.svelte b/src/routes/components/DailyReward.svelte new file mode 100644 index 0000000..6c6a205 --- /dev/null +++ b/src/routes/components/DailyReward.svelte @@ -0,0 +1,21 @@ + + +

Daily Reward!

+

Welcome back!

+

You earned 100 coins!

\ No newline at end of file From d4632e6760370aa3a5c3af1ce8704dbcf124f99f Mon Sep 17 00:00:00 2001 From: Jarrett Fok Date: Mon, 24 Apr 2023 13:36:18 -0400 Subject: [PATCH 5/8] daily rewards --- src/Firebase.js | 148 +++++++++++++++++++++++++++++++++---- src/UserInfoStore.ts | 12 ++- src/routes/Homepage.svelte | 27 ++++++- 3 files changed, 168 insertions(+), 19 deletions(-) diff --git a/src/Firebase.js b/src/Firebase.js index 7a4db95..71cab35 100644 --- a/src/Firebase.js +++ b/src/Firebase.js @@ -42,7 +42,10 @@ async function loginWithGoogle() { "coins": 0, "rooms": ["Gray"], "decorations": [], - "lastLogin": Date.now() + "lastLogin": Date.now(), + // "friends": [], + // "requests": [], + // "email": "" }); } catch (e) { @@ -63,7 +66,13 @@ async function loginWithGoogle() { // @ts-ignore decorations: doc.data().decorations, // @ts-ignore - lastLogin: doc.data().lastLogin + lastLogin: doc.data().lastLogin, + // // @ts-ignore + // friends: doc.data().friends, + // // @ts-ignore + // requests: doc.data().requests, + // // @ts-ignore + // email: doc.data().email }); } } @@ -121,7 +130,10 @@ async function addActivity(activity, date, length) { "coins": get(UserInfoStore).coins + Math.round(length/1000), "rooms": get(UserInfoStore).rooms, "decorations": get(UserInfoStore).decorations, - "lastLogin": get(UserInfoStore).lastLogin + "lastLogin": get(UserInfoStore).lastLogin, + // "friends": get(UserInfoStore).friends, + // "requests": get(UserInfoStore).requests, + // "email": get(UserInfoStore).email }); } catch (e) { @@ -165,7 +177,10 @@ async function buyRoom(room, price) { "coins": get(UserInfoStore).coins - price, "rooms": rooms, "decorations": get(UserInfoStore).decorations, - "lastLogin": get(UserInfoStore).lastLogin + "lastLogin": get(UserInfoStore).lastLogin, + // "friends": get(UserInfoStore).friends, + // "requests": get(UserInfoStore).requests, + // "email": get(UserInfoStore).email }); } @@ -186,7 +201,10 @@ async function buyDecoration(decoration, price) { "coins": get(UserInfoStore).coins - price, "rooms": get(UserInfoStore).rooms, "decorations": decorations, - "lastLogin": get(UserInfoStore).lastLogin + "lastLogin": get(UserInfoStore).lastLogin, + // "friends": get(UserInfoStore).friends, + // "requests": get(UserInfoStore).requests, + // "email": get(UserInfoStore).email }); } catch (e) { @@ -200,13 +218,15 @@ async function buyDecoration(decoration, price) { */ async function addLastLogin(newTime){ try{ - let currentime = Date.now(); await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), { "uid": get(UserInfoStore).uid, - "coins": get(UserInfoStore).coins + 100, + "coins": get(UserInfoStore).coins, "rooms": get(UserInfoStore).rooms, "decorations": get(UserInfoStore).decorations, - "lastLogin": newTime + "lastLogin": newTime, + // "friends": get(UserInfoStore).friends, + // "requests": get(UserInfoStore).requests, + // "email": get(UserInfoStore).email }); } catch (e){ @@ -214,19 +234,117 @@ async function addLastLogin(newTime){ } } /* - -Adding daily reward function - - ->at the mount portion - Friend list func -Add +Add (accept) Delete -Reject +Decline +Send */ +/** + * + * @param {any} aFriend + */ +async function addFriend(aFriend){ + try{ + // friends.push(aFriend); + // requests.remove(aFriend); + await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), { + "uid": get(UserInfoStore).uid, + "coins": get(UserInfoStore).coins, + "rooms": get(UserInfoStore).rooms, + "decorations": get(UserInfoStore).decorations, + "lastLogin": get(UserInfoStore).lastLogin, + // "friends": get(UserInfoStore).friends, + // "requests": get(UserInfoStore).requests, + // "email": get(UserInfoStore).email + }); + + + // Add friends on the sender side + } + catch (e){ + console.log(e); + } +} + +/** + * + * @param {any} delFriend + */ +async function deleteFriend(delFriend){ + try{ + // friends.remove(delFriend); + await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), { + "uid": get(UserInfoStore).uid, + "coins": get(UserInfoStore).coins, + "rooms": get(UserInfoStore).rooms, + "decorations": get(UserInfoStore).decorations, + "lastLogin": get(UserInfoStore).lastLogin, + // "friends": get(UserInfoStore).friends, + // "requests": get(UserInfoStore).requests, + // "email": get(UserInfoStore).email + }); + + // Remove friends on the receiver side + } + catch (e){ + console.log(e); + } +} + +/** + * + * @param {any} declFriend + */ +async function declineFriend(declFriend){ + try{ + // requests.remove(declFriend); + await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), { + "uid": get(UserInfoStore).uid, + "coins": get(UserInfoStore).coins, + "rooms": get(UserInfoStore).rooms, + "decorations": get(UserInfoStore).decorations, + "lastLogin": get(UserInfoStore).lastLogin, + // "friends": get(UserInfoStore).friends, + // "requests": get(UserInfoStore).requests, + // "email": get(UserInfoStore).email + }); + + // Remove friends on the receiver side + } + catch (e){ + console.log(e); + } +} + +/** + * + * @param {any} reqFriend + */ +async function sendFriendRequest(reqFriend){ + try{ + //On the receiver + + // requests.push(reqFriend); + await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), { + "uid": get(UserInfoStore).uid, + "coins": get(UserInfoStore).coins, + "rooms": get(UserInfoStore).rooms, + "decorations": get(UserInfoStore).decorations, + "lastLogin": get(UserInfoStore).lastLogin, + // "friends": get(UserInfoStore).friends, + // "requests": get(UserInfoStore).requests, + // "email": get(UserInfoStore).email + }); + + } + catch (e){ + console.log(e); + } +} export { loginWithGoogle, logoutFromGoogle, diff --git a/src/UserInfoStore.ts b/src/UserInfoStore.ts index d90f464..d3b5a4c 100644 --- a/src/UserInfoStore.ts +++ b/src/UserInfoStore.ts @@ -4,15 +4,21 @@ const UserInfoStore = writable<{ uid: string, coins: number, rooms: [string], - decorations: [string] - lastLogin: number + decorations: [string], + lastLogin: number, + // friends: [string], + // requests: [string], + // email: string }>({ uid: "", coins: 0, rooms: [""], decorations: [""], - lastLogin: 0 + lastLogin: -1 // Date.now() + // friends: [""], + // requests: [""], + // email: "" }); export default { diff --git a/src/routes/Homepage.svelte b/src/routes/Homepage.svelte index c7021a4..1840371 100644 --- a/src/routes/Homepage.svelte +++ b/src/routes/Homepage.svelte @@ -19,7 +19,17 @@ onMount(() => { currentRoom = "Gray"; - + + let newLogin = Date.now(); + let newLoginDate = new Date(newLogin).getDate(); + // newLogin = newLogin.getDate(); + // console.log($UserInfoStore.lastLogin.toString()); + let lastLoginDate = new Date ($UserInfoStore.lastLogin).getDate(); + + console.log("newLogin homepage1", newLogin); + console.log("newLogin homepage2", newLoginDate); + console.log("lastLogin homepage1", lastLoginDate); + console.log("lastLogin homepage2", $UserInfoStore.lastLogin); }); const dailyRewardModal = () =>{ @@ -104,7 +114,22 @@ } } + let newLogin = Date.now(); + let newLoginDate = new Date(newLogin).getDate(); + + setInterval(() => { + let lastLogin = $UserInfoStore.lastLogin; + if (lastLogin != -1) { + let lastLoginDate = new Date ($UserInfoStore.lastLogin).getDate(); + if (newLoginDate == lastLoginDate) { + console.log("ASGYUASGJ"); + visible = false; + } + } + }, 100) + const clicked = () => { + visible = false } From 2bd3cf0c0e8423d3db2f478888149db433acffca Mon Sep 17 00:00:00 2001 From: Jarrett Fok Date: Wed, 26 Apr 2023 16:16:30 -0400 Subject: [PATCH 6/8] monday demo --- src/Firebase.js | 2 +- src/routes/Homepage.svelte | 2 -- src/routes/components/StartSession.svelte | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Firebase.js b/src/Firebase.js index 71cab35..a986a6d 100644 --- a/src/Firebase.js +++ b/src/Firebase.js @@ -220,7 +220,7 @@ async function addLastLogin(newTime){ try{ await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), { "uid": get(UserInfoStore).uid, - "coins": get(UserInfoStore).coins, + "coins": get(UserInfoStore).coins + 100, "rooms": get(UserInfoStore).rooms, "decorations": get(UserInfoStore).decorations, "lastLogin": newTime, diff --git a/src/routes/Homepage.svelte b/src/routes/Homepage.svelte index 1840371..3fbc312 100644 --- a/src/routes/Homepage.svelte +++ b/src/routes/Homepage.svelte @@ -122,14 +122,12 @@ if (lastLogin != -1) { let lastLoginDate = new Date ($UserInfoStore.lastLogin).getDate(); if (newLoginDate == lastLoginDate) { - console.log("ASGYUASGJ"); visible = false; } } }, 100) const clicked = () => { - visible = false } diff --git a/src/routes/components/StartSession.svelte b/src/routes/components/StartSession.svelte index f92ee3e..82adb3c 100644 --- a/src/routes/components/StartSession.svelte +++ b/src/routes/components/StartSession.svelte @@ -17,6 +17,10 @@ + +

What do you want to accomplish this session?

This session, I want to...

From aa034044a57908058158c4de451077d4ead0b6d3 Mon Sep 17 00:00:00 2001 From: Jarrett Fok Date: Wed, 26 Apr 2023 16:39:20 -0400 Subject: [PATCH 7/8] input field stylzed --- src/routes/components/StartSession.svelte | 4 --- .../components/StartSessionModal.svelte | 36 +++++++++++++++++-- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/routes/components/StartSession.svelte b/src/routes/components/StartSession.svelte index 82adb3c..f92ee3e 100644 --- a/src/routes/components/StartSession.svelte +++ b/src/routes/components/StartSession.svelte @@ -17,10 +17,6 @@ - -

What do you want to accomplish this session?

This session, I want to...

diff --git a/src/routes/components/StartSessionModal.svelte b/src/routes/components/StartSessionModal.svelte index 3ef2c48..6f75a43 100644 --- a/src/routes/components/StartSessionModal.svelte +++ b/src/routes/components/StartSessionModal.svelte @@ -16,12 +16,42 @@ }; + +

What do you want to accomplish this session?

This session, I want to...

- - - + + + + +
\ No newline at end of file From 5dc5ebe89781f9a3fbb940c8e311dfa57c0a94df Mon Sep 17 00:00:00 2001 From: Jarrett Fok Date: Wed, 26 Apr 2023 21:15:30 -0400 Subject: [PATCH 8/8] fixed input --- src/routes/components/StartSessionModal.svelte | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/routes/components/StartSessionModal.svelte b/src/routes/components/StartSessionModal.svelte index 6f75a43..fc0a820 100644 --- a/src/routes/components/StartSessionModal.svelte +++ b/src/routes/components/StartSessionModal.svelte @@ -25,24 +25,26 @@ border: none; font-family: "Porpora-Regular"; font-size: 0.8rem; - padding: 0.75rem; - border-radius: 1.5rem; + padding: 0.8rem; + border-radius: 0 1.5rem 1.5rem 0; color:#DC83A4; cursor: pointer; } .input{ width: 60%; - margin-left: auto; - margin-right: 0.75rem; + /* margin-left: auto; */ + /* margin-right: 0.75rem; */ border-radius: 1.5rem; - font-size: 0.9rem; - height: 1.8rem; + font-size: 1rem; + /* height: 1.8rem; */ + padding: 0.7rem; + padding-left: 1rem; + border-radius: 1.5rem 0 0 1.5rem; + border: 0.15rem solid #F8DEC7; } .bar { display: flex; - align-items: center; - justify-content: center; }