diff --git a/Project.toml b/Project.toml index 0eede3d..c54abbe 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "PRISMA" uuid = "7b67a8d2-c4f5-4933-b91c-0fc427024db5" authors = ["Ceco Elijah Maples ", "PRISMA.jl Contributors"] -version = "0.0.8" +version = "0.0.9" [deps] CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" diff --git a/app/Dockerfile b/app/Dockerfile index 13d7dc8..cc8926f 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -12,4 +12,4 @@ RUN apt-get update && apt-get install -y \ && curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \ && apt-get install -y nodejs -ENTRYPOINT [ "julia", "--project", "src-oxygen/index.jl" ] \ No newline at end of file +ENTRYPOINT [ "julia", "--project", "src-oxygen/app.jl" ] \ No newline at end of file diff --git a/app/Manifest.toml b/app/Manifest.toml index 24f193e..b6d897f 100644 --- a/app/Manifest.toml +++ b/app/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.4" manifest_format = "2.0" -project_hash = "978be966e9da3af26653d9bdffeabd57c427fec7" +project_hash = "ebcfc8abde6e01c63cbafe593b19dcbb6952530b" [[deps.AbstractTrees]] git-tree-sha1 = "2d9c9a55f9c93e8887ad391fbae72f8ef55e1177" diff --git a/app/Project.toml b/app/Project.toml index ebd51f9..28bc45f 100644 --- a/app/Project.toml +++ b/app/Project.toml @@ -1,4 +1,5 @@ [deps] +DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" HTMLTables = "b1afcece-b80e-4563-b90e-36b4cc56d3fa" HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3" JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1" @@ -8,6 +9,7 @@ Oxygen = "df9a0d86-3283-4920-82dc-4555fc0d1d8b" PRISMA = "7b67a8d2-c4f5-4933-b91c-0fc427024db5" [compat] +DataFrames = "1.7" HTMLTables = "0.5" HTTP = "1" JSON3 = "1" diff --git a/app/src-oxygen/index.jl b/app/src-oxygen/app.jl similarity index 97% rename from app/src-oxygen/index.jl rename to app/src-oxygen/app.jl index d749b16..7f54893 100644 --- a/app/src-oxygen/index.jl +++ b/app/src-oxygen/app.jl @@ -1,6 +1,6 @@ module AppPRISMA -using DataFrame, HTMLTables, HTTP, JSON3, JSONTables, NodeJS, Oxygen, PRISMA +using DataFrames, HTMLTables, HTTP, JSON3, JSONTables, NodeJS, Oxygen, PRISMA const DIRECTORY::String = Base.Filesystem.dirname(Base.@__DIR__) @@ -22,8 +22,6 @@ function build_reactjs(; build_directory::String)::Nothing Base.run(`$(NodeJS.npm_cmd()) install`) Base.run(`$(NodeJS.npm_cmd()) run build`) - Base.CoreLogging.@info "Finished building frontend" - return nothing end @@ -55,13 +53,13 @@ function serve_reactjs(; build_directory::String)::Nothing for path in Base.Filesystem.readdir(build_directory; join=true) filename::String = Base.Filesystem.basename(path) if filename == "index.html" - for page in ["", "checklist", "flow_diagram"] - Oxygen.get("/$page") do + for page in ["", "checklist", "flow_diagram", "*"] + Oxygen.get(page) do Oxygen.file(path) end end else - Oxygen.get("/$filename") do + Oxygen.get(filename) do Oxygen.file(path) end end diff --git a/app/src-react/app.tsx b/app/src-react/app.tsx new file mode 100644 index 0000000..35ba7dd --- /dev/null +++ b/app/src-react/app.tsx @@ -0,0 +1,29 @@ +import React from "react"; +import { BrowserRouter, Route, Routes } from "react-router-dom"; + +import Header from "./components/header.tsx"; +import Footer from "./components/footer.tsx"; + +import Home from "./pages/home.tsx"; +import Checklist from "./pages/checklist.tsx"; +import FlowDiagram from "./pages/flow_diagram.tsx"; +import NotFound from "./pages/notfound.tsx"; + +const App: React.FC = () => { + return ( + + +
+ + } /> + } /> + } /> + } /> + +