Skip to content

Main => event calendar #24

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

Open
MaleeshaSulakshana wants to merge 43 commits into
base: event-calendar
Choose a base branch
from
Open

Main => event calendar #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
3d37e9b
add review content
disururathnayake Oct 1, 2024
a564193
Merge branch 'main' of https://github.com/disururathnayake/EventManager
disururathnayake Oct 1, 2024
287d50d
add review content
disururathnayake Oct 1, 2024
3c01535
Merge pull request #17 from disururathnayake/review-update-issues
disururathnayake Oct 1, 2024
a8f4d89
add review content
disururathnayake Oct 1, 2024
0141592
Merge pull request #18 from disururathnayake/review-update-issues
disururathnayake Oct 1, 2024
ce9a65a
Add event booking
Chamoth Oct 1, 2024
7c73d57
Added unit test cases for addEvent, manage users by admin.
Pasindufdo98 Oct 1, 2024
bf18f04
Merge branch 'event-booking-new' into Booking-New-withoutconflicts
disururathnayake Oct 1, 2024
275bb09
Merge pull request #22 from disururathnayake/Booking-New-withoutconfl…
disururathnayake Oct 1, 2024
615c7dc
issue fix
disururathnayake Oct 1, 2024
7918d2a
issue fix
disururathnayake Oct 1, 2024
77249f2
Merge branch 'main' into unit_test_addEvent_admin
disururathnayake Oct 1, 2024
faa43c6
Merge pull request #20 from disururathnayake/unit_test_addEvent_admin
disururathnayake Oct 1, 2024
7894b06
issue fix
disururathnayake Oct 1, 2024
348d4d3
Merge pull request #23 from disururathnayake/issue-fixes
disururathnayake Oct 1, 2024
02266d2
issue fix
disururathnayake Oct 1, 2024
bd9d0c1
Merge pull request #25 from disururathnayake/issue-fixes
disururathnayake Oct 1, 2024
42ec063
issue fix
disururathnayake Oct 1, 2024
9a3bcb5
Merge pull request #26 from disururathnayake/issue-fixes
disururathnayake Oct 1, 2024
09d39e6
Merge branch 'event-calendar' into main
disururathnayake Oct 1, 2024
572595e
unit-testing
disururathnayake Oct 1, 2024
15375d9
Merge pull request #27 from disururathnayake/review-unit-testing
disururathnayake Oct 1, 2024
b03d364
dashboard enhancement
Pasindufdo98 Oct 2, 2024
6c2ceae
Merge pull request #28 from disururathnayake/dashboardEnahance
disururathnayake Oct 2, 2024
61770e5
unit-testing
disururathnayake Oct 2, 2024
92ab13f
Merge branch 'main' into review-unit-testing
disururathnayake Oct 2, 2024
69f4ba4
Merge pull request #29 from disururathnayake/review-unit-testing
disururathnayake Oct 2, 2024
301e6dc
issue-fixes
disururathnayake Oct 2, 2024
4af34a1
issue-fixes
disururathnayake Oct 2, 2024
6a70bf2
dashboard logout button alignment fix
Pasindufdo98 Oct 2, 2024
9ea8926
Add Unit Testinng for the Feedback Form
Chamoth Oct 2, 2024
7b89696
Merge pull request #30 from disururathnayake/unit-testing-feedback
disururathnayake Oct 2, 2024
28bb394
issue-fixes
disururathnayake Oct 2, 2024
05c649f
Add Unit Testing for the Evennt Bookinng
Chamoth Oct 2, 2024
7555319
Change DB URL
Chamoth Oct 2, 2024
49a3f58
Merge pull request #31 from disururathnayake/event-booking-unit-testing
disururathnayake Oct 2, 2024
d4d31a2
issue-fixes
disururathnayake Oct 2, 2024
9fb3571
Merge branch 'main' of https://github.com/disururathnayake/EventManager
disururathnayake Oct 2, 2024
d6e4613
issue-fixes
disururathnayake Oct 2, 2024
9c34095
issue-fixes
disururathnayake Oct 2, 2024
41c0213
added popup modal
MaleeshaSulakshana Oct 2, 2024
7b704f7
Merge pull request #32 from disururathnayake/calendar-popup-modal
disururathnayake Oct 2, 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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
node_modules
node_modules
uploads
dbConnection.js
15 changes: 15 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}"
}
]
}
199 changes: 95 additions & 104 deletions addEvent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="description" content="" />
<meta name="author" content="" />
<title>Add Events</title>
<link
href="https://cdn.jsdelivr.net/npm/simple-datatables@7.1.2/dist/style.min.css"
rel="stylesheet"
/>
<link href="css/styles.css" rel="stylesheet" />
<script
src="https://use.fontawesome.com/releases/v6.3.0/js/all.js"
crossorigin="anonymous"
></script>
</head>


<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="" />
<meta name="author" content="" />
<title>Add Events</title>
<link href="https://cdn.jsdelivr.net/npm/simple-datatables@7.1.2/dist/style.min.css" rel="stylesheet" />
<link href="css/styles.css" rel="stylesheet" />
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
</head>




<body>
<nav class="sb-topnav navbar navbar-expand navbar-dark bg-dark">
<!-- Navbar Brand-->
Expand All @@ -36,18 +33,7 @@
<form
class="d-none d-md-inline-block form-inline ms-auto me-0 me-md-3 my-2 my-md-0"
>
<div class="input-group">
<input
class="form-control"
type="text"
placeholder="Search for..."
aria-label="Search for..."
aria-describedby="btnNavbarSearch"
/>
<button class="btn btn-primary" id="btnNavbarSearch" type="button">
<i class="fas fa-search"></i>
</button>
</div>

