Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 75-comi-frontend-logi…
Browse files Browse the repository at this point in the history
…nlogoutsignup
  • Loading branch information
Strogator committed Apr 12, 2024
2 parents a5b78af + b6e7355 commit c7973c4
Show file tree
Hide file tree
Showing 66 changed files with 2,182 additions and 1,967 deletions.
64 changes: 32 additions & 32 deletions api/data/csv/animals.csv

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions api/data/csv/brain-teasers.csv
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
",0,9,19,6,0
141,"A tree is 20 meters tall. An ant is climbing it. Every day the ant climbs 5 meters, and each night it descends 4 meters. In how many days will the ant reach the top of the tree?
",16,10,13,20,16
142,"A bar of soap is placed on one of the sides of a pair of scales. On the other side there is 3/4 of a bar of the same soap and а 3/4 kg metal weight. The scales are in balance. How much does a bar of soap weigh?
142,"A bar of soap is placed on one of the sides of a pair of scales. On the other side there is 3/4 of a bar of the same soap and а 3/4 kg metal weight. The scales are in balance. How much does a bar of soap weigh?
",3 kg,2 kg,1 kg,4 kg,3 kg
143,"There are three sorts of apples in a basket. How many apples have to be taken from the basket, without looking, to be sure that there are at least 2 apples of the same sort?
",4,3,4,10,8
Expand Down Expand Up @@ -331,7 +331,7 @@
",Xylem,Xylose,Xylene,Xebec,Xylem
165,"Which word refers to a colourless, odourless gaseous element that occurs in trace amounts in air?
",Xenon,Xylose,Xenon,Xanthene,Xylene
166,"Were X-rays at one time proposed to be called Röntgen rays?
166,"Were X-rays at one time proposed to be called Röntgen rays?
",Yes,Yes,No,,
167,"When you add 55 and 45 the sum is 100. When you add 65 and 35 the sum is also 100. But which is greater: 55 multiplied by 45 or 65 multiplied by 35?
",55 multiplied by 45,55 multiplied by 45,They are equal.,65 multiplied by 35,None of these
Expand Down
130 changes: 65 additions & 65 deletions api/data/csv/celebrities.csv

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions api/data/csv/entertainment.csv
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
",True,False,True,,
92,"Choose the missing words in the following lyrics to get the name of a song from Guitar Hero 3:
","_________ _____, if you know what I mean","_________ _____, she taught me everything","is lady she asked me, if I would be her man","u know that I told her, Id do what I can", keep her looking pretty
93,"In Guitar Hero 3, “Bulls on Parade by Rage Against the Machine is the third encore song.
93,"In Guitar Hero 3, “Bulls on Parade by Rage Against the Machine is the third encore song.
",False,True,False,,
94,"Who is the last boss in the music video game Guitar Hero 3?
",Lou,Lou,Slash,Billy,Bob
Expand Down Expand Up @@ -233,7 +233,7 @@
",Yes,No,Yes,,
116,"What is the name of Peters girlfriend in the comics FoxTrot?
",Denise,Ashley,Sarah,Abbey,Denise
117,"Which of the following best describes Andy and Roger’s youngest child in the comics FoxTrot?
117,"Which of the following best describes Andy and Roger’s youngest child in the comics FoxTrot?
",A nerd,A jock,A nerd,A sports addict,A TV addict
118,"Has FoxTrot character Jason developed a plan for a Star Trek-themed amusement park?
",No,Yes,No,,
Expand Down Expand Up @@ -334,7 +334,7 @@
166,"O and Ovo are among the shows performed by this circus group founded in 1984.
",Cirque du Soleil,Cirque du Soleil,Circus Smirkus,Circus Amok,Archaos
167,"Name the Frenchman who invented the flying trapeze in 1859.
",Jules Leotard,Monty Python,Guy Laliberté,Daniel Gauthier,Jules Leotard
",Jules Leotard,Monty Python,Guy Laliberté,Daniel Gauthier,Jules Leotard
168,"Which traveling circus of the early 20th century, based in Peru, Indiana, was the inspiration for Cathy Days novel The Circus in Winter?
",The Hagenbeck-Wallace Circus,Shrine Circus,Cirque dhiver,The Bertram Mills Circus,The Hagenbeck-Wallace Circus
169,"Which of these is the name of an old British circus dynasty that toured Europe and the Far East with their shows?
Expand Down
4 changes: 2 additions & 2 deletions api/data/csv/for-kids.csv
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@
",A love potion,A love potion,A love spell,An imperious curse,A potion and spell
333,"In Harry Potter and the Half-Blood Prince, is Dumbledores blood the only blood used in the Cavern by the sea where the Horcrux is hidden?
",No,No,Yes,,
334,"In the book Harry Potter and the Half-Blood Prince, a corpse that is re-animated but isn’t alive is called what?
334,"In the book Harry Potter and the Half-Blood Prince, a corpse that is re-animated but isn’t alive is called what?
",Inferi,Inferi,Infery,Infreri,Infrery
335,"Harry destroyed two Horcruxes in Harry Potter and the Half-Blood Prince.
",False,False,True,,
Expand All @@ -691,7 +691,7 @@
",Both of these,Both of these,Pinocchio,None of these,Buratino
345,"Which of the following is not a character from Lewis Carrolls 1865 novel Alices Adventures in Wonderland?
",the Chief Weasel,the Queen of Hearts,the Mock Turtle,the March Hare,the Chief Weasel
346,"What character from Antoine de Saint-Exupérys novella, The Little Prince, utters these famous lines that sum up the essence of the book: One cannot see well except with the heart, the essential is invisible to the eyes.?
346,"What character from Antoine de Saint-Exupérys novella, The Little Prince, utters these famous lines that sum up the essence of the book: One cannot see well except with the heart, the essential is invisible to the eyes.?
",the Fox,the Fox,the Snake,the Lamplighter,the Rose
347,"What is the birth name of the author who penned The English Roses, a childrens book that follows the lives of four girls?
",Madonna Louise Ciccone,Theodor Seuss Geisel,Helen Beatrix Potter,Madonna Louise Ciccone,Dorothy Gladys Smith
Expand Down
Loading

0 comments on commit c7973c4

Please sign in to comment.