Fix bug with nested url

Author: edsaac

.gitignore

@@ -129,4 +129,5 @@ dmypy.json
 .pyre/
 
 # Ignore folders
-.ignore/
+.ignore/
+.bookvenv/

.streamlit/config.toml

@@ -2,10 +2,10 @@
 gatherUsageStats = false
 
 [theme]
-base="light"
-primaryColor="#4E2A84"
-backgroundColor="snow"
-secondaryBackgroundColor="#B6ACD150"
+base = "light"
+primaryColor = "#4E2A84"
+backgroundColor = "snow"
+secondaryBackgroundColor = "#d2cddf"
 
 [runner]
 magicEnabled = true

book/assets/style.css

@@ -14,10 +14,17 @@ tr .math {
     font-size: 1.2rem;
 }
 
-[data-testid="stSidebar"] {
+/* [data-testid="stSidebar"] {
     background-color: #4E2A84;
 }
 
+[data-testid="stNavSectionHeader"] {
+    color: white;
+}
+
+[data-testid="stSidebarNavLink"] span {
+    color: snow;
+} */
 
 [data-testid="stSidebar"] p {
     font-size: 1.0rem;

book/pages.py

@@ -39,18 +39,26 @@ def generate_pages(page_week: Callable) -> dict[str, StreamlitPage]:
 
     for i, topic in enumerate(list_of_topics, start=1):
         if not topic.startswith("~"):
+            title = f"{topic}"
+            url_path = title.replace(" ", "_").replace("-", "").strip().lower()
+            # print(title, url_path)
+
             pages[topic] = st.Page(
                 partial(page_week, topic),
-                title=(title := f"{topic}"),
-                url_path=title.replace(" ", "_").replace("-", "").strip().lower(),
+                title=title,
+                url_path=url_path,
                 icon=":material/article:",
             )
 
         else:
+            title = " - " + topic.replace("~", "")
+            url_path = title.replace("-", "").strip().replace(" ", "_").lower()
+            # print(title, url_path)
+
             pages[topic] = st.Page(
                 partial(page_week, topic),
-                title=(title := " - " + topic.replace("~", "")),
-                url_path=title.replace("-", "").strip().replace(" ", "_").lower(),
+                title=title,
+                url_path=url_path,
                 icon="🐍",
             )
 

book/week_03/Week_3.py

@@ -12,7 +12,7 @@
 from .subpages import making_epanet, adjacency_matrix
 
 TOC = Literal[
-    "Pipes in series/parallel",
+    "Pipes in series and parallel",
     "Branched systems",
     "Looped networks",
     "Newton method",
@@ -24,7 +24,7 @@
 def page_week_03(option: TOC):
     st.title(option.replace("~", ""))
 
-    if option == "Pipes in series/parallel":
+    if option == "Pipes in series and parallel":
         cols = st.columns(2)
         with cols[1]:
             st.pyplot(pipes_in_series())
@@ -589,7 +589,7 @@ def three_reservoirs_problem(
 
                 return error
 
-        st.subheader("### 🍠 Find the root ", anchor=False)
+        st.subheader("🍠 Find the root ", anchor=False)
 
         with st.echo():
             solution = root(
@@ -617,13 +617,13 @@ def three_reservoirs_problem(
 
         st.divider()
         st.warning("What was the pressure in the junction?")
-    
+
     elif option == "~Building an EPANET":
         making_epanet()
-    
+
     elif option == "~Adjacency matrix":
         adjacency_matrix()
-        
+
     else:
         r"### 🚧 Under construction 🚧"
 
@@ -954,5 +954,3 @@ def write_network_equations():
             """
 
     return None
-
-

hydraulics_book.py

@@ -1,14 +1,17 @@
 import streamlit as st
 import os
+
 from book.pages import all_pages
 from book.common import page_config_common, apply_css_style, sidebar_common, badges
 
 
 def entrypoint_page():
-
-    st.title("🌊 Hydraulics and Hydrology with Python 🌊", anchor="Hydraulics and Hydrology with Python")
+    st.title(
+        "🌊 Hydraulics and Hydrology with Python 🌊",
+        anchor="Hydraulics and Hydrology with Python",
+    )
     st.markdown(" ")
-    
+
     left_col, right_col = st.columns([2, 1])
 
     with right_col:
@@ -24,7 +27,7 @@ def entrypoint_page():
                 <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">
                     <img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/80x15.png" />
                 </a>
-                <br />This work is licensed under a 
+                <br />This work is licensed under a
                 <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">
                     Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License
                 </a>.
@@ -39,8 +42,8 @@ def entrypoint_page():
     with left_col:
         st.markdown(
             R"""
-            This material was first made to support the course 
-            :violet[CIV-ENV 340: Hydraulics and Hydrology] that I taught during 
+            This material was first made to support the course
+            :violet[CIV-ENV 340: Hydraulics and Hydrology] that I taught during
             the Spring quarter of 2023 at Northwestern University. It is divided
             in the ten weeks of the quarter, covering concepts in hydraulics of
             presurized pipe systems, open channel flow, and basic hydrology. This
@@ -56,7 +59,7 @@ class included short computational projects, in which we...
 
         st.page_link(
             all_pages["Week 6 - More channel flow"]["~Solve IVP"],
-            label=":violet-background[... made a gradually-variable flow profiles calculator]",
+            label=":violet-background[... made a gradually-variable flow calculator]",
             use_container_width=True,
         )
 
@@ -72,9 +75,11 @@ class included short computational projects, in which we...
             use_container_width=True,
         )
 
+        st.markdown("""⁂""")
+
         st.markdown("""
             The pages marked with a 🐍 indicate the projects involving using Python.
-            The rest correspond to supplemental material for the lectures, like 
+            The rest correspond to supplemental material for the lectures, like
             diagrams and interactive plots.
             """)
 
@@ -89,14 +94,13 @@ def main():
     )
 
     all_pages.update({"Cover": {"Introduction": entry_page}})
-
     pages_for_nav = {k: list(v.values()) for k, v in all_pages.items()}
+
     nav = st.navigation(pages_for_nav)
     nav.run()
 
 
 if __name__ == "__main__":
-    
     if not st.session_state.get("set_mplrc", False):
         os.environ["MATPLOTLIBRC"] = (
             os.getcwd() + "/book/assets/matplotlib/matplotlibrc"