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

Header search, re-add breadcrumbs, other small features #288

Merged
merged 26 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
64692d4
fix tsconfig warning
vincerubinetti Aug 22, 2023
940ea70
move casing of select labels to in-situ
vincerubinetti Aug 22, 2023
3c8a443
table comp save exp state, rework styling
vincerubinetti Aug 22, 2023
ff8bdf7
add bg to phenom first page
vincerubinetti Aug 22, 2023
23969f4
fix pheno qual icon
vincerubinetti Aug 22, 2023
76affb3
remove unnecessary refs around uids
vincerubinetti Aug 22, 2023
f909431
fix select component hover bug
vincerubinetti Aug 22, 2023
8fbc55b
add taxon labels where available
vincerubinetti Aug 23, 2023
816e8fa
remove unused import
vincerubinetti Aug 23, 2023
c01815b
remove node badge link prop, determine from url
vincerubinetti Aug 23, 2023
2d0c250
re-add breadcrumbs, hook up to hierarchy
vincerubinetti Aug 23, 2023
25522cf
add icons to multi select component
vincerubinetti Aug 23, 2023
45480bb
add beta banner for prod
vincerubinetti Aug 23, 2023
5fd1897
Merge branch 'main' into header-search
vincerubinetti Aug 23, 2023
3b042ca
table component fixes
vincerubinetti Aug 23, 2023
ec36409
add "back to search" button on node page
vincerubinetti Aug 23, 2023
80a4f61
tweak colors for better contrast, tweak nexus
vincerubinetti Aug 23, 2023
ef9f1c5
fix home page anatomy icon
vincerubinetti Aug 23, 2023
865c29c
solo on first click
vincerubinetti Aug 23, 2023
72a1877
fix tabs component keyboard wrapping
vincerubinetti Aug 23, 2023
3996eb9
remove unnecessary style
vincerubinetti Aug 23, 2023
d936688
fix redirect and param bug
vincerubinetti Aug 23, 2023
1d65570
add search box to header
vincerubinetti Aug 24, 2023
cb668fe
change data attrs to classes
vincerubinetti Aug 24, 2023
ba54288
touchup icon source code
vincerubinetti Aug 24, 2023
3aceaf3
fix more cat icon svgs source
vincerubinetti Aug 24, 2023
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
18 changes: 8 additions & 10 deletions frontend/public/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,16 @@
* everything.
*/

/** turn on "preserve log" in chrome dev tools to still see this after nav */
console.info("Redirecting from:", window.location);
console.info("With state:", window.history.state);
/** turn on "preserve log" in dev tools to still see this after nav */
console.info("Redirecting from:", location);
console.info("With state:", history.state);

/** get redirect and state */
const { origin, pathname, search, hash } = window.location;
const { state } = window.history;
/** save redirect and state */
sessionStorage.redirect = location.href;
sessionStorage.redirectState = JSON.stringify(history.state);

/** set redirect and state */
window.sessionStorage.redirect = pathname + search + hash;
window.sessionStorage.redirectState = JSON.stringify(state);
window.location = "/";
/** navigate */
location = "/";
</script>
</body>
</html>
3 changes: 2 additions & 1 deletion frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<template>
<TheBanner>
This web app is the
<strong v-if="apiName === 'beta'">BETA VERSION</strong
<strong v-if="apiName === 'v3'">BETA VERSION</strong
><strong v-if="apiName === 'beta'">BETA VERSION</strong
><strong v-if="apiName === 'dev'">DEV VERSION</strong> successor to the
<AppLink to="https://monarchinitiative.org/">old web app here</AppLink>. Not
all features are implemented yet. Please use the feedback form to tell us
Expand Down
7 changes: 2 additions & 5 deletions frontend/src/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/** base biolink api url */
export const biolink = "https://api.monarchinitiative.org/api";

/** served location of web app, verbatim from browser address bar */
const url = new URL(window.location.href);
/** served location of web app, from address bar or storage redirect */
const url = new URL(window.sessionStorage.redirectHref || window.location.href);

/** get api name/version to use */

Expand Down Expand Up @@ -50,7 +50,6 @@ if (apiName === "relative") monarch = suffix;

export { monarch };

/** debug */
console.info({ fromParam, fromEnv, fromDomain, apiName, monarch });

/**
Expand Down Expand Up @@ -107,7 +106,6 @@ export const request = async <Response>(
/** first check if request is cached */
let response = await cache.match(request);

/** log details for debugging (except don't clutter logs when running tests) */
if (import.meta.env.MODE !== "test") {
console.groupCollapsed(
response ? "📞 Request (cached)" : "📞 Request (new)",
Expand Down Expand Up @@ -148,7 +146,6 @@ export const request = async <Response>(
const parsed: Response =
parse === "text" ? await response.text() : await response.json();

/** log details for debugging (except don't clutter logs when running tests) */
if (import.meta.env.MODE !== "test") {
console.groupCollapsed("📣 Response", endpoint);
console.info("Url", url);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 11 additions & 3 deletions frontend/src/assets/icons/category-case.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions frontend/src/assets/icons/category-causal-disease.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 16 additions & 4 deletions frontend/src/assets/icons/category-causal-gene.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions frontend/src/assets/icons/category-cell-line.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions frontend/src/assets/icons/category-correlated-disease.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 16 additions & 4 deletions frontend/src/assets/icons/category-correlated-gene.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions frontend/src/assets/icons/category-disease.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion frontend/src/assets/icons/category-function.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 16 additions & 4 deletions frontend/src/assets/icons/category-gene.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 11 additions & 3 deletions frontend/src/assets/icons/category-genotype.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 21 additions & 5 deletions frontend/src/assets/icons/category-homolog.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions frontend/src/assets/icons/category-interaction.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions frontend/src/assets/icons/category-model.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 16 additions & 4 deletions frontend/src/assets/icons/category-ortholog-disease.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 14 additions & 6 deletions frontend/src/assets/icons/category-ortholog-phenotype.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion frontend/src/assets/icons/category-pathway.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions frontend/src/assets/icons/category-phenotypic-feature.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions frontend/src/assets/icons/category-phenotypic-quality.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions frontend/src/assets/icons/category-publication.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading