From 2cc019842d0921a48a4aef55df8fde5a3ff11aa6 Mon Sep 17 00:00:00 2001 From: Tianyi Wang <90009613+tiwa1154@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:51:21 -0400 Subject: [PATCH] 24.09.26 PRD push (#459) (#460) * Static page update (#447) * updated static page * Updated CSS --------- * Homepageedits (#458) * Removed workshop from homepage, added pilot project instead * Modified homepage and help buttons on Builder Page to open a new tab --------- * test --------- Co-authored-by: tianywan819 <57418894+tianywan819@users.noreply.github.com> Co-authored-by: hadleyking --- client/src/App.css | 1 - .../src/components/builder/descriptionDomain.js | 2 +- client/src/components/builder/errorDomain.js | 2 +- client/src/components/builder/executionDomain.js | 2 +- client/src/components/builder/extensionDomain.js | 2 +- client/src/components/builder/ioDomain.js | 2 +- .../src/components/builder/parametricDomain.js | 2 +- .../src/components/builder/provenanceDomain.js | 2 +- client/src/components/builder/usabilityDomain.js | 2 +- client/src/images/Builder_edit.png | Bin 0 -> 2722 bytes client/src/images/nextflow.png | Bin 0 -> 4300 bytes client/src/pages/Home.js | 15 ++++++++------- client/src/pages/Resources.js | 14 ++++++++++++-- server/authentication/apis.py | 2 ++ 14 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 client/src/images/Builder_edit.png create mode 100644 client/src/images/nextflow.png diff --git a/client/src/App.css b/client/src/App.css index fa4a729d..6df3d1d5 100644 --- a/client/src/App.css +++ b/client/src/App.css @@ -113,7 +113,6 @@ /* ---------------------------------------------------------------------------------------------------- */ /* Page box components */ .About-half-width-box{ - min-height: 650px; /* Ensure both boxes have a minimum height */ min-width: 350px;/* min-width: 275px; Ensure both boxes have a minimum width */ width: 90%; /* Half the width of the container minus spacing */ margin: 0 auto; /* Add spacing between the boxes */ diff --git a/client/src/components/builder/descriptionDomain.js b/client/src/components/builder/descriptionDomain.js index 73ceab04..6c09efcd 100644 --- a/client/src/components/builder/descriptionDomain.js +++ b/client/src/components/builder/descriptionDomain.js @@ -53,7 +53,7 @@ export const DescriptionDomain = ({onSave}) => { Description Domain - diff --git a/client/src/components/builder/errorDomain.js b/client/src/components/builder/errorDomain.js index 3deee765..a8ded540 100644 --- a/client/src/components/builder/errorDomain.js +++ b/client/src/components/builder/errorDomain.js @@ -67,7 +67,7 @@ export const ErrorDomain = ({onSave}) => { Error Domain - diff --git a/client/src/components/builder/executionDomain.js b/client/src/components/builder/executionDomain.js index f6feadbd..d833e5e2 100644 --- a/client/src/components/builder/executionDomain.js +++ b/client/src/components/builder/executionDomain.js @@ -66,7 +66,7 @@ export const ExecutionDomain = ({onSave}) => { Execution Domain - diff --git a/client/src/components/builder/extensionDomain.js b/client/src/components/builder/extensionDomain.js index 653f214d..adf50d43 100644 --- a/client/src/components/builder/extensionDomain.js +++ b/client/src/components/builder/extensionDomain.js @@ -39,7 +39,7 @@ export const ExtensionDomain = ({onSave}) => { Extension Domain - diff --git a/client/src/components/builder/ioDomain.js b/client/src/components/builder/ioDomain.js index ecb3bdf1..e9d4c803 100644 --- a/client/src/components/builder/ioDomain.js +++ b/client/src/components/builder/ioDomain.js @@ -43,7 +43,7 @@ export const IODomain = ({onSave}) => { I/O Domain - diff --git a/client/src/components/builder/parametricDomain.js b/client/src/components/builder/parametricDomain.js index da2578e3..cb301b39 100644 --- a/client/src/components/builder/parametricDomain.js +++ b/client/src/components/builder/parametricDomain.js @@ -38,7 +38,7 @@ export const ParametricDomain = ({onSave}) => { Parametric Domain - diff --git a/client/src/components/builder/provenanceDomain.js b/client/src/components/builder/provenanceDomain.js index b1d3f0ef..a86ad71e 100644 --- a/client/src/components/builder/provenanceDomain.js +++ b/client/src/components/builder/provenanceDomain.js @@ -98,7 +98,7 @@ export const ProvenanceDomain = ({onSave} ) => { Provenance Domain - diff --git a/client/src/components/builder/usabilityDomain.js b/client/src/components/builder/usabilityDomain.js index c1cb86c1..bf71ddd6 100644 --- a/client/src/components/builder/usabilityDomain.js +++ b/client/src/components/builder/usabilityDomain.js @@ -53,7 +53,7 @@ export const UsabilityDomain = ({onSave}) => { Usability Domain - diff --git a/client/src/images/Builder_edit.png b/client/src/images/Builder_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..abfe590ea469e1bbdf6edc7e9c577f148b5c4857 GIT binary patch literal 2722 zcmV;T3SISyP)+AUV`1wr$~7ASRm}|?D?kc=~=@`gv6Il6m!hUGt4{`iN=%-PQY@g#Y;U z_Hjz>x2pZm#Qdt3@|Aw=ys+op+V^ck{^#NPg=PNl>gd$Z`Dr`(V=?@)p!~R|?y#Wo zp^fjUm}?_$djJ3lxJg7oRCt{2-FbhaI2Z?T5m5wDrmglqrmfRsrrUP6o%jFJ7En2! z9ONVkAD;hqbj5FfAwURmG#Y9sr)xf)PMoOebk47vP6FSl3MM?t=`#CYJjW{g#uHXw z;2v*RzRzNu2afWJ^1W#raOtuyFMml7&~qJ_$4KdNrtbUl@`=PrKY$sLuru}sNJ_CM zO>|$lPNr8tT#st{J1H)7S9Jb3h*YoJXkPFH4*Q<$^fYjxinDIC+WJx7Uy59HnW^~% zJsE3;7@)wVGrV14j^?#j(FjRr1r`^As2}#xj?}RLi-N>@Go|SrD%eni@)ZQ{UK8CF zOsaeV*juh4EiMQtn~w0_tbjU4w8C+Fyfk5ZYgZ(0yU^QofJECZ#<8?2!;$L>&H^TQ~{Ou{o9s0@kSn z!d1UTUyajn3Mb<8G<>$H1Tt0ISaqGtCzQOwq5Jx}yiZ@>5SLK;Hmdd%CtfjusD2&K zC6x5#M7_XKF4?PrKrQ@nLsrndA3olpWdL^?TJriCvfmtahnibw4K=nkU zLNq}QM3cfxEKoJkpb(#+a-umQDM8glV?uI*iixI#v;@@>4GG(T3W;Wf^d_p7XheuR z&}$=_5MHM3Jat3^!uEYoDY1JYJ5UX=Yhn1t*hG~PI~Im)os3Fix55Q4Pyw-1A$Ni* zh+PU7Je`a(VuwPZ1m%g{2}7|2rHP#hg%gw|b|s8&xQ>Ggi5&^yfqugq=uCL1xEo;z z5}e&X&G>}LN_4=#6CvCOXBVT`5hEESRx%<;`Ud8|_rTNkgT`!2=w_Nk+ykO| zghXI{0|($){vUK=#02!PvpcoSz6^=LYWC&)u}UznYYLGqL9hW4A?plUa)PzL@#CtN zU|ttQA_ovd5dOKD7?Am<BY|DX%I-l|mk%ssxKdJHXnWs8GlPJXfD!QD{poUs5N8z&p%)E_5VV6w*w~s|;mA zmIU{wo>-tvf+O^dQurBCVzDH6PXQju0V!*JDH5_Is1=B`)AC72HNrE71kdyWiEDi+ z5!wJGu6U(F_{0D_<>+JtXC)B28U;dGpxj}iDs9432H+D%6BV9UqHE<3mIP@)n4tK? z8BIcK64WJx3F4-N{M$)_nuIJ(v@4(%;lB(C{?`>yhmd6-JOJ-8uK{2rIT=`ya6Vb? zKPmoh0#`R7a$_U@+Px=zMur4~037I}YFNr^*3(-5R>3GA||+i$HC*nAIKNJL{%ZIeZ%*t z3B)A0ebUGy*{3)tZ$G7whJ+BKbV26T@S2 zCj)y?1Zama`~o-n8YzY{30fkIZ{cjMWL&0L0&$0lcAy=?@HaByt|W%*l$ap-KyRDS zk03B3CIvBEOEpnTgo`z9)VoU+DC1{5*h7$@7#Lt&iBAK8i zLgLI`N`ml;o&>Z)ctU@cP%1$ygo|UU5DR2Z&igwn zA&9d;=uvR9=<#{`?#bZH3-Kcun^n5{xcyq^$w}(W3t>l-?{uH%5<8u3!ti-j$3>qv z-%4@jh5Mn>Y^O`pqqCP2`JK)-p|>dxxt@}&MqPA`ZSVda0V^o`ZSUy{43d4no*IOM(Eb{PgV6pOgoDuj>c7y#3*mZo zM!%z60pZ~y1qemQxhyEsDoXI*MTZc~7ilG|5owt-=L#%Y;S*nQwVA>WrHTrM>uQKF zscLtFc1QO_IF?%2zX$$<9z2 cYAECNKXNeo_+6sDwg3PC07*qoM6N<$g0}uFo&W#< literal 0 HcmV?d00001 diff --git a/client/src/images/nextflow.png b/client/src/images/nextflow.png new file mode 100644 index 0000000000000000000000000000000000000000..9eea2eeee2c7e457e044844b89d398981657b48f GIT binary patch literal 4300 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 literal 0 HcmV?d00001 diff --git a/client/src/pages/Home.js b/client/src/pages/Home.js index b3ad8d35..2094f881 100644 --- a/client/src/pages/Home.js +++ b/client/src/pages/Home.js @@ -9,6 +9,7 @@ import ieee from "../images/ieee.jpg"; import workshoppic from "../images/workshop.jpg" import mediaWiki from "../images/mediawikiwiki.svg"; import cloudlogo from "../images/cloud.png" +import builderlogo from "../images/Builder_edit.png" const HomePage = () => { return ( @@ -28,7 +29,7 @@ const HomePage = () => {
@@ -50,7 +51,7 @@ const HomePage = () => { @@ -71,11 +72,11 @@ const HomePage = () => { @@ -92,7 +93,7 @@ const HomePage = () => { diff --git a/client/src/pages/Resources.js b/client/src/pages/Resources.js index 476c08f4..6a663eaa 100644 --- a/client/src/pages/Resources.js +++ b/client/src/pages/Resources.js @@ -9,6 +9,7 @@ import { import ThirdBox from "../components/ThirdBox.js"; import FullWidthBox from "../components/FullWidthBox.js"; +import HalfWidthBox from "../components/HalfWidthBox.js" import logo from "../images/logo.png" import hive from "../images/hive.png" import gitLogo from "../images/Octocat.png"; @@ -17,6 +18,7 @@ import dnaNexus from "../images/dnanexus.png" import galaxy from "../images/galaxy.png" import cgc from "../images/cgc2.png" import swagger from "../images/swagger.png" +import nextflow from "../images/nextflow.png" export default function Resources() { const bcodbUrl = process.env.REACT_APP_BCOAPI_URL @@ -25,14 +27,22 @@ export default function Resources() { - - + + + +