diff --git a/arts-humanities.md b/arts-humanities.md index 7b63853..1f25e53 100644 --- a/arts-humanities.md +++ b/arts-humanities.md @@ -2,44 +2,9 @@ title: Arts and Humanities --- -This is the home page for the **Arts and Humanities** category, which includes *Opera*, *Musical Theater*, *Music*, *Painting*, *Architecture*, *Sculpture*, *Religion and Religious Literature*, *Mythology and Mythological Literature*, *Philosophy*, and *Social Science*. +This is the home page for the **Arts and Humanities** category. -### Opera +Obviously enough, we have organized arts and humanities content into two main subcategories: -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Musical Theater - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Music - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Painting - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Architecture - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Sculpture - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Religion and Religious Literature - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Mythology and Mythological Literature - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Philosophy - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Social Science - -There is no content yet in this category. [Contribute some!](/contribute/index.html) +- [Arts](arts/index.html) (2.1 / 2.1) +- [Humanities](humanities/index.html) (2.1 / 1.8) diff --git a/arts-humanities/arts.md b/arts-humanities/arts.md new file mode 100644 index 0000000..8f99389 --- /dev/null +++ b/arts-humanities/arts.md @@ -0,0 +1,33 @@ +--- +title: Arts +--- + +This is the homepage for the *Arts* category. + +### Music (0.8 / 0.8) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Painting (0.6 / 0.5) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Architecture (0.2 / 0.2) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Sculpture (0.2 / 0.2) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Opera (0.2 / 0.2) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Dance (0.0 / 0.1) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Musical Theater (0.0 / 0.0) + +Note: "Musical Theater" has a very small weight and will come up rarely or never. It is probably not worthwhile to study unless you enjoy watching musicals in your free time. We include it on this site for the sake of completeness. diff --git a/arts-humanities/humanities.md b/arts-humanities/humanities.md new file mode 100644 index 0000000..7c882e6 --- /dev/null +++ b/arts-humanities/humanities.md @@ -0,0 +1,12 @@ +--- +title: Humanities +--- + +This is the homepage for the *Humanities* category. + +We have organized humanities into two main subcategories: + +- [Belief](belief/index.html) (0.9 / 0.8) +- [Thought](thought/index.html) (1.4 / 1.2) + +You may also be looking for Literature, which can be found as its own separate category [here](/literature/index.html). diff --git a/arts-humanities/humanities/belief.md b/arts-humanities/humanities/belief.md new file mode 100644 index 0000000..b8acb0a --- /dev/null +++ b/arts-humanities/humanities/belief.md @@ -0,0 +1,33 @@ +--- +title: Belief +--- + +This is the homepage for the *Belief* category. + +### Judaism + +### Christianity + +### Islam + +### Baha'i + +### Hinduism + +### Zoroastrianism + +### Greek + +### Roman + +### Arthurian + +### Mayan + +### Inca + +### Aztec + +### Celtic + +### Norse diff --git a/arts-humanities/humanities/thought.md b/arts-humanities/humanities/thought.md new file mode 100644 index 0000000..29251d3 --- /dev/null +++ b/arts-humanities/humanities/thought.md @@ -0,0 +1,17 @@ +--- +title: Thought +--- + +This is the homepage for the *Thought* category. + +### Philosophy and Theology + +### Economics + +### Psychology + +### Anthropology and Sociology + +### Archaeology + +### Linguistics diff --git a/history.md b/history.md index 1969bd2..6bf209e 100644 --- a/history.md +++ b/history.md @@ -6,8 +6,10 @@ This is the homepage for the **History** category, which includes *Geography*. We have organized history content into five main subcategories: -- [American History](american/index.html) -- [European History](european/index.html) -- [Ancient History](ancient/index.html) -- [World History](world/index.html) -- [Geography](geography/index.html) +- [Geography](geography/index.html) (1.9 / 1.9) +- [American History](american/index.html) (1.8 / 1.8) +- [European History](european/index.html) (1.0 / 1.0) +- [World History](world/index.html) (0.8 / 0.8) +- [Ancient History](ancient/index.html) (0.3 / 0.3) + +Distribution Note: "Cross History" is given (0.8 / 0.8) and will include trans-regional history, so each of these counts are slight underestimates. diff --git a/history/american.md b/history/american.md index f5bf8c9..392efed 100644 --- a/history/american.md +++ b/history/american.md @@ -4,6 +4,16 @@ title: American History This is the homepage for the *American History* category. -### Revolutionary War +Distribution Note: "Other American History" is given 0.2 / 0.2 in the distribution, so each of these counts is a slight underestimate. -There is no content yet in this category. [Contribute some!](/contribute/index.html) \ No newline at end of file +### American Government History (0.8 / 0.7) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### American Social History (0.5 / 0.6) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### American Military History (0.3 / 0.3) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/history/ancient.md b/history/ancient.md index d6267b3..6c1257b 100644 --- a/history/ancient.md +++ b/history/ancient.md @@ -4,6 +4,14 @@ title: Ancient History This is the homepage for the *Ancient History* category. -### Peloponesian War +### Ancient Rome History (0.2 / 0.1) -There is no content yet in this category. [Contribute some!](/contribute/index.html) \ No newline at end of file +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Ancient Greece History (0.1 / 0.1) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Non-Classical Ancient History (0.1 / 0.2) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/history/european.md b/history/european.md index 28d2ff8..c0fc3d2 100644 --- a/history/european.md +++ b/history/european.md @@ -4,6 +4,22 @@ title: European History This is the homepage for the *European History* category. -### Hundred Year's War +### British History (0.4 / 0.5) -There is no content yet in this category. [Contribute some!](/contribute/index.html) \ No newline at end of file +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### French History (0.2 / 0.2) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Russian History (0.2 / 0.2) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### German History (0.2 / 0.2) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Italian History (0.1 / 0.0) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/history/geography.md b/history/geography.md index b700ad8..f2087ee 100644 --- a/history/geography.md +++ b/history/geography.md @@ -4,6 +4,24 @@ title: Geography This is the homepage for the *Geography* category. -### Gobi Dessert +Distribution Note: "Any World Geography" is given 0.2 / 0.2 so each of these counts is a slight underestimate. -There is no content yet in this category. [Contribute some!](/contribute/index.html) \ No newline at end of file +### North American Geography (0.6 / 0.6) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### European Geography (0.3 / 0.3) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### Asian Geography (0.4 / 0.4) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### African Geography (0.2 / 0.3) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### South American Geography (0.1 / 0.1) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/history/world.md b/history/world.md new file mode 100644 index 0000000..63b2cd0 --- /dev/null +++ b/history/world.md @@ -0,0 +1,21 @@ +--- +title: World History +--- + +This is the homepage for the *World History* category. + +### Asian History (0.5 / 0.4) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### African History (0.1 / 0.1) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### South American History (0.1 / 0.1) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) + +### North American History (0.2 / 0.2) + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/index.html b/index.html index 7108a26..800324a 100644 --- a/index.html +++ b/index.html @@ -2,22 +2,29 @@ title: Home --- -

