Skip to content

Miro/2024 events page #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Sep 20, 2024
Merged

Miro/2024 events page #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9194263
Added Event Content and CSS
Shiverhex Sep 3, 2024
830c927
Added Slider, Array, and WIP Popup
Shiverhex Sep 10, 2024
b2f4f51
Merge branch '2024WebsiteOverhaul' into Miro/2024-Events-Page
Quashnock Sep 10, 2024
4e36585
Completed Popup
Shiverhex Sep 13, 2024
135a783
Merge branch 'Miro/2024-Events-Page' of https://github.com/TrickfireR…
Shiverhex Sep 13, 2024
1f90036
Merge branch '2024WebsiteOverhaul' into Miro/2024-Events-Page
Quashnock Sep 13, 2024
b4fa7e7
Completed Mobile Page
Shiverhex Sep 17, 2024
9e0bece
Merge branch 'Miro/2024-Events-Page' of https://github.com/TrickfireR…
Shiverhex Sep 17, 2024
f40cfe1
Fixing Bugs
Shiverhex Sep 17, 2024
e437b25
Added Mobile Popup
Shiverhex Sep 19, 2024
4cbd4fe
-Fixed graphical bug with text going off the mobile pop-up at around …
Sep 20, 2024
fe943a3
Merge branch '2024WebsiteOverhaul' into Miro/2024-Events-Page
Quashnock Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 54 additions & 24 deletions Events.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,40 +38,70 @@
<body>
<!-- Header will be loaded here -->
<main>
<!-- Mobile Page Navigation-->
<div class="page-setup">
<h1>Upcoming Events</h1>

<!-- Event container with fixed buttons to scroll through events-->
<div class="events-navigation">
<div class="upcoming-header active" id="upcoming-header">
Upcoming Events
</div>
<div class="previous-header" id="previous-header">
Previous Events
</div>
</div>
<div class="upcoming-events-wrapper">
<button class="back-button">
<img src="assets/images/icons/backward.png" alt="Back" class="button-img">
</button>

<div class="upcoming-events">
<!-- Event cards will be added here with Javascript-->
<h1 class="upcoming-title">Upcoming Events</h1>

<!-- Event container with fixed buttons to scroll through events-->
<div class="upcoming-card-wrapper">
<button class="back-button">
<img
src="assets/images/icons/backward.png"
alt="Back"
class="button-img"
/>
</button>

<div class="upcoming-events">
<!-- Event cards will be added here with Javascript-->
</div>

<button class="next-button">
<img
src="assets/images/icons/forward.png"
alt="Next"
class="button-img"
/>
</button>
</div>

<button class="next-button">
<img src="assets/images/icons/forward.png" alt="Next" class="button-img">
</button>
<!-- Previous Events cards which their time is before the current date are put here-->
<!-- Previous Events cards which their time is before the current date are put here-->
</div>
<h1>Previous Events</h1>
<div class="previous-events">
<h1 class="previous-title">Previous Events</h1>
<div class="previous-events-wrapper">
<div class="previous-events">
<!-- Event cards will be added here with Javascript-->
</div>
</div>
</div>
<!-- Popup HTML -->
<div class="popup" id="popup">
<div class="popup-content">
<div class="first-column">
<img src="" alt="" class="popup-img" id="popup-img">
<img src="" alt="Event Image" class="popup-img" id="popup-img" />
<div class="time-hold">
<img src="assets/images/icons/clock_black.png" alt="" class="clock">
<p class="popup-date" id="popup-date">Oct 10th, 24</p>
<p class="popup-time" id="popup-time">8 pm - 11 pm</p>
<img
src="assets/images/icons/clock_black.png"
alt="Clock icon"
class="popup-clock"
/>
<p class="popup-date" id="popup-date">Oct 10th, 24</p>
<p class="popup-time" id="popup-time">8 pm - 11 pm</p>
</div>
<div class="location-hold">
<img src="assets/images/icons/waypoint_black.png" alt="" class="waypoint">
<img
src="assets/images/icons/waypoint_black.png"
alt="Waypoint icon"
class="popup-waypoint"
/>
<p class="popup-location" id="popup-location">UWB INV-011</p>
</div>
</div>
Expand All @@ -84,8 +114,8 @@ <h2 class="popup-title" id="popup-title">Event Title</h2>
</div>
</div>
</div>
<!-- Old Commented out Event Card HTML -->
<!-- <div class="event-card" id="event1">
<!-- Old Commented out Event Card HTML -->
<!-- <div class="event-card" id="event1">
<div class="image-container">
<div class="time">
<div class="date">
Expand Down Expand Up @@ -120,7 +150,7 @@ <h3 class="event-location">UWB INV-011</h3>
</div>
</div>
</div> -->
<script src="assets/javascript/Event.js"></script>
<script src="assets/javascript/Event.js"></script>
</main>
<!-- Footer will be loaded here -->
</body>
Expand Down
2 changes: 1 addition & 1 deletion assets/images/icons/clock.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/icons/waypoint_gray.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading