Skip to content

Commit

Permalink
Merge branch 'develop-2'
Browse files Browse the repository at this point in the history
  • Loading branch information
dominikbruechner committed Jun 20, 2022
2 parents 961eb17 + 5512cbe commit f9445a3
Show file tree
Hide file tree
Showing 16 changed files with 66 additions and 18 deletions.
4 changes: 2 additions & 2 deletions components/Cards/CommunityCard.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-card class="d-flex flex-column">
<div class="pa-5">
<nuxt-link :to="to">
<nuxt-link :to="to" :aria-label="name">
<v-img :src="logo" contain max-height="100" height="100" />
</nuxt-link>
</div>
Expand Down Expand Up @@ -44,7 +44,7 @@
<v-spacer />
<v-menu v-if="links.length > 0" bottom left>
<template #activator="{ on, attrs }">
<v-btn icon v-bind="attrs" v-on="on">
<v-btn icon v-bind="attrs" aria-label="Expand sub menu" v-on="on">
<v-icon>mdi-dots-vertical</v-icon>
</v-btn>
</template>
Expand Down
2 changes: 1 addition & 1 deletion components/Cards/FeatureCard.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<v-avatar color="primary" size="62" class="mb-10">
<v-avatar color="primary" size="62" class="mb-5 mb-md-10">
<slot name="icon" />
</v-avatar>
<h2 class="text-h6 mb-2"><slot name="title" /></h2>
Expand Down
4 changes: 2 additions & 2 deletions components/Cards/__snapshots__/CommunityCard.spec.js.snap

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion components/Cards/__snapshots__/FeatureCard.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`FeatureCard should match snapshot 1`] = `
"<div>
<v-avatar-stub color=\\"primary\\" size=\\"62\\" class=\\"mb-10\\"></v-avatar-stub>
<v-avatar-stub color=\\"primary\\" size=\\"62\\" class=\\"mb-5 mb-md-10\\"></v-avatar-stub>
<h2 class=\\"text-h6 mb-2\\"></h2>
<p class=\\"body-1\\"></p>
<v-btn-stub color=\\"primary\\" outlined=\\"true\\" tag=\\"button\\" activeclass=\\"\\" to=\\"someroute\\" type=\\"button\\" class=\\"mt-2\\"> Explore </v-btn-stub>
Expand Down
8 changes: 7 additions & 1 deletion components/Communities/CommunityEventSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
<span class="text--clickable primary--text" v-bind="attrs" v-on="on"
>Event - {{ currentEvent.name }}</span
>
<v-btn icon color="primary" v-bind="attrs" v-on="on">
<v-btn
icon
color="primary"
v-bind="attrs"
aria-label="Expand Community Selector"
v-on="on"
>
<v-icon>mdi-chevron-down</v-icon>
</v-btn>
</template>
Expand Down
7 changes: 6 additions & 1 deletion components/Communities/CommunityInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
<div>
<h1 class="text-h4 d-flex text--clickable" @click="expand = !expand">
{{ community.acronym }}
<v-btn class="ml-2" color="primary" icon>
<v-btn
class="ml-2"
color="primary"
icon
aria-label="Expand Community Information"
>
<v-icon>{{
expand
? 'mdi-chevron-up-circle-outline'
Expand Down
3 changes: 2 additions & 1 deletion components/Header/HeaderMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@
v-if="$vuetify.breakpoint.smAndDown"
icon
data-testid="btn-toggle-menu"
aria-label="Toggle Menu"
@click.stop="handleToggleOpen"
>
<v-icon>mdi-menu</v-icon>
</v-btn>
<nuxt-link to="/">
<nuxt-link to="/" aria-label="Home">
<v-img
class="mx-2"
:src="opebLogo"
Expand Down
7 changes: 6 additions & 1 deletion components/Landing/LogoSlider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@
:key="`logoslider_` + index"
disabled
>
<a :href="image.href" target="_blank" class="d-flex">
<a
:href="image.href"
target="_blank"
class="d-flex"
:aria-label="image.title"
>
<v-img
contain
class="ma-5 pa-2"
Expand Down
8 changes: 4 additions & 4 deletions components/Landing/__snapshots__/FeatureTeaser.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ exports[`FeatureTeaser should match snapshot 1`] = `
<div class=\\"row\\">
<div align=\\"center\\" class=\\"col-md-3 col-12\\">
<div>
<div class=\\"v-avatar mb-10 primary\\" style=\\"height: 62px; min-width: 62px; width: 62px;\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate material-icons theme--dark\\">$vuetify.icons.values.benchmark</i></div>
<div class=\\"v-avatar mb-5 mb-md-10 primary\\" style=\\"height: 62px; min-width: 62px; width: 62px;\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate material-icons theme--dark\\">$vuetify.icons.values.benchmark</i></div>
<h2 class=\\"text-h6 mb-2\\"> Benchmarks </h2>
<p class=\\"body-1\\">Explore existing community-driven scientific benchmark results for
Life Sciences software</p> <a class=\\"mt-2 v-btn v-btn--outlined v-btn--router theme--light v-size--default primary--text\\"><span class=\\"v-btn__content\\"> Explore </span></a>
</div>
</div>
<div align=\\"center\\" class=\\"mt-10 mt-md-0 col-md-3 col-12\\">
<div>
<div class=\\"v-avatar mb-10 primary\\" style=\\"height: 62px; min-width: 62px; width: 62px;\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate mdi mdi-clipboard-list-outline theme--dark\\" style=\\"font-size: 36px;\\"></i></div>
<div class=\\"v-avatar mb-5 mb-md-10 primary\\" style=\\"height: 62px; min-width: 62px; width: 62px;\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate mdi mdi-clipboard-list-outline theme--dark\\" style=\\"font-size: 36px;\\"></i></div>
<h2 class=\\"text-h6 mb-2\\"> Tools &amp; Metrics </h2>
<p class=\\"body-1\\">Individually browse technical metrics for popular research software
in Life Sciences</p> <a class=\\"mt-2 v-btn v-btn--outlined v-btn--router theme--light v-size--default primary--text\\"><span class=\\"v-btn__content\\"> Explore </span></a>
</div>
</div>
<div align=\\"center\\" class=\\"mt-10 mt-md-0 col-md-3 col-12\\">
<div>
<div class=\\"v-avatar mb-10 primary\\" style=\\"height: 62px; min-width: 62px; width: 62px;\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate material-icons theme--dark\\">$vuetify.icons.values.observatory</i></div>
<div class=\\"v-avatar mb-5 mb-md-10 primary\\" style=\\"height: 62px; min-width: 62px; width: 62px;\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate material-icons theme--dark\\">$vuetify.icons.values.observatory</i></div>
<h2 class=\\"text-h6 mb-2\\"> Tools Observatory </h2>
<p class=\\"body-1\\">
Quantitative monitoring of the technical quality of software in Life
Expand All @@ -31,7 +31,7 @@ exports[`FeatureTeaser should match snapshot 1`] = `
</div>
<div align=\\"center\\" class=\\"mt-10 mt-md-0 col-md-3 col-12\\">
<div>
<div class=\\"v-avatar mb-10 primary\\" style=\\"height: 62px; min-width: 62px; width: 62px;\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate material-icons theme--dark\\">$vuetify.icons.values.projects</i></div>
<div class=\\"v-avatar mb-5 mb-md-10 primary\\" style=\\"height: 62px; min-width: 62px; width: 62px;\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate material-icons theme--dark\\">$vuetify.icons.values.projects</i></div>
<h2 class=\\"text-h6 mb-2\\"> Project Spaces </h2>
<p class=\\"body-1\\">
Community spaces for projects to collaborate on software in life
Expand Down
7 changes: 6 additions & 1 deletion components/Molecules/InfoSlider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
<v-row>
<v-col class="d-flex" cols="auto">
<slot name="header" icon />
<v-btn class="ml-2" color="primary" icon>
<v-btn
class="ml-2"
color="primary"
icon
aria-label="Expand Information"
>
<v-icon>{{
expand
? 'mdi-chevron-up-circle-outline'
Expand Down
4 changes: 3 additions & 1 deletion components/TheFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
icon
dark
class="button"
href="mailto:[email protected] "
href="mailto:[email protected]"
aria-label="Mail link for OpenEBench Support"
>
<v-icon>mdi-email-outline</v-icon>
</v-btn>
Expand All @@ -86,6 +87,7 @@
class="button"
href="https://twitter.com/openebench"
target="_blank"
aria-label="Link to Twitter Profile of OpenEBench"
>
<v-icon>mdi-twitter</v-icon>
</v-btn>
Expand Down
2 changes: 1 addition & 1 deletion components/__snapshots__/TheFooter.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ exports[`TheFooter should match snapshot 1`] = `
</div>
</div>
<div class=\\"pa-4 col-md-3 col-12\\">
<div><a href=\\"mailto:[email protected] \\" class=\\"button v-btn v-btn--icon v-btn--round v-btn--text theme--dark v-size--default\\"><span class=\\"v-btn__content\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate mdi mdi-email-outline theme--dark\\"></i></span></a> <a href=\\"https://twitter.com/openebench\\" target=\\"_blank\\" class=\\"button v-btn v-btn--icon v-btn--round v-btn--text theme--dark v-size--default\\"><span class=\\"v-btn__content\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate mdi mdi-twitter theme--dark\\"></i></span></a></div>
<div><a href=\\"mailto:[email protected]\\" class=\\"button v-btn v-btn--icon v-btn--round v-btn--text theme--dark v-size--default\\" aria-label=\\"Mail link for OpenEBench Support\\"><span class=\\"v-btn__content\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate mdi mdi-email-outline theme--dark\\"></i></span></a> <a href=\\"https://twitter.com/openebench\\" target=\\"_blank\\" class=\\"button v-btn v-btn--icon v-btn--round v-btn--text theme--dark v-size--default\\" aria-label=\\"Link to Twitter Profile of OpenEBench\\"><span class=\\"v-btn__content\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate mdi mdi-twitter theme--dark\\"></i></span></a></div>
<div class=\\"row mt-5 no-gutters\\">
<div align=\\"left\\" class=\\"col col-9\\">
<p class=\\"text-sm-body-2\\">
Expand Down
13 changes: 12 additions & 1 deletion nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ export default {
meta: [
{ charset: 'utf-8' },
{ name: 'viewport', content: 'width=device-width, initial-scale=1' },
{ hid: 'description', name: 'description', content: '' },
{
hid: 'description',
name: 'description',
content:
'OpenEBench is the ELIXIR gateway to benchmarking communities, software monitoring, and quality metrics for life sciences tools and workflows.',
},
{ name: 'format-detection', content: 'telephone=no' },
],
link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }],
Expand Down Expand Up @@ -65,8 +70,14 @@ export default {
modules: [
// https://go.nuxtjs.dev/axios
'@nuxtjs/axios',
'@nuxtjs/robots',
],

robots: {
UserAgent: '*',
Allow: '/',
},

// Axios module configuration: https://go.nuxtjs.dev/config-axios
axios: {
// Workaround to avoid enforcing hard-coded localhost:3000: https://github.com/nuxt-community/axios-module/issues/308
Expand Down
11 changes: 11 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@inb/oeb-chart-scatter": "^1.1.4",
"@inb/oeb-classification-table": "^1.2.3",
"@nuxtjs/axios": "^5.13.6",
"@nuxtjs/robots": "^2.5.0",
"core-js": "^3.22.6",
"dompurify": "^2.3.8",
"gsap": "^3.10.4",
Expand Down
1 change: 1 addition & 0 deletions pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<a
class="scroll-down mt-5"
aria-label="Scroll to feature overview"
href="#"
@click="$vuetify.goTo('#key-features')"
/>
<key-features id="key-features" class="landing-mt mb-16" />
Expand Down

0 comments on commit f9445a3

Please sign in to comment.