From 8f1e35c4bc86a7153c492f5cf5328220b65a410b Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Sun, 13 Aug 2023 18:41:02 -0500 Subject: [PATCH 01/19] added home button to match other pages --- src/router/index.ts | 38 +++-- src/views/Home/Home.vue | 12 +- src/views/JazzmanMenu/JazzmanMenu.vue | 230 ++++++++++++++++++++++++++ 3 files changed, 260 insertions(+), 20 deletions(-) create mode 100644 src/views/JazzmanMenu/JazzmanMenu.vue diff --git a/src/router/index.ts b/src/router/index.ts index b25e0a73..8bca0077 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,21 +1,22 @@ import { createRouter, createWebHistory, RouteRecordRaw, RouteComponent, RouteLocationNormalized, NavigationGuardNext } from 'vue-router'; import useAuthenticationStore from '@/stores/authentication'; -const Home:RouteComponent = () => import('@/views/Home/Home.vue'); -const GpaCalculator:RouteComponent = () => import('@/views/GpaCalculator/GpaCalculator.vue'); -const BellSchedules:RouteComponent = () => import('@/views/Bell Schedules/BellSchedules.vue'); -const Calendar:RouteComponent = () => import('@/views/Calendar/Calendar.vue'); -const Links:RouteComponent = () => import('@/views/Links/Links.vue'); -const Colors:RouteComponent = () => import('@/views/Colors/Colors.vue'); -const Settings:RouteComponent = () => import('@/views/Settings/Settings.vue'); -const Tools:RouteComponent = () => import('@/views/Tools/Tools.vue'); -const Documents:RouteComponent = () => import('@/views/Documents/Documents.vue'); -const AddSchedule:RouteComponent = () => import('@/views/Settings/Add Schedule/AddSchedule.vue'); -const Login:RouteComponent = () => import('@/views/Login/Login.vue'); -const Code:RouteComponent = () => import('@/views/Code/Code.vue'); -const QRCode:RouteComponent = () => import('@/views/QRCodes/QRCodes.vue'); -const GetHelp:RouteComponent = () => import('@/views/GetHelp/GetHelp.vue'); +const Home: RouteComponent = () => import('@/views/Home/Home.vue'); +const GpaCalculator: RouteComponent = () => import('@/views/GpaCalculator/GpaCalculator.vue'); +const BellSchedules: RouteComponent = () => import('@/views/Bell Schedules/BellSchedules.vue'); +const Calendar: RouteComponent = () => import('@/views/Calendar/Calendar.vue'); +const Links: RouteComponent = () => import('@/views/Links/Links.vue'); +const Colors: RouteComponent = () => import('@/views/Colors/Colors.vue'); +const Settings: RouteComponent = () => import('@/views/Settings/Settings.vue'); +const Tools: RouteComponent = () => import('@/views/Tools/Tools.vue'); +const Documents: RouteComponent = () => import('@/views/Documents/Documents.vue'); +const AddSchedule: RouteComponent = () => import('@/views/Settings/Add Schedule/AddSchedule.vue'); +const Login: RouteComponent = () => import('@/views/Login/Login.vue'); +const Code: RouteComponent = () => import('@/views/Code/Code.vue'); +const QRCode: RouteComponent = () => import('@/views/QRCodes/QRCodes.vue'); +const GetHelp: RouteComponent = () => import('@/views/GetHelp/GetHelp.vue'); const Jukebox: RouteComponent = () => import('@/views/Jukebox/Jukebox.vue'); +const JazzmanMenu: RouteComponent = () => import('@/views/JazzmanMenu/JazzmanMenu.vue'); type EditScheduleProps = { @@ -103,6 +104,11 @@ const routes: Array = [ path: '/jukebox', component: Jukebox, }, + { + name: 'JazzmanMenu', + path: '/jazzmanMenu', + component: JazzmanMenu, + }, ]; const router = createRouter({ @@ -117,7 +123,7 @@ const router = createRouter({ }); // ensure any page with requiresAuth set to true will redirect through the login proxy component -router.beforeEach((to:RouteLocationNormalized, from:RouteLocationNormalized, next:NavigationGuardNext) => { +router.beforeEach((to: RouteLocationNormalized, from: RouteLocationNormalized, next: NavigationGuardNext) => { // check if to requires auth if (to.matched.some((record) => record.meta && record.meta.requiresAuth)) { // check if we are already authenticated, and continue ahead if we are @@ -136,4 +142,4 @@ router.beforeEach((to:RouteLocationNormalized, from:RouteLocationNormalized, nex } }); -export default router; +export default router; \ No newline at end of file diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue index 952a2846..deb5813b 100644 --- a/src/views/Home/Home.vue +++ b/src/views/Home/Home.vue @@ -19,7 +19,7 @@ - + @@ -35,6 +35,8 @@ + + + \ No newline at end of file diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue new file mode 100644 index 00000000..e856ea95 --- /dev/null +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -0,0 +1,230 @@ + + + + + \ No newline at end of file From 399caab8e7fc817d1e82849c72028416a11ca107 Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Sun, 13 Aug 2023 19:58:16 -0500 Subject: [PATCH 02/19] Pwc Menu added, dropdown, color changes added pwc menu, will add milkshake place later as well. Added dropdown to select between menus. changed colors to match what theme is chosen --- src/views/JazzmanMenu/JazzmanMenu.vue | 407 ++++++++++++++++++-------- 1 file changed, 290 insertions(+), 117 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index e856ea95..90cada67 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -1,124 +1,249 @@ \ No newline at end of file From 818467ccb508f3d0fd2acfeda15e764c827927bd Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:52:28 -0500 Subject: [PATCH 03/19] Added Special Menu + Deli Added Special Menu (Poke Bowl, Sushi, Taco, Wings) and Deli menu (Sandwich Bar) --- src/views/JazzmanMenu/JazzmanMenu.vue | 213 ++++++++++++++++++++++++-- 1 file changed, 203 insertions(+), 10 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index 90cada67..14c54c52 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -6,6 +6,8 @@
@@ -17,6 +19,14 @@

PWC Menu

+
+

Deli Menu

+
+
+
+

Special Menu

+
+
@@ -81,6 +91,103 @@
+
+
+

Poké Bowl
(Monday)

+
+
    +
  • Choose Two:
    • +
  • Salmon
    • +
  • Tuna
    • +
  • Shrimp Tempura
    • +
  • Tofu
    • +
  • Imitation Crab
    • +
  • + - +
    • +
  • Toppings:
    • +
  • Edamame
    • +
  • Mushroom
    • +
  • Cucumber
    • +
  • Green Onion
    • +
  • Carrot
    • +
  • Lettuce
    • +
  • Ginger
    • +
  • Radish
    • +
  • -
    • +
  • Sauce:
    • +
  • Spicy Mayo
    • +
  • Soy Sauce
    • +
  • Wasabi:
    • + +
+
+ +
+

Fat Rosie's Tacos (Tuesday)

+
+
    +
  • Choose Two:
    • +
  • Beef
    • +
  • Chicken
    • +
  • Cauliflower
    • +
  • + - +
    • +
  • Sides:
    • +
  • Rice & Beans
    • + +
  • -
    • +
  • Toppings;
    • +
  • Cheese
    • +
  • Lettuce
    • +
  • Sour Cream
    • +
  • Tomatoes
    • +
  • -
    • +
  • Sauce:
    • +
  • Spicy
    • +
  • Mild
    • +
+
+ + + +
+

Chicken Wing (Wednesday)

+
+
    +
  • Choice Of:
    • +
  • Boneless
    • +
  • Bone-In
    • +
  • -
    • +
  • Sides:
    • +
  • Fries
    • +
  • -
    • +
  • Flavor (Dry):
    • +
  • Lemon Pepper
    • +
  • Parmesan
    • +
  • Flavor (Wet):
    • +
  • Spicy
    • +
  • BBQ
    • +
+
+ +
+

Stevenson Sushi (Friday)

+
+
    +
  • Choose 8 Pieces:
    • +
  • California
    • +
  • Salmon
    • +
  • Philidelphia
    • +
  • Tuna Roll
    • +
  • Rainbow
    • +
  • Spicy Crab
    • +
  • Shrimp Tempura
    • +
+
+
+

Tea/Coffee

@@ -90,7 +197,6 @@
  • Latte Hot
  • Latte Iced
  • Latte Iced Caramel
    • -
  • Mocha White Chocolate
  • Mocha Hot
  • Mocha Iced
  • Monin Tea
    • @@ -106,7 +212,7 @@
    • Power Wrap
    • Thai Wrap
      • -
    • Veggie Vitality Wrap
      • +
    • Veggie Wrap
    @@ -114,8 +220,8 @@

    Pastries

      -
    • Caprese Puff Pastry
      • -
    • Ham & Cheese Puff Pastry With Asparagus
      • +
    • Caprese Puff
      • +
    • Ham & Cheese
    @@ -129,6 +235,7 @@
    +

    Classics

    @@ -238,6 +345,63 @@
  • Tuxedo
    • +
    +
    +
    +

    Bread

    +
    +
      +
    • White Bread
      • +
    • Wheat Bread
      • +
    • 9 Grain
      • +
    • Pretzel Bun
      • +
    • Kaiser Roll
      • +
    • Tortilla
      • +
    +
    + +
    +

    Protein

    +
    +
      +
    • Roast Beef
      • +
    • Turkey
      • +
    • Ham
      • +
    • Salami
      • +
    • BBQ Chicken
      • +
    • Buffalo Chicken
      • +
    • Hummus
      • +
    +
    + +
    +

    Toppings

    +
    +
      +
    • Lettuce
      • +
    • Tomato
      • +
    • Onion
      • +
    • Pickles
      • +
    • Olives
      • +
    • Cucumber
      • +
    • Swiss Cheese
      • +
    • Provolone
      • +
    • Cheddar
      • +
    • Pepper Jack
      • +
    +
    + +
    +

    Sauce

    +
    +
      +
    • Chipotle
      • +
    • Mustard
      • +
    • Ketchup
      • +
    • Ranch
      • +
    • Honey Mustard
      • +
    +
    @@ -339,23 +503,34 @@ flex: 1 .menu-categoryTwo - margin-right: 77px - margin-left: 77px + margin-right: 70px + margin-left: 70px text-align: center flex: 1 .menu-categoryThree - margin-right: 17px - margin-left: 30px + margin-right: 90px + margin-left: 90px text-align: center flex: 1 .menu-categoryFour - margin-right: 70px - margin-left: 70px + margin-right: 90px + margin-left: 90px + text-align: center + flex: 1 + +.menu-categoryFive + margin-right: 97px + margin-left: 97px text-align: center flex: 1 +.menu-categorySix + margin-right: 25px + margin-left: 25px + text-align: center + flex: 1 .category-title font-size: 24px color: var(--color) /* Silver sand */ @@ -396,6 +571,24 @@ font-size: 18px color: #8c8c8c /* Dark gray text color */ +.menu-categoryFive ul + list-style-type: none + padding-left: 0 + +.menu-categoryFive li + margin: 5px 0 + font-size: 18px + color: #8c8c8c /* Dark gray text color */ + +.menu-categorySix ul + list-style-type: none + padding-left: 0 + +.menu-categorySix li + margin: 5px 0 + font-size: 18px + color: #8c8c8c /* Dark gray text color */ + .menu-title font-size: 32px From af34fde01ffd83541eb104c0ed21fe7747dee1d6 Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Tue, 15 Aug 2023 21:46:05 -0500 Subject: [PATCH 04/19] added more styling to match --- src/views/JazzmanMenu/JazzmanMenu.vue | 815 +++++++++++++------------- 1 file changed, 418 insertions(+), 397 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index 14c54c52..af5efed4 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -1,6 +1,5 @@ @@ -447,6 +465,9 @@ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2) margin: auto +.menu-text + text-align: center + font-size: 17px .menu-dropdown text-align: center @@ -518,38 +539,38 @@ justify-content: center .menu-category - margin-right: 70px - margin-left: 70px + margin-right: 50px + margin-left: 50px text-align: center flex: 1 .menu-categoryTwo - margin-right: 70px - margin-left: 70px + margin-right: 50px + margin-left: 50px text-align: center flex: 1 .menu-categoryThree - margin-right: 90px - margin-left: 90px + margin-right: 50px + margin-left: 50px text-align: center flex: 1 .menu-categoryFour - margin-right: 90px - margin-left: 90px + margin-right: 50px + margin-left: 50px text-align: center flex: 1 .menu-categoryFive - margin-right: 97px - margin-left: 97px + margin-right: 50px + margin-left: 50px text-align: center flex: 1 .menu-categorySix - margin-right: 25px - margin-left: 25px + margin-right: 50px + margin-left: 50px text-align: center flex: 1 .category-title From d23e2f2a3ad2610a56a449643f2162e922ca03f4 Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Wed, 16 Aug 2023 22:47:06 -0500 Subject: [PATCH 06/19] Update JazzmanMenu.vue --- src/views/JazzmanMenu/JazzmanMenu.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index fd5b3181..8672de5e 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -417,13 +417,13 @@ - \ No newline at end of file + color: var(--color) + From 6552cff8841039cb1f36461505e58193ccf31693 Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Tue, 22 Aug 2023 20:42:54 -0500 Subject: [PATCH 12/19] matched padding to jukebox --- src/views/JazzmanMenu/JazzmanMenu.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index d970b97d..e61deb61 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -460,7 +460,7 @@ .gap - padding: 35px + padding:50px .menu-container width: 80% @@ -480,6 +480,7 @@ .menu-dropdown text-align: center margin: 20px 0 + .menu-select @@ -506,7 +507,7 @@ .home-link position: absolute - top: 10px + top: 30px right: 90px +mobile-small top: 0 From b0d2a0a3df455788c187fa7c4a3e43e4e06c417e Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Tue, 22 Aug 2023 20:53:39 -0500 Subject: [PATCH 13/19] tried to change dropdown alignment --- src/views/JazzmanMenu/JazzmanMenu.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index e61deb61..cc6acd5c 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -5,7 +5,7 @@

    Select a Menu:

    @@ -469,7 +469,10 @@ background-color: #ffffff border: 0px solid #000000 border-radius: 10px - padding: 20px + padding-bottom: 20px + padding-right: 20px + padding-left: 20px + padding-top: 5px box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2) margin: auto From 381c7caa16a287d21a237a51b7ed08f1c814eb91 Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Tue, 22 Aug 2023 20:57:42 -0500 Subject: [PATCH 14/19] bug fix --- src/views/Home/Home.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue index deb5813b..c18d1486 100644 --- a/src/views/Home/Home.vue +++ b/src/views/Home/Home.vue @@ -73,7 +73,7 @@ import CardContainer from "@/components/CardContainer.vue"; import UpcomingEventsCard from "@/components/cards/UpcomingEventsCard.vue"; import IconTextCard from "@/components/cards/IconTextCard.vue"; import WeatherCard from "@/components/cards/WeatherCard.vue"; - + import PwcCard from "@/components/cards/PwcCard.vue"; import ScheduleCard from "@/components/cards/ScheduleCard.vue"; import HolidayCard from "@/components/cards/HolidayCard.vue"; import ContributeCard from "@/components/cards/ContributeCard.vue"; @@ -98,6 +98,7 @@ export default { IconTextCard, ScheduleCard, WeatherCard, + PwcCard, HolidayCard, ContributeCard, From 0008e4d703556b32bd30f50e7c42f2a727d0b3b1 Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Sat, 26 Aug 2023 17:43:58 -0500 Subject: [PATCH 15/19] Fixed dropdown button size and position --- src/views/JazzmanMenu/JazzmanMenu.vue | 79 +++++++++++++++++++-------- 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index cc6acd5c..e36b306c 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -2,14 +2,17 @@
    -

    Select a Menu:

    - - -
    + +
    +

    Select a Menu:

    + +
    + +
    @@ -351,7 +354,7 @@
    -
    +

    Bread

      @@ -364,7 +367,7 @@
    -
    +

    Protein

      @@ -378,7 +381,7 @@
    -
    +

    Toppings

      @@ -395,7 +398,7 @@
    -
    +

    Sauce

      @@ -450,7 +453,7 @@ - + \ No newline at end of file From a8445e235b098da065a5c7b4c8c63b89715c1413 Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:06:07 -0500 Subject: [PATCH 16/19] Updated mobile font sizing --- src/views/JazzmanMenu/JazzmanMenu.vue | 67 +++++++++++++++++++++------ 1 file changed, 54 insertions(+), 13 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index e36b306c..d6118319 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -355,8 +355,8 @@
    -

    Bread

    -
    +

    Bread

    +
    • White Bread
    • Wheat Bread
      • @@ -368,8 +368,8 @@
    -

    Protein

    -
    +

    Protein

    +
    • Roast Beef
    • Turkey
      • @@ -382,8 +382,8 @@
    -

    Toppings

    -
    +

    Toppings

    +
    • Lettuce
    • Tomato
      • @@ -399,8 +399,8 @@
    -

    Sauce

    -
    +

    Sauce

    +
    • Chipotle
    • Mustard
      • @@ -503,7 +503,7 @@ text-align: center margin: 20px 0 - + .menu-select padding: 5px 10px @@ -549,6 +549,7 @@ text-align: center margin-bottom: 30px + .green-line width: 60px height: 2px @@ -572,6 +573,8 @@ margin-left:60px text-align: center flex: 1 + + .menu-categoryTwo margin-right: 50px @@ -612,24 +615,34 @@ .category-title font-size: 24px color: var(--color) /* Silver sand */ + +mobile + font-size:19px + padding-right: 5px .menu-category ul list-style-type: none padding-left: 0 - + + + .menu-category li margin: 5px 0 font-size: 18px color: #8c8c8c /* Dark gray text color */ + +mobile + font-size: 12px .menu-categoryTwo ul list-style-type: none padding-left: 0 + .menu-categoryTwo li margin: 5px 0 font-size: 18px color: #8c8c8c /* Dark gray text color */ + +mobile + font-size: 12px .menu-categoryThree ul list-style-type: none @@ -639,6 +652,8 @@ margin: 5px 0 font-size: 18px color: #8c8c8c /* Dark gray text color */ + +mobile + font-size: 12px .menu-categoryFour ul list-style-type: none @@ -648,6 +663,8 @@ margin: 5px 0 font-size: 18px color: #8c8c8c /* Dark gray text color */ + +mobile + font-size: 12px .menu-categoryFive ul list-style-type: none @@ -657,6 +674,8 @@ margin: 5px 0 font-size: 18px color: #8c8c8c + +mobile + font-size: 12px .menu-categorySix ul list-style-type: none @@ -666,18 +685,40 @@ margin: 5px 0 font-size: 18px color: #8c8c8c + +mobile + font-size: 12px .menu-categorySeven ul list-style-type: none - padding-left: 0 + padding-left: 0px + padding-right: 0px .menu-categorySeven li margin: 5px 0 font-size: 18px color: #8c8c8c - + +mobile + font-size: 12px + padding-right: 25px .menu-title font-size: 32px - color: var(--color) + color: var(--color) + +.category-titleTwo + font-size: 24px + color: var(--color) /* Silver sand */ + +mobile + font-size:19px + padding-right:30px + +.small-green-lineTwo + width: 20px + height: 2px + background-color: #040f0f /* Phthalo green */ + margin-left: 50px + margin-right: 45px + +mobile + padding-right:0px + padding-left:0px \ No newline at end of file From e142b00ea3e827b116cc6df0f95fb04a94a82201 Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Sun, 3 Sep 2023 11:49:12 -0500 Subject: [PATCH 17/19] Fixed deli padding --- src/views/JazzmanMenu/JazzmanMenu.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index d6118319..cec21bee 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -583,32 +583,32 @@ flex: 1 .menu-categoryThree - margin-right: 70px - margin-left: 65px + margin-right: 50px + margin-left: 60x text-align: center flex: 1 .menu-categoryFour - margin-right: 70px - margin-left: 65px + margin-right: 50px + margin-left: 60px text-align: center flex: 1 .menu-categoryFive margin-right: 50px - margin-left: 50px + margin-left: 60px text-align: center flex: 1 .menu-categorySix margin-right: 50px - margin-left: 50px + margin-left: 60px text-align: center flex: 1 .menu-categorySeven - margin-right: 60px - margin-left: 94px + margin-right: 50px + margin-left: 70px text-align: center flex: 1 From 0af129694c9807686f94c2fea9ac63bd6a795932 Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Sun, 10 Sep 2023 22:49:44 -0500 Subject: [PATCH 18/19] Fixed dropdown Added text to dropdown to match current menu --- src/views/JazzmanMenu/JazzmanMenu.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index cec21bee..497bb7e7 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -6,12 +6,16 @@

      Select a Menu:

      + @update:modelValue="onMenuSelect"> + +
      - + From 0b8aa90cac925aab02c335b7f782ef81e52e00fa Mon Sep 17 00:00:00 2001 From: yashjagtap23 <108370176+yashjagtap23@users.noreply.github.com> Date: Thu, 14 Sep 2023 00:03:16 -0500 Subject: [PATCH 19/19] Fixed Styling Fixed styling to work on all devices properly and no extra padding or white space --- src/views/JazzmanMenu/JazzmanMenu.vue | 943 +++++++++++++------------- 1 file changed, 466 insertions(+), 477 deletions(-) diff --git a/src/views/JazzmanMenu/JazzmanMenu.vue b/src/views/JazzmanMenu/JazzmanMenu.vue index 497bb7e7..6bdeb01c 100644 --- a/src/views/JazzmanMenu/JazzmanMenu.vue +++ b/src/views/JazzmanMenu/JazzmanMenu.vue @@ -2,424 +2,442 @@
      - -
      -

      Select a Menu:

      - - - -
      - - - - -
      -
      -

      Jazzman's Menu

      -
      -
      -
      -

      PWC Menu

      -
      -
      -
      -

      Deli Menu

      -
      -
      -
      -

      Special Menu

      -
      -
      - - -
      -
      -

      Açaí Bowl

      -
      -
        -
      • Acai Sorbet
        • -
      • Granola
        • -
      • Chia Seeds
        • -
      • Honey
        • -
      • Blueberries
        • -
      • Blackberries
        • -
      • Strawberries
        • -
      • Mango
        • -
      • Kiwi
        • -
      -
      - -
      -

      Drinks

      -
      -
        -
      • Black Milk
        • -
      • Matcha Milk
        • -
      • Chia Milk
        • -
      • Taro Milk
        • -
      • Strawberry
        • -
      • Mango
        • -
      • Dragon Fruit
        • -
      • Green Machine
        • -
      • Forever Berry
        • -
      -
      - - - -
      -

      Salad

      -
      -
        -
      • Chicken Salad
        • -
      • Hearts of Palm
        • -
      • Tuna Salad
        • -
      • Egg Salad
        • -
      • Sweet Potato
        • -
      • Custom Salad
        • -
      -
      - -
      -

      To Go

      -
      -
        -
      • Antipasto Box
        • -
      • Pinwheel Box
        • -
      • Protein Box
        • -
      • Cottage Cheese Box
        • -
      • Crudite Cup
        • -
      • Mixed Fruit Cup
        • -
      • Fruit Yogurt
        • -
      -
      -
      - -
      -
      -

      Poké Bowl
      (Monday)

      -
      -
        -
      • Choose Two:
        • -
      • Salmon
        • -
      • Tuna
        • -
      • Shrimp Tempura
        • -
      • Tofu
        • -
      • Imitation Crab
        • -
      • - - -
        • -
      • Toppings:
        • -
      • Edamame
        • -
      • Mushroom
        • -
      • Cucumber
        • -
      • Green Onion
        • -
      • Carrot
        • -
      • Lettuce
        • -
      • Ginger
        • -
      • Radish
        • -
      • -
        • -
      • Sauce:
        • -
      • Spicy Mayo
        • -
      • Soy Sauce
        • -
      • Wasabi:
        • - -
      -
      - -
      -

      Fat Rosie's Tacos (Tuesday)

      -
      -
        -
      • Choose Two:
        • -
      • Beef
        • -
      • Chicken
        • -
      • Cauliflower
        • -
      • - - -
        • -
      • Sides:
        • -
      • Rice & Beans
        • - -
      • -
        • -
      • Toppings;
        • -
      • Cheese
        • -
      • Lettuce
        • -
      • Sour Cream
        • -
      • Tomatoes
        • -
      • -
        • -
      • Sauce:
        • -
      • Spicy
        • -
      • Mild
        • -
      -
      - - - -
      -

      Chicken Wing (Wednesday)

      -
      -
        -
      • Choice Of:
        • -
      • Boneless
        • -
      • Bone-In
        • -
      • -
        • -
      • Sides:
        • -
      • Fries
        • -
      • -
        • -
      • Flavor (Dry):
        • -
      • Lemon Pepper
        • -
      • Parmesan
        • -
      • Flavor (Wet):
        • -
      • Spicy
        • -
      • BBQ
        • -
      -
      - -
      -

      Stevenson Sushi (Friday)

      -
      -
        -
      • Choose 8 Pieces:
        • -
      • California
        • -
      • Salmon
        • -
      • Philidelphia
        • -
      • Tuna Roll
        • -
      • Rainbow
        • -
      • Spicy Crab
        • -
      • Shrimp Tempura
        • -
      -
      -
      - -
      -
      -

      Tea/Coffee

      -
      -
        -
      • Coffee
        • -
      • Latte Hot
        • -
      • Latte Iced
        • -
      • Latte Iced Caramel
        • -
      • Mocha Hot
        • -
      • Mocha Iced
        • -
      • Monin Tea
        • -
      • Americano
        • -
      • Cappucino
        • -
      • Hot Chocolate
        • -
      -
      - -
      -

      Wraps

      -
      -
        -
      • Power Wrap
        • -
      • Thai Wrap
        • -
      • Veggie Wrap
        • -
      -
      - -
      -

      Pastries

      -
      -
        -
      • Caprese Puff
        • -
      • Ham & Cheese
        • -
      -
      - -
      -

      Oats

      -
      -
        -
      • Autumn Harvest
        • -
      • Strawberry Cheesecake
        • -
      • Mango Chia
        • -
      -
      -
      -
      -
      -

      Classics

      -
      -
        -
      • Latte & Cappuccino
        • -
      • Mocha
        • -
      • Espresso
        • -
      • Americano
        • -
      • Regular or Decaf Coffee
        • -
      • Iced Coffee
        • -
      • Hot Chocolate
        • -
      • Flavored Steamer
        • -
      -
      - -
      -

      Snacks

      -
      -
        -
      • Chips
        • -
      • Hummus & Pita
        • -
      • Yogurt Parfait
        • -
      • Grapes & Cheese
        • -
      • Fruit Cup
        • -
      • Jello
        • -
      • Pasta-Salad
        • -
      • Pudding
        • -
      -
      - -
      -

      Tea

      -
      -
        -
      • Iced Blueberry Green Tea
        • -
      • Hot Tea
        • -
      • Hot or Iced Tea Latte
        • - -
      • Chai
        • -
      • Coco Coconut
        • -
      • Green Tea Matcha
        • - -
      • Iced Tea
        • -
      -
      - -
      -

      Bakery

      -
      -
        -
      • Muffins
        • -
      • Cookies
        • -
      • Turnovers
        • -
      • Scones
        • -
      • Brownies
        • -
      • Bagels
        • -
      • Cinnamon Roll
        • -
      -
      -
      - -
      -
      -

      Sandwiches

      -
      -
        -
      • Turkey & Cheese
        • -
      • Italian Sandwich
        • -
      • Chicken Salad
        • -
      • Ham & Swiss
        • -
      -
      - -
      -

      Wraps

      -
      -
        -
      • Buffalo Chicken
        • -
      • Hummus & Roasted Veggie
        • -
      • Chicken Caesar
        • -
      • Caesar Wrap
        • -
      • Turkey Bacon
        • -
      -
      - -
      -

      Salads

      -
      -
        -
      • Buffalo Chicken
        • -
      • Garden Salad
        • -
      • Chicken Caesar
        • -
      • Caesar Salad
        • -
      • Quinoa Salad
        • -
      -
      - -
      -

      Good Stuff

      -
      -
        -
      • Caramel Delight
        • -
      • Caramel Latte
        • -
      • White Chocolate Mocha
        • -
      • Crème Brûlée
        • -
      • Tuxedo
        • -
      -
      -
      -
      -
      -

      Bread

      -
      -
        -
      • White Bread
        • -
      • Wheat Bread
        • -
      • 9 Grain
        • -
      • Pretzel Bun
        • -
      • Kaiser Roll
        • -
      • Tortilla
        • -
      -
      - -
      -

      Protein

      -
      -
        -
      • Roast Beef
        • -
      • Turkey
        • -
      • Ham
        • -
      • Salami
        • -
      • BBQ Chicken
        • -
      • Buffalo Chicken
        • -
      • Hummus
        • -
      -
      - -
      -

      Toppings

      -
      -
        -
      • Lettuce
        • -
      • Tomato
        • -
      • Onion
        • -
      • Pickles
        • -
      • Olives
        • -
      • Cucumber
        • -
      • Swiss Cheese
        • -
      • Provolone
        • -
      • Cheddar
        • -
      • Pepper Jack
        • -
      -
      - -
      -

      Sauce

      -
      -
        -
      • Chipotle
        • -
      • Mustard
        • -
      • Ketchup
        • -
      • Ranch
        • -
      • Honey Mustard
        • -
      -
      +
      + +
      +

      Menu:

      + + + + + +
      +
      + + + + +
      +
      +

      Jazzman's Menu

      +
      +
      +
      +

      PWC Cafe Menu

      +
      +
      +
      +

      The Deli Menu

      +
      +
      +
      +

      Special Menu

      +
      +
      + + +
      +
      +

      Açaí Bowl

      +
      +
        +
      • Acai Sorbet
        • +
      • Granola
        • +
      • Chia Seeds
        • +
      • Honey
        • +
      • Blueberries
        • +
      • Blackberries
        • +
      • Strawberries
        • +
      • Mango
        • +
      • Kiwi
        • +
      +
      + +
      +

      Drinks

      +
      +
        +
      • Black Milk
        • +
      • Matcha Milk
        • +
      • Chia Milk
        • +
      • Taro Milk
        • +
      • Strawberry
        • +
      • Mango
        • +
      • Dragon Fruit
        • +
      • Green Machine
        • +
      • Forever Berry
        • +
      +
      + + + +
      +

      Salad

      +
      +
        +
      • Chicken Salad
        • +
      • Hearts of Palm
        • +
      • Tuna Salad
        • +
      • Egg Salad
        • +
      • Sweet Potato
        • +
      • Custom Salad
        • +
      +
      + +
      +

      To Go

      +
      +
        +
      • Antipasto Box
        • +
      • Pinwheel Box
        • +
      • Protein Box
        • +
      • Cottage Cheese Box
        • +
      • Crudite Cup
        • +
      • Mixed Fruit Cup
        • +
      • Fruit Yogurt
        • +
      +
      +
      + + +
      +
      +

      Poké Bowl
      (Monday)

      +
      +
        +
      • Choose Two:
        • +
      • Salmon
        • +
      • Tuna
        • +
      • Shrimp Tempura
        • +
      • Tofu
        • +
      • Imitation Crab
        • +
      • + - +
        • +
      • Toppings:
        • +
      • Edamame
        • +
      • Mushroom
        • +
      • Cucumber
        • +
      • Green Onion
        • +
      • Carrot
        • +
      • Lettuce
        • +
      • Ginger
        • +
      • Radish
        • +
      • -
        • +
      • Sauce:
        • +
      • Spicy Mayo
        • +
      • Soy Sauce
        • +
      • Wasabi:
        • + +
      +
      + +
      +

      Fat Rosie's Tacos (Tuesday)

      +
      +
        +
      • Choose Two:
        • +
      • Beef
        • +
      • Chicken
        • +
      • Cauliflower
        • +
      • + - +
        • +
      • Sides:
        • +
      • Rice & Beans
        • + +
      • -
        • +
      • Toppings;
        • +
      • Cheese
        • +
      • Lettuce
        • +
      • Sour Cream
        • +
      • Tomatoes
        • +
      • -
        • +
      • Sauce:
        • +
      • Spicy
        • +
      • Mild
        • +
      +
      + + + +
      +

      Chicken Wing (Wednesday)

      +
      +
        +
      • Choice Of:
        • +
      • Boneless
        • +
      • Bone-In
        • +
      • -
        • +
      • Sides:
        • +
      • Fries
        • +
      • -
        • +
      • Flavor (Dry):
        • +
      • Lemon Pepper
        • +
      • Parmesan
        • +
      • Flavor (Wet):
        • +
      • Spicy
        • +
      • BBQ
        • +
      +
      + +
      +

      Stevenson Sushi (Friday)

      +
      +
        +
      • Choose 8 Pieces:
        • +
      • California
        • +
      • Salmon
        • +
      • Philidelphia
        • +
      • Tuna Roll
        • +
      • Rainbow
        • +
      • Spicy Crab
        • +
      • Shrimp Tempura
        • +
      +
      +
      + +
      +
      +

      Tea/Coffee

      +
      +
        +
      • Coffee
        • +
      • Latte Hot
        • +
      • Latte Iced
        • +
      • Latte Iced Caramel
        • +
      • Mocha Hot
        • +
      • Mocha Iced
        • +
      • Monin Tea
        • +
      • Americano
        • +
      • Cappucino
        • +
      • Hot Chocolate
        • +
      +
      + +
      +

      Wraps

      +
      +
        +
      • Power Wrap
        • +
      • Thai Wrap
        • +
      • Veggie Wrap
        • +
      +
      + +
      +

      Pastries

      +
      +
        +
      • Caprese Puff
        • +
      • Ham & Cheese
        • +
      +
      + +
      +

      Oats

      +
      +
        +
      • Autumn Harvest
        • +
      • Strawberry Cheesecake
        • +
      • Mango Chia
        • +
      +
      +
      + +
      +
      +

      Classics

      +
      +
        +
      • Latte & Cappuccino
        • +
      • Mocha
        • +
      • Espresso
        • +
      • Americano
        • +
      • Regular or Decaf Coffee
        • +
      • Iced Coffee
        • +
      • Hot Chocolate
        • +
      • Flavored Steamer
        • +
      +
      + +
      +

      Snacks

      +
      +
        +
      • Chips
        • +
      • Hummus & Pita
        • +
      • Yogurt Parfait
        • +
      • Grapes & Cheese
        • +
      • Fruit Cup
        • +
      • Jello
        • +
      • Pasta-Salad
        • +
      • Pudding
        • +
      +
      + +
      +

      Tea

      +
      +
        +
      • Iced Blueberry Green Tea
        • +
      • Hot Tea
        • +
      • Hot or Iced Tea Latte
        • + +
      • Chai
        • +
      • Coco Coconut
        • +
      • Green Tea Matcha
        • + +
      • Iced Tea
        • +
      +
      + +
      +

      Bakery

      +
      +
        +
      • Muffins
        • +
      • Cookies
        • +
      • Turnovers
        • +
      • Scones
        • +
      • Brownies
        • +
      • Bagels
        • +
      • Cinnamon Roll
        • +
      +
      +
      + +
      +
      +

      Sandwiches

      +
      +
        +
      • Turkey & Cheese
        • +
      • Italian Sandwich
        • +
      • Chicken Salad
        • +
      • Ham & Swiss
        • +
      +
      + +
      +

      Wraps

      +
      +
        +
      • Buffalo Chicken
        • +
      • Hummus & Roasted Veggie
        • +
      • Chicken Caesar
        • +
      • Caesar Wrap
        • +
      • Turkey Bacon
        • +
      +
      + +
      +

      Salads

      +
      +
        +
      • Buffalo Chicken
        • +
      • Garden Salad
        • +
      • Chicken Caesar
        • +
      • Caesar Salad
        • +
      • Quinoa Salad
        • +
      +
      + +
      +

      Good Stuff

      +
      +
        +
      • Caramel Delight
        • +
      • Caramel Latte
        • +
      • White Chocolate Mocha
        • +
      • Crème Brûlée
        • +
      • Tuxedo
        • +
      +
      +
      +
      +
      +

      Bread Types

      +
      +
        +
      • White Bread
        • +
      • Wheat Bread
        • +
      • 9 Grain
        • +
      • Pretzel Bun
        • +
      • Kaiser Roll
        • +
      • Tortilla
        • +
      +
      + +
      +

      Protein Types

      +
      +
        +
      • Roast Beef
        • +
      • Turkey
        • +
      • Ham
        • +
      • Salami
        • +
      • BBQ Chicken
        • +
      • Buffalo Chicken
        • +
      • Hummus
        • + +
      +
      + +
      +

      Toppings Types

      +
      +
        +
      • Lettuce
        • +
      • Tomato
        • +
      • Onion
        • +
      • Pickles
        • +
      • Olives
        • +
      • Cucumber
        • +
      • Swiss Cheese
        • +
      • Provolone
        • +
      • Cheddar
        • +
      • Pepper Jack
        • + + + + + + + + + +
      +
      + +
      +

      Sauce Types

      +
      +
        +
      • Chipotle
        • +
      • Mustard
        • +
      • Ketchup
        • +
      • Ranch
        • +
      • Honey Mustard
        • +
      • Mayo
        • + +
      +
      + +
      -
      -
      @@ -434,12 +452,12 @@ }, data() { return { - selectedMenu: 'Jazzmans', // Default selection + selectedMenu: 'Jazzmans Menu', // Default selection // Additional data for Dropdown component menuOptions: [ - 'Jazzmans', - 'PWC Cafe', - 'Deli Menu', + 'Jazzmans Menu', + 'PWC Cafe Menu', + 'The Deli Menu', 'Special Menu', ], selectedOptionIndex: 0, // Default selected index @@ -460,11 +478,25 @@ \ No newline at end of file