diff --git a/CSC110-Project.iml b/CSC110-Project.iml index 02091c1..1318279 100644 --- a/CSC110-Project.iml +++ b/CSC110-Project.iml @@ -8,5 +8,6 @@ + \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 8b7228e..5a63923 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,8 +18,7 @@ tabulate==0.8.9 matplotlib==3.5.0 # Calculate data statistics numpy==1.21.4 -# Generate report -markdown==3.3.6 +# #################### # Data Packing diff --git a/src/report.py b/src/report/report.py similarity index 85% rename from src/report.py rename to src/report/report.py index 1fc4681..5418339 100644 --- a/src/report.py +++ b/src/report/report.py @@ -21,9 +21,9 @@ def generate_report() -> str: if line.startswith('@include'): line = line[line.index('`') + 1:] line = line[:line.index('`')] - md[i] = read(os.path.join(REPORT_DIR, line)) + md[i] = read(line) - return markdown.markdown('\n'.join(md)) + return markdown.markdown('\n'.join(md), extensions=['tables']) if __name__ == '__main__': diff --git a/src/report/report_document.md b/src/report/report_document.md new file mode 100644 index 0000000..78e6ff6 --- /dev/null +++ b/src/report/report_document.md @@ -0,0 +1,10 @@ + +# H1 + +Test Image: + +![]({REPORT_DIR}/1-covid-tweet-frequency/500-pop.png) + +Test Include: + +@include `{REPORT_DIR}/1-covid-tweet-frequency/500-pop.md` diff --git a/src/report/report_page.html b/src/report/report_page.html new file mode 100644 index 0000000..e31f038 --- /dev/null +++ b/src/report/report_page.html @@ -0,0 +1,17 @@ + + + + + CSC110 Report + + +
+ +
+ + + + diff --git a/src/report_document.md b/src/report_document.md deleted file mode 100644 index 43b7619..0000000 --- a/src/report_document.md +++ /dev/null @@ -1,10 +0,0 @@ - -# H1 - -Test Image: - -![](../report/1-covid-tweet-frequency/500-pop.png) - -Test Include: - -@include `../report/1-covid-tweet-frequency/500-pop.md`