From 30cc89fe25dbea5385847cec03961a8d1c39a276 Mon Sep 17 00:00:00 2001 From: dpschen Date: Sat, 13 Nov 2021 14:16:14 +0000 Subject: [PATCH] feat: add vite-svg-loader and add Logo component (#971) Co-authored-by: Dominik Pschenitschni Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/971 Reviewed-by: konrad Co-authored-by: dpschen Co-committed-by: dpschen --- cypress/integration/misc/menu.spec.js | 4 +- package.json | 1 + src/assets/logo-full-pride.svg | 2 +- src/assets/logo-full.svg | 2 +- src/components/home/Logo.vue | 11 +++ src/components/home/MenuButton.vue | 75 +++++++++++++++++++ src/components/home/PoweredByLink.vue | 20 ++++++ src/components/home/contentAuth.vue | 28 +++++++- src/components/home/contentLinkShare.vue | 60 +++++++--------- src/components/home/contentNoAuth.vue | 13 ++-- src/components/home/navigation.vue | 43 ++++++----- src/components/home/topNavigation.vue | 62 +++++++--------- src/i18n/lang/en.json | 4 +- src/styles/theme/_index.scss | 1 - src/styles/theme/navigation.scss | 92 ------------------------ src/styles/theme/theme.scss | 9 --- src/types/vite-svg-loader.d.ts | 1 + src/views/migrator/MigrateService.vue | 10 +-- src/views/migrator/migrators.ts | 8 +-- src/views/tasks/ShowTasks.vue | 38 +++++----- vite.config.js | 6 ++ yarn.lock | 83 ++++++++++++++++++++- 22 files changed, 335 insertions(+), 238 deletions(-) create mode 100644 src/components/home/Logo.vue create mode 100644 src/components/home/MenuButton.vue create mode 100644 src/components/home/PoweredByLink.vue delete mode 100644 src/styles/theme/navigation.scss create mode 100644 src/types/vite-svg-loader.d.ts diff --git a/cypress/integration/misc/menu.spec.js b/cypress/integration/misc/menu.spec.js index 98e228f2f..86e3ab57f 100644 --- a/cypress/integration/misc/menu.spec.js +++ b/cypress/integration/misc/menu.spec.js @@ -7,7 +7,7 @@ describe('The Menu', () => { }) it('Can be hidden on desktop', () => { - cy.get('a.menu-show-button:visible') + cy.get('button.menu-show-button:visible') .click() cy.get('.namespace-container') .should('not.have.class', 'is-active') @@ -21,7 +21,7 @@ describe('The Menu', () => { it('Is can be shown on mobile', () => { cy.viewport('iphone-8') - cy.get('a.menu-show-button:visible') + cy.get('button.menu-show-button:visible') .click() cy.get('.namespace-container') .should('have.class', 'is-active') diff --git a/package.json b/package.json index 72d4a3623..1fea18f54 100644 --- a/package.json +++ b/package.json @@ -81,6 +81,7 @@ "vite": "2.6.14", "vite-plugin-pwa": "0.11.3", "vue-tsc": "0.29.4", + "vite-svg-loader": "^3.1.0", "wait-on": "6.0.0", "workbox-cli": "6.3.0" }, diff --git a/src/assets/logo-full-pride.svg b/src/assets/logo-full-pride.svg index f79358778..f7d6527f6 100644 --- a/src/assets/logo-full-pride.svg +++ b/src/assets/logo-full-pride.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/logo-full.svg b/src/assets/logo-full.svg index 12b4369da..c5e728a3a 100644 --- a/src/assets/logo-full.svg +++ b/src/assets/logo-full.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/home/Logo.vue b/src/components/home/Logo.vue new file mode 100644 index 000000000..cea2d0f04 --- /dev/null +++ b/src/components/home/Logo.vue @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/src/components/home/MenuButton.vue b/src/components/home/MenuButton.vue new file mode 100644 index 000000000..ec5caeeac --- /dev/null +++ b/src/components/home/MenuButton.vue @@ -0,0 +1,75 @@ + + + + + \ No newline at end of file diff --git a/src/components/home/PoweredByLink.vue b/src/components/home/PoweredByLink.vue new file mode 100644 index 000000000..e174ba691 --- /dev/null +++ b/src/components/home/PoweredByLink.vue @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue index d68cdb43f..e0fda1201 100644 --- a/src/components/home/contentAuth.vue +++ b/src/components/home/contentAuth.vue @@ -1,7 +1,7 @@