From 57330cbddf4db4f2b3ed67427465261437714282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= <dominik.br@posteo.net>
Date: Wed, 2 Feb 2022 09:54:05 +0100
Subject: [PATCH 01/10] Update nuxt.config.js

---
 nuxt.config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nuxt.config.js b/nuxt.config.js
index 24698419..dbd70d43 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -90,7 +90,8 @@ export default {
 
 	publicRuntimeConfig: {
 		OEB_LEGACY_ANGULAR_URI:
-			process.env.OEB_LEGACY_ANGULAR_URI || 'https://dev-openebench.bsc.es/',
+			process.env.OEB_LEGACY_ANGULAR_URI ||
+			'https://legacy.dev-openebench.bsc.es/',
 		VRE_URI: process.env.VRE_URI || 'https://dev-openebench.bsc.es/vre/home/',
 		OBSERVATORY_URI:
 			process.env.OBSERVATORY_URI || 'https://observatory.openebench.bsc.es',

From c42c2e103257cef50add4c15a818ad01c8d93c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= <dominik.br@posteo.net>
Date: Wed, 2 Feb 2022 09:54:05 +0100
Subject: [PATCH 02/10] Update nuxt.config.js

---
 nuxt.config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nuxt.config.js b/nuxt.config.js
index 24698419..dbd70d43 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -90,7 +90,8 @@ export default {
 
 	publicRuntimeConfig: {
 		OEB_LEGACY_ANGULAR_URI:
-			process.env.OEB_LEGACY_ANGULAR_URI || 'https://dev-openebench.bsc.es/',
+			process.env.OEB_LEGACY_ANGULAR_URI ||
+			'https://legacy.dev-openebench.bsc.es/',
 		VRE_URI: process.env.VRE_URI || 'https://dev-openebench.bsc.es/vre/home/',
 		OBSERVATORY_URI:
 			process.env.OBSERVATORY_URI || 'https://observatory.openebench.bsc.es',

From 6f4042b1acffc527d55a5b5ec82cd1c5ea8136a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= <dominik.br@posteo.net>
Date: Wed, 2 Feb 2022 10:32:44 +0100
Subject: [PATCH 03/10] added dashboard route

---
 nuxt.config.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nuxt.config.js b/nuxt.config.js
index dbd70d43..b4642141 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -108,4 +108,14 @@ export default {
 
 	// Build Configuration: https://go.nuxtjs.dev/config-build
 	build: {},
+
+	router: {
+		extendRoutes(routes, resolve) {
+			routes.push({
+				name: 'dashboard',
+				path: '/dashboard',
+				component: resolve(__dirname, 'pages/index.vue'),
+			});
+		},
+	},
 };

From bdcc64e1edc9e29c40c3765439f31080e3e91155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= <dominik.br@posteo.net>
Date: Wed, 2 Feb 2022 10:32:44 +0100
Subject: [PATCH 04/10] added dashboard route

---
 nuxt.config.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nuxt.config.js b/nuxt.config.js
index dbd70d43..b4642141 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -108,4 +108,14 @@ export default {
 
 	// Build Configuration: https://go.nuxtjs.dev/config-build
 	build: {},
+
+	router: {
+		extendRoutes(routes, resolve) {
+			routes.push({
+				name: 'dashboard',
+				path: '/dashboard',
+				component: resolve(__dirname, 'pages/index.vue'),
+			});
+		},
+	},
 };

From 725e70496507acc74620e7be81e438548eb3a49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= <dominik.br@posteo.net>
Date: Wed, 2 Feb 2022 10:54:57 +0100
Subject: [PATCH 05/10] changed /communities endpoint to /scientific

---
 components/Header/menuEntries.js                  | 2 +-
 components/Landing/FeatureTeaser.vue              | 2 +-
 components/Landing/WelcomeSection.vue             | 4 ++--
 pages/{communities.spec.js => scientific.spec.js} | 2 +-
 pages/{communities.vue => scientific.vue}         | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename pages/{communities.spec.js => scientific.spec.js} (92%)
 rename pages/{communities.vue => scientific.vue} (100%)

diff --git a/components/Header/menuEntries.js b/components/Header/menuEntries.js
index 9104ff9a..ea11e573 100644
--- a/components/Header/menuEntries.js
+++ b/components/Header/menuEntries.js
@@ -3,7 +3,7 @@
 const menuEntries = [
 	{
 		title: 'Benchmarking',
-		to: '/communities',
+		to: '/scientific',
 	},
 	{
 		title: 'Tools',
diff --git a/components/Landing/FeatureTeaser.vue b/components/Landing/FeatureTeaser.vue
index 92eead53..49df229c 100644
--- a/components/Landing/FeatureTeaser.vue
+++ b/components/Landing/FeatureTeaser.vue
@@ -12,7 +12,7 @@
 					Explore benchmarks of the scientific performance of bioinformatics
 					methods
 				</p>
-				<v-btn text color="primary" to="/communities"> Learn More </v-btn>
+				<v-btn text color="primary" to="/scientific"> Learn More </v-btn>
 			</v-col>
 			<v-col align="center" cols="12" md="4" class="mt-10 mt-md-0">
 				<v-avatar color="primary" size="62" class="mb-10">
diff --git a/components/Landing/WelcomeSection.vue b/components/Landing/WelcomeSection.vue
index 262d20ca..aba095b1 100644
--- a/components/Landing/WelcomeSection.vue
+++ b/components/Landing/WelcomeSection.vue
@@ -16,7 +16,7 @@
 							As a Researcher I want to search for benchmarking communities and
 							results
 						</p>
-						<v-btn color="primary" class="mt-10" large block to="communities">
+						<v-btn color="primary" class="mt-10" large block to="/scientific">
 							Scientific Benchmarking
 						</v-btn>
 					</v-col>
@@ -28,7 +28,7 @@
 							As a Developer I want to learn how to develop sustainable research
 							tools
 						</p>
-						<v-btn color="accent" class="mt-10" large block to="observatory">
+						<v-btn color="accent" class="mt-10" large block to="/observatory">
 							Tools Observatory
 						</v-btn>
 					</v-col>
diff --git a/pages/communities.spec.js b/pages/scientific.spec.js
similarity index 92%
rename from pages/communities.spec.js
rename to pages/scientific.spec.js
index 035d4747..b838df5f 100644
--- a/pages/communities.spec.js
+++ b/pages/scientific.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import Communities from './communities.vue';
+import Communities from './scientific.vue';
 
 const factory = () => {
 	return mount(Communities, {
diff --git a/pages/communities.vue b/pages/scientific.vue
similarity index 100%
rename from pages/communities.vue
rename to pages/scientific.vue

From bc79d9fc0ae4b8305574595c97df1233bf4c9e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= <dominik.br@posteo.net>
Date: Wed, 2 Feb 2022 10:54:57 +0100
Subject: [PATCH 06/10] changed /communities endpoint to /scientific

---
 components/Header/menuEntries.js                  | 2 +-
 components/Landing/FeatureTeaser.vue              | 2 +-
 components/Landing/WelcomeSection.vue             | 4 ++--
 pages/{communities.spec.js => scientific.spec.js} | 2 +-
 pages/{communities.vue => scientific.vue}         | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename pages/{communities.spec.js => scientific.spec.js} (92%)
 rename pages/{communities.vue => scientific.vue} (100%)

diff --git a/components/Header/menuEntries.js b/components/Header/menuEntries.js
index 9104ff9a..ea11e573 100644
--- a/components/Header/menuEntries.js
+++ b/components/Header/menuEntries.js
@@ -3,7 +3,7 @@
 const menuEntries = [
 	{
 		title: 'Benchmarking',
-		to: '/communities',
+		to: '/scientific',
 	},
 	{
 		title: 'Tools',
diff --git a/components/Landing/FeatureTeaser.vue b/components/Landing/FeatureTeaser.vue
index 92eead53..49df229c 100644
--- a/components/Landing/FeatureTeaser.vue
+++ b/components/Landing/FeatureTeaser.vue
@@ -12,7 +12,7 @@
 					Explore benchmarks of the scientific performance of bioinformatics
 					methods
 				</p>
-				<v-btn text color="primary" to="/communities"> Learn More </v-btn>
+				<v-btn text color="primary" to="/scientific"> Learn More </v-btn>
 			</v-col>
 			<v-col align="center" cols="12" md="4" class="mt-10 mt-md-0">
 				<v-avatar color="primary" size="62" class="mb-10">
diff --git a/components/Landing/WelcomeSection.vue b/components/Landing/WelcomeSection.vue
index 262d20ca..aba095b1 100644
--- a/components/Landing/WelcomeSection.vue
+++ b/components/Landing/WelcomeSection.vue
@@ -16,7 +16,7 @@
 							As a Researcher I want to search for benchmarking communities and
 							results
 						</p>
-						<v-btn color="primary" class="mt-10" large block to="communities">
+						<v-btn color="primary" class="mt-10" large block to="/scientific">
 							Scientific Benchmarking
 						</v-btn>
 					</v-col>
@@ -28,7 +28,7 @@
 							As a Developer I want to learn how to develop sustainable research
 							tools
 						</p>
-						<v-btn color="accent" class="mt-10" large block to="observatory">
+						<v-btn color="accent" class="mt-10" large block to="/observatory">
 							Tools Observatory
 						</v-btn>
 					</v-col>
diff --git a/pages/communities.spec.js b/pages/scientific.spec.js
similarity index 92%
rename from pages/communities.spec.js
rename to pages/scientific.spec.js
index 035d4747..b838df5f 100644
--- a/pages/communities.spec.js
+++ b/pages/scientific.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import Communities from './communities.vue';
+import Communities from './scientific.vue';
 
 const factory = () => {
 	return mount(Communities, {
diff --git a/pages/communities.vue b/pages/scientific.vue
similarity index 100%
rename from pages/communities.vue
rename to pages/scientific.vue

From f91d889770d84e7dfcc2c5669f8f52f223bd4694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= <dominik.br@posteo.net>
Date: Wed, 2 Feb 2022 12:11:47 +0100
Subject: [PATCH 07/10] changed /tools endpoint to /tool and added _id route

---
 components/Header/menuEntries.js            |  2 +-
 components/Landing/FeatureTeaser.vue        |  2 +-
 components/Landing/HeroSearchbar.spec.js    |  6 ++---
 components/Landing/HeroSearchbar.vue        |  2 +-
 pages/tool/_id.spec.js                      | 27 +++++++++++++++++++++
 pages/tool/_id.vue                          | 22 +++++++++++++++++
 pages/{tools.spec.js => tool/index.spec.js} |  4 +--
 pages/{tools.vue => tool/index.vue}         |  0
 8 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 pages/tool/_id.spec.js
 create mode 100644 pages/tool/_id.vue
 rename pages/{tools.spec.js => tool/index.spec.js} (94%)
 rename pages/{tools.vue => tool/index.vue} (100%)

diff --git a/components/Header/menuEntries.js b/components/Header/menuEntries.js
index ea11e573..a86725ae 100644
--- a/components/Header/menuEntries.js
+++ b/components/Header/menuEntries.js
@@ -7,7 +7,7 @@ const menuEntries = [
 	},
 	{
 		title: 'Tools',
-		to: '/tools',
+		to: '/tool',
 	},
 	{
 		title: 'Stats',
diff --git a/components/Landing/FeatureTeaser.vue b/components/Landing/FeatureTeaser.vue
index 49df229c..62c5127f 100644
--- a/components/Landing/FeatureTeaser.vue
+++ b/components/Landing/FeatureTeaser.vue
@@ -23,7 +23,7 @@
 					Individually browse metrics of bioinformatics tools, server and
 					workflows
 				</p>
-				<v-btn text color="primary" to="/tools"> Learn More </v-btn>
+				<v-btn text color="primary" to="/tool"> Learn More </v-btn>
 			</v-col>
 			<v-col align="center" cols="12" md="4" class="mt-10 mt-md-0">
 				<v-avatar color="primary" size="62" class="mb-10">
diff --git a/components/Landing/HeroSearchbar.spec.js b/components/Landing/HeroSearchbar.spec.js
index e41896bf..aeb0de4e 100644
--- a/components/Landing/HeroSearchbar.spec.js
+++ b/components/Landing/HeroSearchbar.spec.js
@@ -29,7 +29,7 @@ describe('HeroSearchbar', () => {
 		submitBtn.trigger('click');
 
 		expect(wrapper.vm.$router.push).toHaveBeenCalledWith({
-			path: 'tools',
+			path: '/tool',
 			query: { search: '' },
 		});
 	});
@@ -43,7 +43,7 @@ describe('HeroSearchbar', () => {
 		await searchInput.trigger('keyup.enter');
 
 		expect(wrapper.vm.$router.push).toHaveBeenCalledWith({
-			path: 'tools',
+			path: '/tool',
 			query: { search: '' },
 		});
 	});
@@ -61,7 +61,7 @@ describe('HeroSearchbar', () => {
 		submitBtn.trigger('click');
 
 		expect(wrapper.vm.$router.push).toHaveBeenCalledWith({
-			path: 'tools',
+			path: '/tool',
 			query: { search: 'Random Tool Name' },
 		});
 	});
diff --git a/components/Landing/HeroSearchbar.vue b/components/Landing/HeroSearchbar.vue
index c1febe79..82d98888 100644
--- a/components/Landing/HeroSearchbar.vue
+++ b/components/Landing/HeroSearchbar.vue
@@ -49,7 +49,7 @@ export default {
 	methods: {
 		handleSubmit() {
 			this.$router.push({
-				path: 'tools',
+				path: '/tool',
 				query: { search: this.input },
 			});
 		},
diff --git a/pages/tool/_id.spec.js b/pages/tool/_id.spec.js
new file mode 100644
index 00000000..1a272f6f
--- /dev/null
+++ b/pages/tool/_id.spec.js
@@ -0,0 +1,27 @@
+import { mount } from '@vue/test-utils';
+import Tool from './_id.vue';
+
+const factory = () => {
+	return mount(Tool, {
+		...createComponentMocks({}),
+		mocks: {
+			$route: { params: { id: 'TESTID' } },
+			$config: { OEB_LEGACY_ANGULAR_URI: 'https://jest-openebench.bsc.es/' },
+		},
+	});
+};
+
+describe('Tool', () => {
+	it('is instantiated', () => {
+		const wrapper = factory();
+		expect(wrapper).toBeTruthy();
+	});
+
+	it('sets the iframe url according to env variable', () => {
+		const wrapper = factory();
+		expect(wrapper.vm.hostName).toBe('https://jest-openebench.bsc.es/');
+		expect(wrapper.find('iframe').attributes('src')).toBe(
+			'https://jest-openebench.bsc.es/tool/TESTID'
+		);
+	});
+});
diff --git a/pages/tool/_id.vue b/pages/tool/_id.vue
new file mode 100644
index 00000000..49d14f51
--- /dev/null
+++ b/pages/tool/_id.vue
@@ -0,0 +1,22 @@
+<template>
+	<iframe
+		:src="hostName + `tool/` + $route.params.id"
+		width="100%"
+		height="100%"
+		frameborder="0"
+		class="mt-5"
+	>
+	</iframe>
+</template>
+
+<script>
+export default {
+	name: 'ToolsMonitoringIdPage',
+	layout: 'embedIframe',
+	data() {
+		return {
+			hostName: this.$config.OEB_LEGACY_ANGULAR_URI,
+		};
+	},
+};
+</script>
diff --git a/pages/tools.spec.js b/pages/tool/index.spec.js
similarity index 94%
rename from pages/tools.spec.js
rename to pages/tool/index.spec.js
index ef851ffb..f44ef10a 100644
--- a/pages/tools.spec.js
+++ b/pages/tool/index.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import Tools from './tools.vue';
+import Tools from './index.vue';
 
 const factory = (query) => {
 	return mount(Tools, {
@@ -11,7 +11,7 @@ const emptyQueryMock = { query: { search: '' } };
 const queryString = 'search_query';
 const queryMock = { query: { search: queryString } };
 
-describe('Tools', () => {
+describe('Tools Index', () => {
 	it('is instantiated', () => {
 		const wrapper = factory(emptyQueryMock);
 		expect(wrapper).toBeTruthy();
diff --git a/pages/tools.vue b/pages/tool/index.vue
similarity index 100%
rename from pages/tools.vue
rename to pages/tool/index.vue

From 75f241f563c991e21dd4c8e2ed3f4358eac8ff51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= <dominik.br@posteo.net>
Date: Wed, 2 Feb 2022 12:11:47 +0100
Subject: [PATCH 08/10] changed /tools endpoint to /tool and added _id route

---
 components/Header/menuEntries.js            |  2 +-
 components/Landing/FeatureTeaser.vue        |  2 +-
 components/Landing/HeroSearchbar.spec.js    |  6 ++---
 components/Landing/HeroSearchbar.vue        |  2 +-
 pages/tool/_id.spec.js                      | 27 +++++++++++++++++++++
 pages/tool/_id.vue                          | 22 +++++++++++++++++
 pages/{tools.spec.js => tool/index.spec.js} |  4 +--
 pages/{tools.vue => tool/index.vue}         |  0
 8 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 pages/tool/_id.spec.js
 create mode 100644 pages/tool/_id.vue
 rename pages/{tools.spec.js => tool/index.spec.js} (94%)
 rename pages/{tools.vue => tool/index.vue} (100%)

diff --git a/components/Header/menuEntries.js b/components/Header/menuEntries.js
index ea11e573..a86725ae 100644
--- a/components/Header/menuEntries.js
+++ b/components/Header/menuEntries.js
@@ -7,7 +7,7 @@ const menuEntries = [
 	},
 	{
 		title: 'Tools',
-		to: '/tools',
+		to: '/tool',
 	},
 	{
 		title: 'Stats',
diff --git a/components/Landing/FeatureTeaser.vue b/components/Landing/FeatureTeaser.vue
index 49df229c..62c5127f 100644
--- a/components/Landing/FeatureTeaser.vue
+++ b/components/Landing/FeatureTeaser.vue
@@ -23,7 +23,7 @@
 					Individually browse metrics of bioinformatics tools, server and
 					workflows
 				</p>
-				<v-btn text color="primary" to="/tools"> Learn More </v-btn>
+				<v-btn text color="primary" to="/tool"> Learn More </v-btn>
 			</v-col>
 			<v-col align="center" cols="12" md="4" class="mt-10 mt-md-0">
 				<v-avatar color="primary" size="62" class="mb-10">
diff --git a/components/Landing/HeroSearchbar.spec.js b/components/Landing/HeroSearchbar.spec.js
index e41896bf..aeb0de4e 100644
--- a/components/Landing/HeroSearchbar.spec.js
+++ b/components/Landing/HeroSearchbar.spec.js
@@ -29,7 +29,7 @@ describe('HeroSearchbar', () => {
 		submitBtn.trigger('click');
 
 		expect(wrapper.vm.$router.push).toHaveBeenCalledWith({
-			path: 'tools',
+			path: '/tool',
 			query: { search: '' },
 		});
 	});
@@ -43,7 +43,7 @@ describe('HeroSearchbar', () => {
 		await searchInput.trigger('keyup.enter');
 
 		expect(wrapper.vm.$router.push).toHaveBeenCalledWith({
-			path: 'tools',
+			path: '/tool',
 			query: { search: '' },
 		});
 	});
@@ -61,7 +61,7 @@ describe('HeroSearchbar', () => {
 		submitBtn.trigger('click');
 
 		expect(wrapper.vm.$router.push).toHaveBeenCalledWith({
-			path: 'tools',
+			path: '/tool',
 			query: { search: 'Random Tool Name' },
 		});
 	});
diff --git a/components/Landing/HeroSearchbar.vue b/components/Landing/HeroSearchbar.vue
index c1febe79..82d98888 100644
--- a/components/Landing/HeroSearchbar.vue
+++ b/components/Landing/HeroSearchbar.vue
@@ -49,7 +49,7 @@ export default {
 	methods: {
 		handleSubmit() {
 			this.$router.push({
-				path: 'tools',
+				path: '/tool',
 				query: { search: this.input },
 			});
 		},
diff --git a/pages/tool/_id.spec.js b/pages/tool/_id.spec.js
new file mode 100644
index 00000000..1a272f6f
--- /dev/null
+++ b/pages/tool/_id.spec.js
@@ -0,0 +1,27 @@
+import { mount } from '@vue/test-utils';
+import Tool from './_id.vue';
+
+const factory = () => {
+	return mount(Tool, {
+		...createComponentMocks({}),
+		mocks: {
+			$route: { params: { id: 'TESTID' } },
+			$config: { OEB_LEGACY_ANGULAR_URI: 'https://jest-openebench.bsc.es/' },
+		},
+	});
+};
+
+describe('Tool', () => {
+	it('is instantiated', () => {
+		const wrapper = factory();
+		expect(wrapper).toBeTruthy();
+	});
+
+	it('sets the iframe url according to env variable', () => {
+		const wrapper = factory();
+		expect(wrapper.vm.hostName).toBe('https://jest-openebench.bsc.es/');
+		expect(wrapper.find('iframe').attributes('src')).toBe(
+			'https://jest-openebench.bsc.es/tool/TESTID'
+		);
+	});
+});
diff --git a/pages/tool/_id.vue b/pages/tool/_id.vue
new file mode 100644
index 00000000..49d14f51
--- /dev/null
+++ b/pages/tool/_id.vue
@@ -0,0 +1,22 @@
+<template>
+	<iframe
+		:src="hostName + `tool/` + $route.params.id"
+		width="100%"
+		height="100%"
+		frameborder="0"
+		class="mt-5"
+	>
+	</iframe>
+</template>
+
+<script>
+export default {
+	name: 'ToolsMonitoringIdPage',
+	layout: 'embedIframe',
+	data() {
+		return {
+			hostName: this.$config.OEB_LEGACY_ANGULAR_URI,
+		};
+	},
+};
+</script>
diff --git a/pages/tools.spec.js b/pages/tool/index.spec.js
similarity index 94%
rename from pages/tools.spec.js
rename to pages/tool/index.spec.js
index ef851ffb..f44ef10a 100644
--- a/pages/tools.spec.js
+++ b/pages/tool/index.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import Tools from './tools.vue';
+import Tools from './index.vue';
 
 const factory = (query) => {
 	return mount(Tools, {
@@ -11,7 +11,7 @@ const emptyQueryMock = { query: { search: '' } };
 const queryString = 'search_query';
 const queryMock = { query: { search: queryString } };
 
-describe('Tools', () => {
+describe('Tools Index', () => {
 	it('is instantiated', () => {
 		const wrapper = factory(emptyQueryMock);
 		expect(wrapper).toBeTruthy();
diff --git a/pages/tools.vue b/pages/tool/index.vue
similarity index 100%
rename from pages/tools.vue
rename to pages/tool/index.vue

From 358addf6a8c199e952edc745a412a68eeaa7c19f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= <dominik.br@posteo.net>
Date: Wed, 2 Feb 2022 13:06:45 +0100
Subject: [PATCH 09/10] enabled nested routes for communities and participants

---
 pages/scientific/_community/_id.spec.js       | 27 ++++++++++++++++++
 pages/scientific/_community/_id.vue           | 28 +++++++++++++++++++
 pages/scientific/_community/index.spec.js     | 27 ++++++++++++++++++
 pages/scientific/_community/index.vue         | 22 +++++++++++++++
 .../index.spec.js}                            |  2 +-
 .../{scientific.vue => scientific/index.vue}  |  3 +-
 6 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 pages/scientific/_community/_id.spec.js
 create mode 100644 pages/scientific/_community/_id.vue
 create mode 100644 pages/scientific/_community/index.spec.js
 create mode 100644 pages/scientific/_community/index.vue
 rename pages/{scientific.spec.js => scientific/index.spec.js} (92%)
 rename pages/{scientific.vue => scientific/index.vue} (85%)

diff --git a/pages/scientific/_community/_id.spec.js b/pages/scientific/_community/_id.spec.js
new file mode 100644
index 00000000..243ca560
--- /dev/null
+++ b/pages/scientific/_community/_id.spec.js
@@ -0,0 +1,27 @@
+import { mount } from '@vue/test-utils';
+import Community from './_id.vue';
+
+const factory = () => {
+	return mount(Community, {
+		...createComponentMocks({}),
+		mocks: {
+			$route: { params: { community: 'TESTCOMMUNITY', id: 'TESTID' } },
+			$config: { OEB_LEGACY_ANGULAR_URI: 'https://jest-openebench.bsc.es/' },
+		},
+	});
+};
+
+describe('Community Participant', () => {
+	it('is instantiated', () => {
+		const wrapper = factory();
+		expect(wrapper).toBeTruthy();
+	});
+
+	it('sets the iframe url according to env variable', () => {
+		const wrapper = factory();
+		expect(wrapper.vm.hostName).toBe('https://jest-openebench.bsc.es/');
+		expect(wrapper.find('iframe').attributes('src')).toBe(
+			'https://jest-openebench.bsc.es/scientific/TESTCOMMUNITY/TESTID'
+		);
+	});
+});
diff --git a/pages/scientific/_community/_id.vue b/pages/scientific/_community/_id.vue
new file mode 100644
index 00000000..83ee61ed
--- /dev/null
+++ b/pages/scientific/_community/_id.vue
@@ -0,0 +1,28 @@
+<template>
+	<iframe
+		:src="
+			hostName +
+			`scientific/` +
+			$route.params.community +
+			`/` +
+			$route.params.id
+		"
+		width="100%"
+		height="100%"
+		frameborder="0"
+		class="mt-5"
+	>
+	</iframe>
+</template>
+
+<script>
+export default {
+	name: 'ScientificBenchmarkingPage',
+	layout: 'embedIframeFullWidth',
+	data() {
+		return {
+			hostName: this.$config.OEB_LEGACY_ANGULAR_URI,
+		};
+	},
+};
+</script>
diff --git a/pages/scientific/_community/index.spec.js b/pages/scientific/_community/index.spec.js
new file mode 100644
index 00000000..bf4379cf
--- /dev/null
+++ b/pages/scientific/_community/index.spec.js
@@ -0,0 +1,27 @@
+import { mount } from '@vue/test-utils';
+import Community from './index.vue';
+
+const factory = () => {
+	return mount(Community, {
+		...createComponentMocks({}),
+		mocks: {
+			$route: { params: { community: 'TESTID' } },
+			$config: { OEB_LEGACY_ANGULAR_URI: 'https://jest-openebench.bsc.es/' },
+		},
+	});
+};
+
+describe('Community', () => {
+	it('is instantiated', () => {
+		const wrapper = factory();
+		expect(wrapper).toBeTruthy();
+	});
+
+	it('sets the iframe url according to env variable', () => {
+		const wrapper = factory();
+		expect(wrapper.vm.hostName).toBe('https://jest-openebench.bsc.es/');
+		expect(wrapper.find('iframe').attributes('src')).toBe(
+			'https://jest-openebench.bsc.es/scientific/TESTID'
+		);
+	});
+});
diff --git a/pages/scientific/_community/index.vue b/pages/scientific/_community/index.vue
new file mode 100644
index 00000000..be5dcc4b
--- /dev/null
+++ b/pages/scientific/_community/index.vue
@@ -0,0 +1,22 @@
+<template>
+	<iframe
+		:src="hostName + `scientific/` + $route.params.community"
+		width="100%"
+		height="100%"
+		frameborder="0"
+		class="mt-5"
+	>
+	</iframe>
+</template>
+
+<script>
+export default {
+	name: 'ScientificBenchmarkingPage',
+	layout: 'embedIframeFullWidth',
+	data() {
+		return {
+			hostName: this.$config.OEB_LEGACY_ANGULAR_URI,
+		};
+	},
+};
+</script>
diff --git a/pages/scientific.spec.js b/pages/scientific/index.spec.js
similarity index 92%
rename from pages/scientific.spec.js
rename to pages/scientific/index.spec.js
index b838df5f..cd53d055 100644
--- a/pages/scientific.spec.js
+++ b/pages/scientific/index.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import Communities from './scientific.vue';
+import Communities from './index.vue';
 
 const factory = () => {
 	return mount(Communities, {
diff --git a/pages/scientific.vue b/pages/scientific/index.vue
similarity index 85%
rename from pages/scientific.vue
rename to pages/scientific/index.vue
index 54e9a4a8..e3653d4a 100644
--- a/pages/scientific.vue
+++ b/pages/scientific/index.vue
@@ -4,6 +4,7 @@
 		width="100%"
 		height="100%"
 		frameborder="0"
+		class="mt-5"
 	>
 	</iframe>
 </template>
@@ -11,7 +12,7 @@
 <script>
 export default {
 	name: 'ScientificBenchmarkingPage',
-	layout: 'embedIframe',
+	layout: 'embedIframeFullWidth',
 	data() {
 		return {
 			hostName: this.$config.OEB_LEGACY_ANGULAR_URI,

From 9d6dace56789989acb9e10f1c0085afacd9144c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Br=C3=BCchner?= <dominik.br@posteo.net>
Date: Thu, 3 Feb 2022 10:36:35 +0100
Subject: [PATCH 10/10] updated git workflows

---
 .github/workflows/ci.yml              | 35 +++--------------------
 .github/workflows/gh-pages-deploy.yml | 40 +++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 31 deletions(-)
 create mode 100644 .github/workflows/gh-pages-deploy.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 841b0567..dfaf6f38 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,9 +4,13 @@ on:
   push:
     branches:
       - master
+      - develop
+      - develop-2
   pull_request:
     branches:
       - master
+      - develop
+      - develop-2
 
 jobs:
   ci:
@@ -48,34 +52,3 @@ jobs:
         run: npx codecov
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-  gh-pages-deploy:
-    runs-on: ${{ matrix.os }}
-    needs: [ci]
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        node: [16]
-
-    steps:
-      - name: Checkout 🛎
-        uses: actions/checkout@master
-
-      - name: Install dependencies 👨🏻‍💻
-        run: npm ci --prefer-offline --no-audit
-
-      - name: Github Pages Build
-        run: npm run generate:gh-pages
-        env:
-          REST_API_URL: ${{ secrets.REST_API_URL }}
-          SCIENTIFIC_SERVICE_URL: ${{ secrets.SCIENTIFIC_SERVICE_URL }}
-          OEB_LEGACY_ANGULAR_URI: ${{ secrets.OEB_LEGACY_ANGULAR_URI }}
-          VRE_URI: ${{ secrets.VRE_URI }}
-          OBSERVATORY_URI: ${{ secrets.OBSERVATORY_URI }}
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./dist
diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml
new file mode 100644
index 00000000..31d603a8
--- /dev/null
+++ b/.github/workflows/gh-pages-deploy.yml
@@ -0,0 +1,40 @@
+name: GitHub Pages Deploy
+
+on:
+  push:
+    branches:
+      - develop-2
+  pull_request:
+    branches:
+      - develop-2
+
+jobs:
+  gh-pages-deploy:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node: [16]
+
+    steps:
+      - name: Checkout 🛎
+        uses: actions/checkout@master
+
+      - name: Install dependencies 👨🏻‍💻
+        run: npm ci --prefer-offline --no-audit
+
+      - name: Github Pages Build
+        run: npm run generate:gh-pages
+        env:
+          REST_API_URL: ${{ secrets.REST_API_URL }}
+          SCIENTIFIC_SERVICE_URL: ${{ secrets.SCIENTIFIC_SERVICE_URL }}
+          OEB_LEGACY_ANGULAR_URI: ${{ secrets.OEB_LEGACY_ANGULAR_URI }}
+          VRE_URI: ${{ secrets.VRE_URI }}
+          OBSERVATORY_URI: ${{ secrets.OBSERVATORY_URI }}
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./dist