Skip to content

Commit

Permalink
replaced cnag.crg.eu with cnag.eu
Browse files Browse the repository at this point in the history
  • Loading branch information
IvoLeist committed Dec 8, 2023
1 parent ee8932a commit 6dc81b3
Show file tree
Hide file tree
Showing 33 changed files with 34 additions and 48 deletions.
13 changes: 0 additions & 13 deletions convertPheno_client/src/code/apis.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@

import axiosInstance from "./axiosInstance";

// ist this function actually still used?
export async function fileUpload(token, urlprefix, data) {
return fetch(`${urlprefix}api/submission/upload`, {
method: "POST",
body: data,
headers: {
Accept: "application/json",
connection: "keep-alive",
Authorization: token,
},
});
}

export async function fileConversion(token, urlprefix, data) {
try {
const res = await axiosInstance.post(`${urlprefix}api/submission/convert`, data, {
Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
3 changes: 1 addition & 2 deletions convertPheno_server/get_public_kc_key.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license
# CERTS_URL="https://client/auth/realms/$KC_REALM/protocol/openid-connect/certs"
Expand All @@ -24,4 +24,3 @@ if [ -z "$KEY" ]; then
exit 1
fi
echo KC_PUBLIC_KEY=$KEY

2 changes: 1 addition & 1 deletion convertPheno_server/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/apis/captcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/apis/clinical.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/apis/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/apis/submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/apis/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/config/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license
from os import environ
Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/config/config_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/config/general_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/config/gunicorn_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/security.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/utils/convert_pheno.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license
"""
Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/utils/db_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license
import json
Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/utils/error_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/server/utils/jsonschema_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/tests/helpers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/tests/test_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/tests/test_clinical.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/tests/test_download.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/tests/test_health.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/tests/test_jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion convertPheno_server/tests/test_submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
4 changes: 2 additions & 2 deletions docs/about.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
**Convert-Pheno-UI** has been developed at [CNAG](https://cnag.crg.eu), Barcelona, Spain.
**Convert-Pheno-UI** has been developed at [CNAG](https://cnag.eu), Barcelona, Spain.

## Developers

Expand All @@ -20,7 +20,7 @@

* Group Leader: [Ivo G. Gut](https://scholar.google.com/citations?user=YKdDEVYAAAAJ)
* Design: [Sofia Chaves](https://scholar.google.com/citations?user=Q0wogt8AAAAJ)
* Developmental support: [Davide Piscia](https://github.com/dpiscia) and his [team](https://www.cnag.crg.eu/teams/bioinformatics-unit/data-platforms-and-tools-development)
* Developmental support: [Davide Piscia](https://github.com/dpiscia) and his [team](https://www.cnag.eu/teams/bioinformatics-unit/data-platforms-and-tools-development)

=== "External"

Expand Down
2 changes: 1 addition & 1 deletion docs/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Jun/21/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
2 changes: 1 addition & 1 deletion get_public_kc_key.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down Expand Up @@ -67,7 +67,7 @@ kc-ip:
db-ip:
db_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' convert-pheno-api-db)
echo $${db_ip}

mkcert:
/usr/local/bin/mkcert -cert-file ./nginx_mountpoint/certs/convertpheno.local.dev.pem -key-file ./nginx_mountpoint/certs/convertpheno.local.dev-key.pem convertpheno.local.dev

Expand Down
2 changes: 1 addition & 1 deletion nginx_mountpoint/replace_env_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Last Modified: Apr/28/2023
#
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.crg.eu)
# Copyright (C) 2022-2023 Ivo Christopher Leist - CNAG (Ivo.leist@cnag.eu)
#
# License: GPL-3.0 license

Expand Down

0 comments on commit 6dc81b3

Please sign in to comment.