Skip to content

Commit 748c854

Browse files
costero-ecostero-e
authored
Merge pull request #231 from EGA-archive/develop
Develop
2 parents 501ca00 + ca18e18 commit 748c854

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3112
-2365
lines changed

‎beacon/__main__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def main(path=None):
6262
#)
6363

6464
beacon = web.Application(
65-
middlewares=[web.normalize_path_middleware(), middlewares.error_middleware, cors_middleware(origins=["https://beacon-network-test.ega-archive.org", "https://beacon-network-test2.ega-archive.org", "https://beacon-network-demo.ega-archive.org","https://beacon-network-demo2.ega-archive.org", "http://localhost:3000", "https://beacon-network-cineca-demo.ega-archive.org"])]
65+
middlewares=[web.normalize_path_middleware(), middlewares.error_middleware, cors_middleware(origins=["https://beacon-network-test.ega-archive.org", "https://beacon-network-test2.ega-archive.org", "https://beacon-network-demo.ega-archive.org","https://beacon-network-demo2.ega-archive.org", "http://localhost:3000", "http://localhost:3010", "https://beacon-network-cineca-demo.ega-archive.org"])]
6666
)
6767

6868

@@ -107,6 +107,11 @@ def main(path=None):
107107
expose_headers="*",
108108
allow_methods=("POST", "PATCH", "GET", "OPTIONS"),
109109
allow_headers=DEFAULT_ALLOW_HEADERS),
110+
"http://localhost:3010":
111+
aiohttp_cors.ResourceOptions(allow_credentials=True,
112+
expose_headers="*",
113+
allow_methods=("POST", "PATCH", "GET", "OPTIONS"),
114+
allow_headers=DEFAULT_ALLOW_HEADERS),
110115
"https://beacon-network-test2.ega-archive.org":
111116
aiohttp_cors.ResourceOptions(allow_credentials=True,
112117
expose_headers="*",

‎deploy/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ services:
173173
command: ["node", "/opt/yarn-v1.22.19/bin/yarn.js", "start" ]
174174
container_name: react
175175
ports:
176-
- 3010:3000
176+
- 3000:3000
177177
volumes:
178178
- ../frontend:/usr/src/app
179179

‎frontend/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/build
1313

1414
# misc
15+
.env
1516
.DS_Store
1617
.env.local
1718
.env.development.local
@@ -21,5 +22,3 @@
2122
npm-debug.log*
2223
yarn-debug.log*
2324
yarn-error.log*
24-
25-
.env

‎frontend/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
"bootswatch": "5.2.2",
1818
"devextreme": "^22.2.4",
1919
"devextreme-react": "^22.2.4",
20+
"dotenv": "^16.3.1",
2021
"flatted": "^3.2.7",
2122
"formik": "2.2.9",
2223
"jquery": "^3.6.4",
24+
"oidc-client": "^1.11.5",
2325
"oidc-react": "^3.2.2",
2426
"prettyjson": "^1.2.5",
2527
"react": "^18.2.0",

‎frontend/public/adelante.png

-24.1 KB
Binary file not shown.

‎frontend/public/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
work correctly both with client-side routing and a non-root public URL.
2525
Learn how to configure a non-root public URL by running `npm run build`.
2626
-->
27-
<title>Beacon network demo</title>
27+
<title>Beacon demo</title>
2828
</head>
2929
<body class="dx-viewport">
3030
<noscript>You need to enable JavaScript to run this app.</noscript>

‎frontend/public/next.png

30.6 KB
Loading

‎frontend/src/App.css

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ html {
5959
}
6060

6161
.newSearchButton:hover {
62-
color: #4fb5f0;
62+
color: rgb(118, 151, 228);
6363
}
6464

6565
.searchButton2 {
@@ -90,6 +90,7 @@ html {
9090
border-color: black;
9191
height: 30px;
9292
margin-left: 14px;
93+
z-index: 0;
9394
}
9495

9596
.container-fluid {
@@ -158,7 +159,7 @@ html {
158159
/* margin: 10px; */
159160
border-radius: 10px;
160161
/* box-shadow: 2px 1px 2px #cecece; */
161-
height: 34px;
162+
height: 32px;
162163
}
163164

164165
.searchIcon {
@@ -171,12 +172,13 @@ html {
171172
}
172173

173174
.forwardIcon {
174-
width: 24px;
175-
margin-left: 4px;
175+
width: 25px;
176176
}
177177

178178
.forwardIcon:hover {
179-
margin-left: 12px;
179+
background-color: #c8d4e6;
180+
padding: 4px;
181+
border-radius: 16px;
180182
}
181183

182184
.navbar {
@@ -272,7 +274,9 @@ html {
272274
margin-top: -10px;
273275
margin-bottom: 35px;
274276
background: rgba(0, 0, 0, 0.09);
275-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
277+
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
278+
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
279+
sans-serif;
276280
}
277281
.spanQE {
278282
display: block;
@@ -450,15 +454,14 @@ html {
450454
.container1 a {
451455
display: flex;
452456
align-content: center;
453-
justify-content: center;
454457
text-underline-offset: 4px;
455458
align-items: center;
456459
}
457460

458461
.elixirLogo {
459-
height: 100px;
462+
height: 91px;
460463
margin-top: 29px;
461-
margin-right: 12px;
464+
margin-right: 21px;
462465
}
463466

464467
.comming_message {
@@ -935,19 +938,19 @@ h5 {
935938
position: absolute !important;
936939
inset: 35% !important;
937940
border: 1px solid rgb(204, 204, 204) !important;
938-
background: #e16e00 !important;
941+
background: #e2842b !important;
939942
overflow: auto !important;
940943
border-radius: 4px !important;
941944
outline: none !important;
942945
padding: 20px !important;
943946
}
944947

945948
.ReactModal__Content--after-open p {
946-
font-size: 21px;
949+
font-size: 18px;
947950
font-weight: normal;
948951
color: white;
949-
line-height: 38px;
950-
padding: 4px;
952+
line-height: 30px;
953+
padding: 2px;
951954
}
952955

953956
@media (max-width: 800px) {

‎frontend/src/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Cohorts from './components/Cohorts/Cohorts'
1212
import ErrorPage from './pages/ErrorPage'
1313
import Navbar from './components/NavBar/Navbar'
1414
import SignInForm from './components/SignIn/SignInForm'
15-
import ResultsDatasets from './components/Datasets/ResultsDatasets'
15+
import BeaconInfo from './components/Dataset/BeaconInfo';
1616
import CrossQueries from './components/CrossQueries/CrossQueries'
1717
import LoggedIn from './components/SignIn/LoggedIn'
1818
import Verifier from './components/Verifier/Verifier'
@@ -30,7 +30,7 @@ function App () {
3030
<Route path='/runs' element={<Runs />} />
3131
<Route path='/analyses' element={<Analyses />} />
3232
<Route path='/cohorts' element={<Cohorts />} />
33-
<Route path='/members' element={<ResultsDatasets />} />
33+
<Route path='/info' element={<BeaconInfo />} />
3434
<Route path='/sign-in' element={<SignInForm />} />
3535
<Route path='/sign-in-noLS' element={<SignInFormNoLS />} />
3636
<Route path='/loggedOut' element={<LoggedIn />} />

‎frontend/src/components/Analyses/Analyses.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
import '../../App.css'
2-
import Layout from '../Layout/Layout'
1+
import '../../App.css';
32

4-
function Analyses () {
5-
return (
6-
<div>
7-
<Layout collection={'Analyses'} />
8-
</div>
9-
)
3+
function Analyses(){
4+
return (<><h2 className="comming_message">Comming soon...</h2></>)
105
}
11-
export default Analyses
6+
export default Analyses

0 commit comments

Comments
 (0)