Merge branch 'master' of https://github.com/thecodingwizard/usaco-guide

content/1_Intro/About_This.md

@@ -1,5 +1,5 @@
 ---
-id: about
+id: about-this
 title: About This Guide
 author: Nathan Wang, Benjamin Qi
 ---

content/1_Intro/Data_Types.md

@@ -1,5 +1,5 @@
 ---
-id: data
+id: data-types
 title: Data Types
 author: Darren Yao
 ---

content/1_Intro/Example_Problem.md

@@ -1,6 +1,6 @@
 ---
-id: problems
-title: Introductory Problems
+id: ex-prob
+title: An Example Problem
 author: Nathan Wang, Benjamin Qi, Darren Yao
 problems:
  - bronze_promote
@@ -9,7 +9,7 @@ problems:
  - bronze_square
 ---
 
-Solutions for an introductory USACO problem in multiple languages. 
+Solutions for an example USACO problem in multiple languages. 
 
 <!-- END DESCRIPTION -->
 
@@ -179,11 +179,9 @@ for i in range(100):
 fout.write(str(ans))
 ```
 
-## Problems
+## Introductory Problems
 
-Let's begin by solving a few problems! The following require relatively little programming experience and no algorithmic knowledge.
-
-Do as many as you want, then move on! You do not have to do all of them.
+The following require relatively little programming experience and no algorithmic knowledge. Do as many as you want, then move on! You do not have to do all of them.
 
 - [Promotion Counting](http://usaco.org/index.php?page=viewproblem2&cpid=591)
 - [Word Processor](http://usaco.org/index.php?page=viewproblem2&cpid=987)

content/1_Intro/Input_Output.md

@@ -1,11 +1,10 @@
 ---
 id: io
-title: Input and Output
+title: Input & Output
 author: Darren Yao
-order: 5
 ---
 
-Demonstrates how to read in input and print output for USACO.
+Demonstrates how to read input and print output for USACO.
 
 <!-- END DESCRIPTION -->
 

content/1_Intro/Prerequisites.md

@@ -1,5 +1,5 @@
 ---
-id: prerequisites
+id: prereqs
 title: Prerequisites
 author: Nathan Wang
 ---

content/2_General/Contest_Strategy.md

@@ -1,5 +1,5 @@
 ---
-id: strategy
+id: contest-strategy
 title: Contest Strategy
 author: ?
 ---

content/3_Bronze/Rect_Geo.md

@@ -1,5 +1,5 @@
 ---
-id: rectangle-geometry
+id: rect-geo
 title: "Rectangle Geometry"
 author: Darren Yao
 ---

content/4_Silver/2P.md

@@ -1,5 +1,5 @@
 ---
-id: two-pointers
+id: 2P
 title: "Two Pointers"
 author: Darren Yao
 prerequisites:

content/4_Silver/Sorting.md

@@ -2,7 +2,6 @@
 id: sorting
 title: "Sorting"
 author: Siyong (WIP)
-order: 3
 prerequisites: 
  - 
      - Silver - Containers

content/4_Silver/Time_Comp.md

@@ -1,5 +1,5 @@
 ---
-id: complexity
+id: time-comp
 title: "Time Complexity"
 author: Darren Yao, Benjamin Qi
 ---

content/5_Gold/Intro_NT.md

@@ -1,5 +1,5 @@
 ---
-id: introductory-number-theory
+id: intro-nt
 title: "Introductory Number Theory"
 author: Unknown
 ---

content/6_Plat/Strings.md

@@ -1,5 +1,5 @@
 ---
-id: hashing
+id: strings
 title: "Strings"
 author: Benjamin Qi
 prerequisites: 

content/Syllabus.md

@@ -1,9 +1,11 @@
 ---
 id: syllabus
 title: Syllabus
-author: Benjamin Qi, I FORGOT WHO ELSE EVERYONE PUT YOUR NAME HERE :D
+author: Benjamin Qi
 ---
 
+(outdated)
+
 Below, we've compiled some of the main topics for each division.
 
 <!-- END DESCRIPTION -->

content/ordering.js

@@ -2,69 +2,94 @@ const ModuleOrdering = {
   "intro": [
     "about-this",
     "getting-started",
-    "prerequisites",
+    "prereqs",
     "running-cpp",
-    "problems",
-    "syllabus",
+    "data-types",
+    "io",
+    "ex-prob",
+    "practicing",
   ],
   "general": [
     "resources",
     "contests",
-    "why-cpp",
-    "practicing",
-    "strategy",
-    "debugging",
-    "macros",
+    "contest-strategy",
     "proposing",
+    "why-cpp",
+    "macros",
+    "debugging",
   ],
   "bronze": [
-    "overview",
-    "rectangle-geometry",
-    "collections",
-    "containers",
-    "ds",
-    "pairs",
+    "rect-geo",
+    {
+      name: "Data Structures",
+      items: [
+        "collections",
+        "containers",
+        "pairs",
+        "ds",
+      ]
+    },
     "simulation",
     "complete-search",
   ],
   "silver": [
-    "complexity",
+    "time-comp",
     "greedy",
     "sorting",
     "binary-search",
-    "two-pointers",
+    "2P",
     "prefix-sums",
     "data-structures",
     "dfs"
   ],
   "gold": [
-    "dp",
-    "bfs",
-    "toposort",
-    "sp",
-    "mst",
+    "intro-nt",
     "bit",
-    "introductory-number-theory",
-    "dp-trees"
+    {
+      name: "Graphs",
+      items: [
+        "bfs",
+        "toposort",
+        "sp",
+        "mst"
+      ]
+    },
+    {
+      name: "Dynamic Programming",
+      items: [
+        "dp",
+        "dp-trees"
+      ]
+    }
   ],
   "plat": [
     "oly",
-    "trees",
-    "1DRQ",
-    "2DRQ",
-    "geo",
-    "graphs",
-    "hashing",
-    "bitset",
-    "fracture",
-    "slope",
+    {
+      name: "Range Queries",
+      items: [
+        "1DRQ",
+        "2DRQ",
+      ]
+    },
+    {
+      name: "Graphs",
+      items: [
+        "trees",
+        "graphs",
+      ]
+    },
     {
       name: "Dynamic Programming",
       items: [
         "dp-bitmasks",
-        "dp-ranges"
+        "dp-ranges",
+        "slope",
       ]
-    }
+    },
+    "geo",
+    "strings",
+    "bitset",
+    "fracture",
   ]
 };