From 8193d85e7daddc1d32cce65fd8617a836bba7d4b Mon Sep 17 00:00:00 2001 From: Spirit0327 Date: Thu, 31 Oct 2024 12:09:49 -0700 Subject: [PATCH 01/12] new file --- _sass/nighthawk/DNHSCafe_backend | 1 + navigation/share_and_care/dnhscafe/cafe_home_page.md | 0 navigation/share_and_care/dnhscafe/cafe_store.md | 0 3 files changed, 1 insertion(+) create mode 160000 _sass/nighthawk/DNHSCafe_backend create mode 100644 navigation/share_and_care/dnhscafe/cafe_home_page.md create mode 100644 navigation/share_and_care/dnhscafe/cafe_store.md diff --git a/_sass/nighthawk/DNHSCafe_backend b/_sass/nighthawk/DNHSCafe_backend new file mode 160000 index 00000000..3443541a --- /dev/null +++ b/_sass/nighthawk/DNHSCafe_backend @@ -0,0 +1 @@ +Subproject commit 3443541adea22a809de3a3c6297b385660b2717d diff --git a/navigation/share_and_care/dnhscafe/cafe_home_page.md b/navigation/share_and_care/dnhscafe/cafe_home_page.md new file mode 100644 index 00000000..e69de29b diff --git a/navigation/share_and_care/dnhscafe/cafe_store.md b/navigation/share_and_care/dnhscafe/cafe_store.md new file mode 100644 index 00000000..e69de29b From f9c8f3f9e625cc5deaaa0cc057d0224813b7ffec Mon Sep 17 00:00:00 2001 From: avikaprasad22 Date: Thu, 31 Oct 2024 12:13:18 -0700 Subject: [PATCH 02/12] dnhs cafe added to menu --- _includes/nav/share_and_care.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/nav/share_and_care.html b/_includes/nav/share_and_care.html index cc77b9d1..fee89faa 100644 --- a/_includes/nav/share_and_care.html +++ b/_includes/nav/share_and_care.html @@ -2,6 +2,7 @@ Chess Forum Revvit - Underground Music + Underground Music + DNHS CAFE From 55e07cdea79f75f1dd235746408df2679df546ec Mon Sep 17 00:00:00 2001 From: avikaprasad22 Date: Thu, 31 Oct 2024 12:15:23 -0700 Subject: [PATCH 03/12] dnhscafe linked to menu --- _includes/nav/share_and_care.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/nav/share_and_care.html b/_includes/nav/share_and_care.html index fee89faa..6fbc4b64 100644 --- a/_includes/nav/share_and_care.html +++ b/_includes/nav/share_and_care.html @@ -3,6 +3,6 @@ Chess Forum Revvit Underground Music - DNHS CAFE + DNHS CAFE From 6aa2a4e735b467ecfd7ac00d205043f8a01615ab Mon Sep 17 00:00:00 2001 From: avikaprasad22 Date: Thu, 31 Oct 2024 12:19:54 -0700 Subject: [PATCH 04/12] changes --- _includes/nav/share_and_care.html | 2 +- navigation/share_and_care/dnhscafe/cafe_home_page.md | 6 ++++++ navigation/share_and_care/dnhscafe/cafe_store.md | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/_includes/nav/share_and_care.html b/_includes/nav/share_and_care.html index 6fbc4b64..36e0800f 100644 --- a/_includes/nav/share_and_care.html +++ b/_includes/nav/share_and_care.html @@ -3,6 +3,6 @@ Chess Forum Revvit Underground Music - DNHS CAFE + DNHS Cafe diff --git a/navigation/share_and_care/dnhscafe/cafe_home_page.md b/navigation/share_and_care/dnhscafe/cafe_home_page.md index e69de29b..5e4b5809 100644 --- a/navigation/share_and_care/dnhscafe/cafe_home_page.md +++ b/navigation/share_and_care/dnhscafe/cafe_home_page.md @@ -0,0 +1,6 @@ +--- +layout: page +title: DNHS Cafe +description: Cafe homepage +permalink: /dnhscafe/ +--- \ No newline at end of file diff --git a/navigation/share_and_care/dnhscafe/cafe_store.md b/navigation/share_and_care/dnhscafe/cafe_store.md index e69de29b..036f5f3a 100644 --- a/navigation/share_and_care/dnhscafe/cafe_store.md +++ b/navigation/share_and_care/dnhscafe/cafe_store.md @@ -0,0 +1,6 @@ +--- +layout: page +title: DNHS Cafe Store +description: Purchase coffee using your d'nero you earned from helping! +permalink: /dnhscafestore? +--- \ No newline at end of file From 02e06665fda61c8cfb2e8af70456ae5b93115218 Mon Sep 17 00:00:00 2001 From: avikaprasad22 Date: Thu, 31 Oct 2024 12:21:19 -0700 Subject: [PATCH 05/12] should work now --- _includes/nav/share_and_care.html | 2 +- navigation/share_and_care/dnhscafe/cafe_store.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/nav/share_and_care.html b/_includes/nav/share_and_care.html index 36e0800f..74627a52 100644 --- a/_includes/nav/share_and_care.html +++ b/_includes/nav/share_and_care.html @@ -3,6 +3,6 @@ Chess Forum Revvit Underground Music - DNHS Cafe + DNHS Cafe diff --git a/navigation/share_and_care/dnhscafe/cafe_store.md b/navigation/share_and_care/dnhscafe/cafe_store.md index 036f5f3a..5f0c9eea 100644 --- a/navigation/share_and_care/dnhscafe/cafe_store.md +++ b/navigation/share_and_care/dnhscafe/cafe_store.md @@ -2,5 +2,5 @@ layout: page title: DNHS Cafe Store description: Purchase coffee using your d'nero you earned from helping! -permalink: /dnhscafestore? +permalink: /dnhscafestore/ --- \ No newline at end of file From 0b349ef3b389c9621e5e61e5fa0cceb65094bbbd Mon Sep 17 00:00:00 2001 From: Spirit0327 Date: Thu, 31 Oct 2024 12:24:31 -0700 Subject: [PATCH 06/12] stor --- .../share_and_care/dnhscafe/cafe_store.md | 54 ++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/navigation/share_and_care/dnhscafe/cafe_store.md b/navigation/share_and_care/dnhscafe/cafe_store.md index 5f0c9eea..d3d609a0 100644 --- a/navigation/share_and_care/dnhscafe/cafe_store.md +++ b/navigation/share_and_care/dnhscafe/cafe_store.md @@ -3,4 +3,56 @@ layout: page title: DNHS Cafe Store description: Purchase coffee using your d'nero you earned from helping! permalink: /dnhscafestore/ ---- \ No newline at end of file +--- + +# ☕ Welcome to DNHS Cafe + +*Come for the coffee, stay for the cozy vibes.* + +--- + +## Menu + +### **House Favorites** + +- **Classic Espresso** + A bold shot of espresso, perfect for a quick boost. + **Price:** 5 dneros + +- **Cappuccino** + Steamed milk and frothy foam topped with a hint of cinnamon. + **Price:** 8 dneros + +- **Mocha Latte** + A sweet blend of espresso, milk, and chocolate. + **Price:** 10 dneros + +### **Seasonal Specials** + +- **Pumpkin Spice Latte** + The cozy flavors of fall in a cup, perfect for crisp days. + **Price:** 12 dneros + +- **Vanilla Caramel Macchiato** + Creamy vanilla meets rich caramel for a truly indulgent treat. + **Price:** 11 dneros + +- **Maple Brown Sugar Latte** + Sweet, earthy maple and brown sugar bring warmth to each sip. + **Price:** 12 dneros + +--- + +## 💰 How to Pay + +Pay with **dneros**, our exclusive currency! Just add your order to the cart and check out with dneros. + +--- + +## 📦 Place Your Order + +1. Choose your favorite drink(s). +2. Message us to confirm your order. +3. Enjoy the cozy vibes and delicious flavors of DNHS Cafe! + +*Thank you for visiting DNHS Cafe! We hope our cozy corner brings you a taste of joy and warmth.* From d5e5fb9fe63d0c159b15c8598469b12b2ba1be98 Mon Sep 17 00:00:00 2001 From: avikaprasad22 Date: Thu, 31 Oct 2024 12:32:49 -0700 Subject: [PATCH 07/12] added button --- navigation/share_and_care/dnhscafe/cafe_home_page.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/navigation/share_and_care/dnhscafe/cafe_home_page.md b/navigation/share_and_care/dnhscafe/cafe_home_page.md index 5e4b5809..c390d868 100644 --- a/navigation/share_and_care/dnhscafe/cafe_home_page.md +++ b/navigation/share_and_care/dnhscafe/cafe_home_page.md @@ -3,4 +3,8 @@ layout: page title: DNHS Cafe description: Cafe homepage permalink: /dnhscafe/ ---- \ No newline at end of file +--- + + + + \ No newline at end of file From 83b0e155afd2e574fef8d52b5cecc8706da4d9f7 Mon Sep 17 00:00:00 2001 From: zoeqinhe Date: Thu, 31 Oct 2024 12:37:23 -0700 Subject: [PATCH 08/12] commit --- DNHSCafe_backend | 1 + 1 file changed, 1 insertion(+) create mode 160000 DNHSCafe_backend diff --git a/DNHSCafe_backend b/DNHSCafe_backend new file mode 160000 index 00000000..3443541a --- /dev/null +++ b/DNHSCafe_backend @@ -0,0 +1 @@ +Subproject commit 3443541adea22a809de3a3c6297b385660b2717d From 26ef4f22cf8965541fccac1ab86bf87f7914161a Mon Sep 17 00:00:00 2001 From: avikaprasad22 Date: Thu, 31 Oct 2024 12:38:33 -0700 Subject: [PATCH 09/12] study room added --- .../share_and_care/dnhscafe/cafe_store.md | 4 + .../share_and_care/dnhscafe/cafechatroom.md | 103 ++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 navigation/share_and_care/dnhscafe/cafechatroom.md diff --git a/navigation/share_and_care/dnhscafe/cafe_store.md b/navigation/share_and_care/dnhscafe/cafe_store.md index d3d609a0..9e3b67a3 100644 --- a/navigation/share_and_care/dnhscafe/cafe_store.md +++ b/navigation/share_and_care/dnhscafe/cafe_store.md @@ -56,3 +56,7 @@ Pay with **dneros**, our exclusive currency! Just add your order to the cart and 3. Enjoy the cozy vibes and delicious flavors of DNHS Cafe! *Thank you for visiting DNHS Cafe! We hope our cozy corner brings you a taste of joy and warmth.* + + + + \ No newline at end of file diff --git a/navigation/share_and_care/dnhscafe/cafechatroom.md b/navigation/share_and_care/dnhscafe/cafechatroom.md new file mode 100644 index 00000000..ee776543 --- /dev/null +++ b/navigation/share_and_care/dnhscafe/cafechatroom.md @@ -0,0 +1,103 @@ +--- +layout: page +title: DNHS Cafe Study Room +description: Help out your peers with school work to earn d'neros! +permalink: /dnhscafestudyroom/ +--- + + + + Chat Box + + + +
+
+ +
+
+ + +
+
+ + + From 4b3d3e72675271572132d50c1ca5bd123dba5077 Mon Sep 17 00:00:00 2001 From: avikaprasad22 Date: Thu, 31 Oct 2024 12:40:15 -0700 Subject: [PATCH 10/12] studyroom added --- navigation/share_and_care/dnhscafe/cafe_store.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/navigation/share_and_care/dnhscafe/cafe_store.md b/navigation/share_and_care/dnhscafe/cafe_store.md index 9e3b67a3..2a6f29cc 100644 --- a/navigation/share_and_care/dnhscafe/cafe_store.md +++ b/navigation/share_and_care/dnhscafe/cafe_store.md @@ -57,6 +57,6 @@ Pay with **dneros**, our exclusive currency! Just add your order to the cart and *Thank you for visiting DNHS Cafe! We hope our cozy corner brings you a taste of joy and warmth.* - + \ No newline at end of file From 74a8e88a3c5ee020933930eb269de13185edafa8 Mon Sep 17 00:00:00 2001 From: Spirit0327 Date: Thu, 31 Oct 2024 12:43:54 -0700 Subject: [PATCH 11/12] store changes --- .../share_and_care/dnhscafe/cafe_store.md | 85 ++++++++++++++++--- 1 file changed, 73 insertions(+), 12 deletions(-) diff --git a/navigation/share_and_care/dnhscafe/cafe_store.md b/navigation/share_and_care/dnhscafe/cafe_store.md index 2a6f29cc..d0ab1399 100644 --- a/navigation/share_and_care/dnhscafe/cafe_store.md +++ b/navigation/share_and_care/dnhscafe/cafe_store.md @@ -7,10 +7,10 @@ permalink: /dnhscafestore/ # ☕ Welcome to DNHS Cafe -*Come for the coffee, stay for the cozy vibes.* +**Come for the coffee, stay for the cozy vibes.** +*Enjoy a range of your favorite brews using dneros, our exclusive currency!* --- - ## Menu ### **House Favorites** @@ -37,20 +37,43 @@ permalink: /dnhscafestore/ Creamy vanilla meets rich caramel for a truly indulgent treat. **Price:** 11 dneros -- **Maple Brown Sugar Latte** - Sweet, earthy maple and brown sugar bring warmth to each sip. - **Price:** 12 dneros +- ---- +### Points: 50 dneros -## 💰 How to Pay - -Pay with **dneros**, our exclusive currency! Just add your order to the cart and check out with dneros. +| Coffee | Cost (dneros) | Action | +|---------------|---------------|----------| +| **Classic Espresso** | 15 | | +| **Pumpkin Spice Latte** | 20 | | +| **Cappuccino**| 18 | | +| **Mocha Latte** | 22 | | +| **Vanilla Caramel Macchiato** | 25 | | --- -## 📦 Place Your Order - + + + + +<<<<<<< HEAD 1. Choose your favorite drink(s). 2. Message us to confirm your order. 3. Enjoy the cozy vibes and delicious flavors of DNHS Cafe! @@ -59,4 +82,42 @@ Pay with **dneros**, our exclusive currency! Just add your order to the cart and - \ No newline at end of file + +======= + +>>>>>>> 52ff572 (store changes) From 36dcb7b502288ff841cae4cc8bfb3b17d47f8d1d Mon Sep 17 00:00:00 2001 From: avikaprasad22 Date: Thu, 31 Oct 2024 12:45:35 -0700 Subject: [PATCH 12/12] button added --- navigation/share_and_care/dnhscafe/cafe_store.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/navigation/share_and_care/dnhscafe/cafe_store.md b/navigation/share_and_care/dnhscafe/cafe_store.md index d0ab1399..92c23009 100644 --- a/navigation/share_and_care/dnhscafe/cafe_store.md +++ b/navigation/share_and_care/dnhscafe/cafe_store.md @@ -120,4 +120,7 @@ th { cursor: not-allowed; } ->>>>>>> 52ff572 (store changes) + + + +