Commit a766dbf1 authored by Yasset Perez-Riverol's avatar Yasset Perez-Riverol
Browse files

merge

parents 29bef79f 88e85b74
......@@ -35,7 +35,9 @@ const webpackConfig = merge(baseWebpackConfig, {
new UglifyJsPlugin({
uglifyOptions: {
compress: {
warnings: false
warnings: false,
drop_debugger: true, // self added for removing logs in productions
drop_console: true // self added for removing logs in productions
}
},
sourceMap: config.build.productionSourceMap,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -28,7 +28,8 @@
"vue-resource": "^1.5.0",
"vue-router": "^3.0.1",
"vue-text-highlight": "^1.1.1",
"vue-tweet-embed": "^2.1.1"
"vue-tweet-embed": "^2.1.1",
"vuex": "^3.0.1"
},
"devDependencies": {
"autoprefixer": "^7.1.2",
......
......@@ -50,9 +50,10 @@
},
beforeRouteEnter: function(to, from, next){
console.log('from',from);
//console.log(from);
//console.log(document.getElementById('elixir-banner'));
//document.getElementById('elixir-banner').setAttribute('display','none');
//console.log(document.getElementById('elixir-banner'));
//document.getElementById('elixir-banner').setAttribute('display','none');
next();
},
mounted(){
......
......@@ -121,7 +121,7 @@
<!--<read-more class="readMore" more-str="(More)" :text="publicationItem.projectDescription" link="#" less-str="Less" :max-chars="200"></read-more>-->
</span>
<p><span class="project-info">{{projectItemsPublicationDate}}: </span><text-highlight :queries="highlightKeyword" :caseSensitive="HighlightKeywordSensitive">{{publicationItem.publicationDate}}</text-highlight></p>
<Dropdown class="dataset-wrapper" v-for="datesetItem in publicationItem.projectTags">
<Dropdown class="dataset-wrapper" v-for="(datesetItem, index) in publicationItem.projectTags" :key="index">
<a v-if="datesetItem == 'Biological'" class="button biological-dataset-button" href="javascript:void(0)">
<Icon type="ios-pricetag"></Icon>
<text-highlight :queries="highlightKeyword" :caseSensitive="HighlightKeywordSensitive">{{datesetItem}}</text-highlight> Dataset
......@@ -168,6 +168,7 @@
<script>
import NavBar from '@/components/archive/Nav'
import store from "@/store/store.js"
var paramsFromLandingPage='';
export default {
name: 'archive',
......@@ -182,11 +183,11 @@
querySpecificFacetsLoading:false,
highlightKeyword:'',
HighlightKeywordSensitive:false,
facetsURL:'http://ves-pg-41:9020/facet/projects',
searchConfigURL:'/static/config/facets/config.json',
projectItemsConfigURL:'/static/config/projectItems/config.json',
queryArchiveProjectListApi:'http://ves-pg-41:9020/search/projects',
autoCompleteApi:"http://ves-pg-41:9020/search/autocomplete?keyword=",
facetsURL: this.$store.state.baseApiURL + '/facet/projects',
searchConfigURL: this.$store.state.baseURL + '/static/config/facets/config.json',
projectItemsConfigURL: this.$store.state.baseURL + '/static/config/projectItems/config.json',
queryArchiveProjectListApi: this.$store.state.baseApiURL + '/search/projects',
autoCompleteApi: this.$store.state.baseApiURL + '/search/autocomplete?keyword=',
containItemSearch:'',
fieldSelectors:[],
currentPage:1,
......@@ -328,7 +329,6 @@
this.publicaitionList = [];
this.loading = true;
let query = q || this.$route.query;
console.log('queryArchiveProjectList');
query.dateGap = '+1YEAR';
let pageSizeFound = false;
for(let i in query){
......@@ -359,7 +359,6 @@
submissionType: projectsList[i].submissionType,
hightlightItemArray:[],
}
//console.log('projectsList[i].highlights',projectsList[i].highlights);
for(let j in projectsList[i].highlights){
let content='';
......
......@@ -376,7 +376,7 @@
<Card class="card" v-if="similarProjects.length>0">
<p slot="title"><i class="fas fa-link icon-tag"></i>Similar Studies</p>
<div class="list-wrapper">
<Card class="similarity-card" v-for="item in similarProjects">
<Card class="similarity-card" v-for="item in similarProjects" :key="item.accession">
<div class="similarity-title"><a @click="gotoDetails(item.accession)">{{item.title}}</a></div>
<div><span>{{item.submissionDate}}</span></div>
</Card>
......@@ -392,6 +392,7 @@
<script>
import NavBar from '@/components/landingpage/Nav'
import store from "@/store/store.js"
export default {
name: 'archive',
data(){
......@@ -412,13 +413,13 @@
experimentTypes:[],
softwares:[],
modification:[],
queryArchiveProjectApi:'http://ves-pg-41:9020/projects/',
queryArchiveProjectFilesApi:'http://ves-pg-41:9020/projects/',
queryArchiveProjectApi: this.$store.state.baseApiURL + '/projects/',
queryArchiveProjectFilesApi: this.$store.state.baseApiURL + '/projects/',
queryAssayApi:'https://www.ebi.ac.uk:443/pride/ws/archive/assay/list/project/',
europepmcApi:'http://europepmc.org/abstract/MED/',
reactomeApi:'https://reactome.org/AnalysisService/identifiers/url?pageSize=1&page=1',
viewInreactomeApi:'https://www.ebi.ac.uk/pride/ws/archive/protein/list/assay/',
similarityApi:'http://ves-pg-41:9020/projects/',
similarityApi: this.$store.state.baseApiURL + '/projects/',
contactors:[],
similarProjects:[],
similarityLoading:false,
......
......@@ -120,6 +120,7 @@
</div>
</template>
<script>
import store from "@/store/store.js"
export default {
data () {
return {
......@@ -127,7 +128,7 @@
selected: 'archive',
title:'',
subnav:[],
landingPageJsonURL:'/static/landingPage/landing_page.json'
landingPageJsonURL: this.$store.state.baseURL + '/static/landingPage/landing_page.json'
}
},
methods:{
......@@ -200,7 +201,7 @@
border: 0 !important;
}
.ebi-masthead{
background-image: url('/static/image/hero-beta-banner.png');
background-image: url('../../../static/image/hero-beta-banner.png');
}
.ebi-masthead nav ul.menu li{
border-right: 1px solid rgb(248,248,248,0.7);
......
......@@ -5,7 +5,7 @@
<Affix :offset-top="20">
<div class="menu-wrapper">
<Menu mode="vertical" :active-name="activeName" @on-select="menuSlect">
<MenuItem v-for="item in tableList" :name="item.name">
<MenuItem v-for="item in tableList" :name="item.name" :key="item.name">
<Icon type="ios-paper"></Icon>{{item.content}}
</MenuItem>
</Menu>
......@@ -23,12 +23,13 @@
</template>
<script>
import NavBar from '@/components/landingpage/Nav'
import store from "@/store/store.js"
export default {
data () {
return {
source: '',
activeName:'',
landingPageJsonURL:'/static/landingPage/landing_page.json',
landingPageJsonURL: this.$store.state.baseURL + '/static/landingPage/landing_page.json',
tableList:[],
/*
anchorAttrs: {
......@@ -66,7 +67,7 @@
this.source = '';
this.activeName='';
this.tableList=[];
this.markdownURL = '/static/markdown/'+subpage+'/content.md';
this.markdownURL = this.$store.state.baseURL + '/static/markdown/'+subpage+'/content.md';
this.$http
.get(this.markdownURL)
.then(function(res){
......
......@@ -8,11 +8,12 @@
</template>
<script>
import NavBar from '@/components/landingpage/Nav'
import store from "@/store/store.js"
export default {
data () {
return {
source: '',
markdownURL:'/static/markdown/citationPage/content.md',
markdownURL: this.$store.state.baseURL + '/static/markdown/citationPage/content.md',
}
},
components: {
......
......@@ -32,7 +32,7 @@
News
},
mounted: function(){
console.log('this.$router',this.$router);
}
}
</script>
......
......@@ -6,7 +6,7 @@
<!-- local-title -->
<div class="columns medium-5" id="local-title">
<div class="pride-logo">
<a href="../../" title="Back to [service-name] homepage"><img src="/static/logo/PRIDE_logo.png" alt="logo" width="500"></a>
<a href="../../" title="Back to [service-name] homepage"><img :src="logoURL" alt="logo" width="500"></a>
</div>
</div>
<!-- /local-title -->
......@@ -121,6 +121,7 @@
</div>
</template>
<script>
import store from "@/store/store.js"
export default {
data () {
return {
......@@ -128,7 +129,8 @@
selected: 'archive',
title:'',
subnav:[],
landingPageJsonURL:'/static/landingPage/landing_page.json'
landingPageJsonURL: this.$store.state.baseURL + '/static/landingPage/landing_page.json',
logoURL: this.$store.state.baseURL + '/static/logo/PRIDE_logo.png',
}
},
methods:{
......@@ -204,7 +206,7 @@
border: 0 !important;
}
.ebi-masthead{
background-image: url('/static/image/hero-beta-banner.png');
background-image: url('../../../static/image/hero-beta-banner.png');
}
.ebi-masthead nav ul.menu li{
border-right: 1px solid rgb(248,248,248,0.7);
......
......@@ -16,11 +16,11 @@
<div class="content-text">
{{item.content}}
</div>
<a class="content-button" @click="moreButtonAction(item.markdownFolder,item.moreID)">More</a>
<a class="content-button" @click="moreButtonAction(item.markdownFolder,item.moreID,item.externalURL)">More</a>
</div>
</div>
<Button class="news-button" @click="moreButtonAction(toolsButton.markdownFolder,toolsButton.moreID)">MORE</Button>
<Button class="news-button" @click="moreButtonAction(toolsButton.markdownFolder,toolsButton.moreID,toolsButton.externalURL)">MORE</Button>
</div>
</Col>
<Col :xs="{ span: 24 }" :sm="{span: 12}" :md="{ span: 12}" :lg="{ span: 6}">
......@@ -37,10 +37,10 @@
<div class="content-text">
{{item.content}}
</div>
<a class="content-button"@click="moreButtonAction(item.markdownFolder,item.moreID)">More</a>
<a class="content-button"@click="moreButtonAction(item.markdownFolder,item.moreID,item.externalURL)">More</a>
</div>
</div>
<Button class="news-button" @click="moreButtonAction(documentationButton.markdownFolder,documentationButton.moreID)">MORE</Button>
<Button class="news-button" @click="moreButtonAction(documentationButton.markdownFolder,documentationButton.moreID,documentationButton.externalURL)">MORE</Button>
</div>
</Col>
<Col :xs="{ span: 24 }" :sm="{span: 12}" :md="{ span: 12}" :lg="{ span: 6}">
......@@ -87,6 +87,7 @@
</template>
<script>
import Timeline from 'vue-tweet-embed/timeline'
import store from "@/store/store.js"
export default {
components: {
Timeline
......@@ -113,7 +114,7 @@
linefour:'',
button:{}
},
landingPageJsonURL:'/static/landingPage/landing_page.json'
landingPageJsonURL: this.$store.state.baseURL + '/static/landingPage/landing_page.json'
}
},
methods:{
......@@ -161,7 +162,11 @@
});
*/
},
moreButtonAction(subpage, id){
moreButtonAction(subpage, id, externalLink){
if(externalLink){
window.open(externalLink);
return;
}
if(id){
id = id.replace(/(^\s*)|(\s*$)/g,'').replace(/\s/g,'_').toLowerCase();
this.$router.push({path:'/markdownpage/'+subpage+'#'+id});
......
......@@ -32,11 +32,12 @@
</template>
<script>
import NavBar from '@/components/landingpage/Nav'
import store from "@/store/store.js"
export default {
data () {
return {
source: '',
markdownURL:'/static/markdown/documentationPage/content.md',
markdownURL:this.$store.state.baseURL + '/static/markdown/documentationPage/content.md',
activeName:'one'
/*
anchorAttrs: {
......
......@@ -59,6 +59,7 @@
</div>
</template>
<script>
import store from "@/store/store.js"
export default {
data () {
return {
......@@ -176,7 +177,7 @@
}
],
searchExample:[],
landingPageJsonURL:'/static/landingPage/landing_page.json'
landingPageJsonURL: this.$store.state.baseURL + '/static/landingPage/landing_page.json'
}
},
methods:{
......
......@@ -42,13 +42,14 @@
import SankeyPrideSimple from './statistics_chart/SankeySimple.vue'
import MapPrideSimple from './statistics_chart/MapSimple.vue'
import TreePrideSimple from './statistics_chart/TreeSimple.vue'
import store from "@/store/store.js"
export default {
data () {
return {
treePrideApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_CATEGORIES',
sankeyPrideApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_MONTH',
mapPrideApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_COUNTRY',
linePrideApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_YEAR',
treePrideApi: this.$store.state.baseApiURL + '/stats/SUBMISSIONS_PER_CATEGORIES',
sankeyPrideApi: this.$store.state.baseApiURL + '/stats/SUBMISSIONS_PER_MONTH',
mapPrideApi: this.$store.state.baseApiURL + '/stats/SUBMISSIONS_PER_COUNTRY',
linePrideApi: this.$store.state.baseApiURL + '/stats/SUBMISSIONS_PER_YEAR',
treePrideShow:true,
sankeyPrideShow:true,
mapPrideShow:true,
......
......@@ -99,15 +99,16 @@
import PiePride from './statistics_chart/Pie.vue'
import MapPride from './statistics_chart/Map.vue'
import NavBar from '@/components/landingpage/Nav'
import store from "@/store/store.js"
export default {
data () {
return {
treePrideApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_CATEGORIES',
sunburstPrideApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_CATEGORIES',
sankeyPrideApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_MONTH',
mapPrideApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_COUNTRY',
linePrideYearApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_YEAR',
linePrideMonthApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_MONTH',
treePrideApi: this.$store.state.baseApiURL + '/stats/SUBMISSIONS_PER_CATEGORIES',
sunburstPrideApi: this.$store.state.baseApiURL + '/stats/SUBMISSIONS_PER_CATEGORIES',
sankeyPrideApi: this.$store.state.baseApiURL + '/stats/SUBMISSIONS_PER_MONTH',
mapPrideApi: this.$store.state.baseApiURL +'/stats/SUBMISSIONS_PER_COUNTRY',
linePrideYearApi: this.$store.state.baseApiURL + '/stats/SUBMISSIONS_PER_YEAR',
linePrideMonthApi: this.$store.state.baseApiURL + '/stats/SUBMISSIONS_PER_MONTH',
sunburstPrideShow:true,
sankeyPrideShow:true,
mapPrideShow:true,
......@@ -188,7 +189,7 @@
facetsTypeChange(facets){
this.piePrideShow=true;
this.$http
.get('http://ves-pg-41:9020/stats/SUBMISSIONS_PER_'+facets)
.get( this.$store.state.baseApiURL + '/stats/SUBMISSIONS_PER_'+facets)
.then(function(res){
this.piePrideShow=false;
this.$bus.$emit('show-pie', res.body);
......
......@@ -86,6 +86,7 @@
</div>
</template>
<script>
import store from "@/store/store.js"
export default {
data () {
return {
......@@ -119,7 +120,7 @@
four: '',
five: ''
},
landingPageJsonURL:'/static/landingPage/landing_page.json',
landingPageJsonURL: this.$store.state.baseURL + '/static/landingPage/landing_page.json',
markdownFolder:''
}
},
......
......@@ -9,8 +9,6 @@ export default {
data: function () {
//let data =
return {
lineYearApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_YEAR',
lineMonthApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_MONTH',
options: {
title: {
/*text: 'Beijing AQI'*/
......
......@@ -9,8 +9,6 @@ export default {
data: function () {
//let data =
return {
lineYearApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_YEAR',
lineMonthApi:'http://ves-pg-41:9020/stats/SUBMISSIONS_PER_MONTH',
options: {
title: {
text: 'Public submission',
......
......@@ -6,7 +6,7 @@
<!-- local-title -->
<div class="columns medium-5" id="local-title">
<div class="pride-logo">
<a href="../../" title="Back to [service-name] homepage"><img src="/static/logo/PRIDE_logo_Peptide.png" alt="logo" width="500"></a>
<a href="../../" title="Back to [service-name] homepage"><img :src="logoURL" alt="logo" width="500"></a>
</div>
</div>
<!-- /local-title -->
......@@ -120,6 +120,7 @@
</div>
</template>
<script>
import store from "@/store/store.js"
export default {
data () {
return {
......@@ -127,7 +128,8 @@
selected: 'archive',
title:'',
subnav:[],
landingPageJsonURL:'/static/landingPage/landing_page.json'
landingPageJsonURL:this.$store.state.baseURL + '/static/landingPage/landing_page.json',
logoURL: this.$store.state.baseURL + '/static/logo/PRIDE_logo_Peptide.png',
}
},
methods:{
......@@ -200,7 +202,7 @@
border: 0 !important;
}
.ebi-masthead{
background-image: url('/static/image/hero-beta-banner.png');
background-image: url('../../../static/image/hero-beta-banner.png');
}
.ebi-masthead nav ul.menu li{
border-right: 1px solid rgb(248,248,248,0.7);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment