Skip to content

Commit

Permalink
Merge pull request #91 from grycap/master
Browse files Browse the repository at this point in the history
Added Imagine front page
  • Loading branch information
catttam committed Nov 13, 2023
2 parents 67108ef + 510def2 commit dbbf02a
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 12 deletions.
Binary file added src/assets/logo/ai4eosc-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/logo/imagine-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/components/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@ export default {
},

bucketExistCall(params,callBackHandler){
this.minioClient.bucketExists(params.name, function(err, exists) {
callBackHandler('success')
/*this.minioClient.bucketExists(params.name, function(err, exists) {
if (err){
callBackHandler(err)
window.getApp.$emit('APP_SHOW_SNACKBAR', {
Expand All @@ -389,7 +390,7 @@ export default {
callBackHandler('success')
}
})
})*/
},

getBucketFilesCall(params, callBackHandler){
Expand Down
1 change: 1 addition & 0 deletions src/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ module.exports = {
"response_default_minio": "minio.minio",
"external_ui": "https://ui.oscar.grycap.net/?endpoint=",
"ai4eosc_servers": ["https://inference.cloud.ai4eosc.eu"],
"imagine_servers": ["https://inference.cloud.imagine-ai.eu"],
}
13 changes: 8 additions & 5 deletions src/views/Foot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ export default {
window.open(routeData.href, '_blank');
},
getClass(){
console.log(this.$route.name)
if(env.deploy_container=='true' && env.ai4eosc_servers.includes(window.location.origin) && this.$route.name==="Login"){
return "ai4eosc"
}else return "teal darken-1"
if(env.deploy_container=='true' && env.ai4eosc_servers.includes(window.location.origin) && this.$route.name==="Login"){
return "ai4eosc"
}else if(env.deploy_container=='true' && env.imagine_servers.includes(window.location.origin) && this.$route.name==="Login"){
return "imagine"
}else return "teal darken-1"
},
privacy(){
let routeData = this.$router.resolve({name: 'Privacy', });
Expand All @@ -64,5 +65,7 @@ table, th, td {
.ai4eosc{
background-color: #09837e;
}
.imagine{
background-color: #1561aa;
}
</style>
17 changes: 12 additions & 5 deletions src/views/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@
<v-card class="elevation-1 pa-3">
<v-card-text>
<div class="layout column align-center" >

<img src="@/assets/logo.png" alt="Vue Material Admin" width="120" height="120">

<img v-if="ai4eoscServer()" src="https://ai4eosc.eu/wp-content/uploads/sites/10/2022/09/horizontal-transparent.png" alt="Vue Material Admin" width="50%" height="50%">

<img v-if="ai4eoscServer()" src="@/assets/logo/ai4eosc-logo.png" alt="Vue Material Admin" width="50%" height="50%">
<img v-if="imagineServer()" src="@/assets/logo/imagine-logo.png" alt="Vue Material Admin" width="25%" style="margin-top: 30px;">
<h1 class="flex my-4 teal--text">OSCAR</h1>
</div>


<v-form v-if= "env.deploy_container == 'false'" >
<v-text-field append-icon="language" name="password" label="Endpoint" id="password" type="text"
<v-text-field append-icon="language" name="endpoint" label="Endpoint" id="endpoint" type="text"
v-model="model.endpoint" :hide-details=true></v-text-field>
<div class="text-right">
<span style="color:red; font-size:10px;">Required</span>
Expand Down Expand Up @@ -114,9 +112,15 @@ export default {
if(env.deploy_container=='true' && env.ai4eosc_servers.includes(window.location.origin)) return true
else return false
},
imagineServer(){
if(env.deploy_container=='true' && env.imagine_servers.includes(window.location.origin)) return true
else return false
},
getClass(){
if(this.ai4eoscServer()){
return "ai4eosc"
}else if(this.imagineServer()){
return "imagine"
}else return "teal darken-1"
},
oscar_ui_egi(){
Expand Down Expand Up @@ -256,4 +260,7 @@ export default {
background-color: #09837e;
}
.imagine{
background-color: #1561aa;
}
</style>

0 comments on commit dbbf02a

Please sign in to comment.