From a60434ac6ed0db669966ea8e924a7c8b34b2d36c Mon Sep 17 00:00:00 2001
From: Tosin Oguntuyi <tcubed03@gmail.com>
Date: Tue, 20 Feb 2024 15:40:31 +0100
Subject: [PATCH] Fix merge conflicts

---
 templates/event.php | 49 +++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/templates/event.php b/templates/event.php
index a79b9cd4..59b41413 100644
--- a/templates/event.php
+++ b/templates/event.php
@@ -41,33 +41,7 @@
 		<div class="event-page-content">
 			<?php echo esc_html( $event_description ); ?>
 		</div>
-	</div>
-	<div class="event-details-right">
-		<div class="event-details-date">
-			<p><span class="dashicons dashicons-clock"></span> <time class="event-utc-time" datetime="<?php echo esc_attr( $event_start ); ?>"></time> - <time class="event-utc-time" datetime="<?php echo esc_attr( $event_end ); ?>"></time></p>
-		</div>
-		<?php if ( is_user_logged_in() ) : ?>
-		<div class="event-details-join">
-			<?php
-			$current_time = gmdate( 'Y-m-d H:i:s' );
-			if ( strtotime( $current_time ) > strtotime( $event_end ) ) :
-				?>
-				<?php if ( $user_is_attending ) : ?>
-					<span class="event-details-join-expired"><?php esc_html_e( 'You attended', 'gp-translation-events' ); ?></span>
-				<?php endif ?>
-			<?php else : ?>
-				<form class="event-details-attend" method="post" action="<?php echo esc_url( gp_url( "/events/attend/$event_id" ) ); ?>">
-					<?php if ( ! $user_is_attending ) : ?>
-						<input type="submit" class="button is-primary" value="Attend Event"/>
-					<?php else : ?>
-						<input type="submit" class="button is-secondary" value="You're attending"/>
-					<?php endif ?>
-				</form>
-			<?php endif ?>
-		</div>
-		<?php endif; ?>
-	</div>
-<?php if ( ! empty( $event_stats->rows() ) ) : ?>
+		<?php if ( ! empty( $event_stats->rows() ) ) : ?>
 	<div class="event-details-stats">
 		<h2>Stats</h2>
 		<table>
@@ -113,13 +87,22 @@
 		</div>
 		<?php if ( is_user_logged_in() ) : ?>
 		<div class="event-details-join">
-			<form class="event-details-attend" method="post" action="<?php echo esc_url( gp_url( "/events/attend/$event_id" ) ); ?>">
-				<?php if ( ! $user_is_attending ) : ?>
-					<input type="submit" class="button is-primary attend-btn" value="Attend Event"/>
-				<?php else : ?>
-					<input type="submit" class="button is-secondary attending-btn" value="You're attending"/>
+			<?php
+			$current_time = gmdate( 'Y-m-d H:i:s' );
+			if ( strtotime( $current_time ) > strtotime( $event_end ) ) :
+				?>
+				<?php if ( $user_is_attending ) : ?>
+					<span class="event-details-join-expired"><?php esc_html_e( 'You attended', 'gp-translation-events' ); ?></span>
 				<?php endif ?>
-			</form>
+			<?php else : ?>
+				<form class="event-details-attend" method="post" action="<?php echo esc_url( gp_url( "/events/attend/$event_id" ) ); ?>">
+					<?php if ( ! $user_is_attending ) : ?>
+						<input type="submit" class="button is-primary attend-btn" value="Attend Event"/>
+					<?php else : ?>
+						<input type="submit" class="button is-secondary attending-btn" value="You're attending"/>
+					<?php endif ?>
+				</form>
+			<?php endif ?>
 		</div>
 		<?php endif; ?>
 	</div>