Merge pull request #8 from posit-conf-2024/advanced-ui-edits

Advanced UI edits, part 2
posit-conf-2024 · Aug 12, 2024 · b316e06 · b316e06
2 parents 0a44aba + 07e5b36
commit b316e06
Show file tree

Hide file tree

Showing 39 changed files with 85 additions and 147 deletions.
diff --git a/_quarto.yml b/_quarto.yml
@@ -53,7 +53,6 @@ website:
           contents:
           - docs/apps/101-input/index.qmd
           - docs/apps/102-output/index.qmd
-          - docs/apps/103-table/index.qmd
 
     - title: "Reactivity"
       contents:
@@ -86,7 +85,7 @@ website:
         - section: "Exercises"
           contents: 
           - docs/exercises/express-301-cards/index.qmd
-          - docs/exercises/express-302-sidebars/index.qmdi
+          - docs/exercises/express-302-sidebars/index.qmd
           - docs/exercises/express-303-value-boxes/index.qmd
           - docs/exercises/express-304-columns/index.qmd
           - docs/exercises/express-305-app/index.qmd
@@ -98,9 +97,12 @@ website:
           - docs/exercises/express-311-style/index.qmd
         - section: "Apps"
           contents:
-          - docs/apps/301-cards/index.qmd
-          - docs/apps/302-dynamic-ui/index.qmd
-          - docs/apps/303-conditional-panel/index.qmd
+          - docs/apps/330-target-app/index.qmd
+          - docs/apps/331-starting-app/index.qmd
+          - docs/apps/332-value-boxes/index.qmd
+          - docs/apps/333-columns/index.qmd
+          - docs/apps/334-target-app/index.qmd
+          - docs/apps/335-css/index.qmd
     - title: "Workflow"
       contents:
         - section: "Slides"

diff --git a/docs/apps/102-output/problem/requirements.txt b/docs/apps/102-output/problem/requirements.txt
@@ -1 +1,2 @@
-shiny==1.0.0
+shiny==1.0.0
+shinywidgets
diff --git a/docs/apps/103-table/index.qmd b/docs/apps/103-table/index.qmd
diff --git a/docs/apps/103-table/problem/README b/docs/apps/103-table/problem/README
diff --git a/docs/apps/103-table/problem/app.py b/docs/apps/103-table/problem/app.py
diff --git a/docs/apps/103-table/problem/data_import.py b/docs/apps/103-table/problem/data_import.py
diff --git a/docs/apps/103-table/problem/plots.py b/docs/apps/103-table/problem/plots.py
diff --git a/docs/apps/103-table/problem/requirements.txt b/docs/apps/103-table/problem/requirements.txt
diff --git a/docs/apps/330-target-app/index.qmd b/docs/apps/330-target-app/index.qmd
@@ -1,5 +1,5 @@
 ---
-title: "330 Taerget App"
+title: "330 Target App"
 ---
 
 {{< yourturnChild >}}

diff --git a/docs/apps/332-value-boxes/problem/app.py b/docs/apps/332-value-boxes/problem/app.py
@@ -8,7 +8,6 @@
     theme="green"
 ):
     "Save"
-
     @render.text 
     def save(): 
         return f"${input.number()}"
diff --git a/docs/apps/334-target-app/problem/app.py b/docs/apps/334-target-app/problem/app.py
@@ -12,7 +12,7 @@
     theme = app_theme
 )
 
