Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 🔨 modal alignment, ext routing, about members #241

Merged
merged 7 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,897 changes: 1,470 additions & 1,427 deletions web-app/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"moment": "^2.29.4",
"remarkable": "^2.0.1",
"sigma": "^3.0.0-beta.6",
"swagger-editor": "^4.11.2",
"swagger-editor": "^4.12.2",
"swagger-ui": "^4.19.1",
"tabulator-tables": "^4.9.3",
"tippy.js": "^6.3.7",
Expand Down
Binary file removed web-app/src/assets/img/embl-01.png
Binary file not shown.
2 changes: 1 addition & 1 deletion web-app/src/components/RegistryMetaKG.vue
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export default {
},
sendRequest() {
let self = this;
let base = process.env.NODE_ENV == 'development' ? 'https://dev.smart-api.info' : '';
let base = process.env.NODE_ENV == 'development' ? 'http://localhost:8000' : '';
axios
.get(
base +
Expand Down
2 changes: 1 addition & 1 deletion web-app/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ app
});
// dev base api url
app.config.globalProperties.$apiUrl =
process.env.NODE_ENV == 'development' ? 'https://dev.smart-api.info/api' : '/api';
process.env.NODE_ENV == 'development' ? 'http://localhost:8000/api' : '/api';

// global registration
app.component('VModal', VModal);
Expand Down
3 changes: 2 additions & 1 deletion web-app/src/router/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,9 @@ export const routes = [
}
},
{
path: '/extensions',
path: '/extensions/:name?',
name: 'Extensions',
props: true,
component: () => import('../views/Extensions.vue'),
meta: {
sitemap: {
Expand Down
191 changes: 57 additions & 134 deletions web-app/src/store/modules/about.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import scripps_img from '@/assets/img/scripps.svg';
import mu_img from '@/assets/img/mu.png';
import header_img from '@/assets/img/header-logo.png';
import embl_img from '@/assets/img/embl-01.png';
import def_img from '@/assets/img/logo-small.png';

export const about = {
state: () => ({
Expand Down Expand Up @@ -78,26 +76,6 @@ export const about = {
{ title: 'linkedin', href: 'https://www.linkedin.com/in/andrewsu/' }
]
},
{
name: 'Kevin',
lastname: 'Xin',
title: 'Staff Scientist',
work_logo: scripps_img,
work_website: 'https://www.scripps.edu/',
bio: "I'm currently working on projects that apply data science methodology and cloud computing technologies to facilitate biomedical discovery, through the large-scale biological data integration. Current projects include: http://BioThings.io/Explorer and http://SmartAPI.info",
education: [
'The Scripps Research Institute (second year graduate student)',
'Undergraduate: Fudan University'
],
image:
'https://scholar.google.com/citations?view_op=medium_photo&user=zthpKooAAAAJ&citpid=1',
personal_site: 'https://scholar.google.com/citations?user=zthpKooAAAAJ&hl=en',
links: [
{ title: 'twitter', href: '#' },
{ title: 'github', href: 'https://github.com/kevinxin90' },
{ title: 'linkedin', href: 'https://www.linkedin.com/in/jiwen-xin-7a207b29/' }
]
},
{
name: 'Marco',
lastname: 'Cano',
Expand All @@ -118,25 +96,41 @@ export const about = {
]
},
{
name: 'Xinghua(Jerry)',
lastname: 'Zhou',
name: 'Nichollette',
lastname: 'Acosta',
title: 'Research Programmer III',
work_logo: scripps_img,
work_website: 'https://www.scripps.edu/',
bio: 'Jerry is a research programmer in the Department of Integrative Structure and Computational Biology at Scripps Research.',
education: ['B.S., Computer Engineering, University of California San Diego'],
image: 'https://wulab.io/static/img/jerry_zhou.jpg',
work_website: 'http://sulab.org/',
bio: 'I am joining as a research programmer in 2021. I enjoy machine learning, bioinformatics and building software tools. Prior to this, I coded, primarily with fMRI brain data, for a Neuropsychology Ingestive Behavior lab.',
education: ['BSc. in Computer Science, Minor in Bioinformatics, UNC at Charlotte'],
image: 'https://wulab.io/content/images/2021/09/nicholla.jpg',
personal_site: '#',
links: [
{ title: 'flickr', href: 'https://www.flickr.com/people/namespacestd/' },
{ title: 'github', href: 'https://github.com/namespacestd0' },
{ title: 'linkedin', href: 'https://www.linkedin.com/in/jerry-zhou-b48b04b1/' }
{ title: 'twitter', href: '' },
{ title: 'github', href: 'https://github.com/NikkiBytes' },
{ title: 'linkedin', href: 'https://www.linkedin.com/in/nichollette-acosta/' }
]
},
{
name: 'Everaldo Rodrigo',
lastname: 'Rodolpho',
title: 'Research Programmer III',
work_logo: scripps_img,
work_website: 'http://sulab.org/',
bio: 'Digital Convergence of SCORM Learning Objects.',
education: ['M.S. Computer Science'],
image: 'https://wulab.io/content/images/2022/12/everaldo_rodolpho.jpeg',
personal_site: '#',
links: [
{ title: 'twitter', href: '' },
{ title: 'github', href: '' },
{ title: 'linkedin', href: '' }
]
},
{
name: 'Colleen',
lastname: 'Xu',
title: 'Research Programmer',
title: 'Research Programmer III',
work_logo: scripps_img,
work_website: 'http://sulab.org/',
bio: 'Colleen is a research programmer in the Department of Integrative, Structural and Computational Biology at Scripps Research.',
Expand Down Expand Up @@ -183,110 +177,36 @@ export const about = {
image: header_img,
name: 'Additional Team Members',
members: []
}
],
pastContributors: [
{
name: 'Jiwen (Kevin)',
lastname: 'Xin'
},
{
image: header_img,
name: 'Past Contributors',
members: [
{
name: 'Cyrus',
lastname: 'Afrasiabi',
title: 'Research Programmer IV',
work_logo: scripps_img,
work_website: 'https://www.scripps.edu/',
bio: 'I came to the Su/Wu Lab from UC Berkeley where I worked in a phylogenomics lab primarily doing bioinformatics application development. Before this I did work on the analysis of medical images, the analysis of animal vocalizations, and digital system design. Besides SmartAPI project, I am also currently working on the BioThings API project: http://BioThings.io/',
education: [
'2011 M. Eng. in Biomedical Engineering from Cornell University',
'2003 BS in Electrical and Computer Engineering from Cornell University'
],
image: 'http://sulab.org/wp-content/uploads/2018/03/cyrus2.jpg',
personal_site: '#',
links: [
{ title: 'twitter', href: '#' },
{ title: 'github', href: 'https://github.com/cyrus0824' },
{ title: 'linkedin', href: 'https://www.linkedin.com/in/cyrus-afrasiabi-b623604a' }
]
},
{
name: 'Shima',
lastname: 'Dastgheib',
title: 'Data Scientist',
work_logo: 'http://numedii.com/wp-content/uploads/2017/06/NuMedii-Logo-web.png',
work_website: 'https://www.maastrichtuniversity.nl/',
bio: `Data scientist at Numedii.`,
education: [
'2017 Postdoctoral Reserach Scholar from Stanford University School of Medicine',
'2014 PhD Computer Science from The University of Georgia',
'2008 Masters in Information Technology from Shiraz University',
'2004 B.S. Electrical Engineering from Shiraz University'
],
image:
'https://i1.rgstatic.net/ii/profile.image/544408740339712-1506808566542_Q512/Shima_Dastgheib2.jpg',
personal_site: 'https://scholar.google.com/citations?user=i5ElwboAAAAJ&hl=en',
links: [
{ title: 'twitter', href: 'https://twitter.com/shimadastgheib?lang=en' },
{ title: 'github', href: 'https://github.com/BinaryStars' },
{ title: 'linkedin', href: 'https://www.linkedin.com/in/shima-dastgheib-91a51027/' }
]
},
{
name: 'Trish',
lastname: 'Whetzel',
title: 'Bioinformatician',
work_logo: embl_img,
work_website: 'https://www.ebi.ac.uk/',
bio: `Web and Android developer. Background in bioinformatics and ontology development/management. Currently Bioinformatician at European Bioinformatics Institute | EMBL-EBI`,
education: [
'2016 Full Stack Nanodegree in Python Web Developement and Databases from Udacity',
'2000 PhD in Immunology and Microbiology from University of Delaware'
],
image: 'https://avatars0.githubusercontent.com/u/2167174?s=460&v=4',
personal_site: 'https://scholar.google.com/citations?user=2b1-ZLAAAAAJ&hl=en',
links: [
{ title: 'twitter', href: 'https://twitter.com/trishwhetzel?lang=en' },
{ title: 'github', href: 'https://github.com/twhetzel' },
{ title: 'linkedin', href: 'https://www.linkedin.com/in/trishwhetzel/' }
]
},
{
name: 'Amrapali',
lastname: 'Zaveri',
title: 'Postdoctoral Researcher',
work_logo: mu_img,
work_website: 'https://www.maastrichtuniversity.nl/',
bio: `I am from Pune, India where I studied Bachelors of Science and Masters in Bioinformatics. This was where my interests in science, biology and computers were born and nurtured. My training in bioinformatics took me to Singapore to work as a Senior Research Assistant at the National Neuroscience Institute. This is where I got introduced to ontologies, Semantic Web and Linked Data that could be used to solve biological problems. That brought me to Germany where I pursued my PhD in Computer Science in the University of Leipzig. My focus was on consumption of Linked Data for healthcare, educational and economic research leveraging data quality. Then I got the opportunity to pursue my research ideas further as a postdoctoral researcher at Stanford University in the Biomedical Informatics department. This is where I brought the worlds of Semantic Web and Biology together. After spending just a little over a year at Stanford, my professor got an opportunity to start a Data Science Institute at the University of Maastricht, Netherlands. I followed too and have been here since January 2017.`,
education: [
'2015 PhD Philosophy from Leipzig University',
'2007 M.Sc, Bioinformatics from Sikkim Manipal University of Health, Medical and Technological Sciences',
'2005 B.Sc, Zoology from Savitribai Phule Pune University'
],
image: 'https://avatars3.githubusercontent.com/u/713103?s=460&v=4',
personal_site: 'https://amrapalizaveri.com/',
links: [
{ title: 'twitter', href: 'https://twitter.com/amrapaliz?lang=en' },
{ title: 'github', href: 'https://github.com/amrapalijz' },
{ title: 'linkedin', href: 'https://www.linkedin.com/in/amrapalizaveri/' }
]
},
{
name: 'Alexander',
lastname: 'Malic',
title: 'Architect',
work_logo: mu_img,
work_website: 'https://www.maastrichtuniversity.nl/',
bio: '',
education: [
'Engineering degree in Electronics and Telecommunication Technologies',
'MBA specialization in international program, project, and process management at WU Executive Academy'
],
image: def_img,
personal_site: '#',
links: [
{ title: 'github', href: 'https://github.com/amalic' },
{ title: 'linkedin', href: 'https://www.linkedin.com/in/alexandermalic' }
]
}
]
name: 'Xinghua (Jerry)',
lastname: 'Zhou'
},
{
name: 'Cyrus',
lastname: 'Afrasiabi'
},
{
name: 'Shima',
lastname: 'Dastgheib'
},
{
name: 'Trish',
lastname: 'Whetzel'
},
{
name: 'Amrapali',
lastname: 'Zaveri'
},
{
name: 'Alexander',
lastname: 'Malic'
}
]
}),
Expand All @@ -297,6 +217,9 @@ export const about = {
},
otherMembers: (state) => {
return state.otherMembers;
},
pastContributors: (state) => {
return state.pastContributors;
}
}
};
6 changes: 3 additions & 3 deletions web-app/src/store/modules/extensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import translator from '../../assets/img/TranslatorLogo.jpg';
export const extensions = {
state: () => ({
extensions: {
'SmartAPI extensions': {
smartapi: {
description:
'The SmartAPI project aims to maximize the FAIRness (Findable, Accessible, Interoperable, Reusable) of web-based Application Programming Interfaces (APIs).',
link: 'https://smart-api.info',
Expand Down Expand Up @@ -336,7 +336,7 @@ export const extensions = {
}
]
},
'x-bte extensions': {
'x-bte': {
description:
'BioThings Explorer is an application that creates a federated knowledge graph that is composed of a network of biomedical web services. BioThings Explorer leverages semantically precise annotations of inputs and outputs for each resource, and automates the chaining of web service calls to execute multi-step graph queries.',
link: 'https://explorer.biothings.io/',
Expand Down Expand Up @@ -410,7 +410,7 @@ export const extensions = {
}
]
},
'x-translator extensions': {
'x-translator': {
description:
'The platform created by the Consortium members and funded through NCATS’s Other Transactions Authority has been designed as an exploration tool integrating trusted data sources, which aids researchers in discovering novel connections representing biomedical knowledge. The alpha release of Translator allows the user to explore relationships between chemicals/drugs and either diseases or genes.',
link: 'https://ncats.nih.gov/research/research-activities/translator',
Expand Down
12 changes: 6 additions & 6 deletions web-app/src/store/modules/metakg.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const metakg = {
maxEdgesRendered: 5000,
edgeData: [],
nodeData: [],
size: 20,
size: 100,
edgeColors: {},
total: 0,
subjectTotalFromResponse: [],
Expand Down Expand Up @@ -652,7 +652,7 @@ export const metakg = {
let base = state.baseURL.includes('http')
? state.baseURL
: window.location.origin + state.baseURL;
let url = new URL(base + '/metakg/consolidated');
let url = new URL(base + '/metakg');
for (const key in payload) {
if (!ignore_list.includes(key)) {
url.searchParams.append(key, payload[key]);
Expand Down Expand Up @@ -859,7 +859,7 @@ export const metakg = {
);
// commit('toggleLoading', {loading: true})
axios
.get(state.baseURL + '/metakg/consolidated', { params: urlParams })
.get(state.baseURL + '/metakg', { params: urlParams })
.then((res) => {
commit('buildAPIURL', urlParams);
g = res.data?.hits || [];
Expand Down Expand Up @@ -1015,7 +1015,7 @@ export const metakg = {
getSubjects({ state, commit }) {
if (!state.subject_options.length) {
axios
.get(state.baseURL + '/metakg/consolidated?aggs=subject.raw&facet_size=200')
.get(state.baseURL + '/metakg?aggs=subject.raw&facet_size=200')
.then((res) => {
let data = res.data?.facets?.['subject.raw']?.terms.map((item) => item.term).sort();
commit('saveSubjects', data);
Expand All @@ -1028,7 +1028,7 @@ export const metakg = {
getObjects({ state, commit }) {
if (!state.object_options.length) {
axios
.get(state.baseURL + '/metakg/consolidated?aggs=object.raw&facet_size=200')
.get(state.baseURL + '/metakg?aggs=object.raw&facet_size=200')
.then((res) => {
let data = res.data?.facets?.['object.raw']?.terms.map((item) => item.term).sort();
commit('saveObjects', data);
Expand All @@ -1041,7 +1041,7 @@ export const metakg = {
getPredicates({ state, commit }) {
if (!state.predicate_options.length) {
axios
.get(state.baseURL + '/metakg/consolidated?aggs=predicate&facet_size=500')
.get(state.baseURL + '/metakg?aggs=predicate&facet_size=500')
.then((res) => {
let data = res.data?.facets?.predicate?.terms.map((item) => item.term).sort();
commit('savePredicates', data);
Expand Down
Loading
Loading