Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 5d38793
Author: Dominik Brüchner <[email protected]>
Date:   Tue May 31 10:34:13 2022 +0200

    Update CommunityCard.spec.js.snap

commit 457d0e8
Author: Dominik Brüchner <[email protected]>
Date:   Tue May 31 10:32:51 2022 +0200

    Update docker-image-dev.yml

commit 04dc1df
Author: Dominik Brüchner <[email protected]>
Date:   Tue May 31 10:30:30 2022 +0200

    some more general fixes

commit 2df4824
Author: Dominik Brüchner <[email protected]>
Date:   Mon May 30 16:07:27 2022 +0200

    Update embedIframeFullWidth.vue

commit 721e3af
Author: Dominik Brüchner <[email protected]>
Date:   Mon May 30 16:05:18 2022 +0200

    adding footer everywhere, improving tools scroll situation

commit a52df0c
Merge: 151cbe9 8cf16d3
Author: Dominik Brüchner <[email protected]>
Date:   Mon May 30 11:53:23 2022 +0200

    Merge branch 'develop-2' of https://github.com/inab/openEBench-nuxt into develop-2

commit 151cbe9
Author: Dominik Brüchner <[email protected]>
Date:   Mon May 30 11:53:19 2022 +0200

    some refactoring, adding links to community info

commit 8cf16d3
Merge: 380ce9c 03f6e29
Author: Dominik Brüchner <[email protected]>
Date:   Fri May 27 14:25:34 2022 +0200

    Merge pull request #193 from inab/dependabot/npm_and_yarn/develop-2/dompurify-2.3.8

    fix(deps): bump dompurify from 2.3.6 to 2.3.8

commit 380ce9c
Merge: 8570ad4 0a42589
Author: Dominik Brüchner <[email protected]>
Date:   Fri May 27 14:25:21 2022 +0200

    Merge pull request #196 from inab/dependabot/npm_and_yarn/develop-2/eslint-plugin-storybook-0.5.12

    chore(deps-dev): bump eslint-plugin-storybook from 0.5.11 to 0.5.12

commit 8570ad4
Merge: 95d30ec 8fee5cd
Author: Dominik Brüchner <[email protected]>
Date:   Fri May 27 14:25:09 2022 +0200

    Merge pull request #205 from inab/dependabot/npm_and_yarn/develop-2/stylelint-14.8.5

    chore(deps-dev): bump stylelint from 14.7.1 to 14.8.5

commit 95d30ec
Merge: e06ee6d 2188150
Author: Dominik Brüchner <[email protected]>
Date:   Fri May 27 14:24:48 2022 +0200

    Merge pull request #201 from inab/dependabot/npm_and_yarn/develop-2/eslint-8.16.0

    chore(deps-dev): bump eslint from 8.15.0 to 8.16.0

commit 2d7a218
Author: Dominik Brüchner <[email protected]>
Date:   Fri May 27 13:56:55 2022 +0200

    fixed landing page number calculation

commit dcb565d
Author: Dominik Brüchner <[email protected]>
Date:   Thu May 26 12:23:59 2022 +0200

    Update docker-image-dev.yml

commit 8fee5cd
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu May 26 01:38:26 2022 +0000

    chore(deps-dev): bump stylelint from 14.7.1 to 14.8.5

    Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.7.1 to 14.8.5.
    - [Release notes](https://github.com/stylelint/stylelint/releases)
    - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md)
    - [Commits](stylelint/stylelint@14.7.1...14.8.5)

    ---
    updated-dependencies:
    - dependency-name: stylelint
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit e06ee6d
Author: Dominik Brüchner <[email protected]>
Date:   Wed May 25 16:30:19 2022 +0200

    adding About page

commit 700206a
Author: Dominik Brüchner <[email protected]>
Date:   Tue May 24 17:11:49 2022 +0200

    adding observatory api for tools count

commit 2188150
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 23 15:33:38 2022 +0000

    chore(deps-dev): bump eslint from 8.15.0 to 8.16.0

    Bumps [eslint](https://github.com/eslint/eslint) from 8.15.0 to 8.16.0.
    - [Release notes](https://github.com/eslint/eslint/releases)
    - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
    - [Commits](eslint/eslint@v8.15.0...v8.16.0)

    ---
    updated-dependencies:
    - dependency-name: eslint
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 0a42589
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 23 15:33:26 2022 +0000

    chore(deps-dev): bump eslint-plugin-storybook from 0.5.11 to 0.5.12

    Bumps [eslint-plugin-storybook](https://github.com/storybookjs/eslint-plugin-storybook) from 0.5.11 to 0.5.12.
    - [Release notes](https://github.com/storybookjs/eslint-plugin-storybook/releases)
    - [Changelog](https://github.com/storybookjs/eslint-plugin-storybook/blob/main/CHANGELOG.md)
    - [Commits](storybookjs/eslint-plugin-storybook@v0.5.11...v0.5.12)

    ---
    updated-dependencies:
    - dependency-name: eslint-plugin-storybook
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 03f6e29
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 23 15:33:08 2022 +0000

    fix(deps): bump dompurify from 2.3.6 to 2.3.8

    Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.3.6 to 2.3.8.
    - [Release notes](https://github.com/cure53/DOMPurify/releases)
    - [Commits](cure53/DOMPurify@2.3.6...2.3.8)

    ---
    updated-dependencies:
    - dependency-name: dompurify
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 6970d8f
Merge: 74fedb6 fc616fd
Author: Dominik Brüchner <[email protected]>
Date:   Mon May 23 17:31:38 2022 +0200

    Merge pull request #199 from inab/dependabot/npm_and_yarn/develop-2/core-js-3.22.6

    fix(deps): bump core-js from 3.21.1 to 3.22.6

commit fc616fd
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 23 01:24:38 2022 +0000

    fix(deps): bump core-js from 3.21.1 to 3.22.6

    Bumps [core-js](https://github.com/zloirock/core-js) from 3.21.1 to 3.22.6.
    - [Release notes](https://github.com/zloirock/core-js/releases)
    - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
    - [Commits](zloirock/core-js@v3.21.1...v3.22.6)

    ---
    updated-dependencies:
    - dependency-name: core-js
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 74fedb6
Author: Dominik Brüchner <[email protected]>
Date:   Fri May 20 14:05:08 2022 +0200

    First badge of fixes after review

commit 7f6d7c7
Merge: 80d7fc4 628782b
Author: Dominik Brüchner <[email protected]>
Date:   Thu May 19 12:27:08 2022 +0200

    Merge pull request #178 from inab/dependabot/npm_and_yarn/develop-2/eslint-8.15.0

    chore(deps-dev): bump eslint from 8.13.0 to 8.15.0

commit 80d7fc4
Merge: f25a823 6c99101
Author: Dominik Brüchner <[email protected]>
Date:   Thu May 19 12:26:52 2022 +0200

    Merge pull request #155 from inab/dependabot/npm_and_yarn/develop-2/nuxtjs/eslint-module-3.1.0

    chore(deps-dev): bump @nuxtjs/eslint-module from 3.0.2 to 3.1.0

commit 6c99101
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu May 19 10:26:22 2022 +0000

    chore(deps-dev): bump @nuxtjs/eslint-module from 3.0.2 to 3.1.0

    Bumps [@nuxtjs/eslint-module](https://github.com/nuxt-community/eslint-module) from 3.0.2 to 3.1.0.
    - [Release notes](https://github.com/nuxt-community/eslint-module/releases)
    - [Changelog](https://github.com/nuxt-community/eslint-module/blob/main/CHANGELOG.md)
    - [Commits](nuxt-modules/eslint@v3.0.2...v3.1.0)

    ---
    updated-dependencies:
    - dependency-name: "@nuxtjs/eslint-module"
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 628782b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu May 19 10:26:07 2022 +0000

    chore(deps-dev): bump eslint from 8.13.0 to 8.15.0

    Bumps [eslint](https://github.com/eslint/eslint) from 8.13.0 to 8.15.0.
    - [Release notes](https://github.com/eslint/eslint/releases)
    - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
    - [Commits](eslint/eslint@v8.13.0...v8.15.0)

    ---
    updated-dependencies:
    - dependency-name: eslint
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit f25a823
Merge: e5e4938 c354852
Author: Dominik Brüchner <[email protected]>
Date:   Thu May 19 12:24:44 2022 +0200

    Merge pull request #181 from inab/dependabot/npm_and_yarn/develop-2/storybook/addon-links-6.5.0

    chore(deps-dev): bump @storybook/addon-links from 6.4.20 to 6.5.0

commit e5e4938
Merge: 709e01a f1eaec0
Author: Dominik Brüchner <[email protected]>
Date:   Thu May 19 12:24:28 2022 +0200

    Merge pull request #191 from inab/dependabot/npm_and_yarn/develop-2/marked-4.0.16

    fix(deps): bump marked from 4.0.14 to 4.0.16

commit 709e01a
Merge: 114eb7c 905e001
Author: Dominik Brüchner <[email protected]>
Date:   Thu May 19 12:24:06 2022 +0200

    Merge pull request #190 from inab/dependabot/npm_and_yarn/develop-2/vuetify-2.6.6

    fix(deps): bump vuetify from 2.6.4 to 2.6.6

commit 114eb7c
Merge: 75bc367 c2fda16
Author: Dominik Brüchner <[email protected]>
Date:   Thu May 19 12:23:49 2022 +0200

    Merge pull request #189 from inab/dependabot/npm_and_yarn/develop-2/babel-loader-8.2.5

    chore(deps-dev): bump babel-loader from 8.2.4 to 8.2.5

commit f1eaec0
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu May 19 10:03:45 2022 +0000

    fix(deps): bump marked from 4.0.14 to 4.0.16

    Bumps [marked](https://github.com/markedjs/marked) from 4.0.14 to 4.0.16.
    - [Release notes](https://github.com/markedjs/marked/releases)
    - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
    - [Commits](markedjs/marked@v4.0.14...v4.0.16)

    ---
    updated-dependencies:
    - dependency-name: marked
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit c354852
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu May 19 10:03:24 2022 +0000

    chore(deps-dev): bump @storybook/addon-links from 6.4.20 to 6.5.0

    Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 6.4.20 to 6.5.0.
    - [Release notes](https://github.com/storybookjs/storybook/releases)
    - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
    - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.0/addons/links)

    ---
    updated-dependencies:
    - dependency-name: "@storybook/addon-links"
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit c2fda16
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu May 19 10:03:13 2022 +0000

    chore(deps-dev): bump babel-loader from 8.2.4 to 8.2.5

    Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.2.4 to 8.2.5.
    - [Release notes](https://github.com/babel/babel-loader/releases)
    - [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
    - [Commits](babel/babel-loader@v8.2.4...v8.2.5)

    ---
    updated-dependencies:
    - dependency-name: babel-loader
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 905e001
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu May 19 10:03:03 2022 +0000

    fix(deps): bump vuetify from 2.6.4 to 2.6.6

    Bumps [vuetify](https://github.com/vuetifyjs/vuetify/tree/HEAD/packages/vuetify) from 2.6.4 to 2.6.6.
    - [Release notes](https://github.com/vuetifyjs/vuetify/releases)
    - [Commits](https://github.com/vuetifyjs/vuetify/commits/v2.6.6/packages/vuetify)

    ---
    updated-dependencies:
    - dependency-name: vuetify
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 75bc367
Merge: e91ebc7 efba7ea
Author: Dominik Brüchner <[email protected]>
Date:   Thu May 19 12:01:46 2022 +0200

    Merge pull request #184 from inab/dependabot/npm_and_yarn/develop-2/storybook/addon-essentials-6.5.0

    chore(deps-dev): bump @storybook/addon-essentials from 6.4.20 to 6.5.0

commit efba7ea
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu May 19 09:44:58 2022 +0000

    chore(deps-dev): bump @storybook/addon-essentials from 6.4.20 to 6.5.0

    Bumps [@storybook/addon-essentials](https://github.com/storybookjs/storybook/tree/HEAD/addons/essentials) from 6.4.20 to 6.5.0.
    - [Release notes](https://github.com/storybookjs/storybook/releases)
    - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
    - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.0/addons/essentials)

    ---
    updated-dependencies:
    - dependency-name: "@storybook/addon-essentials"
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit e91ebc7
Merge: 242581a 1c72de3
Author: Dominik Brüchner <[email protected]>
Date:   Thu May 19 11:42:49 2022 +0200

    Merge pull request #186 from inab/dependabot/npm_and_yarn/develop-2/storybook/vue-6.5.0

    chore(deps-dev): bump @storybook/vue from 6.4.20 to 6.5.0

commit 1c72de3
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu May 19 00:53:59 2022 +0000

    chore(deps-dev): bump @storybook/vue from 6.4.20 to 6.5.0

    Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 6.4.20 to 6.5.0.
    - [Release notes](https://github.com/storybookjs/storybook/releases)
    - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
    - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.0/app/vue)

    ---
    updated-dependencies:
    - dependency-name: "@storybook/vue"
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 242581a
Author: Dominik Brüchner <[email protected]>
Date:   Tue May 17 11:57:58 2022 +0200

    update chart scatter package

commit a8f13ce
Author: Dominik Brüchner <[email protected]>
Date:   Fri May 6 12:19:45 2022 +0200

    some layout/css fixes

commit e174860
Author: Dominik Brüchner <[email protected]>
Date:   Fri May 6 12:19:28 2022 +0200

    Update OEBC009.md

commit 9e2e4f2
Author: Dominik Brüchner <[email protected]>
Date:   Fri Apr 29 10:46:56 2022 +0200

    Add project tile to landing page (#33)

    * Revert "removed project tile for now"

    This reverts commit 25098fe.

    * specs and link

    * Update HeroNumbers.vue

    * Update HeroNumbers.spec.js

    * Added Text Pluralize to HeroNumbers

    * Added Key Feature Section to Landing Page

    * fixing tests

    * Update LandingParts.stories.js

    * Update index.vue

    * permedcoe pages

    * fixing tests

    * package update postcss-html

    * replacing marked with nuxt/content

    * Revert "replacing marked with nuxt/content"

    This reverts commit 7d52288.

    * Update index.vue

    * added permedcoe markdown draft

    * some markup styling

    * added image urls and styling

    * some more markdown styling

    * Update MarkedWrapper.vue

    * moving the markdown file

    * img styling wrapper

    * Update .prettierrc.js

    * remove static project data, filter based on community metadata

    * make markdown file load for projects semi-dynamic

    * some refactoring

    * added unit tests

    * more unit tests and some fixes for the markdown wrapper

    * adding stories to storybook

    * Added community empty states

    * Update CommunityComponents.stories.js

    * Update OEBC009.md

    * Update OEBC009.md

commit 7814a1e
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Apr 28 10:51:04 2022 +0200

    chore(deps-dev): bump eslint-plugin-storybook from 0.5.8 to 0.5.11 (#169)

    Bumps [eslint-plugin-storybook](https://github.com/storybookjs/eslint-plugin-storybook) from 0.5.8 to 0.5.11.
    - [Release notes](https://github.com/storybookjs/eslint-plugin-storybook/releases)
    - [Changelog](https://github.com/storybookjs/eslint-plugin-storybook/blob/main/CHANGELOG.md)
    - [Commits](storybookjs/eslint-plugin-storybook@v0.5.8...v0.5.11)

    ---
    updated-dependencies:
    - dependency-name: eslint-plugin-storybook
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit edfe78c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Apr 28 10:50:51 2022 +0200

    chore(deps-dev): bump lint-staged from 12.3.7 to 12.4.1 (#171)

    Bumps [lint-staged](https://github.com/okonet/lint-staged) from 12.3.7 to 12.4.1.
    - [Release notes](https://github.com/okonet/lint-staged/releases)
    - [Commits](lint-staged/lint-staged@v12.3.7...v12.4.1)

    ---
    updated-dependencies:
    - dependency-name: lint-staged
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 5380d09
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Apr 26 17:03:16 2022 +0200

    fix(deps): bump gsap from 3.10.2 to 3.10.4 (#168)

    Bumps [gsap](https://github.com/greensock/GSAP) from 3.10.2 to 3.10.4.
    - [Release notes](https://github.com/greensock/GSAP/releases)
    - [Commits](greensock/GSAP@3.10.2...3.10.4)

    ---
    updated-dependencies:
    - dependency-name: gsap
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit ca8dc1d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Apr 26 17:03:01 2022 +0200

    chore(deps-dev): bump stylelint from 14.6.1 to 14.7.1 (#166)

    Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.6.1 to 14.7.1.
    - [Release notes](https://github.com/stylelint/stylelint/releases)
    - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md)
    - [Commits](stylelint/stylelint@14.6.1...14.7.1)

    ---
    updated-dependencies:
    - dependency-name: stylelint
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit f7621b7
Author: Dominik Brüchner <[email protected]>
Date:   Wed Apr 20 15:06:20 2022 +0200

    refactor graphql query (#167)
  • Loading branch information
@dominikbruechner
dominikbruechner committed May 31, 2022
1 parent b1901ca commit 08fb666
Show file tree
Hide file tree
Showing 43 changed files with 4,015 additions and 5,147 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image-dev.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docker Image CI develop
on:
push:
branches:
- 'develop'
- 'master'
tags:
- 'v[0-9].[0-9]+.[0-9]+'

Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.develop
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ ARG OBSERVATORY_URI=https://observatory.openebench.bsc.es
ARG REST_API_URL=https://dev-openebench.bsc.es/monitor/rest/
ARG SCIENTIFIC_SERVICE_URL=https://dev-openebench.bsc.es/api/scientific
ARG BENCH_EVENT_API_URL=https://dev-openebench.bsc.es/rest/bench_event_api
ARG OBSERVATORY_API_URL=https://observatory.openebench.bsc.es/api/stats
ENV ENVIRONMENT $ENVIRONMENT
ENV OEB_LEGACY_ANGULAR_URI $OEB_LEGACY_ANGULAR_URI
ENV VRE_URI $VRE_URI
ENV OBSERVATORY_URI $OBSERVATORY_URI
ENV REST_API_URL $REST_API_URL
ENV SCIENTIFIC_SERVICE_URL $SCIENTIFIC_SERVICE_URL
ENV BENCH_EVENT_API_URL $BENCH_EVENT_API_URL
ENV OBSERVATORY_API_URL $OBSERVATORY_API_URL
COPY . .
RUN npm install
RUN npm run build
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.develop2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ ARG OBSERVATORY_URI=https://observatory.openebench.bsc.es
ARG REST_API_URL=https://dev-openebench.bsc.es/monitor/rest/
ARG SCIENTIFIC_SERVICE_URL=https://dev-openebench.bsc.es/api/scientific
ARG BENCH_EVENT_API_URL=https://dev-openebench.bsc.es/rest/bench_event_api
ARG OBSERVATORY_API_URL=https://observatory.openebench.bsc.es/api/stats
ENV ENVIRONMENT $ENVIRONMENT
ENV OEB_LEGACY_ANGULAR_URI $OEB_LEGACY_ANGULAR_URI
ENV VRE_URI $VRE_URI
ENV OBSERVATORY_URI $OBSERVATORY_URI
ENV REST_API_URL $REST_API_URL
ENV SCIENTIFIC_SERVICE_URL $SCIENTIFIC_SERVICE_URL
ENV BENCH_EVENT_API_URL $BENCH_EVENT_API_URL
ENV OBSERVATORY_API_URL $OBSERVATORY_API_URL
COPY . .
RUN npm install
RUN npm run build
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.production
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ ARG OBSERVATORY_URI=https://observatory.openebench.bsc.es
ARG REST_API_URL=https://openebench.bsc.es/monitor/rest/
ARG SCIENTIFIC_SERVICE_URL=https://openebench.bsc.es/api/scientific
ARG BENCH_EVENT_API_URL=https://openebench.bsc.es/rest/bench_event_api
ARG OBSERVATORY_API_URL=https://observatory.openebench.bsc.es/api/stats
ENV ENVIRONMENT $ENVIRONMENT
ENV OEB_LEGACY_ANGULAR_URI $OEB_LEGACY_ANGULAR_URI
ENV VRE_URI $VRE_URI
ENV OBSERVATORY_URI $OBSERVATORY_URI
ENV REST_API_URL $REST_API_URL
ENV SCIENTIFIC_SERVICE_URL $SCIENTIFIC_SERVICE_URL
ENV BENCH_EVENT_API_URL $BENCH_EVENT_API_URL
ENV OBSERVATORY_API_URL $OBSERVATORY_API_URL
COPY . .
RUN npm install
RUN npm run build
Expand Down
2 changes: 1 addition & 1 deletion components/Cards/CommunityCard.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{{ acronym }}
</v-card-title>
<v-card-subtitle class="text-left">
<span class="text--muted">
<span class="text--primary">
{{ name }}
</span>
</v-card-subtitle>
Expand Down
4 changes: 2 additions & 2 deletions components/Cards/__snapshots__/CommunityCard.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`CommunityCard should match snapshot for active community 1`] = `
<v-card-title-stub tag=\\"div\\" class=\\"justify-center text-truncate inline-flex\\">
TransBioNet_CNVs
</v-card-title-stub>
<v-card-subtitle-stub tag=\\"div\\" class=\\"text-left\\"><span class=\\"text--muted\\">
<v-card-subtitle-stub tag=\\"div\\" class=\\"text-left\\"><span class=\\"text--primary\\">
Translational Bioinformatics Network - CNVs Benchmarking Group
</span></v-card-subtitle-stub>
<v-card-text-stub tag=\\"div\\" align=\\"bottom\\" class=\\"mt-auto\\">
Expand Down Expand Up @@ -51,7 +51,7 @@ exports[`CommunityCard should match snapshot for incubating community 1`] = `
<v-card-title-stub tag=\\"div\\" class=\\"justify-center text-truncate inline-flex\\">
TransBioNet_CNVs
</v-card-title-stub>
<v-card-subtitle-stub tag=\\"div\\" class=\\"text-left\\"><span class=\\"text--muted\\">
<v-card-subtitle-stub tag=\\"div\\" class=\\"text-left\\"><span class=\\"text--primary\\">
Translational Bioinformatics Network - CNVs Benchmarking Group
</span></v-card-subtitle-stub>
<v-card-text-stub tag=\\"div\\" align=\\"bottom\\" class=\\"mt-auto\\">
Expand Down
2 changes: 1 addition & 1 deletion components/Communities/CommunityClassificationTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</p>
<v-alert class="mt-5" border="left" dense text color="info" type="info">
To filter the table results, please select single challenges below, the
table will automatically update.
table will update automatically.
</v-alert>
<v-data-table
:key="event._id + '_challenges'"
Expand Down
45 changes: 40 additions & 5 deletions components/Communities/CommunityInfo.vue
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="text--clickable" @click="expand = !expand">
<h1 class="text-h4 d-flex">
<div>
<h1 class="text-h4 d-flex text--clickable" @click="expand = !expand">
{{ community.acronym }}
<v-btn class="ml-2" color="primary" icon>
<v-icon>{{
Expand All @@ -10,13 +10,15 @@
}}</v-icon>
</v-btn>
</h1>
<h2 class="subtitle-1 mb-5">{{ community.name }}</h2>
<h2 class="subtitle-1 mb-5 text--clickable" @click="expand = !expand">
{{ community.name }}
</h2>
<v-expand-transition>
<v-row v-show="expand" align="center">
<v-col align="center" cols="2">
<v-img :src="community.logo" contain max-width="500" />
</v-col>
<v-col class="text-body-2 text--secondary" cols="10">
<v-col class="text-body-2 text--primary" cols="10">
<p>
{{ community.description }}
</p>
Expand All @@ -30,6 +32,32 @@
{{ keyword }};
</span>
</p>
<p v-if="communityReferences.length > 0">
References:
<a
v-for="(keyword, index) in communityReferences"
:key="index"
target="_blank"
class="font-weight-medium"
:href="keyword.href"
>
<v-icon x-small>mdi-open-in-new</v-icon>
{{ keyword.doi }};
</a>
</p>
<p v-if="linksFiltered.length > 0">
Links:
<a
v-for="(link, index) in linksFiltered"
:key="index"
target="_blank"
class="font-weight-medium"
:href="link.uri"
>
<v-icon x-small>mdi-open-in-new</v-icon>
{{ link.label }};
</a>
</p>
</v-col>
</v-row>
</v-expand-transition>
Expand All @@ -40,12 +68,19 @@
export default {
props: {
community: { type: Object, required: true },
communityReferences: { type: Array, required: false, default: () => [] },
},
data() {
return {
expand: true,
expand: false,
};
},
computed: {
linksFiltered() {
if (!this.community.links) return [];
return this.community.links.filter((link) => link.comment !== '@logo');
},
},
};
</script>

Expand Down
1 change: 1 addition & 0 deletions components/Communities/CommunityToolsTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
append
target="_blank"
>
<v-icon x-small>mdi-open-in-new</v-icon>
{{ item.name }}
</nuxt-link>
</template>
Expand Down
15 changes: 15 additions & 0 deletions components/Header/HeaderMenu.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,19 @@ describe('HeaderMenu', () => {
await btnToggleMenu.trigger('click');
expect(wrapper.vm.openNavMobile).toBe(false);
});

it('should show the cookie hint, and hide on button click', async () => {
const wrapper = factory();
let cookieBanner = wrapper.find('.Cookie');
expect(cookieBanner.exists()).toBe(true);

const cookieAcceptButton = wrapper.find('.Cookie__button');
expect(cookieAcceptButton.exists()).toBe(true);

cookieAcceptButton.trigger('click');
await wrapper.vm.$nextTick();

cookieBanner = wrapper.find('.Cookie');
expect(cookieBanner.exists()).toBe(false);
});
});
23 changes: 21 additions & 2 deletions components/Header/HeaderMenu.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
<v-list-item-title>{{ item.title }}</v-list-item-title>
<v-icon v-if="item.external" right small>mdi-open-in-new</v-icon>
</v-list-item>
<v-list-item :href="vreHref" target="_blank">
<v-list-item-title>Benchmark your Tool</v-list-item-title>
<v-icon right small>mdi-open-in-new</v-icon>
</v-list-item>
</v-list>
</v-navigation-drawer>
<v-app-bar fixed app>
Expand Down Expand Up @@ -76,11 +80,19 @@
<v-list-item-title>{{ item.title }}</v-list-item-title>
<v-icon v-if="item.external" right small>mdi-open-in-new</v-icon>
</v-list-item>
<v-list-item
v-if="$vuetify.breakpoint.mdAndDown"
:href="vreHref"
target="_blank"
>
<v-list-item-title>Benchmark your Tool</v-list-item-title>
<v-icon right small>mdi-open-in-new</v-icon>
</v-list-item>
</v-list>
</v-menu>
<v-spacer v-if="$vuetify.breakpoint.mdAndUp" />
<v-spacer v-if="$vuetify.breakpoint.lgAndUp" />
<v-btn
v-if="$vuetify.breakpoint.mdAndUp"
v-if="$vuetify.breakpoint.lgAndUp"
:href="vreHref"
target="_blank"
depressed
Expand All @@ -93,16 +105,23 @@
<v-icon left>mdi-login-variant</v-icon> Login
</v-btn> -->
</v-app-bar>
<cookie-law theme="dark-lime">
<div slot="message">
OpenEBench uses 🍪 to ensure you get the best experience on our website.
</div>
</cookie-law>
</div>
</template>

<script>
import CookieLaw from 'vue-cookie-law';
import menuEntries from './menuEntries';
import subMenuEntries from './subMenuEntries';
import opebLogo from '~/static/images/opeb_logo.gif';
export default {
name: 'HeaderMenu',
components: { CookieLaw },
props: {
vreHref: {
type: String,
Expand Down
12 changes: 8 additions & 4 deletions components/Header/menuEntries.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ const menuEntries = [
title: 'Benchmarking',
to: '/benchmarking',
},
{
title: 'Observatory',
to: '/observatory',
},
{
title: 'Projects',
to: '/projects',
},
{
title: 'Tools',
to: '/tool',
Expand All @@ -13,10 +21,6 @@ const menuEntries = [
title: 'Stats',
to: '/statistics',
},
{
title: 'Observatory',
to: '/observatory',
},
];

export default menuEntries;
8 changes: 4 additions & 4 deletions components/Landing/FeatureTeaser.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</template>
<template #title> Benchmarks </template>
<template #description
>Explore benchmarks of the scientific performance of bioinformatics
methods</template
>Explore existing community-driven scientific benchmark results for
Life Sciences software</template
>
</feature-card>
</v-col>
Expand All @@ -21,8 +21,8 @@
</template>
<template #title> Tools & Metrics </template>
<template #description
>Individually browse metrics of bioinformatics tools, server and
workflows</template
>Individually browse technical metrics for popular research software
in Life Sciences</template
>
</feature-card>
</v-col>
Expand Down
10 changes: 8 additions & 2 deletions components/Landing/HeroNumbers.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@
<span class="icon ion-ios-world-outline" />
<div class="text">
<h4 class="text-h3 font-weight-normal">
<animated-number :value="1" />
<animated-number :value="projectsCount" />
</h4>
<h6 class="title">{{ 'Project Space' | pluralize(1) }}</h6>
<h6 class="title">
{{ 'Project Space' | pluralize(projectsCount) }}
</h6>
</div>
</div>
</v-col>
Expand Down Expand Up @@ -79,6 +81,10 @@ export default {
type: Number,
required: true,
},
projectsCount: {
type: Number,
required: true,
},
},
data() {
return {
Expand Down
4 changes: 2 additions & 2 deletions components/Landing/KeyFeatures.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</div>
<div class="text-h5 d-flex align-center mt-10">
<v-icon color="accent" class="mr-3" x-large>mdi-check-circle</v-icon
>Contributing towards the best practices of research software
development
>Contributing towards the adoption of best practices for research
software development
</div>
</v-col>
</v-row>
Expand Down
2 changes: 1 addition & 1 deletion components/Landing/LogoSlider.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<v-img
contain
class="ma-5 pa-2"
max-height="150"
max-height="120"
max-width="200"
width="200"
:src="image.src"
Expand Down
8 changes: 4 additions & 4 deletions components/Landing/__snapshots__/FeatureTeaser.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ exports[`FeatureTeaser should match snapshot 1`] = `
<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>
<h2 class=\\"text-h6 mb-2\\"> Benchmarks </h2>
<p class=\\"body-1\\">Explore benchmarks of the scientific performance of bioinformatics
methods</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>
<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>
<h2 class=\\"text-h6 mb-2\\"> Tools &amp; Metrics </h2>
<p class=\\"body-1\\">Individually browse metrics of bioinformatics tools, server and
workflows</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>
<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\\">
Expand Down
6 changes: 4 additions & 2 deletions components/Landing/__snapshots__/HeroNumbers.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,11 @@ exports[`HeroNumbers should match snapshot 1`] = `
<div class=\\"counter-item\\"><span class=\\"icon ion-ios-world-outline\\"></span>
<div class=\\"text\\">
<h4 class=\\"text-h3 font-weight-normal\\">
<animated-number-stub value=\\"1\\"></animated-number-stub>
<animated-number-stub value=\\"0\\"></animated-number-stub>
</h4>
<h6 class=\\"title\\">Project Space</h6>
<h6 class=\\"title\\">
Project Space
</h6>
</div>
</div>
</v-col-stub>
Expand Down
4 changes: 2 additions & 2 deletions components/Landing/__snapshots__/KeyFeatures.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ exports[`KeyFeatures should match snapshot 1`] = `
</div>
<div class=\\"text-h5 d-flex align-center mt-10\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate mr-3 mdi mdi-check-circle theme--light accent--text\\" style=\\"font-size: 40px;\\"></i>Monitoring of software quality in life sciences
</div>
<div class=\\"text-h5 d-flex align-center mt-10\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate mr-3 mdi mdi-check-circle theme--light accent--text\\" style=\\"font-size: 40px;\\"></i>Contributing towards the best practices of research software
development
<div class=\\"text-h5 d-flex align-center mt-10\\"><i aria-hidden=\\"true\\" class=\\"v-icon notranslate mr-3 mdi mdi-check-circle theme--light accent--text\\" style=\\"font-size: 40px;\\"></i>Contributing towards the adoption of best practices for research
software development
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 08fb666

Please sign in to comment.