Skip to content
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.

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

Updating branch to current state of main #7

Merged
merged 3 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
% mvn clean
% mvn compile
% mvn package
% mvn exec:java -Dexec.mainClass=uta.cse3310.App
47 changes: 30 additions & 17 deletions html/match.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
width: 15rpx;
height:15px;
text-align: center;
line-height: 15px; /* Adjust the line-height */
margin: 0; /* Remove any default margin */
line-height: 15px;
margin: 0;
}
</style>
</head>
Expand All @@ -35,7 +35,6 @@
<nav class="navbar navbar-expand-sm navbar-dark container">
<a href="index.html" class="navbar-brand" ><img src="../asset/navBarIcon.png" width="200" height="70"></a>


<!-- Create ticket to fix this, doesn't respone on click -->
<!-- <button class="navbar-toggler collapsed d-flex d-lg-none flex-column justify-content-around"
type="button"
Expand All @@ -51,7 +50,6 @@

</button> -->


<div class="collapse navbar-collapse" id="toggleMobileMenu">
<ul class="navbar-nav ms-auto text-end">
<li>
Expand All @@ -66,17 +64,13 @@
<li>
<a class="nav-link" href="#contact">SUPPORT</a>
</li>


</ul>
</div>
</nav>
</div>
<div class=" custom-body h-auto">
<div id="home" class="container-fluid text-center flex-column d-flex justify-content-center align-items-center py-3"
style="height: fit-content">

<div ">
<div class="container custom-body h-auto">
<div id="home" class="container text-center d-flex justify-content-center align-items-center py-3" style="height: fit-content">
<div>
<table class="h4 table table-light">
<tr class="h3">
<td id="playerOneName">@</td>
Expand All @@ -86,15 +80,34 @@
<td id="playerTwoName">@</td>
</tr>
</table>
<p>FIND THE WORDS: <span id="wordList"></span></p>
<!-- Multi-user chat box -->
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">Chat</div>
<div class="card-body" id="chatBox">
<!-- Chat messages will be displayed here -->
</div>
<div class="card-footer">
<input type="text" class="form-control" id="chatMessage" placeholder="Type your message">
<button class="btn btn-primary mt-2" id="sendMessage">Send</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="py-3 justify-content-center text-center flex-column d-flex container" >
<p >FIND THE WORDS: <span id="wordList"></span></p>
<table class="wordSearchTable" id="wordSearchTable"></table>
<div class="container">
<div class="py-3 justify-content-center text-center flex-column d-flex container ">
<table class="wordSearchTable" id="wordSearchTable"></table>
</div>
<div class="flex"></div>
</div>
</div>


</div>

<section data-aos="fade-up" id="contact">
<div class="container-fluid custom-footer">
<div id="contact"
Expand Down Expand Up @@ -191,4 +204,4 @@
</script>
</body>

</html>
</html>