Skip to content

Commit

Permalink
feat: removing story header; resetting theme when exploring data (#2743)
Browse files Browse the repository at this point in the history
* feat: removing story header; resetting theme when exploring data

* chore: updated upload artifact version

* chore: adding unique names to artifacts
  • Loading branch information
santilland authored Feb 3, 2025
1 parent 10bde54 commit f8d9ed5
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/feature-branch_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ jobs:
working-directory: app
spec: tests/e2e/specs/indicators_gtif.js
config: 'baseUrl=https://${{ secrets.TEST_INSTANCE_UN }}:${{ secrets.TEST_INSTANCE_PW }}@gtif-testing.eox.at/${{ github.ref_name }}/'
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots
name: cypress-screenshots-gtif
path: app/tests/e2e/screenshots
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: cypress-videos
name: cypress-videos-gtif
path: app/tests/e2e/videos

cypress-run-race:
Expand All @@ -141,16 +141,16 @@ jobs:
spec: tests/e2e/specs/indicators_race.js
config: 'baseUrl=https://${{ secrets.TEST_INSTANCE_UN }}:${{ secrets.TEST_INSTANCE_PW }}@eodash-testing.eox.at/${{ github.ref_name }}/'

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots
name: cypress-screenshots-race
path: app/tests/e2e/screenshots

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: cypress-videos
name: cypress-videos-race
path: app/tests/e2e/videos

cypress-run-trilateral:
Expand All @@ -169,14 +169,14 @@ jobs:
spec: tests/e2e/specs/indicators_trilateral.js
config: 'baseUrl=https://${{ secrets.TEST_INSTANCE_UN }}:${{ secrets.TEST_INSTANCE_PW }}@eodash-trilateral-testing.eox.at/${{ github.ref_name }}/'

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots
name: cypress-screenshots-trilateral
path: app/tests/e2e/screenshots

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: cypress-videos
name: cypress-videos-trilateral
path: app/tests/e2e/videos
4 changes: 2 additions & 2 deletions app/src/components/GlobalHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
text
color="primary"
block
:to="{ name: 'explore' }"
@click="loadTheme(null); $router.push({name: 'explore'})"
>
Explore Datasets
</v-btn>
Expand Down Expand Up @@ -249,7 +249,7 @@
text
dark
small
:to="{ name: 'explore' }"
@click="loadTheme(null); $router.push({name: 'explore'})"
>
Explore Datasets
</v-btn>
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/ThemesLandingPage/StoriesGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class="ma-0 px-4 px-md-8"
style="max-width: 1400px;"
>
<h3 class="mb-10" :class="[headingClass]">{{appConfig.branding.storiesHeader}}</h3>
<!--<h3 class="mb-10" :class="[headingClass]">{{appConfig.branding.storiesHeader}}</h3>-->

<v-row
no-gutters
Expand Down
4 changes: 2 additions & 2 deletions app/src/views/ThemeSinglePage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
class="py-2 white--text"
block
max-height="44"
:color="getCurrentTheme.color"
color="primary"
large
@click="$router.push({name: 'explore'})"
@click="loadTheme(null); $router.push({name: 'explore'})"
>Explore Datasets</v-btn>
</div>
</v-col>
Expand Down

0 comments on commit f8d9ed5

Please sign in to comment.