From 08fb666ccc84ad343cfce0af22026a4e9c3bfd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= Date: Tue, 31 May 2022 10:37:19 +0200 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 5d38793b56bf582ab0446aa48fc6a443bb5a715d Author: Dominik Brüchner Date: Tue May 31 10:34:13 2022 +0200 Update CommunityCard.spec.js.snap commit 457d0e835020aec6a6568bb825b11faf6a3eb8c0 Author: Dominik Brüchner Date: Tue May 31 10:32:51 2022 +0200 Update docker-image-dev.yml commit 04dc1dfe0b4ac447ec8d2ed4a8e5e1260e4d469f Author: Dominik Brüchner Date: Tue May 31 10:30:30 2022 +0200 some more general fixes commit 2df48249fd97c2d34af7ee0c1c35961d3a2b528c Author: Dominik Brüchner Date: Mon May 30 16:07:27 2022 +0200 Update embedIframeFullWidth.vue commit 721e3af2488c1dac1f23357f739912d8cd637c58 Author: Dominik Brüchner Date: Mon May 30 16:05:18 2022 +0200 adding footer everywhere, improving tools scroll situation commit a52df0c3de5bb1beb9cce8a074e50a1fea0899f9 Merge: 151cbe9 8cf16d3 Author: Dominik Brüchner Date: Mon May 30 11:53:23 2022 +0200 Merge branch 'develop-2' of https://github.com/inab/openEBench-nuxt into develop-2 commit 151cbe9ae80e2de10e030b5f49f0124d6169dd14 Author: Dominik Brüchner Date: Mon May 30 11:53:19 2022 +0200 some refactoring, adding links to community info commit 8cf16d36ebc3069e624ebe88e9cb002a9fcd8719 Merge: 380ce9c 03f6e29 Author: Dominik Brüchner 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 380ce9c00c7ff455c29299b81607a17ef3a6545f Merge: 8570ad4 0a42589 Author: Dominik Brüchner 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 8570ad4363c30f11ff0c823476d2f336642e5a79 Merge: 95d30ec 8fee5cd Author: Dominik Brüchner 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 95d30ece3b97fa1a97dd6ecb4f0f54a9613201fe Merge: e06ee6d 2188150 Author: Dominik Brüchner 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 2d7a218b9670b7c8fcd9ce4b3594553cfee83def Author: Dominik Brüchner Date: Fri May 27 13:56:55 2022 +0200 fixed landing page number calculation commit dcb565d59c5903a08f38b362323e05b1e7700379 Author: Dominik Brüchner Date: Thu May 26 12:23:59 2022 +0200 Update docker-image-dev.yml commit 8fee5cd8d7b96b32c43adb374a6352242a980d36 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](https://github.com/stylelint/stylelint/compare/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] commit e06ee6dedc84e05caef84e96b57fb24d424a799c Author: Dominik Brüchner Date: Wed May 25 16:30:19 2022 +0200 adding About page commit 700206ade71e6a1cf9629a66c393c88bcb0d40a0 Author: Dominik Brüchner Date: Tue May 24 17:11:49 2022 +0200 adding observatory api for tools count commit 2188150da432c02dfb9fe641fb381afa00c17bdc 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](https://github.com/eslint/eslint/compare/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] commit 0a4258997e6035a9f2271a2a6e931a5a63cbdf3a 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](https://github.com/storybookjs/eslint-plugin-storybook/compare/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] commit 03f6e298e18ad2c7d45016ec14d2f36fe99bbcdc 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](https://github.com/cure53/DOMPurify/compare/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] commit 6970d8fa4bfdfba038561987c3575666f895c0ec Merge: 74fedb6 fc616fd Author: Dominik Brüchner 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 fc616fd366186ae758b75fe01c9a06845fcbe550 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](https://github.com/zloirock/core-js/compare/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] commit 74fedb6e20ce5b773c0dd3911d526a8142e2997c Author: Dominik Brüchner Date: Fri May 20 14:05:08 2022 +0200 First badge of fixes after review commit 7f6d7c71251bafa2faa4dd0c071018eb4c6ff28a Merge: 80d7fc4 628782b Author: Dominik Brüchner 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 80d7fc466c0078b9242f637112d3e137d3d09d73 Merge: f25a823 6c99101 Author: Dominik Brüchner 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 6c9910186519931a2b88eb68df59369894b75a41 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](https://github.com/nuxt-community/eslint-module/compare/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] commit 628782b469f675cbdbac3f4619455be391c69443 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](https://github.com/eslint/eslint/compare/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] commit f25a82315bd43baed97a56a2c00eeef51626aee7 Merge: e5e4938 c354852 Author: Dominik Brüchner 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 e5e49387758bc383f1fc07f19c326030e74311cb Merge: 709e01a f1eaec0 Author: Dominik Brüchner 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 709e01a2f1d4b7926725667648719a4835e86707 Merge: 114eb7c 905e001 Author: Dominik Brüchner 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 114eb7cc5c241154e22bd3d2d2456cf6fe464919 Merge: 75bc367 c2fda16 Author: Dominik Brüchner 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 f1eaec012d72d4df41350d396e055887f4b29a51 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](https://github.com/markedjs/marked/compare/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] commit c3548524fd0502698ed95354dc55e50843870f9f 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] commit c2fda16cb0102c3aa0d38b7e4817a60c63131050 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](https://github.com/babel/babel-loader/compare/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] commit 905e0015e92a7083b7bd45981b5734bdd6925130 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] commit 75bc367763fa4c91b88a93c67962b18724ae87fc Merge: e91ebc7 efba7ea Author: Dominik Brüchner 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 efba7ea043b4b1d842c4c45532bad20be5cb67cc 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] commit e91ebc754fd4147f4d9ff744b4aa5d11794812e2 Merge: 242581a 1c72de3 Author: Dominik Brüchner 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 1c72de3b5c8d0325a2d935b697a66b45834d481d 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] commit 242581ac0fb72ce12ff56beb278b0e107bb63c49 Author: Dominik Brüchner Date: Tue May 17 11:57:58 2022 +0200 update chart scatter package commit a8f13cef8e156b674cb5c06c544c878283fca025 Author: Dominik Brüchner Date: Fri May 6 12:19:45 2022 +0200 some layout/css fixes commit e17486081b262313c2fa668fe03f39ec978da616 Author: Dominik Brüchner Date: Fri May 6 12:19:28 2022 +0200 Update OEBC009.md commit 9e2e4f232db85aa671d1f013283ce79c23add201 Author: Dominik Brüchner 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 25098fee4ca31cbd5bd082d0c23ea0e5ac3b0915. * 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 7d52288c1e71bf4720cfde85ce21eec040ff486f. * 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 7814a1e4b8ef7281cae63b8542115c5113abf2e9 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](https://github.com/storybookjs/eslint-plugin-storybook/compare/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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit edfe78c29e686056f123db24756f8fea1023f30f 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](https://github.com/okonet/lint-staged/compare/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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 5380d090da9cd64fd8e07bb4efd7efa030048e3f 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](https://github.com/greensock/GSAP/compare/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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit ca8dc1d118d66acb226e0b8751aca9cdbecc0a45 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](https://github.com/stylelint/stylelint/compare/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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit f7621b7b641ed3cd41be83aad2e09ed5e37a1742 Author: Dominik Brüchner Date: Wed Apr 20 15:06:20 2022 +0200 refactor graphql query (#167) --- .github/workflows/docker-image-dev.yml | 2 +- Dockerfile.develop | 2 + Dockerfile.develop2 | 2 + Dockerfile.production | 2 + components/Cards/CommunityCard.vue | 2 +- .../__snapshots__/CommunityCard.spec.js.snap | 4 +- .../CommunityClassificationTable.vue | 2 +- components/Communities/CommunityInfo.vue | 45 +- .../Communities/CommunityToolsTable.vue | 1 + components/Header/HeaderMenu.spec.js | 15 + components/Header/HeaderMenu.vue | 23 +- components/Header/menuEntries.js | 12 +- components/Landing/FeatureTeaser.vue | 8 +- components/Landing/HeroNumbers.vue | 10 +- components/Landing/KeyFeatures.vue | 4 +- components/Landing/LogoSlider.vue | 2 +- .../__snapshots__/FeatureTeaser.spec.js.snap | 8 +- .../__snapshots__/HeroNumbers.spec.js.snap | 6 +- .../__snapshots__/KeyFeatures.spec.js.snap | 4 +- components/Molecules/BreadcrumbsBar.vue | 4 - components/TheFooter.spec.js | 15 - components/TheFooter.vue | 22 +- .../__snapshots__/TheFooter.spec.js.snap | 31 +- layouts/embedIframe.vue | 5 +- layouts/embedIframeFullWidth.vue | 5 +- nuxt.config.js | 4 + package-lock.json | 8564 +++++++---------- package.json | 24 +- pages/about.spec.js | 8 - pages/about.vue | 168 +- pages/benchmarking/_community/events.vue | 53 +- pages/benchmarking/_community/index.vue | 30 +- pages/benchmarking/index.vue | 4 +- pages/index.vue | 2 + pages/observatory.vue | 15 + pages/tool/_id.vue | 3 +- pages/tool/index.vue | 2 +- plugins/observatory.js | 16 + static/images/about/oeb-levels.png | Bin 0 -> 46732 bytes static/images/about/oeb-tools-platform.png | Bin 0 -> 94741 bytes static/images/partners/decider.jpg | Bin 4682 -> 53497 bytes store/community.js | 2 +- store/dashboard.js | 31 +- 43 files changed, 4015 insertions(+), 5147 deletions(-) create mode 100644 plugins/observatory.js create mode 100644 static/images/about/oeb-levels.png create mode 100644 static/images/about/oeb-tools-platform.png diff --git a/.github/workflows/docker-image-dev.yml b/.github/workflows/docker-image-dev.yml index c9917812..e1057f6b 100644 --- a/.github/workflows/docker-image-dev.yml +++ b/.github/workflows/docker-image-dev.yml @@ -3,7 +3,7 @@ name: Docker Image CI develop on: push: branches: - - 'develop' + - 'master' tags: - 'v[0-9].[0-9]+.[0-9]+' diff --git a/Dockerfile.develop b/Dockerfile.develop index b74d4050..b717f57a 100644 --- a/Dockerfile.develop +++ b/Dockerfile.develop @@ -9,6 +9,7 @@ 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 @@ -16,6 +17,7 @@ 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 diff --git a/Dockerfile.develop2 b/Dockerfile.develop2 index 93c6b810..fb43c774 100644 --- a/Dockerfile.develop2 +++ b/Dockerfile.develop2 @@ -9,6 +9,7 @@ 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 @@ -16,6 +17,7 @@ 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 diff --git a/Dockerfile.production b/Dockerfile.production index 0a7deafc..bd5787db 100644 --- a/Dockerfile.production +++ b/Dockerfile.production @@ -9,6 +9,7 @@ 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 @@ -16,6 +17,7 @@ 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 diff --git a/components/Cards/CommunityCard.vue b/components/Cards/CommunityCard.vue index 340d3f72..9aa61e19 100644 --- a/components/Cards/CommunityCard.vue +++ b/components/Cards/CommunityCard.vue @@ -9,7 +9,7 @@ {{ acronym }} - + {{ name }} diff --git a/components/Cards/__snapshots__/CommunityCard.spec.js.snap b/components/Cards/__snapshots__/CommunityCard.spec.js.snap index 5589c955..c009f1ae 100644 --- a/components/Cards/__snapshots__/CommunityCard.spec.js.snap +++ b/components/Cards/__snapshots__/CommunityCard.spec.js.snap @@ -8,7 +8,7 @@ exports[`CommunityCard should match snapshot for active community 1`] = ` TransBioNet_CNVs - + Translational Bioinformatics Network - CNVs Benchmarking Group @@ -51,7 +51,7 @@ exports[`CommunityCard should match snapshot for incubating community 1`] = ` TransBioNet_CNVs - + Translational Bioinformatics Network - CNVs Benchmarking Group diff --git a/components/Communities/CommunityClassificationTable.vue b/components/Communities/CommunityClassificationTable.vue index 7cdec7e7..2a0cca9d 100644 --- a/components/Communities/CommunityClassificationTable.vue +++ b/components/Communities/CommunityClassificationTable.vue @@ -25,7 +25,7 @@

