diff --git a/package.json b/package.json index fc14d55..827b708 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,8 @@ "vue-material": "^1.0.0-beta-14", "vue-perfect-scrollbar": "^0.1.0", "vue-router": "^3.0.1", - "vuetify": "^1.5.24" + "vuetify": "^1.5.24", + "yaml": "^2.4.5" }, "devDependencies": { "@vue/cli-plugin-babel": "^5.0.8", diff --git a/src/components/AppDrawer.vue b/src/components/AppDrawer.vue index f336371..68fb40b 100644 --- a/src/components/AppDrawer.vue +++ b/src/components/AppDrawer.vue @@ -64,6 +64,12 @@ + + + description + Juno + + info @@ -154,36 +160,42 @@ export default { }else if(_this.$route.name == 'Info'){ $("#btn_info").css("color","#0056b3") + }else if(_this.$route.name == 'Juno'){ + $("#btn_juno").css("color","#0056b3") } }) }, methods: { - getEndpointCallback(response){ - this.getBucketListCall(this.getBucketListCallBack) - }, + getEndpointCallback(response){ + this.getBucketListCall(this.getBucketListCallBack) + }, collapse(id){ - $("#btn_dash").css("color","#000!important") - $("#btn_funct").css("color","#000!important") - $("#btn_sett").css("color","#000!important") - $("#btn_logout").css("color","#000!important") - $("#btn_storage").css("color","#000!important") - $("#btn_info").css("color","#000!important") + $("#btn_dash").css("color","#000") + $("#btn_funct").css("color","#000") + $("#btn_sett").css("color","#000") + $("#btn_logout").css("color","#000") + $("#btn_storage").css("color","#000") + $("#btn_juno").css("color","#000") + $("#btn_info").css("color","#000") if(id == "btn_dash"){ - // $("#btn_dash").css("color","#0056b3") + $("#btn_dash").css("color","#0056b3") this.$router.push({name: "Dashboard"}).catch(err => {}) }else if (id == "btn_funct"){ - // $("#btn_funct").css("color","#0056b3") + $("#btn_funct").css("color","#0056b3") this.$router.push({name: "Functions"}).catch(err => {}) }else if (id == "btn_sett"){ - // $("#btn_sett").css("color","#0056b3") + $("#btn_sett").css("color","#0056b3") this.$router.push({name: "Settings"}).catch(err => {}) }else if (id == "btn_logout"){ - // $("#btn_logout").css("color","#0056b3") + $("#btn_logout").css("color","#0056b3") this.$router.push({name: "Login"}) + }else if (id == "btn_juno"){ + $("#btn_juno").css("color","#0056b3") + this.$router.push({name: "Juno"}).catch(err => {}) }else if (id == "btn_storage"){ $("#name_buckets").slideToggle("slow"); this.drawer2 = (!this.drawer2) @@ -199,9 +211,10 @@ export default { this.expand_sto = "expand_more" } }else if(id == "btn_info"){ + $("#btn_info").css("color","#0056b3") this.$router.push({name: "Info"}).catch(err => {}) } - }, + }, cleanfield(){ this.menucreate = false; @@ -302,7 +315,7 @@ export default { } -#btn_storage,#btn_dash,#btn_funct,#btn_sett,#btn_logout, #btn_info { +#btn_storage,#btn_dash,#btn_funct,#btn_sett,#btn_logout, #btn_info, #btn_juno { text-transform:capitalize; font-size:13px; padding-left:30px; @@ -311,11 +324,11 @@ export default { font-weight:400; } -#btn_storage:hover,#btn_dash:hover,#btn_funct:hover,#btn_sett:hover,#btn_logout:hover , #btn_info:hover{ +#btn_storage:hover,#btn_dash:hover,#btn_funct:hover,#btn_sett:hover,#btn_logout:hover , #btn_info:hover, #btn_juno:hover{ color: #0056b3; } -#btn_dash .v-btn__content, #btn_funct .v-btn__content, #btn_sett .v-btn__content,#btn_logout .v-btn__content, #btn_info .v-btn__content{ +#btn_dash .v-btn__content, #btn_funct .v-btn__content, #btn_sett .v-btn__content,#btn_logout .v-btn__content, #btn_info .v-btn__content, #btn_juno .v-btn__content{ justify-content: left!important; } diff --git a/src/components/AppToolbar.vue b/src/components/AppToolbar.vue index 5afb809..784a066 100644 --- a/src/components/AppToolbar.vue +++ b/src/components/AppToolbar.vue @@ -10,6 +10,7 @@
{{showinfo}}
+ fullscreen @@ -27,41 +28,11 @@ export default { NotificationList }, data: () => ({ - showinfo: (localStorage.getItem("user")?localStorage.getItem("user"): JSON.parse(localStorage.getItem("session")).user.info.name )+" - " + localStorage.getItem("api") , + showinfo: (localStorage.getItem("user")?localStorage.getItem("user"): JSON.parse(localStorage.getItem("session")).user.info.name )+" - " , + api: localStorage.getItem("api"), mini: false, - items: [ - { - icon: 'account_circle', - href: '#', - title: 'Profile', - click: (e) => { - console.log(e) - } - }, - { - icon: 'settings', - href: '#', - title: 'Settings', - click: (e) => { - console.log(e) - } - }, - { - icon: 'fullscreen_exit', - href: '#', - title: 'Logout', - click: (e) => { - window.getApp.$emit('APP_LOGOUT') - } - } - ], notificationCounter: 3 }), - computed: { - notificationShow () { - return (this.notificationCounter > 0) - } - }, methods: { handleDrawerToggle () { window.getApp.$emit('APP_DRAWER_TOGGLED') @@ -72,6 +43,9 @@ export default { }, handleFullScreen () { Util.toggleFullScreen() + }, + copy() { + navigator.clipboard.writeText(this.api); } } } @@ -92,7 +66,8 @@ export default { font-family: Roboto; display: inline; font-size: 15px; - vertical-align: middle; } - +.identifieruser button{ + size: 500; +} \ No newline at end of file diff --git a/src/env.js b/src/env.js index 529f255..79cc9d8 100644 --- a/src/env.js +++ b/src/env.js @@ -6,12 +6,17 @@ module.exports = { "url_user_info": "$EGI_CHECKIN_ISSUER/protocol/openid-connect/userinfo", "token_endpoint": "$EGI_CHECKIN_ISSUER/protocol/openid-connect/token", "api" : "", - "deploy_container" : "false", + "deploy_container" : "true", "minio_local_endpoint" :"localhost", "minio_local_port": "30300", "minio_local_ssl": false , "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"], + "imagine_servers": ["https://inference.cloud.imagine-ai.eu","https://inference-walton.cloud.imagine-ai.eu"], + "juno":{ + repo: "https://raw.githubusercontent.com/grycap/oscar-juno/main/", + service: "juno.yaml", + script:"script.sh", + } } diff --git a/src/router/paths.js b/src/router/paths.js index 0cf6a17..6b08194 100644 --- a/src/router/paths.js +++ b/src/router/paths.js @@ -164,6 +164,18 @@ export default [ `@/views/Invoke.vue` ) }, + { + path: '/juno', + meta: { + public: false + }, + name: 'Juno', + component: () => import( + /* webpackChunkName: "routes" */ + /* webpackMode: "lazy" */ + `@/views/Juno.vue` + ) + }, { path: '/settings', meta: { diff --git a/src/views/Info.vue b/src/views/Info.vue index 637fefc..08aa446 100644 --- a/src/views/Info.vue +++ b/src/views/Info.vue @@ -88,9 +88,9 @@ - + - + OSCAR services @@ -99,25 +99,10 @@ - + - - - - - Buckets - - -
    -
  • - {{ bucket.title }} -
    • -
- - - - + @@ -252,7 +237,7 @@ export default { display: flex; } .panel_info{ - margin-top: 5%; + margin-top: 0%; } .infoservice{ border: 1px; diff --git a/src/views/InfoService.vue b/src/views/InfoService.vue index 170a259..16a6e29 100644 --- a/src/views/InfoService.vue +++ b/src/views/InfoService.vue @@ -4,7 +4,7 @@ Service {{service.name}} Info - Name: {{service.name}} + Name: {{service.name}} Image: {{service.image}} Token: @@ -43,7 +43,7 @@ + Allowed users: +

Public

+ Inputs: @@ -107,6 +110,45 @@ + + + Mount: + + +
+
+ Path +
+
+ Storage Provider +
+
+ Prefix +
+
+ Suffix +
+
+
+
+ {{service.mount.path}} +
+
+ {{service.mount.storage_provider}} +
+
+
+ {{service.mount}} +
+
+
+
+ {{service.mount}} +
+
+
+ + Outputs: diff --git a/src/views/Juno.vue b/src/views/Juno.vue new file mode 100644 index 0000000..3eb1836 --- /dev/null +++ b/src/views/Juno.vue @@ -0,0 +1,204 @@ + + + + \ No newline at end of file