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.

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

Jump to bottom

Added video to the about us page #263

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added video to the about us page #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
105465f
video added in about us page
Jun 5, 2024
57c7c26
changes made
Jun 5, 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
87 changes: 64 additions & 23 deletions about.css
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 24 additions & 6 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>About The Game - Rubik Cube</title>
<link rel="stylesheet" href="about.css">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Exo+2:wght@400;700&display=swap" rel="stylesheet">
</head>
<body>
<header class="header">
Expand All @@ -14,24 +17,31 @@
<div class="content"
<h1 class="text--title" style="text-align: center;">
<span>About The Game</span>
<br>
</h1>
<br>
</div>

<div class="content">
<div class="text">
<div class="about-text--content">
<p>This website is dedicated to providing you with the best Rubik's Cube solving experience. Our team is passionate about puzzles and games, and we strive to create tools and resources that enhance your enjoyment and skill development.</p>
<p>Whether you're a beginner or an experienced solver, we hope you find our website helpful and enjoyable. Feel free to explore the various features and settings of our Rubik's Cube solver and let us know if you have any feedback or suggestions!</p>
<h1>About Rubik's Cubes</h1>
<br>
<br>
<h2 class ="subheading">About Rubik's Cubes</h2>

<p>Welcome to the "About" page for Rubik's Cubes! Here, you'll find comprehensive information about Rubik's Cubes, including their history, basic concepts, solving methods, and more.</p>

<br>
<br>
<h2 class="subheading">History</h2>
<p>The Rubik's Cube, invented by Ernő Rubik in 1974, is a 3D combination puzzle that has fascinated millions of people worldwide. Originally called the "Magic Cube," it gained immense popularity after being licensed to the Ideal Toy Corporation in 1980 and rebranded as the "Rubik's Cube."</p>

<br>
<br>
<h2 class="subheading">Basic Concepts</h2>
<p>A standard Rubik's Cube consists of six faces, each covered by nine stickers of one of six solid colors: white, red, blue, orange, green, and yellow. The goal is to solve the cube by rotating the faces until each face is a solid color.</p>

<br>
<br>
<h2 class="subheading">Solving Methods</h2>
<p class="subtopic">There are several methods for solving Rubik's Cube, including:</p>
<ul class="subtopic">
Expand All @@ -40,7 +50,8 @@ <h2 class="subheading">Solving Methods</h2>
<li>Roux Method</li>
<li>ZB Method</li>
</ul>

<br>
<br>
<h2 class="subheading">Advanced Techniques</h2>
<p class="subtopic">Advanced cubers often utilize techniques such as:</p>
<ul class="subtopic">
Expand All @@ -51,7 +62,7 @@ <h2 class="subheading">Advanced Techniques</h2>
<li>OLLCP (OLL plus Corner Permutation)</li>
</ul>
<br>

<br>
<h2 class="subheading">Formulas and Algorithms</h2>
<br>
<div class="formula">
Expand All @@ -74,6 +85,13 @@ <h3>Orientation of Last Layer (OLL)</h3>
<h3>Permutation of Last Layer (PLL)</h3>
<p>Formula: <code>R U2 R' U' R U R' U' R U' R'</code></p>
</div>
<br>
<br>
<h2 class="subheading">How to Play Rubik's Cube?</h2>
<br>
<div style="display: flex; justify-content: center;">
<iframe width="1500" height="700" src="https://www.youtube.com/embed/E2SZgptK4oM" frameborder="0" allowfullscreen></iframe>
</div>
</div>

<footer class="footer">
Expand Down
190 changes: 83 additions & 107 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,128 +1,104 @@
<!DOCTYPE html>
<html lang="en" >
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Rubik Cube</title>
<link rel="icon" type="image/x-icon" href="images\icon.png">
<meta name="viewport" content="width=device-width,height=device-height,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0"><link rel="stylesheet" href="./style.css">
<!--For volume icon-->
<link rel="icon" type="image/x-icon" href="images/icon.png">
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<link rel="stylesheet" href="./style.css">
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet">


</head>
<body>
<header class="ui__header header"> <!-- Added "header" class -->
<header class="ui__header header">
<a href="about.html" class="btn--about">About Us</a>
</header>
<!-- separate div element for the goggle sign-in/log-in element -->
<!-- g_id_onload is for automatic loading of the Google Identity Services. -->
<div id="g_id_onload"
data-client_id="1056580552736-gos4t0nvaco0o3eq9v5tdaa1425qhhdu.apps.googleusercontent.com"

data-callback="handleCredentialResponse">
</div>
<!-- the data client id is the goggle o-auth secret client id. -->
<!-- g_id_signin is for rendering the Google Sign-In button. -->

<div class="g_id_signin" data-type="standard"></div>

<!-- Adding the Google Identity Services script to your HTML file. -->
<script src="https://accounts.google.com/gsi/client" async defer></script>

<!-- Added the script1.js file for initializing the Google Identity Services client and handle the sign-in process. -->
<script src="script1.js"></script>

<div class="ui">

<div class="ui__background"></div>

<div class="ui__game"></div>

