Uniform Improvements (#17)

I'm just going to consider this done, and if anything else needs to be added. make a new PR

docs/Makefile

@@ -5,18 +5,13 @@ BUILDDIR      = _build
 
 # Refactored from minimal makefile
 
-all: patches latexpdf
-
-# Build custom patches
-patches:
-	mkdir -p uniforms/patches/renders
-	cd uniforms/patches && python patchbuilder.py
+all: latexpdf
 
 clean:
 	git clean -fdX 
 
 latexpdf: Makefile
 	@$(SPHINXBUILD) -M latexpdf "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-html: patches Makefile
+html: Makefile
 	@$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/Merchandise/Merchandise.rst

@@ -1,6 +1,13 @@
 Merchandise
 ===========
 
-.. image:: resources/therealmoeny.jpg
-   :height: 250
-   :alt: Where the real money from the movie is made
+Super Button
+------------
+
+The `Super Button`_ is a collection of small macro keypads made for fundraising!
+
+.. image:: resources/SuperButton.png
+   :width: 80%
+   :alt: Super Button x1
+
+.. _Super Button: https://github.com/FRC-1721/SuperButton

docs/awards/medals.rst

@@ -16,7 +16,7 @@ The Enderson Award
 
 
 The Captian's Award
-==================
+===================
 
 .. figure:: ../../awards/medals/captain_medal.png
    :width: 150
@@ -26,7 +26,7 @@ The Captian's Award
 
 
 The President's Award
-==================
+=====================
 
 .. figure:: ../../awards/medals/president_medal.png
    :width: 150

docs/conf.py

@@ -1,5 +1,6 @@
+import os
+import sys
 import subprocess
-
 import sphinx_theme
 
 # Revision/git information
@@ -23,8 +24,14 @@
 copyright = "2021-2022, To Be Announced"
 author = "Tidal Force, FRC Team 1721"
 
+# Ammend any custom extensions we have
+sys.path.append(os.path.abspath("uniforms/patches"))
+
 # General Config
-extensions = ["sphinx.ext.autosectionlabel"]
+extensions = [
+    "sphinx.ext.autosectionlabel",
+    "patchbuilder",
+]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]

docs/index.rst

@@ -8,6 +8,7 @@ Welcome to Tidal Force Infrastructure's documentation!
    introduction/introduction
    uniforms/roles
    uniforms/chevrons
+   uniforms/service
    stickers/stickers
    stickers/buttons
    awards/medals

docs/logos/logos.rst

@@ -16,6 +16,15 @@ Submit a PR to have your logo added!
    Not the oldest but the most commonly used official logo, commissioned
    in 2016, we went to worlds with this logo and it stuck.
 
+.. figure:: ../../logos/2017/rendered/hoodie.png
+   :width: 60%
+   :alt: 2017 Hoodie Logo
+
+   This logo was reserved for merch/hoodies. Becoming particularly favorited on
+   hoodies and other more casual team merch. This logo was never used on official
+   team uniforms but counts perfectly fine as a uniform for demos, outreach and 
+   offseason events.
+
 2018
 ====
 

docs/stickers/buttons.rst

@@ -1,9 +1,27 @@
 Buttons
 #######
 
+"Modern" Buttons (2017-2022)
+============================
+
+.. figure:: ../../buttons/misc/2017_button.jpg
+   :width: 80%
+   :alt: New 2017 logo printed on a button!
+
+   New 2017 logo printed on a button!
+
+.. figure:: ../../buttons/misc/caleb_button.jpg
+   :width: 80%
+   :alt: 2017 button in alternative color and design
+
+   2017 button in alternative color and design, printed from 2018 - 2019
+
+
 Vintage Buttons (2006-2014)
 ===========================
 
 .. figure:: ../../buttons/misc/vintage.jpg
    :width: 80%
-   :alt: Vintage Tidal Force Sticker
+   :alt: Vintage Tidal Force Button
+
+   Vintage Tidal Force Button, unknown author.

docs/stickers/stickers.rst

@@ -20,7 +20,7 @@ Vivve Fest
    :width: 80%
    :alt: Vivve Fest 6 Sticker
 
-   This is the first Vivve Fest sticker that was presented at a Vivve fest for the winter 2021 Vivve Fest, Designed by Connor_.
+   This is the first Vivve Fest sticker that was presented at a Vivve fest for the winter 2021 Vivve Fest, Designed by Conar_.
 
 
 2022
@@ -30,7 +30,7 @@ Vivve Fest
    :width: 80%
    :alt: Vivve Fest 7 Sticker
 