-with ui.sidebar():
+with ui.sidebar(class_="bg-primary-subtle"):
     ui.input_select(
         "account",
         "Account",

diff --git a/docs/apps/334-target-app/problem/plots.py b/docs/apps/334-target-app/problem/plots.py
@@ -23,7 +23,6 @@ def plot_score_distribution(df: DataFrame, color = "blue"):
 
 def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorange", line_color="navy"):
     fpr, tpr, _ = roc_curve(df[true_col], df[pred_col])
-    roc_auc = auc(fpr, tpr)
 
     roc_df = DataFrame({"fpr": fpr, "tpr": tpr})
 
@@ -33,7 +32,6 @@ def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorang
         + geom_abline(intercept=0, slope=1, color=line_color, linetype="dashed")
         + labs(
             title="Receiver Operating Characteristic (ROC)",
-            subtitle=f"AUC: {roc_auc.round(2)}",
             x="False Positive Rate",
             y="True Positive Rate",
         )

diff --git a/docs/apps/335-css/index.qmd b/docs/apps/335-css/index.qmd
@@ -1,5 +1,5 @@
 ---
-title: "331 Starting App"
+title: "335 CSS"
 ---
 
 {{< yourturnChild >}}

diff --git a/docs/exercises/express-101-run-app/problem/requirements.txt b/docs/exercises/express-101-run-app/problem/requirements.txt
diff --git a/docs/exercises/express-102-ui-module/problem/requirements.txt b/docs/exercises/express-102-ui-module/problem/requirements.txt
diff --git a/docs/exercises/express-103-inputs/problem/requirements.txt b/docs/exercises/express-103-inputs/problem/requirements.txt
diff --git a/docs/exercises/express-104-outputs/problem/requirements.txt b/docs/exercises/express-104-outputs/problem/requirements.txt
@@ -1,3 +1,4 @@
 pandas
+pathlib
 plotly
 shinywidgets
diff --git a/docs/exercises/express-110-app/problem/requirements.txt b/docs/exercises/express-110-app/problem/requirements.txt
@@ -1,3 +1,3 @@
 pandas
 plotly
-statmodels
+statsmodels
diff --git a/docs/exercises/express-301-cards/index.qmd b/docs/exercises/express-301-cards/index.qmd
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```
diff --git a/docs/exercises/express-302-sidebars/index.qmd b/docs/exercises/express-302-sidebars/index.qmd
@@ -1,5 +1,5 @@
 ---
-title: "302 Value Boxes"
+title: "302 Sidebars"
 ---
 
 {{< yourturnChild >}}
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```
diff --git a/docs/exercises/express-303-value-boxes/index.qmd b/docs/exercises/express-303-value-boxes/index.qmd
@@ -1,5 +1,5 @@
 ---
-title: "303 Taerget App"
+title: "303 Value Boxes"
 ---
 
 {{< yourturnChild >}}
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```
diff --git a/docs/exercises/express-304-columns/index.qmd b/docs/exercises/express-304-columns/index.qmd
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```
diff --git a/docs/exercises/express-305-app/index.qmd b/docs/exercises/express-305-app/index.qmd
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```
diff --git a/docs/exercises/express-306-app/index.qmd b/docs/exercises/express-306-app/index.qmd
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```
diff --git a/docs/exercises/express-306-app/problem/plots.py b/docs/exercises/express-306-app/problem/plots.py
@@ -23,7 +23,6 @@ def plot_score_distribution(df: DataFrame, color = "blue"):
 
 def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorange", line_color="navy"):
     fpr, tpr, _ = roc_curve(df[true_col], df[pred_col])
-    roc_auc = auc(fpr, tpr)
 
     roc_df = DataFrame({"fpr": fpr, "tpr": tpr})
 
@@ -33,7 +32,6 @@ def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorang
         + geom_abline(intercept=0, slope=1, color=line_color, linetype="dashed")
         + labs(
             title="Receiver Operating Characteristic (ROC)",
-            subtitle=f"AUC: {roc_auc.round(2)}",
             x="False Positive Rate",
             y="True Positive Rate",
         )

diff --git a/docs/exercises/express-307-themes/index.qmd b/docs/exercises/express-307-themes/index.qmd
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```
diff --git a/docs/exercises/express-307-themes/problem/plots.py b/docs/exercises/express-307-themes/problem/plots.py
@@ -23,7 +23,6 @@ def plot_score_distribution(df: DataFrame, color = "blue"):
 
 def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorange", line_color="navy"):
     fpr, tpr, _ = roc_curve(df[true_col], df[pred_col])
-    roc_auc = auc(fpr, tpr)
 
     roc_df = DataFrame({"fpr": fpr, "tpr": tpr})
 
@@ -33,7 +32,6 @@ def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorang
         + geom_abline(intercept=0, slope=1, color=line_color, linetype="dashed")
         + labs(
             title="Receiver Operating Characteristic (ROC)",
-            subtitle=f"AUC: {roc_auc.round(2)}",
             x="False Positive Rate",
             y="True Positive Rate",
         )

diff --git a/docs/exercises/express-308-plot-themes/index.qmd b/docs/exercises/express-308-plot-themes/index.qmd
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```
diff --git a/docs/exercises/express-308-plot-themes/problem/plots.py b/docs/exercises/express-308-plot-themes/problem/plots.py
@@ -23,7 +23,6 @@ def plot_score_distribution(df: DataFrame, color = "blue"):
 
 def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorange", line_color="navy"):
     fpr, tpr, _ = roc_curve(df[true_col], df[pred_col])
-    roc_auc = auc(fpr, tpr)
 
     roc_df = DataFrame({"fpr": fpr, "tpr": tpr})
 
@@ -33,7 +32,6 @@ def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorang
         + geom_abline(intercept=0, slope=1, color=line_color, linetype="dashed")
         + labs(
             title="Receiver Operating Characteristic (ROC)",
-            subtitle=f"AUC: {roc_auc.round(2)}",
             x="False Positive Rate",
             y="True Positive Rate",
         )

diff --git a/docs/exercises/express-309-valuebox-themes/index.qmd b/docs/exercises/express-309-valuebox-themes/index.qmd
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```
diff --git a/docs/exercises/express-309-valuebox-themes/problem/plots.py b/docs/exercises/express-309-valuebox-themes/problem/plots.py
@@ -23,7 +23,6 @@ def plot_score_distribution(df: DataFrame, color = "blue"):
 
 def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorange", line_color="navy"):
     fpr, tpr, _ = roc_curve(df[true_col], df[pred_col])
-    roc_auc = auc(fpr, tpr)
 
     roc_df = DataFrame({"fpr": fpr, "tpr": tpr})
 
@@ -33,7 +32,6 @@ def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorang
         + geom_abline(intercept=0, slope=1, color=line_color, linetype="dashed")
         + labs(
             title="Receiver Operating Characteristic (ROC)",
-            subtitle=f"AUC: {roc_auc.round(2)}",
             x="False Positive Rate",
             y="True Positive Rate",
         )

diff --git a/docs/exercises/express-310-element-themes/index.qmd b/docs/exercises/express-310-element-themes/index.qmd
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```
diff --git a/docs/exercises/express-310-element-themes/problem/app-solution.py b/docs/exercises/express-310-element-themes/problem/app-solution.py
@@ -9,7 +9,7 @@
 
 ui.page_opts(
     title="Model scoring dashboard",
-    theme = app_theme
+   # theme = app_theme
 )
 
 with ui.sidebar(class_="bg-primary-subtle"):

diff --git a/docs/exercises/express-310-element-themes/problem/app.py b/docs/exercises/express-310-element-themes/problem/app.py
@@ -9,7 +9,7 @@
 
 ui.page_opts(
     title="Model scoring dashboard",
-    theme = app_theme
+   # theme = app_theme
 )
 
 with ui.sidebar():

diff --git a/docs/exercises/express-310-element-themes/problem/plots.py b/docs/exercises/express-310-element-themes/problem/plots.py
@@ -23,7 +23,6 @@ def plot_score_distribution(df: DataFrame, color = "blue"):
 
 def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorange", line_color="navy"):
     fpr, tpr, _ = roc_curve(df[true_col], df[pred_col])
-    roc_auc = auc(fpr, tpr)
 
     roc_df = DataFrame({"fpr": fpr, "tpr": tpr})
 
@@ -33,7 +32,6 @@ def plot_auc_curve(df: DataFrame, true_col: str, pred_col: str, color="darkorang
         + geom_abline(intercept=0, slope=1, color=line_color, linetype="dashed")
         + labs(
             title="Receiver Operating Characteristic (ROC)",
-            subtitle=f"AUC: {roc_auc.round(2)}",
             x="False Positive Rate",
             y="True Positive Rate",
         )

diff --git a/docs/exercises/express-311-style/index.qmd b/docs/exercises/express-311-style/index.qmd
@@ -11,7 +11,7 @@ import sys
 helpers_path = "../../exercises/"
 if helpers_path not in sys.path:
     sys.path.append(helpers_path)
-from helpers import problem_app_express, getcwd
+from helpers import problem_tabs_express, getcwd
 
-problem_app_express(getcwd())
+problem_tabs_express(getcwd())
 ```