Skip to content

Commit 712a5ae

Browse files
cecoecocecoeco
committed
edited app flow_diagram and flow_diagram backend
1 parent cd27d7c commit 712a5ae

File tree

10 files changed

+268
-145
lines changed

10 files changed

+268
-145
lines changed

‎app/backend/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name = "PRISMAWebApp"
1+
name = "PRISMAApp"
22

33
[deps]
44
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"

‎app/backend/app.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module PRISMAWebApp
1+
module PRISMAApp
22

33
using CSV, DataFrames, HTMLTables, HTTP, JSON3, JSONTables, Oxygen, PRISMA
44

‎app/frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "prisma",
2+
"name": "prisma-app",
33
"scripts": {
44
"start": "vite",
55
"dev": "vite",

‎app/frontend/src/app.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ function App() {
2828
<Router root={AppLayout}>
2929
<Meta charset="utf-8" />
3030
<Meta name="viewport" content="width=device-width, initial-scale=1" />
31-
<Meta name="description" content="PRISMA Web App - Checklist and Flow Diagram" />
32-
<Title>PRISMA Web App</Title>
31+
<Title>PRISMA.jl</Title>
32+
<Meta
33+
name="description"
34+
content="PRISMA.jl - checklists and flow diagrams based on the 2020 PRISMA statement"
35+
/>
3336
<Link rel="icon" href="./assets/favicon.ico" />
3437
<Route path="/" component={Home} />
3538
<Route path="/checklist" component={Checklist} />

‎app/frontend/src/assets/css/flow_diagram.css

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,15 @@
7777
width: 100%;
7878
}
7979

80+
.settings-form-database-group,
81+
.settings-form-reason-group {
82+
display: flex;
83+
flex-direction: row;
84+
align-items: center;
85+
justify-content: space-between;
86+
width: 100%;
87+
}
88+
8089
.settings-form,
8190
.settings-form input,
8291
.settings-form select {
@@ -108,14 +117,6 @@
108117
box-shadow: var(--border-box-shadow);
109118
}
110119

111-
.settings-form-reason-group {
112-
display: flex;
113-
flex-direction: row;
114-
align-items: center;
115-
justify-content: space-between;
116-
width: 100%;
117-
}
118-
119120
.settings-form input[type="color"] {
120121
align-items: center;
121122
justify-content: center;

‎app/frontend/src/assets/css/footer.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ footer {
66
min-height: 50px;
77
max-height: 50px;
88
width: 100%;
9-
padding-left: 1%;
10-
padding-right: 1%;
9+
padding: 0 1%;
1110
font-size: .8rem;
1211
border-top: 1px solid var(--border-color);
1312
color: var(--text-color-1);

‎app/frontend/src/components/header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export default function Header() {
5252
<header class={isScrolled() ? "header scrolled" : "header"}>
5353
<h1 class="header-title">
5454
<Logo class="header-logo" />
55-
PRISMA Web App
55+
PRISMA.jl
5656
</h1>
5757
<nav>
5858
<Link href="/">Home</Link>

‎app/frontend/src/pages/flow_diagram.tsx

Lines changed: 94 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ export default function FlowDiagram() {
471471
/>
472472
</div>
473473
{state().databases.map((database, index) => (
474-
<span class="settings-form-reason-group">
474+
<span class="settings-form-database-group">
475475
<div class="settings-form-group">
476476
<label for={`database-${index + 1}`}>{`Database ${index + 1}`}</label>
477477
<input
@@ -1141,6 +1141,41 @@ export default function FlowDiagram() {
11411141
</div>
11421142
</>
11431143
)}
1144+
{/* Borders */}
1145+
<div class="settings-form-group">
1146+
<h4 class="settings-form-heading">
1147+
<label for="borders">Borders</label>
1148+
</h4>
1149+
<select
1150+
id="borders"
1151+
name="borders"
1152+
value={state().visual.borders}
1153+
onInput={(event) => {
1154+
handleChange("borders", event.target.value, "visual");
1155+
}}
1156+
>
1157+
<option value="true">True</option>
1158+
<option value="false">False</option>
1159+
</select>
1160+
</div>
1161+
{/* Border Style */}
1162+
<div class="settings-form-group">
1163+
<h4 class="settings-form-heading">
1164+
<label for="border-style">Border Style</label>
1165+
</h4>
1166+
<select
1167+
id="border-style"
1168+
name="border-style"
1169+
value={state().visual.borderStyle}
1170+
onInput={(event) => {
1171+
handleChange("borderStyle", event.target.value, "visual");
1172+
}}
1173+
>
1174+
<option value="solid">Solid</option>
1175+
<option value="dashed">Dashed</option>
1176+
<option value="dotted">Dotted</option>
1177+
</select>
1178+
</div>
11441179
{/* Border Width */}
11451180
<div class="settings-form-group">
11461181
<h4 class="settings-form-heading">
@@ -1173,6 +1208,64 @@ export default function FlowDiagram() {
11731208
}}
11741209
/>
11751210
</div>
1211+
<div class="settings-form-group">
1212+
<h4 class="settings-form-heading">
1213+
<label for="font">Font</label>
1214+
</h4>
1215+
<select
1216+
id="font"
1217+
name="font"
1218+
value={state().visual.font}
1219+
onInput={(event) => {
1220+
handleChange("font", event.target.value, "visual");
1221+
}}
1222+
>
1223+
<option value="Arial">Arial</option>
1224+
<option value="Avenir">Avenir</option>
1225+
<option value="Baskerville">Baskerville</option>
1226+
<option value="Calibri">Calibri</option>
1227+
<option value="Cambria">Cambria</option>
1228+
<option value="Garamond">Garamond</option>
1229+
<option value="Georgia">Georgia</option>
1230+
<option value="Futura">Futura</option>
1231+
<option value="Helvetica">Helvetica</option>
1232+
<option value="Inter">Inter</option>
1233+
<option value="Lato">Lato</option>
1234+
<option value="Roboto">Roboto</option>
1235+
<option value="Times New Roman">Times New Roman</option>
1236+
<option value="Verdana">Verdana</option>
1237+
</select>
1238+
</div>
1239+
<div class="settings-form-group">
1240+
<h4 class="settings-form-heading">
1241+
<label for="font-size">Font Size</label>
1242+
</h4>
1243+
<input
1244+
id="font-size"
1245+
name="font-size"
1246+
type="number"
1247+
placeholder="0"
1248+
min="0"
1249+
value={state().visual.fontSize}
1250+
onInput={(event) => {
1251+
handleChange("fontSize", event.target.value, "visual");
1252+
}}
1253+
/>
1254+
</div>
1255+
<div class="settings-form-group">
1256+
<h4 class="settings-form-heading">
1257+
<label for="font-color">Font Color</label>
1258+
</h4>
1259+
<input
1260+
id="font-color"
1261+
name="font-color"
1262+
type="color"
1263+
value={state().visual.fontColor}
1264+
onInput={(event) => {
1265+
handleChange("fontColor", event.target.value, "visual");
1266+
}}
1267+
/>
1268+
</div>
11761269
{/* Arrow Head */}
11771270
<div class="settings-form-group">
11781271
<h4 class="settings-form-heading">
@@ -1237,64 +1330,6 @@ export default function FlowDiagram() {
12371330
}}
12381331
/>
12391332
</div>
1240-
<div class="settings-form-group">
1241-
<h4 class="settings-form-heading">
1242-
<label for="font">Font</label>
1243-
</h4>
1244-
<select
1245-
id="font"
1246-
name="font"
1247-
value={state().visual.font}
1248-
onInput={(event) => {
1249-
handleChange("font", event.target.value, "visual");
1250-
}}
1251-
>
1252-
<option value="Arial">Arial</option>
1253-
<option value="Avenir">Avenir</option>
1254-
<option value="Baskerville">Baskerville</option>
1255-
<option value="Calibri">Calibri</option>
1256-
<option value="Cambria">Cambria</option>
1257-
<option value="Garamond">Garamond</option>
1258-
<option value="Georgia">Georgia</option>
1259-
<option value="Futura">Futura</option>
1260-
<option value="Helvetica">Helvetica</option>
1261-
<option value="Inter">Inter</option>
1262-
<option value="Lato">Lato</option>
1263-
<option value="Roboto">Roboto</option>
1264-
<option value="Times New Roman">Times New Roman</option>
1265-
<option value="Verdana">Verdana</option>
1266-
</select>
1267-
</div>
1268-
<div class="settings-form-group">
1269-
<h4 class="settings-form-heading">
1270-
<label for="font-size">Font Size</label>
1271-
</h4>
1272-
<input
1273-
id="font-size"
1274-
name="font-size"
1275-
type="number"
1276-
placeholder="0"
1277-
min="0"
1278-
value={state().visual.fontSize}
1279-
onInput={(event) => {
1280-
handleChange("fontSize", event.target.value, "visual");
1281-
}}
1282-
/>
1283-
</div>
1284-
<div class="settings-form-group">
1285-
<h4 class="settings-form-heading">
1286-
<label for="font-color">Font Color</label>
1287-
</h4>
1288-
<input
1289-
id="font-color"
1290-
name="font-color"
1291-
type="color"
1292-
value={state().visual.fontColor}
1293-
onInput={(event) => {
1294-
handleChange("fontColor", event.target.value, "visual");
1295-
}}
1296-
/>
1297-
</div>
12981333
</div>
12991334
</div>
13001335
{/* settings actions */}

‎src/PRISMA.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Julia package for generating checklists and flow diagrams based on the [2020 **P
1919
"""
2020
module PRISMA
2121

22-
using DataFrames: DataFrame, GroupedDataFrame, rename!, nrow, groupby
22+
using DataFrames: DataFrame, GroupedDataFrame, rename!, nrow, groupby, push!
2323
using DataStructures: LittleDict
2424
using Graphviz_jll: neato
2525
using LinearAlgebra: norm, dot

0 commit comments

Comments
 (0)