-   The Summer 2022 Vivve Fest sticker was designed by Connor_.
+   The Summer 2022 Vivve Fest sticker was designed by Conar_.
 
 .. figure:: ../../stickers/Vivve\ Fest\ Stickers/2022/winter/rendered/Vivve\ Fest\ 8.png
    :width: 80%

docs/tes.py

@@ -0,0 +1,7 @@
+import json
+
+indata = '["none", "none", ["white", "gold"], "none", "none"]'
+
+_chevrons = json.loads(indata)
+
+print(_chevrons)

docs/uniforms/chevrons.rst

@@ -28,89 +28,79 @@ White bars are placed last.
 
 For example, if you had the following two roles:
 
-+--------------+----------+-----------------------+
-| Mechanical   | Driver   | Mechanical And Driver |
-+--------------+----------+-----------------------+
-| |mechanical| | |driver| | |mechanical_driver|   |
-+--------------+----------+-----------------------+
+.. chevron::
+   :chevrons: ["none", "none", "red", "red", "none"]
+   :patches: [["Mechanical", "red"]]
+
+.. chevron::
+   :chevrons: ["none", "none", "red",  "none", "none"]
+   :patches: [["Driver", "red"]]
+
+Then your final patch would look like this
+
+..  chevron::
+   :chevrons: ["none", "none", "red", "red", "none"]
+   :patches: [["Mechanical", "red"], ["Driver", "red"]]
+
 
 Patch Placement
 ---------------
 
 The team patches reflect drive team positions, subteam 
 denotations for leads, Captain's position, and lead mentor
-position. Similar to chevron colours, Red denotes active
-work for the patch, and white an Alumni of the position [3]_.
+position. Similar to chevron colors, Red denotes active
+work for the patch, and white an Alumni of the position.
 Gold denotes senior leadership, and it used for Captain
 and asst. captain.
 
 White patches are only given out to Alumni's who've worked
 in the position either as lead, or on drive team, or as a
 mentor which is worthy of their work being memorialized a
-white patch [4]_.
+white patch.
 
 
 Mentor and Alumni Chevrons
 ==========================
 
-.. figure:: patches/renders/lead_mentor.png
-   :width: 125
-   :alt: Picture of Lead mentor's livery
+.. chevron::
+   :chevrons: ["none", "none", "white", "none", "none"]
+   :patches: [["LeadMentor", "red"]]
 
    Lead mentor's livery.
 
-.. figure:: patches/renders/adult_drivecoach.png
-   :width: 125
-   :alt: Picture of adult drivecoach mentor's livery
+.. chevron::
+   :chevrons: ["none", "red", "white", "none", "none"]
 
    Mentor Drive Coach's livery.
 
-.. figure:: patches/renders/alum_captain.png
-   :width: 125
-   :alt: Picture of Alumni Captain's livery
+.. chevron::
+   :chevrons: ["none", "none", "gold", "white", "white"]
 
    Alumni Captain's livery.
 
-.. figure:: patches/renders/alum_asst_captain.png
-   :width: 125
-   :alt: Picture of Alumni Assistant Captain's livery
+.. chevron::
+   :chevrons: ["none", "none", ["gold", "white"], "white", "white"]
 
    Alumni Assistant Captain's livery.
 
 Examples
 ========
 
-.. figure:: patches/renders/alum_drivecoach.png
-   :width: 125
-   :alt: Picture of Alumni drivecoach's livery
+.. chevron::
+   :chevrons: ["none", "red", "white", "white", "none"]
+   :patches: [["Mechanical", "white"], ["Electrical", "white"]]
 
    Alumni drive coach who was lead of electrical and lead of mechanical
    during their time as a team member. (Likely not during the same years)
 
 
-.. figure:: patches/renders/alumniLeadOfCode.png
-   :width: 125
-   :alt: Picture of Alumni Software Team's livery
+.. chevron::
+   :chevrons: ["none", "none", "white", "white", "none"]
+   :patches: [["Software", "white"], ["Driver", "white"]]
 
    Alumni member who was lead of code and driver while they were on the team.
 
-.. figure:: patches/renders/mentor.png
-   :width: 125
-   :alt: Picture of a Mentor's livery
+.. chevron::
+   :chevrons: ["none", "none", "white", "none", "none"]
 
    A current mentor on the team.
-
-
-.. |mechanical| image:: patches/renders/mechanical_asst.png
-   :width: 125
-   :alt: Assistant Lead of Mechanical's livery
-
-.. |driver| image:: patches/renders/driver.png
-   :width: 125
-   :alt: Driver's livery
-
-Then your final patch would look like this
-
-.. |mechanical_driver| image:: patches/renders/assistantMechanicalDriver.png
-   :width: 125
-   :alt: Assistant Mecahnical And Driver's livery