Spaces:

CompChemCurtin
/

cek

Running

App Files Files Community

praiteri commited on Feb 25, 2025

Commit

26fa3c7

1 Parent(s): bb7886f

calendar added

Browse files

Files changed (4) hide show

marimo/app.py +34 -2
marimo/calendar.html +152 -0
marimo/index.html +21 -10
marimo/pdfs/LabManualCHEM2000-1.pdf +2 -2

marimo/app.py CHANGED Viewed

@@ -5,7 +5,6 @@ from fastapi import FastAPI, Form, Request, Response
 import os
 from pathlib import Path
 # Create a FastAPI app
 app = FastAPI()
@@ -37,7 +36,40 @@ async def download_pdf(pdf_name: str):
             media_type='application/pdf',
             filename=pdf_name
         )
-    return {"error": f"PDF not found [../pdfs/{pdf_name}]"}, 404
 # Mount the marimo server at the root
 # This will handle all the routes defined in the marimo server

 import os
 from pathlib import Path
 # Create a FastAPI app
 app = FastAPI()
             media_type='application/pdf',
             filename=pdf_name
         )
+    return {"error": f"PDF not found [./pdfs/{pdf_name}]"}, 404
+@app.get("/calendar", response_class=HTMLResponse)
+async def read_root():
+    with open('calendar.html', 'r', encoding='utf-8') as f:
+        return f.read()
+## Custom route to serve HTML files that open in a new tab
+#@app.route("/html/<filename>")
+#def serve_html_file(filename):
+#    # Define the directory where your HTML files are stored
+#    # This assumes they're in a folder named 'html_files' in the same directory as your app
+#    html_dir = Path(os.path.dirname(os.path.abspath(__file__))) / "html_files"
+#
+#    # Construct the full path to the requested HTML file
+#    file_path = html_dir / filename
+#
+#    # Check if the file exists
+#    if not file_path.exists():
+#        return "File not found", 404
+#
+#    # Read the HTML content
+#    with open(file_path, "r") as f:
+#        html_content = f.read()
+#
+#    # Set response headers to allow the content to be displayed in the browser
+#    headers = {
+#        "Content-Type": "text/html",
+#        "Content-Disposition": "inline"  # This ensures it displays in browser rather than downloading
+#    }
+#
+#    return html_content, 200, headers
 # Mount the marimo server at the root
 # This will handle all the routes defined in the marimo server

marimo/calendar.html ADDED Viewed

	@@ -0,0 +1,152 @@

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Course Calendar</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            line-height: 1.6;
+            max-width: 800px;
+            margin: 0 auto;
+            padding: 20px;
+        }
+        h1, h2, h3 {
+            color: #333;
+        }
+        .calendar {
+            text-align: center;
+            width: 85%;
+            margin: 0 auto;
+        }
+        .week-item {
+            margin-bottom: 10px;
+            padding: 5px;
+            border-left: 3px solid #ddd;
+            padding-left: 10px;
+        }
+        .week-label {
+            font-weight: bold;
+        }
+        .intro {
+            color: olive;
+            font-weight: bold;
+        }
+        .lab {
+            color: blue;
+            font-weight: bold;
+        }
+        .drop-in {
+            color: orange;
+            font-weight: bold;
+        }
+        .none {
+            color: teal;
+            font-weight: bold;
+        }
+        .due-date {
+            color: red;
+            font-weight: bold;
+            display: block;
+            margin-top: 5px;
+        }
+        .assessment {
+            color: red;
+            font-weight: bold;
+        }
+        .holiday-list {
+            margin-top: 20px;
+        }
+    </style>
+</head>
+<body>
+    <h1>Calendar</h1>
+    <div class="calendar">
+        <div class="week-item">
+            <span class="week-label">Week 1 – </span>
+            <span class="intro">Introduction and refresher of statistics</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 2 – </span>
+            <span class="lab">Basic statistics numerical laboratory</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 3 – </span>
+            <span class="drop-in">Drop-in session</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 4 – </span>
+            <span class="lab">Bomb calorimetry numerical laboratory</span>
+            <span class="due-date">First lab report due</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 5 – </span>
+            <span class="drop-in">Drop-in session</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 6 – </span>
+            <span class="none">No lab</span>
+            <span class="due-date">Second lab report due</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 7 – </span>
+            <span class="assessment">Progressive assessment</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 8 – </span>
+            <span class="lab">Crystal violet numerical laboratory</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 9 – </span>
+            <span style="font-weight: bold;">Tuition free week</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 10 – </span>
+            <span class="lab">Chemical equilibrium numerical laboratory</span>
+            <span class="due-date">Third lab report due</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 11 – </span>
+            <span class="drop-in">Drop-in session</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 12 – </span>
+            <span class="lab">Surface adsorption numerical laboratory</span>
+            <span class="due-date">Fourth lab report due</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 13 – </span>
+            <span class="drop-in">Drop-in session</span>
+        </div>
+        <div class="week-item">
+            <span class="week-label">Week 14 – </span>
+            <span class="none">Study week</span>
+            <span class="due-date">Fifth lab report due</span>
+        </div>
+    </div>
+    <h3>Public holidays</h3>
+    <ul class="holiday-list">
+        <li>2<sup>nd</sup> March – Labour Day</li>
+        <li>18<sup>th</sup> April – Good Friday</li>
+        <li>21<sup>st</sup> April – Easter Monday</li>
+        <li>22<sup>nd</sup> April – Easter Tuesday</li>
+        <li>25<sup>th</sup> April – Anzac Day</li>
+    </ul>
+</body>
+</html>

