Skip to content

Commit 913b4d7

Browse files
VictorSantos09VictorSantos09
authored
Merge pull request #6 from VictorSantos09/front-end
A Few Pages Deleted And RickAndMorty finalized
2 parents 4394f6b + f4186cf commit 913b4d7

File tree

8 files changed

+68
-262
lines changed

8 files changed

+68
-262
lines changed

‎Front-End/HTML/Bored.html‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎Front-End/HTML/GuessAbtYou.html‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎Front-End/HTML/RickAndMorty.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<script src="https://code.jquery.com/jquery-1.10.2.js"></script>
2121

22-
<title>Guess rick and morty</title>
22+
<title>Rick And Morty</title>
2323
</head>
2424

2525
<body>

‎Front-End/HTML/index.html‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -77,28 +77,6 @@
7777
</div>
7878
</section>
7979

80-
<section
81-
class="container-fluid pe-5 d-flex justify-content-center justify-content-sm-center align-items-center my-margin-content">
82-
<div>
83-
<div class="pe-5">
84-
<div class="bg-black effect-hover border-style">
85-
<div class="align-items-center p-3 text-capitalize fw-bold text-center fs-3 effect-hover">
86-
<a class="text-white text-decoration-none" href="#">star wars geeks, check this</a>
87-
</div>
88-
</div>
89-
</div>
90-
<div class="fst-italic fs-6">See informations about everything from star wars
91-
</div>
92-
</div>
93-
<div>
94-
95-
<div class="border-style d-none d-xl-block d-md-block ">
96-
<img src="https://www.liveabout.com/thmb/bMeyVLVuL3XSOEsGhAfnGNaxMaQ=/275x250/filters:no_upscale():max_bytes(150000):strip_icc()/yoda-lightsaber-temple-57153c4a3df78c3fa2fa549c.JPG" alt="Star Wars Picture" srcset=""
97-
class="img-size">
98-
</div>
99-
</div>
100-
</section>
101-
10280
<section
10381
class="container-fluid pe-5 d-flex justify-content-center justify-content-sm-center align-items-center my-margin-content">
10482
<div>

‎Front-End/HTML/nav.html‎

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,37 @@
22
<div class="container">
33

44
<div class="dumbThingsIcon">
5-
<img src="https://www.imagenspng.com.br/wp-content/uploads/2020/10/among-us-icon-png-02.png"
6-
width="50px" height="50px" alt="" srcset="">
5+
<img src="https://www.imagenspng.com.br/wp-content/uploads/2020/10/among-us-icon-png-02.png" width="50px"
6+
height="50px" alt="" srcset="">
77
</div>
88

99
<div class="container-fluid">
10-
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
11-
data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false"
12-
aria-label="Toggle navigation">
10+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown"
11+
aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
1312
<span class="navbar-toggler-icon"></span>
1413
</button>
1514
<div class="collapse navbar-collapse " id="navbarNavDropdown">
1615
<ul class="navbar-nav ps-5">
17-
<li class="nav-item my-nav-space">
18-
<a class="nav-link text-white" href="index.html">DUMBTHINGS</a>
19-
</li>
20-
<li class="nav-item my-nav-space">
21-
<a class="nav-link text-white" href="https://github.com/VictorSantos09/DumbThings">
22-
developer
23-
</a>
24-
</li>
25-
<li class="nav-item my-nav-space">
26-
<a class="nav-link text-white" href="#about">ABOUT</a>
27-
</li>
28-
<li class="nav-item dropdown my-nav-space">
29-
<a class="nav-link dropdown-toggle text-white" href="#" role="button"
30-
aria-expanded="false">
31-
Services
32-
</a>
33-
<ul class="dropdown-menu">
34-
<li><a class="dropdown-item" href="Dogs.html">random dog picture</a></li>
35-
<li><a class="dropdown-item" href="RickAndMorty.html">Rick and Morty</a></li>
36-
<li><a class="dropdown-item" href="DumbJokes.html">hear a joke</a></li>
37-
<li><a class="dropdown-item" href="Bored.html">activity do to when
38-
bored</a>
39-
</li>
40-
<li><a class="dropdown-item" href="GuessAbtYou.html">let me guess about
41-
u</a>
42-
</li>
43-
</ul>
16+
<li class="nav-item my-nav-space">
17+
<a class="nav-link text-white" href="index.html">DUMBTHINGS</a>
18+
</li>
19+
<li class="nav-item my-nav-space">
20+
<a class="nav-link text-white" href="https://github.com/VictorSantos09/DumbThings">
21+
developer
22+
</a>
23+
</li>
24+
<li class="nav-item my-nav-space">
25+
<a class="nav-link text-white" href="#about">ABOUT</a>
26+
</li>
27+
<li class="nav-item dropdown my-nav-space">
28+
<a class="nav-link dropdown-toggle text-white" href="#" role="button" aria-expanded="false">
29+
Services
30+
</a>
31+
<ul class="dropdown-menu">
32+
<li><a class="dropdown-item" href="Dogs.html">random dog picture</a></li>
33+
<li><a class="dropdown-item" href="RickAndMorty.html">Rick and Morty</a></li>
34+
<li><a class="dropdown-item" href="DumbJokes.html">hear a joke</a></li>
35+
</ul>
4436
</li>
4537
</ul>
4638
</div>

