Skip to content

Commit d8eb4fc

Browse files
carleshfcarleshf
committed
Solved conflics and moving up to current version.
2 parents fade9fb + 3d9e544 commit d8eb4fc

File tree

13 files changed

+194
-36
lines changed

13 files changed

+194
-36
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
uses: actions/checkout@master
2525

2626
- name: Setup node env 🏗
27-
uses: actions/setup-node@v2.5.1
27+
uses: actions/setup-node@v3
2828
with:
2929
node-version: ${{ matrix.node }}
3030
check-latest: true
3131

3232
- name: Cache node_modules 📦
33-
uses: actions/cache@v2.1.7
33+
uses: actions/cache@v3
3434
with:
3535
path: ~/.npm
3636
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

‎.github/workflows/docker-image-dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ jobs:
1515
uses: actions/checkout@v2
1616
- name: Docker meta
1717
id: meta
18-
uses: docker/metadata-action@v3
18+
uses: docker/metadata-action@v4
1919
with:
2020
images: ${{ secrets.DOCKER_HUB_USER_NAME }}/openebench-nuxt-dev
2121
- name: Login to Docker Hub
22-
uses: docker/login-action@v1
22+
uses: docker/login-action@v2
2323
with:
2424
username: ${{ secrets.DOCKER_HUB_USER_NAME }}
2525
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
2626
- name: Set up Docker Buildx
27-
uses: docker/setup-buildx-action@v1
27+
uses: docker/setup-buildx-action@v2
2828
- name: Build and push
29-
uses: docker/build-push-action@v2
29+
uses: docker/build-push-action@v3
3030
with:
3131
context: .
3232
file: ./Dockerfile.develop

‎.github/workflows/docker-image-dev2.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v2
1515
- name: Login to Docker Hub
16-
uses: docker/login-action@v1
16+
uses: docker/login-action@v2
1717
with:
1818
username: ${{ secrets.DOCKER_HUB_USER_NAME }}
1919
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
2020
- name: Set up Docker Buildx
21-
uses: docker/setup-buildx-action@v1
21+
uses: docker/setup-buildx-action@v2
2222
- name: Build and push
23-
uses: docker/build-push-action@v2
23+
uses: docker/build-push-action@v3
2424
with:
2525
context: .
2626
file: ./Dockerfile.develop2

‎.github/workflows/docker-image-prod.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ jobs:
1515
uses: actions/checkout@v2
1616
- name: Docker meta
1717
id: meta
18-
uses: docker/metadata-action@v3
18+
uses: docker/metadata-action@v4
1919
with:
2020
images: ${{ secrets.DOCKER_HUB_USER_NAME }}/openebench-nuxt-prod
2121
- name: Login to Docker Hub
22-
uses: docker/login-action@v1
22+
uses: docker/login-action@v2
2323
with:
2424
username: ${{ secrets.DOCKER_HUB_USER_NAME }}
2525
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
2626
- name: Set up Docker Buildx
27-
uses: docker/setup-buildx-action@v1
27+
uses: docker/setup-buildx-action@v2
2828
- name: Build and push
29-
uses: docker/build-push-action@v2
29+
uses: docker/build-push-action@v3
3030
with:
3131
context: .
3232
file: ./Dockerfile.production

‎components/Header/HeaderMenu.vue‎

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,23 @@
1919
</v-list-item-content>
2020
</v-list-item>
2121
<v-list-item
22-
v-for="(item, index) in subMenuEntries"
22+
v-for="(item, index) in subMenuEntriesDocs"
2323
:key="`sub` + index"
2424
:to="item.to"
2525
:href="item.href"
2626
:target="item.external ? '_blank' : ''"
2727
>
28-
<v-list-item-title>{{ item.title }}</v-list-item-title>
28+
<v-list-item-title>{{ item.title_hide }}</v-list-item-title>
29+
<v-icon v-if="item.external" right small>mdi-open-in-new</v-icon>
30+
</v-list-item>
31+
<v-list-item
32+
v-for="(item, index) in subMenuEntriesAbout"
33+
:key="`sub` + index"
34+
:to="item.to"
35+
:href="item.href"
36+
:target="item.external ? '_blank' : ''"
37+
>
38+
<v-list-item-title>{{ item.title_hide }}</v-list-item-title>
2939
<v-icon v-if="item.external" right small>mdi-open-in-new</v-icon>
3040
</v-list-item>
3141
<v-list-item :href="vreHref" target="_blank">
@@ -67,12 +77,12 @@
6777
<template #activator="{ on, attrs }">
6878
<v-btn v-bind="attrs" text v-on="on">
6979
<v-icon>mdi-chevron-down</v-icon>
70-
More
80+
Docs
7181
</v-btn>
7282
</template>
7383
<v-list>
7484
<v-list-item
75-
v-for="(item, index) in subMenuEntries"
85+
v-for="(item, index) in subMenuEntriesDocs"
7686
:key="`sub` + index"
7787
:to="item.to"
7888
:href="item.href"
@@ -91,6 +101,35 @@
91101
</v-list-item>
92102
</v-list>
93103
</v-menu>
104+
<v-menu v-if="$vuetify.breakpoint.mdAndUp" left offset-y>
105+
<template #activator="{ on, attrs }">
106+
<v-btn v-bind="attrs" text v-on="on">
107+
<v-icon>mdi-chevron-down</v-icon>
108+
About
109+
</v-btn>
110+
</template>
111+
<v-list>
112+
<v-list-item
113+
v-for="(item, index) in subMenuEntriesAbout"
114+
:key="`sub` + index"
115+
:to="item.to"
116+
:href="item.href"
117+
:target="item.external ? '_blank' : ''"
118+
>
119+
<v-list-item-title>{{ item.title }}</v-list-item-title>
120+
<v-icon v-if="item.external" right small>mdi-open-in-new</v-icon>
121+
</v-list-item>
122+
<v-list-item
123+
v-if="$vuetify.breakpoint.mdAndDown"
124+
:href="vreHref"
125+
target="_blank"
126+
>
127+
<v-list-item-title>Benchmark your Tool</v-list-item-title>
128+
<v-icon right small>mdi-open-in-new</v-icon>
129+
</v-list-item>
130+
</v-list>
131+
</v-menu>
132+
94133
<v-spacer />
95134
<v-btn
96135
v-if="$vuetify.breakpoint.lgAndUp"
@@ -136,7 +175,8 @@
136175
<script>
137176
import CookieLaw from 'vue-cookie-law';
138177
import menuEntries from './menuEntries';
139-
import subMenuEntries from './subMenuEntries';
178+
import subMenuEntriesDocs from './subMenuEntriesDocs';
179+
import subMenuEntriesAbout from './subMenuEntriesAbout';
140180
import opebLogo from '~/static/images/opeb_logo.gif';
141181
142182
export default {
@@ -153,7 +193,8 @@ export default {
153193
openNavMobile: null,
154194
fixed: false,
155195
menuEntries,
156-
subMenuEntries,
196+
subMenuEntriesDocs,
197+
subMenuEntriesAbout,
157198
opebLogo,
158199
};
159200
},