<div class="ui__texts">
<h1 class="text text--title">
<span>Let's</span>
<span>Solve!</span>
</h1>
<div class="text text--note">
Double tap to start
</div>
<div class="text text--timer">
0:00
</div>
<div class="text text--complete">
<span>Complete!</span>
<div class="ui">
<div class="ui__background"></div>
<div class="ui__game"></div>
<div class="ui__texts">
<h1 class="text text--title">
<span>Let's</span>
<span>Solve!</span>
</h1>
<div class="text text--note">
Double tap to start
</div>
<div class="text text--timer" id="timer">5:00</div>
<div class="text text--complete">
<span>Complete!</span>
</div>
<div class="text text--best-time" id="best-time">
<icon trophy></icon>
<span>Best Time!</span>
</div>
</div>
<div class="text text--best-time">
<icon trophy></icon>
<span>Best Time!</span>
</div>
</div>

<div class="ui__prefs">
<range name="size" title="Cube Size" list="2,3,4,5"></range>
<range name="flip" title="Flip Type" list="Swift&nbsp;,Smooth,Bounce"></range>
<range name="scramble" title="Scramble Length" list="20,25,30"></range>
<range name="fov" title="Camera Angle" list="Ortographic,Perspective"></range>
<range name="theme" title="Color Scheme" list="Cube,Erno,Dust,Camo,Rain"></range>
</div>

<div class="ui__theme">
<range name="hue" title="Hue" color></range>
<range name="saturation" title="Saturation" color></range>
<range name="lightness" title="Lightness" color></range>
</div>

<div class="ui__stats">
<div class="stats" name="cube-size">
<i>Cube:</i><b>3x3x3</b>
</div>
<div class="stats" name="total-solves">
<i>Total solves:</i><b>-</b>
</div>
<div class="stats" name="best-time">
<i>Best time:</i><b>-</b>
</div>
<div class="stats" name="worst-time">
<i>Worst time:</i><b>-</b>
<div class="ui__prefs">
<range name="size" title="Cube Size" list="2,3,4,5"></range>
<range name="flip" title="Flip Type" list="Swift&nbsp;,Smooth,Bounce"></range>
<range name="scramble" title="Scramble Length" list="20,25,30"></range>
<range name="fov" title="Camera Angle" list="Ortographic,Perspective"></range>
<range name="theme" title="Color Scheme" list="Cube,Erno,Dust,Camo,Rain"></range>

</div>
<div class="stats" name="average-5">
<i>Average of 5:</i><b>-</b>

<div class="ui__theme">
<range name="hue" title="Hue" color></range>
<range name="saturation" title="Saturation" color></range>
<range name="lightness" title="Lightness" color></range>
</div>
<div class="stats" name="average-12">
<i>Average of 12:</i><b>-</b>

<div class="ui__stats">
<div class="stats" name="cube-size">
<i>Cube:</i><b>3x3x3</b>
</div>
<div class="stats" name="total-solves">
<i>Total solves:</i><b>-</b>
</div>
<div class="stats" name="best-time">
<i>Best time:</i><b>-</b>
</div>
<div class="stats" name="worst-time">
<i>Worst time:</i><b>-</b>
</div>
<div class="stats" name="average-5">
<i>Average of 5:</i><b>-</b>
</div>
<div class="stats" name="average-12">
<i>Average of 12:</i><b>-</b>
</div>
<div class="stats" name="average-25">
<i>Average of 25:</i><b>-</b>
</div>
</div>
<div class="stats" name="average-25">
<i>Average of 25:</i><b>-</b>

<div class="ui__buttons">
<button class="btn btn--bl btn--stats">
<icon trophy></icon>
</button>
<button class="btn btn--br btn--prefs">
<icon settings></icon>
</button>
<button class="btn btn--tl btn--back">
<icon back></icon>
</button>
<button class="btn btn--br btn--theme">
<icon theme></icon>
</button>
<button class="btn btn--br btn--reset" id="restart-btn">
<icon reset></icon>
</button>
<button class="btn btn--tr fa-solid fa-volume-high" id="play-btn"></button>
</div>
</div>

<div class="ui__buttons">
<button class="btn btn--bl btn--stats">
<icon trophy></icon>
</button>
<button class="btn btn--br btn--prefs">
<icon settings></icon>
</button>
<button class="btn btn--tl btn--back">
<icon back></icon>
</button>
<button class="btn btn--br btn--theme">
<icon theme></icon>
</button>
<button class="btn btn--br btn--reset">
<icon reset></icon>
</button>
<button class="btn btn--tr fa-solid fa-volume-high" id="play-btn">
<!-- Audio element for background music -->
<audio id="background-music" autoplay loop>
<source src="Music/8 Bit Space Groove! Chill Pretty Chiptune Game Music by HeatleyBros.mp3" type="audio/mpeg">
</audio>
</div>

<!-- Audio element for background music -->
<audio id="background-music" autoplay loop >
<source src="Music/8 Bit Space Groove! Chill Pretty Chiptune Game Music by HeatleyBros.mp3" type="audio/mpeg">
</audio>

</div>
<!-- partial -->
<script src='https://cdnjs.cloudflare.com/ajax/libs/three.js/95/three.min.js'></script><script src="./script.js"></script>

<script src='https://cdnjs.cloudflare.com/ajax/libs/three.js/95/three.min.js'></script>
<script src="./script.js"></script>
</body>
</html>
5 changes: 4 additions & 1 deletion script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4099,4 +4099,7 @@ musicButton.addEventListener('click', () => {
});

window.version = '0.99.2';
window.game = new Game();
window.game = new Game();



2 changes: 1 addition & 1 deletion style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ body {
font-size: inherit;
overflow: visible;
vertical-align: -0.125em;
preserveAspectRatio: none;
preserveAspectRatio none;
}

.range {
Expand Down