Skip to content

Commit

Permalink
Merge branch 'main' into Sam-Orion
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam-Orion authored Jul 22, 2024
2 parents f305abe + 7cae9d1 commit 3d396b4
Show file tree
Hide file tree
Showing 172 changed files with 6,148 additions and 610 deletions.
Binary file modified .DS_Store
Binary file not shown.
16 changes: 10 additions & 6 deletions .github/CONTRIBUTING_GUIDELINE.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,21 @@ in case you are stuck:
<br>

## **File naming conventions 📁**
- Give unique name for your game that is not already existed
- Give unique name for your game that don't exist already.
* Folder naming convention
- ```Game_Name``` ex. ```Tilting_Maze``` (first letter should be capital and if you need space use _ )
- ```Game_Name``` ex. ```Tilting_Maze```,```Rock_Paper_Scissors``` (first letter should be capital and if you need space use underscore **_** )
* files in the folder
- ```index.html``` , ```script.js``` , ```style.css```(not stictly to follow this but you should have separate )
- Main html file should be named as **index.html** , not something else like ```Tilting_Maze.html```
- Game files - ```index.html``` , ```script.js``` , ```style.css```(not stictly to follow this but you should have separate file for each kind)
- It is preferred if the main html file is directly added to the main folder of you game like ```Tilting_Maze/index.html``` along with other files like *style.css*, *script.js*
- you can have other folders if you are having assets for your game
- ```README.md``` for your folder using template [TEMPLATE](../Games/FOLDER_README_TEMPLATE.md)
- It is not compulsory to follow this README template only you can have your own
- Create```README.md``` for your Game using this [TEMPLATE](../Games/FOLDER_README_TEMPLATE.md).Although, it is not compulsory to follow this README template ,you can use your own *README* template whichever you prefer, to explain your Game
* naming convention for the screenshot you will add in ```assets/images```
- Remember preview image should be in ```assets/images``` and not in main folder of Game itself.
- name of image should be same as your game name
- ex. ```Tilting_Maze.jpeg``` or .jpg or .png any of the image formate
- ex. ```Tilting_Maze.jpeg``` or .jpg or .png any of the image format, but don't add image format in the name itself , it is self-assigned to a image,you don't need to add it manually, otherwise it becomes ```Tilting_Maze.jpeg.jpeg```
- There should be only one ScreenShot of the game in ```assets/images``` and that too with same name as the Game(Exactly Same).
* Note:-All Other data except the ScreenShot of your Game, should be in it's main folder , don't add it to other folders of the project.

<br>

Expand Down
24 changes: 24 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,30 @@ If you find this project helpful, please consider giving it a star on GitHub! Yo

<br>


## Add Game to assets/js/gamesData.json

* This is to Show your game on the main Website
- Go to the end of gamesData.json and add :
- **,**
" **No.** ":{
"gameTitle" : " **Title** ",
"gameUrl": " **Main Folder** ",
"thumbnailUrl":" **Preview Image** "
}
- **No.**: Number for your Game , it should be the next number with respect to the file. eg: it the last no. in file at present is *625* you should put *626* at the place of **No.**
- **Title:** this is the title for your game that will be shown on the website, if your game name is ```Super_Mario_Game``` ,put Title as ```Super Mario Game```
- **Main Folder :** This is the reference to *index.html*
- if your index.html is directly in main game folder ,put the main folder name eg: ```Super_Mario_Game```
- if your index.html is in subfolder , give path to it
eg: ```Super_Mario_Game/public``` (assuming index.html is in public folder of Super_Mario_Game folder)
- if your main html file's name is not index.html , you need to specify the main html file also. eg:```Super_Mario_Game/mario.html``` or if in sub folder ```Super_Mario_Game/public/mario.html```
- **Preview Image:** This is the image that will be shown as preview for your game , here you provide the name of the image that you added to **assets/images** folder, along with format type. Eg. ```Super_Mario_Game.png``` or ```Super_Mario_Game.jpg``` or with any other format.

**Note:-**

- Do not modify anything else in the rest of the file, you only need to add your game in the end of the file.
- Don't forget to add the comma for new entry (already give in above sample but this is a reminder as one might miss it to see in the sample)
## **Pull Request Process 🚀**

1. Ensure that you have self reviewed your code 😀
Expand Down
Binary file added Games/.DS_Store
Binary file not shown.
Binary file removed Games/1icon.png
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file removed Games/Mario Matching Game/01.jpg
Binary file not shown.
Binary file removed Games/Mario Matching Game/02.jpg
Binary file not shown.
Binary file removed Games/Mario Matching Game/03.jpg
Binary file not shown.
23 changes: 0 additions & 23 deletions Games/Mario Matching Game/Readme.md

This file was deleted.

34 changes: 0 additions & 34 deletions Games/Mario Matching Game/index.html

This file was deleted.

30 changes: 0 additions & 30 deletions Games/Mario Matching Game/script.js

This file was deleted.

119 changes: 0 additions & 119 deletions Games/Mario Matching Game/style.css

This file was deleted.

4 changes: 2 additions & 2 deletions Games/Master_Typing/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</head>
<body>
<div class="details_div">
<div onclick="window.location.href='/'" class="home_btn">
<i style="color:white;" class="fas fa-home home-icon"></i>
<div onclick="window.location.href='https://kunjgit.github.io/GameZone/'" class="home_btn">
<i style="color:white;" class="fas fa-home home-icon"></i>
</div>
<div class="load">
<h1>MASTER TYPING</h1>
Expand Down
42 changes: 42 additions & 0 deletions Games/Matching_pair/Contact-us.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Contact-Me</title>
<link rel="stylesheet" href="Contact.css">
</head>
<body>
<nav class="navbar">
<div class="navbar-container">
<a href="#" class="navbar-brand">Contact-me</a>
<ul class="navbar-menu">
<li><a href="#">LinkdeIn</a></li>
<li><a href="#">Github</a></li>
<li><a href="#">Devfolio</a></li>
</ul>
</div>
</nav>
<div class="contact-container">
<h1>Contact-Us</h1>

<hr size="5px" noshade="none">
<form class="contactForm" action="#" method="post" enctype="text/plain">
<label for="name">Name:</label>
<input type="text" id="name " name="name" placeholder="Enter Your Name " required>

<label for="email">Email:</label>
<input type="email" id="email"name="email" placeholder="Enter Your Email" required>

<label for="message" >Message:</label>
<textarea type="message" name="message" value=""placeholder="Enter Your Message" required></textarea>
<div class="form-group">
<button class="submit" type="submit">Submit</button>
</div>

</form>
<p id="formMessage"></p>
</div>
<script src="contact.js"></script>
</body>
</html>
Loading

0 comments on commit 3d396b4

Please sign in to comment.