Separate all the subcategories, add distributions

brightly-salty · Jun 22, 2022 · 6425a38 · 6425a38
1 parent e55b4f1
commit 6425a38
Show file tree

Hide file tree

Showing 27 changed files with 377 additions and 158 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
+### 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
@@ -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)
+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
@@ -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)
+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
@@ -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)
+### 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
@@ -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
@@ -2,22 +2,29 @@
 title: Home
 ---
 
-<h2>Welcome</h2>
-
 <img src="/images/keep-calm.png" style="float: right; margin: 10px;" />
 
 <p>Welcome to the QB Canon site!</p>
 
-<p>We have content organized into four main categories:</p>
+<p>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 <a href="https://www.qbwiki.com/wiki/Canon">QBWiki</a>.</p>
+
+<p>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 <a href="https://www.naqt.com/hs/distribution.jsp">here</a>. These are just
+    meant as a guide to studying, and should not be taken as canon themselves.
+</p>
+
+<p>We have all of our content organized into four main categories:</p>
 
 <ul>
 
-<li><a href="science/index.html">Science</a></li>
+    <li><a href="history/index.html">History</a> (6.6 / 6.5)</li>
 
-<li><a href="arts-humanities/index.html">Arts and Humanities</a></li>
+    <li><a href="science/index.html">Science</a> (5.6 / 5.4)</li>
 
-<li><a href="literature/index.html">Literature</a></li>
+    <li><a href="arts-humanities/index.html">Arts and Humanities</a> (4.2 / 3.9)</li>
 
-<li><a href="history/index.html">History</a></li>
+    <li><a href="literature/index.html">Literature</a> (4.0 / 3.8)</li>
 
 </ul>
diff --git 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
@@ -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
@@ -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
@@ -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