Welcome

-

Welcome to the QB Canon site!

-

We have content organized into four main categories:

+

You may be asking yourself, "What's a canon?" Simply put, the canon is the set of topics which can reasonably be + asked about in quizbowl, based on past frequency. For a better explanation of the concept and the surrounding + controversy, see QBWiki.

+ +

The numbers by the categories are the number of tossups and bonus that you can expect to see in each NAQT + Invitational Series packet, as listed here. These are just + meant as a guide to studying, and should not be taken as canon themselves. +

+ +

We have all of our content organized into four main categories:

\ No newline at end of file diff --git a/literature.md b/literature.md index 240b6df..8c6ff32 100644 --- a/literature.md +++ b/literature.md @@ -2,29 +2,14 @@ title: Literature --- -This is the home page for the **Literature** category, which includes *American Literature*, *British Literature*, *European Literature*, *World Literature*, and *Young Reader Literature*. +This is the home page for the **Literature** category. -### American Literature +We have organized literature content into five main subcategories: -Sylvia Plath +- [American Literature](american/index.html) (1.3 / 1.2) +- [British Literature](british/index.html) (1.2 / 1.2) +- [European Literature](european/index.html) (0.8 / 0.7) +- [World Literature](world/index.html) (0.2 / 0.2) +- [Young Reader Literature](young-reader/index.html) (0.2 / 0.2) -- Daddy -- The Munich Mannequins -- The Bell Jar: Features Esther Greenwood, who undergoes various treatments for her mental illness. -- Sylvia is the subject of "The Blue Flannel Suit", a poem by Ted Hughes - -### British Literature - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### European Literature - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### World Literature - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Young Reader Literature - -There is no content yet in this category. [Contribute some!](/contribute/index.html) +Distribution Note: "Any Literature" is given 0.2 / 0.2 so each of these counts is a slight underestimate. diff --git a/literature/american.md b/literature/american.md new file mode 100644 index 0000000..cf03ed3 --- /dev/null +++ b/literature/american.md @@ -0,0 +1,14 @@ +--- +title: American Literature +--- + +This is the homepage for the *American Literature* category. + +### Confessional Poetry + +Sylvia Plath + +- Daddy +- The Munich Mannequins +- The Bell Jar: Features Esther Greenwood, who undergoes various treatments for her mental illness. +- Sylvia is the subject of "The Blue Flannel Suit", a poem by Ted Hughes diff --git a/literature/british.md b/literature/british.md new file mode 100644 index 0000000..8b88f32 --- /dev/null +++ b/literature/british.md @@ -0,0 +1,11 @@ +--- +title: British Literature +--- + +This is the homepage for the *British Literature* category. + +### Romanticism + +William Blake + +- The Tyger diff --git a/literature/european.md b/literature/european.md new file mode 100644 index 0000000..ef4c6a2 --- /dev/null +++ b/literature/european.md @@ -0,0 +1,11 @@ +--- +title: European Literature +--- + +This is the homepage for the *European Literature* category. + +### German + +Johann Wolfgang von Goethe + +- The Sorrows of Young Werther diff --git a/literature/world.md b/literature/world.md new file mode 100644 index 0000000..4f14c6d --- /dev/null +++ b/literature/world.md @@ -0,0 +1,13 @@ +--- +title: World Literature +--- + +This is the homepage for the *World Literature* category. + +### Argentinian + +Jorge Luis Borges + +- Garden of Forking Paths +- The Aleph +- Ficciones diff --git a/literature/young-reader.md b/literature/young-reader.md new file mode 100644 index 0000000..4c10f0a --- /dev/null +++ b/literature/young-reader.md @@ -0,0 +1,11 @@ +--- +title: Young Reader Literature +--- + +This is the homepage for the *Young Reader Literature* category. + +### British + +Lewis Carroll + +- Alice's Adventures in Wonderland diff --git a/science.md b/science.md index 1fb7226..69cb2b9 100644 --- a/science.md +++ b/science.md @@ -2,81 +2,16 @@ title: Science --- -This is the home page for the **Science** category, which includes *Mathematics*, *Biology*, *Chemistry*, *Physics*, *Earth Science*, *Astronomy*, and *Computer Science*. +This is the home page for the **Science** category. -### Mathematics +We have organized science content into seven main subcategories: -**Resources** +- [Mathematics](math/index.html) (1.8 / 1.7) +- [Physics](physics/index.html) (1.0 / 1.0) +- [Biology](biology/index.html) (1.0 / 1.0) +- [Chemistry](chemistry/index.html) (0.8 / 0.8) +- [Astronomy](astronomy/index.html) (0.3 / 0.3) +- [Earth Science](earth/index.html) (0.2 / 0.2) +- [Computer Science](computer/index.html) (0.2 / 0.2) -**Content** - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Biology - -**Resources** - -**Content** - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Chemistry - -**Resources** - -**Content** - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Physics - -**Resources** - -You Gotta Know... - -- [Classes of Particles](https://www.naqt.com/you-gotta-know/classes-of-particles.html) -- [Circuit Components](https://www.naqt.com/you-gotta-know/circuit-components.html) -- [20th-Century Physicists](https://www.naqt.com/you-gotta-know/20th-century-physicists.html) - -Stanford Culture Guide - -- [Particle Physics](https://ai.stanford.edu/~csewell/culture/physics.htm) -- [Physics](https://ai.stanford.edu/~csewell/culture/physics.htm) - -Qwiz5 -- [Electrons](https://www.qwizbowl.com/post/qwiz5-quizbowl-electrons) -- [Lasers](https://www.qwizbowl.com/post/qwiz5-quizbowl-lasers) -- [Hooke's Law](https://www.qwizbowl.com/post/qwiz5-quizbowl-hooke) -- [Bose-Einstein Condensate](https://www.qwizbowl.com/post/qwiz5-quizbowl-bec) -- [The Michelson-Morley Experiment](https://www.qwizbowl.com/post/qwiz5-quizbowl-michelsonmorley) -- [Max Plaanck](https://www.qwizbowl.com/post/qwiz5-quizbowl-planck) - -**Content** - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Earth Science - -**Resources** - -**Content** - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Astronomy - -**Resources** - -[You Gotta Know These Rocket Scientists](https://www.naqt.com/you-gotta-know/rocket-scientists.html) - -**Content** - -There is no content yet in this category. [Contribute some!](/contribute/index.html) - -### Computer Science - -**Resources** - -**Content** - -There is no content yet in this category. [Contribute some!](/contribute/index.html) +Distribution Note: "Other Science" and "Any Science" are each given 0.2 / 0.2 so each of the counts above is a slight underestimate. diff --git a/science/astronomy.md b/science/astronomy.md new file mode 100644 index 0000000..29732e8 --- /dev/null +++ b/science/astronomy.md @@ -0,0 +1,11 @@ +--- +title: Astronomy +--- + +This is the homepage for the *Astronomy* category. + +**Resources:** + +**Content:** + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/science/biology.md b/science/biology.md new file mode 100644 index 0000000..76572c2 --- /dev/null +++ b/science/biology.md @@ -0,0 +1,11 @@ +--- +title: Biology +--- + +This is the homepage for the *Biology* category. + +**Resources:** + +**Content:** + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/science/chemistry.md b/science/chemistry.md new file mode 100644 index 0000000..48a55ec --- /dev/null +++ b/science/chemistry.md @@ -0,0 +1,11 @@ +--- +title: Chemistry +--- + +This is the homepage for the *Chemistry* category. + +**Resources:** + +**Content:** + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/science/computer.md b/science/computer.md new file mode 100644 index 0000000..dcb1cba --- /dev/null +++ b/science/computer.md @@ -0,0 +1,11 @@ +--- +title: Computer Science +--- + +This is the homepage for the *Computer Science* category. + +**Resources:** + +**Content:** + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/science/earth.md b/science/earth.md new file mode 100644 index 0000000..7995389 --- /dev/null +++ b/science/earth.md @@ -0,0 +1,11 @@ +--- +title: Earth Science +--- + +This is the homepage for the *Earth Science* category. + +**Resources:** + +**Content:** + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/science/math.md b/science/math.md new file mode 100644 index 0000000..296e2b6 --- /dev/null +++ b/science/math.md @@ -0,0 +1,11 @@ +--- +title: Mathematics +--- + +This is the homepage for the *Mathematics* category. + +**Resources:** + +**Content:** + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/science/physics.md b/science/physics.md new file mode 100644 index 0000000..488fbf2 --- /dev/null +++ b/science/physics.md @@ -0,0 +1,31 @@ +--- +title: Physics +--- + +This is the homepage for the *Physics* category. + +**Resources:** + +You Gotta Know... + +- [Classes of Particles](https://www.naqt.com/you-gotta-know/classes-of-particles.html) +- [Circuit Components](https://www.naqt.com/you-gotta-know/circuit-components.html) +- [20th-Century Physicists](https://www.naqt.com/you-gotta-know/20th-century-physicists.html) + +Stanford Culture Guide + +- [Particle Physics](https://ai.stanford.edu/~csewell/culture/physics.htm) +- [Physics](https://ai.stanford.edu/~csewell/culture/physics.htm) + +Qwiz5 + +- [Electrons](https://www.qwizbowl.com/post/qwiz5-quizbowl-electrons) +- [Lasers](https://www.qwizbowl.com/post/qwiz5-quizbowl-lasers) +- [Hooke's Law](https://www.qwizbowl.com/post/qwiz5-quizbowl-hooke) +- [Bose-Einstein Condensate](https://www.qwizbowl.com/post/qwiz5-quizbowl-bec) +- [The Michelson-Morley Experiment](https://www.qwizbowl.com/post/qwiz5-quizbowl-michelsonmorley) +- [Max Planck](https://www.qwizbowl.com/post/qwiz5-quizbowl-planck) + +**Content:** + +There is no content yet in this category. [Contribute some!](/contribute/index.html) diff --git a/site.hs b/site.hs index e45b74f..42901c5 100644 --- a/site.hs +++ b/site.hs @@ -23,7 +23,7 @@ main = hakyll $ do >>= relativizeUrls >>= cleanIndexUrls - match ("science.md" .||. "science/*.md" .||. "arts-humanities.md" .||. "arts-humanities/*.md" .||. "literature.md" .||. "literature/*.md" .||. "history.md" .||. "history/*.md") $ do + match ("*.md" .||. "**/*.md") $ do route cleanRoute compile $ pandocCompiler >>= loadAndApplyTemplate "templates/default.html" defaultContext