From 274365fb88f306df9c21f1a82124f5e63dfa7ae8 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 18 May 2022 13:14:36 +0200 Subject: [PATCH] rename files DashboardLayout, AuthLayout --- frontend/src/App.spec.js | 4 ++-- frontend/src/App.vue | 8 ++++---- frontend/src/assets/scss/gradido-template.scss | 4 +++- frontend/src/components/GddSend/TransactionForm.spec.js | 2 +- .../{AuthLayout_gdd.spec.js => AuthLayout.spec.js} | 6 +++--- .../src/layouts/{AuthLayout_gdd.vue => AuthLayout.vue} | 2 +- ...ashboardLayout_gdd.spec.js => DashboardLayout.spec.js} | 6 +++--- .../{DashboardLayout_gdd.vue => DashboardLayout.vue} | 0 frontend/src/pages/Send.spec.js | 2 +- 9 files changed, 18 insertions(+), 16 deletions(-) rename frontend/src/layouts/{AuthLayout_gdd.spec.js => AuthLayout.spec.js} (94%) rename frontend/src/layouts/{AuthLayout_gdd.vue => AuthLayout.vue} (99%) rename frontend/src/layouts/{DashboardLayout_gdd.spec.js => DashboardLayout.spec.js} (97%) rename frontend/src/layouts/{DashboardLayout_gdd.vue => DashboardLayout.vue} (100%) diff --git a/frontend/src/App.spec.js b/frontend/src/App.spec.js index cc26f5135..79467e2a8 100644 --- a/frontend/src/App.spec.js +++ b/frontend/src/App.spec.js @@ -43,8 +43,8 @@ describe('App', () => { expect(wrapper.find('#app').exists()).toBe(true) }) - it('has a component AuthLayoutGDD', () => { - expect(wrapper.findComponent({ name: 'AuthTemplate' }).exists()).toBe(true) + it('has a component AuthLayout', () => { + expect(wrapper.findComponent({ name: 'AuthLayout' }).exists()).toBe(true) }) describe('route requires authorization', () => { diff --git a/frontend/src/App.vue b/frontend/src/App.vue index a7fc5f13e..8ba270938 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,19 +1,19 @@ diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index e600ffda8..8dae4ce08 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -27,7 +27,7 @@ a, /* Button */ .btn { - border-radius: 17px; + border-radius: 25px; } .btn-gradido { @@ -38,6 +38,8 @@ a, border-style: none; box-shadow: 10px 10px 50px 10px rgb(56 56 56 / 31%); color: #fff; + padding-right: 50px; + padding-left: 50px; } .btn-gradido:hover { diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js index 0b7245b67..501fb7c37 100644 --- a/frontend/src/components/GddSend/TransactionForm.spec.js +++ b/frontend/src/components/GddSend/TransactionForm.spec.js @@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils' import TransactionForm from './TransactionForm' import flushPromises from 'flush-promises' import { SEND_TYPES } from '@/pages/Send.vue' -import DashboardLayout from '@/layouts/DashboardLayout_gdd.vue' +import DashboardLayout from '@/layouts/DashboardLayout.vue' const localVue = global.localVue diff --git a/frontend/src/layouts/AuthLayout_gdd.spec.js b/frontend/src/layouts/AuthLayout.spec.js similarity index 94% rename from frontend/src/layouts/AuthLayout_gdd.spec.js rename to frontend/src/layouts/AuthLayout.spec.js index 09b064a05..451edaed6 100644 --- a/frontend/src/layouts/AuthLayout_gdd.spec.js +++ b/frontend/src/layouts/AuthLayout.spec.js @@ -1,9 +1,9 @@ import { mount, RouterLinkStub } from '@vue/test-utils' -import AuthLayoutGdd from './AuthLayout_gdd' +import AuthLayout from './AuthLayout' const localVue = global.localVue -describe('AuthLayoutGdd', () => { +describe('AuthLayout', () => { let wrapper const mocks = { @@ -28,7 +28,7 @@ describe('AuthLayoutGdd', () => { } const Wrapper = () => { - return mount(AuthLayoutGdd, { localVue, mocks, stubs }) + return mount(AuthLayout, { localVue, mocks, stubs }) } describe('mount', () => { diff --git a/frontend/src/layouts/AuthLayout_gdd.vue b/frontend/src/layouts/AuthLayout.vue similarity index 99% rename from frontend/src/layouts/AuthLayout_gdd.vue rename to frontend/src/layouts/AuthLayout.vue index 399213d20..466b0517a 100644 --- a/frontend/src/layouts/AuthLayout_gdd.vue +++ b/frontend/src/layouts/AuthLayout.vue @@ -90,7 +90,7 @@ import LanguageSwitch from '@/components/LanguageSwitch2' import AuthFooter from '@/components/Auth/Footer.vue' export default { - name: 'AuthTemplate', + name: 'AuthLayout', components: { MobileStart, Navbar, diff --git a/frontend/src/layouts/DashboardLayout_gdd.spec.js b/frontend/src/layouts/DashboardLayout.spec.js similarity index 97% rename from frontend/src/layouts/DashboardLayout_gdd.spec.js rename to frontend/src/layouts/DashboardLayout.spec.js index ac079b0f3..398724201 100644 --- a/frontend/src/layouts/DashboardLayout_gdd.spec.js +++ b/frontend/src/layouts/DashboardLayout.spec.js @@ -1,6 +1,6 @@ import { mount, RouterLinkStub } from '@vue/test-utils' import flushPromises from 'flush-promises' -import DashboardLayoutGdd from './DashboardLayout_gdd' +import DashboardLayout from './DashboardLayout' import { toastErrorSpy } from '@test/testSetup' @@ -19,7 +19,7 @@ const apolloMock = jest.fn().mockResolvedValue({ }, }) -describe('DashboardLayoutGdd', () => { +describe('DashboardLayout', () => { let wrapper const mocks = { @@ -61,7 +61,7 @@ describe('DashboardLayoutGdd', () => { } const Wrapper = () => { - return mount(DashboardLayoutGdd, { localVue, mocks, stubs }) + return mount(DashboardLayout, { localVue, mocks, stubs }) } describe('mount', () => { diff --git a/frontend/src/layouts/DashboardLayout_gdd.vue b/frontend/src/layouts/DashboardLayout.vue similarity index 100% rename from frontend/src/layouts/DashboardLayout_gdd.vue rename to frontend/src/layouts/DashboardLayout.vue diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js index 88759c839..47a30ff65 100644 --- a/frontend/src/pages/Send.spec.js +++ b/frontend/src/pages/Send.spec.js @@ -3,7 +3,7 @@ import Send, { SEND_TYPES } from './Send' import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup' import { TRANSACTION_STEPS } from '@/components/GddSend.vue' import { sendCoins, createTransactionLink } from '@/graphql/mutations.js' -import DashboardLayout from '@/layouts/DashboardLayout_gdd.vue' +import DashboardLayout from '@/layouts/DashboardLayout.vue' import flushPromises from 'flush-promises' const apolloMutationMock = jest.fn()