To filter the table results, please select single challenges below, the - table will automatically update. + table will update automatically. -
-

+
+

{{ community.acronym }} {{ @@ -10,13 +10,15 @@ }}

-

{{ community.name }}

+

+ {{ community.name }} +

- +

{{ community.description }}

@@ -30,6 +32,32 @@ {{ keyword }};

+

+ References: + + mdi-open-in-new + {{ keyword.doi }}; + +

+

+ Links: + + mdi-open-in-new + {{ link.label }}; + +

@@ -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'); + }, + }, }; diff --git a/components/Communities/CommunityToolsTable.vue b/components/Communities/CommunityToolsTable.vue index 132d32e6..782f0ab7 100644 --- a/components/Communities/CommunityToolsTable.vue +++ b/components/Communities/CommunityToolsTable.vue @@ -27,6 +27,7 @@ append target="_blank" > + mdi-open-in-new {{ item.name }} diff --git a/components/Header/HeaderMenu.spec.js b/components/Header/HeaderMenu.spec.js index 44fb586b..85cf68a7 100644 --- a/components/Header/HeaderMenu.spec.js +++ b/components/Header/HeaderMenu.spec.js @@ -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); + }); }); diff --git a/components/Header/HeaderMenu.vue b/components/Header/HeaderMenu.vue index 6315b0b6..b1624dff 100644 --- a/components/Header/HeaderMenu.vue +++ b/components/Header/HeaderMenu.vue @@ -28,6 +28,10 @@ {{ item.title }} mdi-open-in-new + + Benchmark your Tool + mdi-open-in-new + @@ -76,11 +80,19 @@ {{ item.title }} mdi-open-in-new + + Benchmark your Tool + mdi-open-in-new + - + mdi-login-variant Login --> + +
+ OpenEBench uses 🍪 to ensure you get the best experience on our website. +
+
diff --git a/components/TheFooter.spec.js b/components/TheFooter.spec.js index 82258a78..566ea720 100644 --- a/components/TheFooter.spec.js +++ b/components/TheFooter.spec.js @@ -21,21 +21,6 @@ describe('TheFooter', () => { expect(wrapper.html()).toMatchSnapshot(); }); - 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); - }); - it('should have computed prop isMobile true on small devices', async () => { const wrapper = factory(); diff --git a/components/TheFooter.vue b/components/TheFooter.vue index b1a883bc..e37142d0 100644 --- a/components/TheFooter.vue +++ b/components/TheFooter.vue @@ -1,14 +1,9 @@ diff --git a/pages/tool/_id.vue b/pages/tool/_id.vue index 5c036d51..9937e05b 100644 --- a/pages/tool/_id.vue +++ b/pages/tool/_id.vue @@ -4,7 +4,6 @@ width="100%" height="100%" frameborder="0" - class="mt-5" > @@ -12,7 +11,7 @@