Skip to content

Commit 5be6108

Browse files
kshefchekkshefchek
authored
Merge pull request monarch-initiative#361 from iimpulse/feature/overview-facelift
Feature/overview facelift
2 parents 53f29f0 + dfcf87d commit 5be6108

12 files changed

+503
-290
lines changed

Diff for: ‎package-lock.json

+46-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"babel-eslint": "^10.0.3",
2727
"bbop-graph": "0.0.19",
2828
"bootstrap": "^4.4.1",
29-
"bootstrap-vue": "^2.9.0",
29+
"bootstrap-vue": "^2.15.0",
3030
"d3": "^5.15.0",
3131
"d3-axis": "^1.0.12",
3232
"d3-scale": "^3.2.1",

Diff for: ‎public/index.html

+1-17
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,11 @@
3737
</script>
3838
</head>
3939

40-
<body
41-
style="height: unset;">
40+
<body>
4241
<noscript>
4342
<strong>Please enable JavaScript and reload this page to continue.</strong>
4443
</noscript>
4544
<div id="app"></div>
4645
<!-- built files will be auto injected -->
47-
48-
<div
49-
class="debug-area"
50-
style="display:none;">
51-
<span class="debug-spinner">
52-
<img
53-
src="<%= require('@/assets/img/monarch-logo.png') %>"
54-
class="debug-spinner-logo left"
55-
alt="monarch-logo"/>
56-
<img
57-
src="<%= require('@/assets/img/monarch-logo.png') %>"
58-
class="debug-spinner-logo right"
59-
alt="monarch-logo"/>
60-
</span>
61-
</div>
6246
</body>
6347
</html>

Diff for: ‎src/App.vue

+13-22
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
<template>
2-
<div
3-
id="app"
4-
class="page-wrapper"
5-
>
2+
<div id="app" class="page-wrapper">
3+
<monarch-navbar />
64
<div class="content-wrapper">
7-
<monarch-navbar />
8-
<div class="main-wrapper">
9-
<router-view />
10-
</div>
5+
<router-view />
116
</div>
12-
137
<div class="footer-wrapper">
148
<monarch-footer
159
:compact="useCompactFooter"
@@ -66,20 +60,20 @@ $fa-font-path: "~font-awesome/fonts" !default;
6660
padding-left: 15px;
6761
}
6862
#app.page-wrapper {
69-
position: absolute;
70-
min-height: 100vh;
7163
width: 100%;
64+
display: flex;
65+
flex-direction: column;
66+
height: 100vh;
7267
}
7368
7469
#app.page-wrapper .content-wrapper {
75-
padding-bottom: $footer-height;
70+
padding: $navbar-height 0 0 0;
71+
flex: 1;
7672
margin: 0;
77-
min-height: 100vh;
78-
display: flex;
73+
background-color: #efefef;
7974
}
8075
8176
#app.page-wrapper .footer-wrapper {
82-
position: absolute;
8377
z-index: $monarch-footer-z;
8478
bottom: 0;
8579
width: 100%;
@@ -93,13 +87,6 @@ $fa-font-path: "~font-awesome/fonts" !default;
9387
padding-bottom: 15px;
9488
}
9589
96-
#app.page-wrapper .main-wrapper {
97-
padding: $navbar-height 0 0 0;
98-
min-height: 100%;
99-
min-width: 100%;
100-
}
101-
102-
10390
div.vue-markdown {
10491
xmargin-top: $navbar-height;
10592
xborder: 5px solid cyan;
@@ -181,6 +168,10 @@ html, body {
181168
font-family: 'Poppins', sans-serif;
182169
}
183170
171+
.gfc-tooltip {
172+
position: fixed !important;
173+
}
174+
184175
@media (min-width: 2400px) {
185176
186177
.col-desktop-1, .col-desktop-2, .col-desktop-3, .col-desktop-4, .col-desktop-5, .col-desktop-6, .col-desktop-7, .col-desktop-8, .col-desktop-9, .col-desktop-10, .col-desktop-11, .col-desktop-12 {

Diff for: ‎src/api/Entrez.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export async function getPublication(nodeId) {
2727
const entrezAbstractURL = 'https://eutils.ncbi.nlm.nih.gov/entrez/eutils/efetch.fcgi?';
2828
const entrezAbstractParams = {
2929
db: 'pubmed',
30-
retmode: 'text',
30+
retmode: 'xml',
3131
rettype: 'abstract',
3232
id: pubId
3333
};

Diff for: ‎src/components/ExacGeneSummary.vue

+8-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
id="exacGene"
55
class="container-fluid"
66
>
7-
<h4>Exac Population Frequencies</h4>
87
<table class="table table-hover">
98
<thead>
109
<tr>
@@ -102,6 +101,8 @@ export default {
102101
mounted() {
103102
if (this.nodePrefix.prefix in this.curieMap) {
104103
this.hitMyGene();
104+
} else {
105+
this.$emit('show-exac', false);
105106
}
106107
},
107108
methods: {
@@ -127,6 +128,7 @@ export default {
127128
const hits = resp.data.hits[0];
128129
if (hits && hits.exac) {
129130
this.showGeneExac = true;
131+
this.$emit('show-exac', true);
130132
this.exacGene = {
131133
exp_syn: this.round(hits.exac.all.exp_syn, 1),
132134
n_syn: this.round(hits.exac.all.n_syn, 1),
@@ -139,22 +141,21 @@ export default {
139141
p_li: this.round(hits.exac.all.p_li, 1),
140142
link: resp.request.responseURL
141143
};
144+
} else {
145+
this.$emit('show-exac', false);
142146
}
147+
143148
})
144149
.catch((err) => {
145150
// eslint-disable-next-line
146-
console.log('mygene.info error', err.message);
151+
this.$emit('show-exac', false);
152+
// console.log('mygene.info error', err.message);
147153
});
148154
}
149155
}
150156
};
151157
</script>
152158
<style>
153-
#exacGene {
154-
border-radius: 10px;
155-
border: solid darkgray 1px;
156-
}
157-
158159
#mgi-link {
159160
text-align: left;
160161
margin-bottom: 4px;

Diff for: ‎src/components/ExacVariantTable.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class="col-md-8"
66
>
77
<h2 class="p-2">
8-
Exac Population Frequencies
8+
ExAC Population Frequencies
99
</h2>
1010
<table class="table table-hover">
1111
<thead>

0 commit comments

Comments
 (0)