Skip to content

Commit

Permalink
Merge pull request #94 from XavierTho/main
Browse files Browse the repository at this point in the history
Updates to Period 3 Topic Page: Scrum Master Spencer
  • Loading branch information
XavierTho authored Nov 2, 2024
2 parents 5e3343b + 9288a44 commit f8a89a4
Show file tree
Hide file tree
Showing 11 changed files with 117 additions and 45 deletions.
28 changes: 4 additions & 24 deletions navigation/share_and_care/chess/hangout.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ authors: Ahaan, Xavier, Spencer, Vasanth



<!DOCTYPE html>

<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Chess Hangout Zone - Chess Game with Chat</title>
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
<style>
/* Styles */
body {
Expand Down Expand Up @@ -179,7 +178,7 @@ authors: Ahaan, Xavier, Spencer, Vasanth
generateBoard();
displayTurnPopup();
if (gameMode === 'bot' && turn === 'black') {
setTimeout(botMove, 1000);
setTimeout(botMove, 5000); // 5 seconds delay for bot move
}
}

Expand All @@ -202,31 +201,12 @@ authors: Ahaan, Xavier, Spencer, Vasanth

function getLegalMoves(piece, startRow, startCol) {
const moves = [];
switch (piece) {
case 'p': // Pawn
// Add pawn movement and capture rules
break;
case 'r': // Rook
// Add rook movement rules
break;
case 'n': // Knight
// Add knight movement rules
break;
case 'b': // Bishop
// Add bishop movement rules
break;
case 'q': // Queen
// Add queen movement rules
break;
case 'k': // King
// Add king movement rules
break;
}
// Add move logic here
return moves.filter(move => isLegalMove(move));
}

function isLegalMove(move) {
return true; // Implement legality check
return true; // Add legality check
}

function sendBotMessage() {
Expand Down
1 change: 1 addition & 0 deletions navigation/share_and_care/chess/home.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ layout: post
title: Chess [Home Page]
permalink: /chess/home
comments: true
authors: Ahaan, Xavier, Spencer, Vasanth
---

Welcome to the Chess Forum!
Expand Down
Binary file added navigation/share_and_care/dnhscafe/Cap.png
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 navigation/share_and_care/dnhscafe/Espresso.png
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 navigation/share_and_care/dnhscafe/Mocha.png
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 navigation/share_and_care/dnhscafe/Pumpkin.png
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 navigation/share_and_care/dnhscafe/Vanilla.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 77 additions & 2 deletions navigation/share_and_care/dnhscafe/cafe_home_page.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,82 @@ title: DNHS Cafe
description: Cafe homepage
permalink: /dnhscafe/
---

<div>
<img src="{{site.baseurl}}/navigation/share_and_care/dnhscafe/dnhs_cafe_header.png" width="1200px" height="250px">
</div>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<style>
.collapsible {
background-color: #825B41;
color: #ffff;
cursor: pointer;
padding: 18px;
width: 100%;
border: none;
text-align: left;
outline: none;
font-size: 15px;
}
.active, .collapsible:hover {
background-color: #825B41;
}
.content {
padding: 0 18px;
display: none;
overflow: hidden;
background-color: #AB8265;
}
</style>
</head>
<body>
<button type="button" class="collapsible"> Moderator Rules ▽</button>
<div class="content">
<p>
• Adhere to chatroom topic
</p>
<p>
• Be mindful of others in the conversation
</p>
<p>
• Do not exploit coffee points
</p>
<p>
• No swearing/slurs
</p>
<p>
• No harassment
</p>
<p>
• No explicit jokes
</p>
<p>
• No discrimination against other people
</p>
</div>
<script>
var coll = document.getElementsByClassName("collapsible");
var i;
for (i = 0; i < coll.length; i++) {
coll[i].addEventListener("click", function() {
this.classList.toggle("active");
var content = this.nextElementSibling;
if (content.style.display === "block") {
content.style.display = "none";
} else {
content.style.display = "block";
}
});
}
</script>
</body>
<div>
<center>
<span>
<a href="{{site.baseurl}}/dnhscafestore">
<button style="background-color: #e4bc84; color: white; padding: 10px"> Take Me To DNHS Cafe! </button>
</a>
</a>
<span>
<a href="{{site.baseurl}}/dnhscafestudyroom">
<button style="background-color: #e4bc84; color: white; padding: 10px"> Take Me To DNHS Cafe Study Room! </button>
</a>
53 changes: 34 additions & 19 deletions navigation/share_and_care/dnhscafe/cafe_store.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,15 @@ permalink: /dnhscafestore/
Creamy vanilla meets rich caramel for a truly indulgent treat.
**Price:** 11 dneros

-

### Points: <span id="userPoints">50</span> dneros

| Coffee | Cost (dneros) | Action |
|---------------|---------------|----------|
| **Classic Espresso** | 15 | <button class="buy-button" onclick="buyCoffee(15)">Buy</button> |
| **Pumpkin Spice Latte** | 20 | <button class="buy-button" onclick="buyCoffee(20)">Buy</button> |
| **Cappuccino**| 18 | <button class="buy-button" onclick="buyCoffee(18)">Buy</button> |
| **Mocha Latte** | 22 | <button class="buy-button" onclick="buyCoffee(22)">Buy</button> |
| **Vanilla Caramel Macchiato** | 25 | <button class="buy-button" onclick="buyCoffee(25)">Buy</button> |
| Image | Coffee | Cost (dneros) | Action |
|--------------------------------|-------------------------------|---------------|----------|
| ![Classic Espresso](Espresso.png) | **Classic Espresso** | 15 | <button class="buy-button" onclick="buyCoffee(15)">Buy</button> |
| ![Pumpkin Spice Latte](Pumpkin.png) | **Pumpkin Spice Latte** | 20 | <button class="buy-button" onclick="buyCoffee(20)">Buy</button> |
| ![Cappuccino](Cap.png) | **Cappuccino** | 18 | <button class="buy-button" onclick="buyCoffee(18)">Buy</button> |
| ![Mocha Latte](Mocha.png) | **Mocha Latte** | 22 | <button class="buy-button" onclick="buyCoffee(22)">Buy</button> |
| ![Vanilla Caramel Macchiato](Vanilla.png) | **Vanilla Caramel Macchiato** | 25 | <button class="buy-button" onclick="buyCoffee(25)">Buy</button> |

---

Expand All @@ -73,17 +71,15 @@ function buyCoffee(cost) {
updatePointsDisplay(); // Initial display update
</script>

<<<<<<< HEAD

1. Choose your favorite drink(s).

2. Message us to confirm your order.

3. Enjoy the cozy vibes and delicious flavors of DNHS Cafe!

*Thank you for visiting DNHS Cafe! We hope our cozy corner brings you a taste of joy and warmth.*

<a href="{{site.baseurl}}/dnhscafestudyroom">
<button style="background-color: #e4bc84; color: white; padding: 10px"> Take Me To DNHS Cafe Study Room! </button>
</a>
=======
<style>
body {
font-family: Arial, sans-serif;
Expand All @@ -106,21 +102,40 @@ th, td {
th {
background-color: #F0E5D8;
}
img {
width: 80px;
height: auto;
border-radius: 8px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
}
.buy-button {
padding: 8px 12px;
background-color: #D2691E;
padding: 10px 15px;
background-color: #4682B4;
color: white;
border: none;
border: 2px solid #0056b3;
border-radius: 8px;
cursor: pointer;
font-size: 14px;
font-size: 16px;
transition: background-color 0.3s, transform 0.2s;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
}

.buy-button:hover {
background-color: #5A9BD4;
transform: scale(1.05);
}

.buy-button:active {
transform: scale(0.95);
}

.buy-button:disabled {
background-color: #ccc;
cursor: not-allowed;
}
</style>


<a href="{{site.baseurl}}/dnhscafestudyroom">
<button style="background-color: #e4bc84; color: white; padding: 10px"> Take Me To DNHS Cafe Study Room! </button>
</a>
</a>
1 change: 1 addition & 0 deletions navigation/share_and_care/dnhscafe/cafechatroom.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ title: DNHS Cafe Study Room
description: Help out your peers with school work to earn d'neros!
permalink: /dnhscafestudyroom/
---

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f8a89a4

Please sign in to comment.