Skip to content

Commit

Permalink
removed empty method in questions.js
Browse files Browse the repository at this point in the history
  • Loading branch information
@cryptokoala4
cryptokoala4 committed Oct 15, 2015
1 parent 57a6c92 commit c3d9e7d
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 23 deletions.
20 changes: 14 additions & 6 deletions css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
font-family: 30px;
}

body {
height: 100vh;
html {
/*height: 100vh;*/
background-image: url("../images/got-background.jpg");
background-repeat: no-repeat;
background-size: cover;
/* background-repeat: no-repeat;
background-size: cover;*/
}

.well {
Expand Down Expand Up @@ -95,17 +95,24 @@ body {
position: absolute;
top: 50%;
left: 50%;
height: 95%;
width: 80%;
/*height: 95%*/;
/*width: 80%;*/
transform: translate(-50%, -50%);
margin-left: auto;
margin-right: auto;
text-align: center;
margin-top: 10px;
}

.char-desc {
font-family: Impact, Haettenschweiler, 'Franklin Gothic Bold', Charcoal, 'Helvetica Inserat', 'Bitstream Vera Sans Bold', 'Arial Black', 'sans serif';
font-size: 40px;
font-style: italic;
font-variant: small-caps;
font-weight: bold;
line-height: 36px;
color: #1212C7;
height: 43px;
}

.char-img {
Expand All @@ -122,4 +129,5 @@ body {

.text-desc {
font-weight: bold;
color: black;
}
2 changes: 1 addition & 1 deletion js/questions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ Quiz.prototype.questionPercentage = function(){
Quiz.prototype.nextQuestion = function(){
return this.questions[this.currentQuestion++];
};
//what's prototype

Quiz.prototype.answer = function(){

};
2 changes: 1 addition & 1 deletion js/script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ $( function() {

console.log( quiz.totalScore )
var h1Input = ""
h1Input += "<h1>" + "Your MBTI breakdown is: " + h1[ 0 ] + h1[ 1 ] + h1[ 2 ] + h1[ 3 ] + "</h1>"
h1Input += "<h1>" + "Your MBTI breakdown is: " + "<br>" + h1[ 0 ] + h1[ 1 ] + h1[ 2 ] + h1[ 3 ] + "</h1>"
$( "h1" ).empty().append( h1Input )

var typeResult = ""
Expand Down
30 changes: 15 additions & 15 deletions quiz.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<body>
<div id="quiz-1" class="">
<form class="well center-block col-md-6" style="float: none">
<form class="well center-block col-md-6">
<div class="form-group" id="questions-full">Oh no!</div>
<div class="btn btn-quiz btn-choose center-block btn-primary button-width" id="very-true" option-name="option1">Strongly agree</div>
<div class="btn btn-quiz btn-choose center-block btn-primary button-width" id="true" option-name="option2">Agree</div>
Expand Down Expand Up @@ -52,98 +52,98 @@ <h1>Your personality type is:</h1>
<div id="ESFJ" class="hidden">
<div class="char-desc">ESFJ: Cersei Lannister</div>
<div class="text-desc">
<img class="char-img" src="./images/ESFJ.jpg">
<img class="char-img" src="./images/ESFJ.jpg"><br>
This type supposedly “are the great nurturers of social institutions such as schools, churches, social clubs, and civic groups… friendly social service is a key to their nature.” Alright, nevermind. There is no one like that in Game of Thrones, so let’s just say that Cersei Lannister is what you get when you mix an ESFJ with a sociopath. She is comfortable in social situations (E), more direct than abstract in her thinking (S), driven by her love for her brother and children and hatred of others (F), and presents the image of a devoted matriarch (J). Too bad we can’t add a (B) for batshit crazy.
</div>
</div>
<div id="ISFJ" class="hidden">
<div class="char-desc">ISFJ: Catelyn Stark</div>
<div class="text-desc">
<img class="char-img" src="./images/ISFJ.jpg">
<img class="char-img" src="./images/ISFJ.jpg"><br>
Keirsey refers to ISFJ’s as “protectors”. “Their primary interest is in the safety and security of those they care about… [They] have an extraordinary sense of loyalty and responsibility in their makeup, and seem fulfilled in the degree they can shield others from the dirt and dangers of the world… Their reserve ought really to be seen as an expression of their sincerity and seriousness of purpose.” Catelyn is constantly concerned for her husband and children, trying to keep them safe despite the dangers coming from all directions.
</div>
</div>
<div id="ESTP" class="hidden">
<div class="char-desc">ESTP: Jaime Lannister</div>
<div class="text-desc">
<img class="char-img" src="./images/ESTP.jpg">
<img class="char-img" src="./images/ESTP.jpg"><br>
Keirsey says that ESTP’s “…will take tremendous risks to get what they want, and seem exhilarated by walking close to the edge of disaster… these smooth operators are usually something of a mystery to others. While they live in the moment and lend excitement – and unpredictability – to all their relationships, they rarely let anyone get really close to them.” Jaime is impulsive (throwing Bran out the window) and fearless (taunting Catelyn to kill him). He is handsome and popular, but only one person knows him very well… you know who I mean. Late in the series, Jaime says “There are no men like me… only me.” Well Jaime, according to Keirsey’s stats, about 10% of the population is like you, although hopefully not when it comes to the incest and attempted murder.
</div>
</div>
<div id="ISTP" class="hidden">
<div class="char-desc">ISTP: Arya Stark</div>
<div class="text-desc">
<img class="char-img" src="./images/ISTP.jpg">
<img class="char-img" src="./images/ISTP.jpg"><br>
ISTP’s “love action, and know instinctively that their activities are more enjoyable, and more effective, if done impulsively, spontaneously, subject to no schedules or standards but their own… they can be fiercely insubordinate to those in authority, seeing rules and regulations as unnecessarily confining… [they] want to be free to do their own thing, and they are proud of their ability to do it with an artist’s skill.” Arya certainly wants to learn to use Needle like an artist. She chafes at the strict female role thrust upon her, and wishes to chart her own way in the world, doing what she loves.
</div>
</div>
<div id="ESFP" class="hidden">
<div class="char-desc">ESFP: Tyrion Lannister</div>
<div class="text-desc">
<img class="char-img" src="./images/ESFP.jpg">
<img class="char-img" src="./images/ESFP.jpg"><br>
This category of people is “exciting and full of fun, and their great social interest lies in stimulating those around them to take a break from work and worry, to lighten up and enjoy life… [they] are smooth, talkative, and witty; they always seem to know the latest jokes and stories, and are quick with wisecracks and wordplay–nothing is so serious or sacred that it can’t be made fun of. Performers also like to live in the fast lane…” I don’t know if Westeros has fast lanes (horse drawn carts can’t move very quickly), but the equivalent is probably all the wine and prostitutes Tyrion is fond of.
</div>
</div>
<div id="ISFP" class="hidden">
<div class="char-desc">ISFP: Daenerys Targaryen</div>
<div class="text-desc">
<img class="char-img" src="./images/ISFP.jpg">
<img class="char-img" src="./images/ISFP.jpg"><br>
Keirsey’s description of this personality type largely centers on its tendency toward artisitic pursuits, but he also notes that they “are especially sensitive to the pain and suffering of others, and they sympathize freely with the sufferer.” Daenerys goes to personal risk to free mistreated slaves, and she suffers deeply when Khal Drogo does. She may not be “seized by the act of artistic composition, as if caught up in a whirlwind”, but she does seem to impulsively draw many actions from within herself, such as developing the ritual that hatches her dragon eggs.
</div>
</div>
<div id="ENFJ" class="hidden">
<div class="char-desc">ENFJ: Syrio Forel</div>
<div class="text-desc">
<img class="char-img" src="./images/ENFJ.jpg">
<img class="char-img" src="./images/ENFJ.jpg"><br>
This one’s easy, as it’s called “the teacher”. ENFJ’s “ability to fire the imagination can amount to a kind of genius which other types find hard to emulate… [they] will voice their passions with dramatic flourish… [they] like things settled and organized.” I have to say, I am totally uncoordinated, but if someone tossed me a sword, said “Next time you will catch it,” then spouted out awesome lines about saying “Not today” to the god of death… I bet I could learn to fight.
</div>
</div>
<div id="INFJ" class="hidden">
<div class="char-desc">INFJ Varys</div>
<div class="text-desc">
<img class="char-img" src="./images/INFJ.jpg">
<img class="char-img" src="./images/INFJ.jpg"><br>
Keirsey calls INFJ “the counselor”. They “prefer to work intensely with those close to them, especially on a one-to-one basis, quietly exerting their influence behind the scenes. [They] value their integrity a great deal, but they have mysterious, intricately woven personalities which sometimes puzzle even them.” Remember Varys’s conversations with Ned in his cell? He managed to control Ned, to get him to admit his treason through a strong understanding of Ned’s motivations (the safety of his daughter), but he did it for what he considered to be his own sense of honor in valuing the peace of the realm.
</div>
</div>
<div id="ENFP" class="hidden">
<div class="char-desc">ENFP: Robert Baratheon</div>
<div class="text-desc">
<img class="char-img" src="./images/ENFP.jpg">
<img class="char-img" src="./images/ENFP.jpg"><br>
Robert at the beginning of the show has certainly declined, but in his youth he exhibited the best qualities of an ENFP. He saw “life as an exciting drama, pregnant with possibilities for both good and evil” and was “vivacious and inspiring… Fiercely individualistic, [striving] toward a kind of personal authenticity, and this intention always to be [himself was] quite attractive to others.” He certainly inspired an army to rebel in his name, got the devoted loyalty of Ned and others, and commanded the infatuation of plenty of women, until drunkenness and debauchery got to him. So let that be a lesson to you ENFP’s.
</div>
</div>
<div id="INFP" class="hidden">
<div class="char-desc">INFP: Jon Snow</div>
<div class="text-desc">
<img class="char-img" src="./images/INFP.jpg">
<img class="char-img" src="./images/INFP.jpg"><br>
These individuals “have a profound sense of idealism that comes from a strong personal sense of right and wrong. They conceive of the world as an ethical, honorable place… Set off from the rest of humanity by their privacy and scarcity, Healers can often feel even more isolated in the purity of their idealism. [they] might well feel a sense of separation because of their often misunderstood childhood… [they] begin to believe they are bad to be so fanciful, so dreamy, and can come to see themselves as ugly ducklings.” Pushed to the side because of his bastard birth, Jon tries to retain his father’s honor, and sees the world in idealistic terms.
</div>
</div>
<div id="ENTJ" class="hidden">
<div class="char-desc">ENTJ: Tywin Lannister</div>
<div class="text-desc">
<img class="char-img" src="./images/ENTJ.jpg">
<img class="char-img" src="./images/ENTJ.jpg"><br>
According to Keirsey, ENTJ’s “are bound to lead others, and from an early age they can be observed taking command of groups… they have a strong natural urge to give structure and direction wherever they are–to harness people in the field and to direct them to achieve distant goals…more than any other type [they] desire (and generally have the ability) to visualize where the organization is going.” Tywin runs his family and his realm like an organization, trying to guide Jaime and later Tyrion toward his own ends. He takes the long view, hoping that if the Lannisters make the right choices they could “establish a dynasty that lasts a thousand years”.
</div>
</div>
<div id="INTJ" class="hidden">
<div class="char-desc">INTJ: Petyr Baelish</div>
<div class="text-desc">
<img class="char-img" src="./images/INTJ.jpg">
<img class="char-img" src="./images/INTJ.jpg"><br>
Keirsey calls the INTJ “the mastermind”. They “are head and shoulders above all the rest in contingency planning… In their careers, Masterminds usually rise to positions of responsibility, for they work long and hard and are dedicated in their pursuit of goals… Masterminds do not feel bound by established rules and procedures, and traditional authority does not impress them.” Littlefinger, born into a humble family, planned and manipulated his way above so many of the highborn lords around him. He is a rational thinker, but with deeply held public and private ambitions (get power, get Catelyn, respectively).
</div>
</div>
<div id="INTP" class="hidden">
<div class="char-desc">INTP: Samwell Tarly</div>
<div class="text-desc">
<img class="char-img" src="./images/INTP.jpg">
<img class="char-img" src="./images/INTP.jpg"><br>
INTP’s “will learn in any manner and degree they can. They will listen to amateurs if their ideas are useful, and will ignore the experts if theirs are not… They are inclined to be shy except with close friends…” No one fit much else about this category, so… congratulations, INTP. You’re Sam.
</div>
</div>
<div id="ENTP" class="hidden">
<div class="char-desc">ENTP: Melisandre</div>
<div class="text-desc">
<img class="char-img" src="./images/ENTP.jpg">
<img class="char-img" src="./images/ENTP.jpg"><br>
The ONE option I wish you couldn't get because I didn't finish a description for her, but generally ENTP folks are: Inventive, enthusiastic, strategic, enterprising, inquisitive, versatile. Enjoy new ideas and challenges, value inspiration.
</div>
</div>
Expand Down

0 comments on commit c3d9e7d

Please sign in to comment.