‎components/Header/subMenuEntriesAbout.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Displayed in Header and Footer
2+
3+
const subMenuEntriesAbout = [
4+
{
5+
title: 'OpenEBench',
6+
title_hide: 'OpenEBench About',
7+
to: '/about',
8+
},
9+
{
10+
title: 'Collaboration',
11+
title_hide: 'Collaboration About',
12+
to: '/collaboration',
13+
},
14+
];
15+
16+
export default subMenuEntriesAbout;

‎components/Header/subMenuEntries.js‎ renamed to ‎components/Header/subMenuEntriesDocs.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
// Displayed in Header and Footer
22

3-
const subMenuEntries = [
3+
const subMenuEntriesDocs = [
44
{
5-
title: 'About',
6-
to: '/about',
7-
},
8-
{
9-
title: 'Github Docs',
5+
title: 'Github',
6+
title_hide: 'Github Docs',
107
href: 'https://docs.openebench.bsc.es/',
118
external: true,
129
},
1310
{
14-
title: 'Project Docs',
11+
title: 'Project',
12+
title_hide: 'Project Docs',
1513
href: 'https://openebench.readthedocs.io/en/latest/',
1614
external: true,
1715
},
1816
];
1917

20-
export default subMenuEntries;
18+
export default subMenuEntriesDocs;

‎components/TheFooter.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
import logo from '~/static/images/opeb_logo_white_minimal.png';
113113
import euFlag from '~/static/images/eu.svg';
114114
import menuEntries from '~/components/Header/menuEntries';
115-
import subMenuEntries from '~/components/Header/subMenuEntries';
115+
import subMenuEntries from '~/components/Header/subMenuEntriesDocs';
116116
117117
export default {
118118
data: () => ({

‎components/__snapshots__/TheFooter.spec.js.snap‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,13 @@ exports[`TheFooter should match snapshot 1`] = `
5555
Project
5656
</h6>
5757
<ul>
58-
<li><a dark=\\"\\" class=\\"white--text\\">
59-
About
60-
</a>
61-
<!---->
62-
<!---->
63-
</li>
6458
<li>
6559
<!----> <a href=\\"https://docs.openebench.bsc.es/\\" target=\\"_blank\\" dark=\\"\\" class=\\"white--text\\">
66-
Github Docs
60+
Github
6761
</a> <i aria-hidden=\\"true\\" class=\\"v-icon notranslate v-icon--right mdi mdi-open-in-new theme--dark\\" style=\\"font-size: 16px;\\"></i></li>
6862
<li>
6963
<!----> <a href=\\"https://openebench.readthedocs.io/en/latest/\\" target=\\"_blank\\" dark=\\"\\" class=\\"white--text\\">
70-
Project Docs
64+
Project
7165
</a> <i aria-hidden=\\"true\\" class=\\"v-icon notranslate v-icon--right mdi mdi-open-in-new theme--dark\\" style=\\"font-size: 16px;\\"></i></li>
7266
</ul>
7367
</div>

‎pages/collaboration.spec.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { mount } from '@vue/test-utils';
2+
import About from './collaboration.vue';
3+
4+
const factory = () => {
5+
return mount(About, {
6+
...createComponentMocks({}),
7+
});
8+
};
9+
10+
describe('Collaboration', () => {
11+
it('is instantiated', () => {
12+
const wrapper = factory();
13+
expect(wrapper).toBeTruthy();
14+
});
15+
});

0 commit comments

Comments
 (0)