</form>
<!-- Navbar-->
<ul class="navbar-nav ms-auto ms-md-0 me-3 me-lg-4">
Expand All @@ -68,7 +54,7 @@
<li><a class="dropdown-item" href="#!">Settings</a></li>
<li><a class="dropdown-item" href="#!">Activity Log</a></li>
<li><hr class="dropdown-divider" /></li>
<li><a class="dropdown-item" id="logoutButton">Logout</a></li>
<li><a class="dropdown-item" href="index.html">Logout</a></li>
</ul>
</li>
</ul>
Expand Down Expand Up @@ -102,6 +88,7 @@
</div>
Event Calendar
</a>

<a class="nav-link collapsed" href="#" data-bs-toggle="collapse" data-bs-target="#collapseReviews" aria-expanded="false" aria-controls="collapseReviews">
<div class="sb-nav-link-icon">
<i class="fas fa-star"></i>
Expand All @@ -117,84 +104,88 @@
<a class="nav-link" href="viewReviews.html">View Reviews</a>
</nav>
</div>

<!-- New Booking Details Link -->
<a class="nav-link" href="booking_details.html">
<div class="sb-nav-link-icon">
<i class="fas fa-ticket-alt"></i>
</div>
Booking Details
</a>
<!-- Manage Bookings Link -->
<a class="nav-link" href="manage_bookings.html">
<div class="sb-nav-link-icon">
<i class="fas fa-book"></i>
</div>
Manage Bookings
</a>
<!-- Feedback Forum Link -->
<a class="nav-link" href="feedbackForum.html">
<div class="sb-nav-link-icon">
<i class="fas fa-comment-alt"></i>
</div>
Feedback Forum
</a>
<!-- manage_feedback Link -->


</div>
</div>
</nav>
</div>
</div>

<div class="container mt-5">
<h2>Add Event</h2>
<form id="addEventForm">
<div class="mb-3">
<label for="eventName" class="form-label">Event Name</label>
<input type="text" class="form-control" id="eventName" required />
</div>
<div class="mb-3">
<label for="eventDate" class="form-label">Event Date</label>
<input type="date" class="form-control" id="eventDate" required />
</div>
<div class="mb-3">
<label for="eventTime" class="form-label">Event Time</label>
<input type="time" class="form-control" id="eventTime" required />
</div>
<div class="mb-3">
<label for="venue" class="form-label">Venue</label>
<input type="text" class="form-control" id="venue" required />
</div>
<div class="mb-3">
<label for="aboutEvent" class="form-label">About the Event</label>
<textarea
class="form-control"
id="aboutEvent"
rows="3"
required
></textarea>
</div>
<div class="mb-3">
<label for="specialNotes" class="form-label">Special Notes</label>
<textarea
class="form-control"
id="specialNotes"
rows="2"
></textarea>
</div>
<div class="mb-3">
<label class="form-label">Type</label><br />
<input
type="radio"
name="eventType"
id="freeForAll"
value="Free for All"
checked
/>
<label for="freeForAll">Free for All</label><br />
<input
type="radio"
name="eventType"
id="paidTickets"
value="Paid - Tickets"
/>
<label for="paidTickets">Paid - Tickets</label>
</div>
<div class="container mt-5">
<h2>Add Event</h2>
<form id="addEventForm">
<div class="mb-3">
<label for="eventName" class="form-label">Event Name</label>
<input type="text" class="form-control" id="eventName" required />
</div>
<div class="mb-3">
<label for="eventDate" class="form-label">Event Date</label>
<input type="date" class="form-control" id="eventDate" required />
</div>
<div class="mb-3">
<label for="eventTime" class="form-label">Event Time</label>
<input type="time" class="form-control" id="eventTime" required />
</div>
<div class="mb-3">
<label for="venue" class="form-label">Venue</label>
<input type="text" class="form-control" id="venue" required />
</div>
<div class="mb-3">
<label for="aboutEvent" class="form-label">About the Event</label>
<textarea class="form-control" id="aboutEvent" rows="3" required></textarea>
</div>
<div class="mb-3">
<label for="specialNotes" class="form-label">Special Notes</label>
<textarea class="form-control" id="specialNotes" rows="2"></textarea>
</div>
<div class="mb-3">
<label class="form-label">Type</label><br />
<input type="radio" name="eventType" id="freeForAll" value="Free for All" checked />
<label for="freeForAll">Free for All</label><br />
<input type="radio" name="eventType" id="paidTickets" value="Paid - Tickets" />
<label for="paidTickets">Paid - Tickets</label>
</div>

<div class="mb-3">
<label for="eventPhoto" class="form-label"
>Event Notice Photo (optional)</label
>
<input type="file" class="form-control" id="eventPhoto" />
</div>
<div class="mb-3">
<label for="eventPhoto" class="form-label">Event Notice Photo (optional)</label>
<input type="file" class="form-control" id="eventPhoto" />
</div>

<button type="submit" class="btn btn-primary" id="addEventButton">
Add Event
</button>
</form>
</div>
<button type="submit" class="btn btn-primary" id="addEventButton">
Add Event
</button>
</form>
</div>
</div>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>

<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
<script src="scripts.js"></script>
</body>

<script src="scripts.js"></script>
</body>
</html>
</html>
Loading