marimo/index.html CHANGED Viewed

@@ -8,9 +8,9 @@
         body {
             font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
             line-height: 1.6;
-            max-width: 800px;
             margin: 0 auto;
-            padding: 20px;
             color: #333;
         }
@@ -52,7 +52,7 @@
         }
         .lab-grid {
             display: grid;
-            grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
             gap: 20px;
             margin: 20px 0;
         }
@@ -99,32 +99,43 @@
             <p style="text-align: center">Version 1 - 20/02/2025</p>
         </a>
         <a href="/download-pdf/python_primer.pdf" class="lab-card">
-            <h3 style="text-align: center">A python primer<br>(Download PDF)</h3>
             <p style="text-align: center">Version 1 - 20/02/2025</p>
         </a>
         <a href="/stats" class="lab-card">
-            <h3 style="text-align: center">Statistics</h3>
             <p style="text-align: center">Basic statistical concepts and Python introduction<br>(Week 2)</p>
         </a>
         <a href="/bc" class="lab-card">
-            <h3 style="text-align: center">Bomb Calorimetry</h3>
             <p style="text-align: center">Thermodynamics and heat measurements<br>(Week 4)</p>
         </a>
         <a href="/cv" class="lab-card">
-            <h3 style="text-align: center">Crystal Violet</h3>
             <p style="text-align: center">Chemical kinetics and reaction rates<br>(Week 8)</p>
         </a>
         <a href="/eq" class="lab-card">
-            <h3 style="text-align: center">Chemical Equilibrium</h3>
             <p style="text-align: center">Numerical solution of equilibrium problems<br>(Week 10)</p>
         </a>
         <a href="/surface" class="lab-card">
-            <h3 style="text-align: center">Surface Adsorption</h3>
             <p style="text-align: center">Equilibrium and surface chemistry<br>(Week 12)</p>
         </a>
     </div>
-    <h2 style="text-align: center"><strong>Check the unit outline for when the reports are due</strong></h2>
     <p>This web page and those linked below have been created with Python using Jupyter Notebooks and will be used to develop important skills in data analysis, data processing, and computing using simulated experimental results and computational chemistry software.</p>

         body {
             font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
             line-height: 1.6;
+            max-width: 1200px;
             margin: 0 auto;
+            padding: 10px;
             color: #333;
         }
         }
         .lab-grid {
             display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
             gap: 20px;
             margin: 20px 0;
         }
             <p style="text-align: center">Version 1 - 20/02/2025</p>
         </a>
         <a href="/download-pdf/python_primer.pdf" class="lab-card">
+            <h3 style="text-align: center">A Python Primer<br>(Download PDF)</h3>
             <p style="text-align: center">Version 1 - 20/02/2025</p>
         </a>
+        <a href="/calendar" class="lab-card" >
+            <h3 style="text-align: center">Calendar</h3>
+            <p style="text-align: center">Lab schedule and deadlines<br>(2025)</p>
+        </a>
+    </div>
+    <hr style="width: 80%; height: 2px; background-color: #333; border: none;">
+    <div class="lab-grid">
         <a href="/stats" class="lab-card">
+            <h3 style="text-align: center">Statistics Lab</h3>
             <p style="text-align: center">Basic statistical concepts and Python introduction<br>(Week 2)</p>
         </a>
         <a href="/bc" class="lab-card">
+            <h3 style="text-align: center">Bomb Calorimetry Lab</h3>
             <p style="text-align: center">Thermodynamics and heat measurements<br>(Week 4)</p>
         </a>
         <a href="/cv" class="lab-card">
+            <h3 style="text-align: center">Crystal Violet Lab</h3>
             <p style="text-align: center">Chemical kinetics and reaction rates<br>(Week 8)</p>
         </a>
         <a href="/eq" class="lab-card">
+            <h3 style="text-align: center">Chemical Equilibrium Lab</h3>
             <p style="text-align: center">Numerical solution of equilibrium problems<br>(Week 10)</p>
         </a>
         <a href="/surface" class="lab-card">
+            <h3 style="text-align: center">Surface Adsorption Lab</h3>
             <p style="text-align: center">Equilibrium and surface chemistry<br>(Week 12)</p>
         </a>
     </div>
+    <h2 style="text-align: center"><strong>Check the calendar for when the reports are due</strong></h2>
+    <hr style="width: 80%; height: 2px; background-color: #333; border: none;">
+    <h2>Introduction</h2>
     <p>This web page and those linked below have been created with Python using Jupyter Notebooks and will be used to develop important skills in data analysis, data processing, and computing using simulated experimental results and computational chemistry software.</p>

marimo/pdfs/LabManualCHEM2000-1.pdf CHANGED Viewed

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1edb8d09bfc9d1d3102d3c30f0530ad10a26f189f0dd9077fa86a6946018e6b9
-size 4779263

 version https://git-lfs.github.com/spec/v1
+oid sha256:d5aa4e64457f5adeff33842bbaa0a7ff2bbb7c52b4a4af644e7b7ef24cf7b561
+size 4779264