‎Front-End/JS/GuessUser.js‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎Front-End/JS/boredAcitivity.js‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎Front-End/JS/rickAndMorty.js‎

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
var rickAndMortyNameOption1 = "";
2-
var rickAndMortyNameOption2 = "";
3-
var rickAndMortyNameOption3 = "";
1+
var rickAndMortyNameOption1 = ""
2+
var rickAndMortyNameOption2 = ""
3+
var rickAndMortyNameOption3 = ""
44

5-
var correctName = "";
5+
var correctName = ""
6+
7+
var resultArray = []
68

79
const divSpace1 = document.getElementById("spaceNameBox-1")
810
const divSpace2 = document.getElementById("spaceNameBox-2")
911
const divSpace3 = document.getElementById("spaceNameBox-3")
1012

11-
const rickAndMortyRadio1 = document.getElementById("rickAndMortyOption1");
12-
const rickAndMortyRadio2 = document.getElementById("rickAndMortyOption2");
13-
const rickAndMortyRadio3 = document.getElementById("rickAndMortyOption3");
13+
const rickAndMortyRadio1 = document.getElementById("rickAndMortyOption1")
14+
const rickAndMortyRadio2 = document.getElementById("rickAndMortyOption2")
15+
const rickAndMortyRadio3 = document.getElementById("rickAndMortyOption3")
1416

1517
const GetCaracter = async function (idImg) {
1618

@@ -30,22 +32,47 @@ const GetCaracter = async function (idImg) {
3032

3133
correctName = result.correctChoice.name
3234

33-
document.getElementById(idImg).setAttribute("src", result.correctChoice.image);
34-
document.getElementById(idImg).setAttribute("alt", "rick and morty random caracter");
35+
document.getElementById(idImg).setAttribute("src", result.correctChoice.image)
36+
document.getElementById(idImg).setAttribute("alt", "rick and morty random caracter")
37+
38+
resultArray = [result.correctChoice.name, result.wrongChoice1.name, result.wrongChoice2.name]
39+
40+
var randomIndex = MakeRandomIndex()
3541

36-
rickAndMortyNameOption1 = document.getElementById("rickAndMortyOption-1").innerHTML = result.correctChoice.name;
37-
rickAndMortyNameOption2 = document.getElementById("rickAndMortyOption-2").innerHTML = result.wrongChoice1.name;
38-
rickAndMortyNameOption3 = document.getElementById("rickAndMortyOption-3").innerHTML = result.wrongChoice2.name;
42+
var index0 = randomIndex[0]
43+
var index1 = randomIndex[1]
44+
var index2 = randomIndex[2]
45+
46+
rickAndMortyNameOption1 = document.getElementById("rickAndMortyOption-1").innerHTML = resultArray[index0]
47+
rickAndMortyNameOption2 = document.getElementById("rickAndMortyOption-2").innerHTML = resultArray[index1]
48+
rickAndMortyNameOption3 = document.getElementById("rickAndMortyOption-3").innerHTML = resultArray[index2]
3949
}
4050

4151
GetCaracter("rickAndMortyCaracter")
4252

53+
function MakeRandomIndex() {
54+
55+
let finalArray = []
56+
57+
while (true) {
58+
let index = Math.floor(Math.random() * 3)
59+
60+
if (finalArray.length == 3)
61+
break
62+
63+
if (finalArray.includes(index) == false)
64+
finalArray.push(index)
65+
}
66+
67+
return finalArray
68+
}
69+
4370
function CheckNameAndRecall(nameChoice, correctName, divId) {
4471
if (nameChoice == correctName)
4572
document.getElementById(divId).style.backgroundColor = 'green';
4673

4774
else
48-
document.getElementById(divId).style.backgroundColor = 'red';
75+
document.getElementById(divId).style.backgroundColor = 'red'
4976

5077
setTimeout(() => {
5178
GetCaracter("rickAndMortyCaracter")
@@ -56,9 +83,9 @@ function CleanDivsAndUncheckRadio() {
5683
divSpace1.style.backgroundColor = 'white'
5784
divSpace2.style.backgroundColor = 'white'
5885
divSpace3.style.backgroundColor = 'white'
59-
rickAndMortyRadio1.checked = false;
60-
rickAndMortyRadio2.checked = false;
61-
rickAndMortyRadio3.checked = false;
86+
rickAndMortyRadio1.checked = false
87+
rickAndMortyRadio2.checked = false
88+
rickAndMortyRadio3.checked = false
6289
}
6390

6491
rickAndMortyRadio1.addEventListener("click", () => CheckNameAndRecall(rickAndMortyNameOption1, correctName, "spaceNameBox-1"))

0 commit comments

Comments
 (0)