Commit 210fde6e authored by jfriedli's avatar jfriedli
Browse files

Merge branch 'develop' into 'master'

Bugfixes

See merge request jfriedli/mat2-quasar-frontend!369
parents 37ffae83 783e1040
Pipeline #45327 passed with stages
in 14 minutes and 23 seconds
......@@ -77,7 +77,7 @@ When it's done you'll make a merge request for from your branch into the `develo
this is customizable in the `docker-compose.yml` file.
If none of these are set it will default to `http://localhost:5000/` (slash at the end).
To make sure the open graph tags are working you need to set the
env variable `FRONTEND_URL_PLACEHOLDER=https://matweb.info` to the domain name you're
env variable `FRONTEND_URL_PLACEHOLDER=https://matweb.info/` to the domain name you're
hosting the frontend.
## Translations
......
......@@ -17,21 +17,21 @@
<!-- Search Engine -->
<meta name="description" content="Keep your data, trash your meta!">
<meta name="image" content="https://0xacab.org/jfriedli/mat2-quasar-frontend/-/wikis/uploads/407da735fb90d769799254f24bd8ce1e/og.png">
<meta name="image" content="${FRONTEND_URL_PLACEHOLDER}og.png">
<!-- Schema.org for Google -->
<meta itemprop="name" content="MAT2 Web">
<meta itemprop="description" content="Keep your data, trash your meta!">
<meta itemprop="image" content="https://0xacab.org/jfriedli/mat2-quasar-frontend/-/wikis/uploads/407da735fb90d769799254f24bd8ce1e/og.png">
<meta itemprop="image" content="${FRONTEND_URL_PLACEHOLDER}og.png">
<!-- Twitter -->
<meta name="twitter:card" content="summary">
<meta name="twitter:title" content="MAT2 Web">
<meta name="twitter:description" content="Keep your data, trash your meta!">
<meta name="twitter:image:src" content="https://0xacab.org/jfriedli/mat2-quasar-frontend/-/wikis/uploads/407da735fb90d769799254f24bd8ce1e/og.png">
<meta name="twitter:image:src" content="${FRONTEND_URL_PLACEHOLDER}og.png">
<!-- Open Graph general (Facebook, Pinterest & Google+) -->
<meta name="og:title" content="MAT2 Web">
<meta name="og:description" content="Keep your data, trash your meta!">
<meta name="og:image" content="https://0xacab.org/jfriedli/mat2-quasar-frontend/-/wikis/uploads/407da735fb90d769799254f24bd8ce1e/og.png">
<meta name="og:url" content="$FRONTEND_URL_PLACEHOLDER">
<meta name="og:image" content="${FRONTEND_URL_PLACEHOLDER}og.png">
<meta name="og:url" content="${FRONTEND_URL_PLACEHOLDER}">
<meta name="og:site_name" content="MAT2 Web">
<meta name="og:type" content="website">
......
......@@ -3,12 +3,14 @@
<div v-if="cleanedFiles">
<section class="row full-height full-width text-center">
<h1
v-if="cleanedFiles.successful.length > 0"
data-cy="removed-metadata-title"
class="col-12"
>
{{ $t('metadata_removed') }}
</h1>
<p
v-if="cleanedFiles.successful.length > 0"
data-cy="removed-metadata-paragraph"
class="col-12"
>
......
......@@ -144,6 +144,8 @@ describe('Upload page negative tests', () => {
cy.wait('@postFile')
cy.get('[data-cy=failed-file-name]').eq(0).contains('a-very-long...runcate.txt')
cy.get('[data-cy=failed-items-list]').should('be.visible')
cy.get('[data-removed-metadata-paragraph]').should('not.be.visible')
cy.get('[data-cy=removed-metadata-title]').should('not.be.visible')
})
it('redirects to error page if zip creation fails', () => {
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment