resolve relative paths, rename pages

This commit is contained in:
Moriz Wahl 2022-03-07 18:47:14 +01:00
parent c790211870
commit 14dcb3fa93
41 changed files with 89 additions and 91 deletions

View File

@ -12,6 +12,7 @@ module.exports = {
'\\.(css|less)$': 'identity-obj-proxy',
'\\.(scss)$': '<rootDir>/src/assets/mocks/styleMock.js',
'^@/(.*)$': '<rootDir>/src/$1',
'^@test/(.*)$': '<rootDir>/test/$1',
},
transform: {
'^.+\\.vue$': 'vue-jest',

View File

@ -82,9 +82,6 @@
"vue-template-compiler": "^2.6.11",
"webpack-bundle-analyzer": "^4.5.0"
},
"_moduleAliases": {
"@components": "./components"
},
"postcss": {
"plugins": {
"autoprefixer": {}

View File

@ -10,8 +10,8 @@
<script>
import { ParticlesBg } from 'particles-bg-vue'
import icon from './icon.js'
import DashboardLayout from '@/views/Layout/DashboardLayout_gdd.vue'
import AuthLayoutGDD from '@/views/Layout/AuthLayout_gdd.vue'
import DashboardLayout from '@/layouts/DashboardLayout_gdd.vue'
import AuthLayoutGDD from '@/layouts/AuthLayout_gdd.vue'
export default {
name: 'app',

View File

@ -59,7 +59,7 @@
</footer>
</template>
<script>
import CONFIG from '../../config'
import CONFIG from '@/config'
export default {
data() {

View File

@ -2,7 +2,7 @@ import { mount, RouterLinkStub } from '@vue/test-utils'
import flushPromises from 'flush-promises'
import DashboardLayoutGdd from './DashboardLayout_gdd'
import { toastErrorSpy } from '../../../test/testSetup'
import { toastErrorSpy } from '@test/testSetup'
jest.useFakeTimers()

View File

@ -37,12 +37,12 @@
</div>
</template>
<script>
import Navbar from '../../components/Menu/Navbar.vue'
import Sidebar from '../../components/Menu/Sidebar.vue'
import { logout, transactionsQuery } from '../../graphql/queries'
import Navbar from '@/components/Menu/Navbar.vue'
import Sidebar from '@/components/Menu/Sidebar.vue'
import { logout, transactionsQuery } from '@/graphql/queries'
import ContentFooter from './ContentFooter.vue'
import { FadeTransition } from 'vue2-transitions'
import CONFIG from '../../config'
import CONFIG from '@/config'
export default {
components: {

View File

@ -57,12 +57,12 @@
</template>
<script>
import TransactionListItem from '../../../components/TransactionListItem'
import PaginationButtons from '../../../components/PaginationButtons'
import TransactionDecay from '../../../components/Transactions/TransactionDecay'
import TransactionSend from '../../../components/Transactions/TransactionSend'
import TransactionReceive from '../../../components/Transactions/TransactionReceive'
import TransactionCreation from '../../../components/Transactions/TransactionCreation'
import TransactionListItem from '@/components/TransactionListItem'
import PaginationButtons from '@/components/PaginationButtons'
import TransactionDecay from '@/components/Transactions/TransactionDecay'
import TransactionSend from '@/components/Transactions/TransactionSend'
import TransactionReceive from '@/components/Transactions/TransactionReceive'
import TransactionCreation from '@/components/Transactions/TransactionCreation'
export default {
name: 'gdd-transaction-list',

View File

@ -1,8 +1,8 @@
import { mount } from '@vue/test-utils'
import { GdtEntryType } from '../../../graphql/enums'
import { GdtEntryType } from '@/graphql/enums'
import GdtTransactionList from './GdtTransactionList'
import { toastErrorSpy } from '../../../../test/testSetup'
import { toastErrorSpy } from '@test/testSetup'
const localVue = global.localVue

View File

@ -36,9 +36,9 @@
</template>
<script>
import { listGDTEntriesQuery } from '../../../graphql/queries'
import PaginationButtons from '../../../components/PaginationButtons'
import Transaction from '../../../components/Transaction.vue'
import { listGDTEntriesQuery } from '@/graphql/queries'
import PaginationButtons from '@/components/PaginationButtons'
import Transaction from '@/components/Transaction.vue'
export default {
name: 'gdt-transaction-list',

View File

@ -38,8 +38,8 @@
</div>
</template>
<script>
import { sendResetPasswordEmail } from '../../graphql/queries'
import InputEmail from '../../components/Inputs/InputEmail'
import { sendResetPasswordEmail } from '@/graphql/queries'
import InputEmail from '@/components/Inputs/InputEmail'
const textFields = {
reset: {

View File

@ -2,7 +2,7 @@ import { RouterLinkStub, mount } from '@vue/test-utils'
import flushPromises from 'flush-promises'
import Login from './Login'
import { toastErrorSpy } from '../../../test/testSetup'
import { toastErrorSpy } from '@test/testSetup'
const localVue = global.localVue

View File

@ -60,10 +60,10 @@
</div>
</template>
<script>
import InputPassword from '../../components/Inputs/InputPassword'
import InputEmail from '../../components/Inputs/InputEmail'
import { login } from '../../graphql/queries'
import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo'
import InputPassword from '@/components/Inputs/InputPassword'
import InputEmail from '@/components/Inputs/InputEmail'
import { login } from '@/graphql/queries'
import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
export default {
name: 'login',

View File

@ -1,11 +1,11 @@
import { mount } from '@vue/test-utils'
import AccountOverview from './AccountOverview'
import Overview from './Overview'
const localVue = global.localVue
window.scrollTo = jest.fn()
describe('AccountOverview', () => {
describe('Overview', () => {
let wrapper
const mocks = {
@ -14,7 +14,7 @@ describe('AccountOverview', () => {
}
const Wrapper = () => {
return mount(AccountOverview, {
return mount(Overview, {
localVue,
mocks,
})

View File

@ -27,7 +27,7 @@
</div>
</template>
<script>
import Status from '../../components/Status.vue'
import Status from '@/components/Status.vue'
import GddTransactionList from './AccountOverview/GddTransactionList.vue'
import GddTransactionListFooter from './AccountOverview/GddTransactionListFooter.vue'

View File

@ -1,9 +1,9 @@
import { shallowMount } from '@vue/test-utils'
import UserProfileOverview from './UserProfileOverview'
import Profile from './Profile'
const localVue = global.localVue
describe('UserProfileOverview', () => {
describe('Profile', () => {
let wrapper
const mocks = {
@ -11,7 +11,7 @@ describe('UserProfileOverview', () => {
}
const Wrapper = () => {
return shallowMount(UserProfileOverview, { localVue, mocks })
return shallowMount(Profile, { localVue, mocks })
}
describe('shallow Mount', () => {

View File

@ -2,7 +2,7 @@ import { mount, RouterLinkStub } from '@vue/test-utils'
import flushPromises from 'flush-promises'
import Register from './Register'
import { toastErrorSpy } from '../../../test/testSetup'
import { toastErrorSpy } from '@test/testSetup'
const localVue = global.localVue

View File

@ -188,10 +188,10 @@
</div>
</template>
<script>
import InputEmail from '../../components/Inputs/InputEmail.vue'
import LanguageSwitchSelect from '../../components/LanguageSwitchSelect.vue'
import { createUser } from '../../graphql/mutations'
import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo'
import InputEmail from '@/components/Inputs/InputEmail.vue'
import LanguageSwitchSelect from '@/components/LanguageSwitchSelect.vue'
import { createUser } from '@/graphql/mutations'
import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
export default {
components: { InputEmail, LanguageSwitchSelect },

View File

@ -1,7 +1,7 @@
import { mount, RouterLinkStub } from '@vue/test-utils'
import RegisterCommunity from './RegisterCommunity'
import { toastErrorSpy } from '../../../test/testSetup'
import { toastErrorSpy } from '@test/testSetup'
const localVue = global.localVue

View File

@ -49,7 +49,7 @@
</div>
</template>
<script>
import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo'
import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
export default {
name: 'registerCommunity',

View File

@ -2,7 +2,7 @@ import { mount, RouterLinkStub } from '@vue/test-utils'
import ResetPassword from './ResetPassword'
import flushPromises from 'flush-promises'
import { toastErrorSpy } from '../../../test/testSetup'
import { toastErrorSpy } from '@test/testSetup'
// validation is tested in src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js

View File

@ -44,8 +44,8 @@
</div>
</template>
<script>
import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation'
import { setPassword } from '../../graphql/mutations'
import InputPasswordConfirmation from '@/components/Inputs/InputPasswordConfirmation'
import { setPassword } from '@/graphql/mutations'
const textFields = {
reset: {

View File

@ -1,8 +1,8 @@
import { mount, RouterLinkStub } from '@vue/test-utils'
import { communities, communityInfo } from '../../graphql/queries'
import RegisterSelectCommunity from './RegisterSelectCommunity'
import { communities, communityInfo } from '@/graphql/queries'
import SelectCommunity from './SelectCommunity'
import { toastErrorSpy } from '../../../test/testSetup'
import { toastErrorSpy } from '@test/testSetup'
const localVue = global.localVue
@ -56,7 +56,7 @@ const apolloQueryMock = jest
const mockStoreCommit = jest.fn()
describe('RegisterSelectCommunity', () => {
describe('SelectCommunity', () => {
let wrapper
const mocks = {
@ -86,7 +86,7 @@ describe('RegisterSelectCommunity', () => {
}
const Wrapper = () => {
return mount(RegisterSelectCommunity, { localVue, mocks, stubs })
return mount(SelectCommunity, { localVue, mocks, stubs })
}
describe('mount', () => {

View File

@ -48,8 +48,8 @@
</div>
</template>
<script>
import { communities } from '../../graphql/queries'
import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo'
import { communities } from '@/graphql/queries'
import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
export default {
name: 'registerSelectCommunity',

View File

@ -1,5 +1,5 @@
import { mount } from '@vue/test-utils'
import SendOverview from './SendOverview'
import Send from './Send'
const sendMock = jest.fn()
sendMock.mockResolvedValue('success')
@ -8,7 +8,7 @@ const localVue = global.localVue
// window.scrollTo = jest.fn()
describe('SendOverview', () => {
describe('Send', () => {
let wrapper
const propsData = {
@ -32,7 +32,7 @@ describe('SendOverview', () => {
}
const Wrapper = () => {
return mount(SendOverview, { localVue, mocks, propsData })
return mount(Send, { localVue, mocks, propsData })
}
describe('mount', () => {

View File

@ -34,7 +34,7 @@ import GddSend from './SendOverview/GddSend.vue'
import TransactionForm from './SendOverview/GddSend/TransactionForm.vue'
import TransactionConfirmation from './SendOverview/GddSend/TransactionConfirmation.vue'
import TransactionResult from './SendOverview/GddSend/TransactionResult.vue'
import { sendCoins } from '../../graphql/mutations.js'
import { sendCoins } from '@/graphql/mutations.js'
const EMPTY_TRANSACTION_DATA = {
email: '',

View File

@ -1,11 +1,11 @@
import { mount } from '@vue/test-utils'
import UserProfileTransactionList from './UserProfileTransactionList'
import Transactions from './Transactions'
const localVue = global.localVue
window.scrollTo = jest.fn()
describe('UserProfileTransactionList', () => {
describe('Transactions', () => {
let wrapper
const mocks = {
@ -22,7 +22,7 @@ describe('UserProfileTransactionList', () => {
}
const Wrapper = () => {
return mount(UserProfileTransactionList, { localVue, mocks, stubs })
return mount(Transactions, { localVue, mocks, stubs })
}
describe('mount', () => {

View File

@ -1,8 +1,8 @@
import { mount } from '@vue/test-utils'
import UserCardCoinAnimation from './UserCard_CoinAnimation'
import { updateUserInfos } from '../../../graphql/mutations'
import { updateUserInfos } from '@/graphql/mutations'
import { toastErrorSpy, toastSuccessSpy } from '../../../../test/testSetup'
import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
const localVue = global.localVue

View File

@ -31,7 +31,7 @@
</b-card>
</template>
<script>
import { updateUserInfos } from '../../../graphql/mutations'
import { updateUserInfos } from '@/graphql/mutations'
export default {
name: 'FormUserCoinAnimation',
data() {

View File

@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
import UserCardFormUserData from './UserCard_FormUserData'
import flushPromises from 'flush-promises'
import { toastErrorSpy, toastSuccessSpy } from '../../../../test/testSetup'
import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
const localVue = global.localVue

View File

@ -64,7 +64,7 @@
</b-card>
</template>
<script>
import { updateUserInfos } from '../../../graphql/mutations'
import { updateUserInfos } from '@/graphql/mutations'
export default {
name: 'FormUserData',

View File

@ -32,7 +32,7 @@
</b-card>
</template>
<script>
import { updateUserInfos } from '../../../graphql/mutations'
import { updateUserInfos } from '@/graphql/mutations'
export default {
name: 'FormUserMail',

View File

@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
import UserCardFormPasswort from './UserCard_FormUserPasswort'
import flushPromises from 'flush-promises'
import { toastErrorSpy, toastSuccessSpy } from '../../../../test/testSetup'
import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
const localVue = global.localVue

View File

@ -48,9 +48,9 @@
</b-card>
</template>
<script>
import InputPassword from '../../../components/Inputs/InputPassword'
import InputPasswordConfirmation from '../../../components/Inputs/InputPasswordConfirmation'
import { updateUserInfos } from '../../../graphql/mutations'
import InputPassword from '@/components/Inputs/InputPassword'
import InputPasswordConfirmation from '@/components/Inputs/InputPasswordConfirmation'
import { updateUserInfos } from '@/graphql/mutations'
export default {
name: 'FormUserPasswort',

View File

@ -1,7 +1,7 @@
import { mount } from '@vue/test-utils'
import UserCardLanguage from './UserCard_Language'
import { toastErrorSpy, toastSuccessSpy } from '../../../../test/testSetup'
import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
const localVue = global.localVue

View File

@ -60,8 +60,8 @@
</b-card>
</template>
<script>
import LanguageSwitchSelect from '../../../components/LanguageSwitchSelect.vue'
import { updateUserInfos } from '../../../graphql/mutations'
import LanguageSwitchSelect from '@/components/LanguageSwitchSelect.vue'
import { updateUserInfos } from '@/graphql/mutations'
export default {
name: 'FormUserLanguage',

View File

@ -1,8 +1,8 @@
import { mount } from '@vue/test-utils'
import UserCardNewsletter from './UserCard_Newsletter'
import { unsubscribeNewsletter, subscribeNewsletter } from '../../../graphql/mutations'
import { unsubscribeNewsletter, subscribeNewsletter } from '@/graphql/mutations'
import { toastErrorSpy, toastSuccessSpy } from '../../../../test/testSetup'
import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
const localVue = global.localVue

View File

@ -27,7 +27,7 @@
</b-card>
</template>
<script>
import { subscribeNewsletter, unsubscribeNewsletter } from '../../../graphql/mutations'
import { subscribeNewsletter, unsubscribeNewsletter } from '@/graphql/mutations'
export default {
name: 'FormUserNewsletter',

View File

@ -1,5 +1,5 @@
import router from './router'
import NotFound from '@/views/NotFoundPage.vue'
import NotFound from '@/components/NotFoundPage.vue'
describe('router', () => {
describe('options', () => {

View File

@ -1,4 +1,4 @@
import NotFound from '@/views/NotFoundPage.vue'
import NotFound from '@/components/NotFoundPage.vue'
const routes = [
{
@ -12,43 +12,43 @@ const routes = [
},
{
path: '/overview',
component: () => import('../views/Pages/AccountOverview.vue'),
component: () => import('@/pages/Overview.vue'),
meta: {
requiresAuth: true,
},
},
{
path: '/send',
component: () => import('../views/Pages/SendOverview.vue'),
component: () => import('@/pages/Send.vue'),
meta: {
requiresAuth: true,
},
},
{
path: '/profile',
component: () => import('../views/Pages/UserProfileOverview.vue'),
component: () => import('@/pages/Profile.vue'),
meta: {
requiresAuth: true,
},
},
{
path: '/transactions',
component: () => import('../views/Pages/UserProfileTransactionList.vue'),
component: () => import('@/pages/Transactions.vue'),
meta: {
requiresAuth: true,
},
},
{
path: '/login',
component: () => import('../views/Pages/Login.vue'),
component: () => import('@/pages/Login.vue'),
},
{
path: '/register',
component: () => import('../views/Pages/Register.vue'),
component: () => import('@/pages/Register.vue'),
},
{
path: '/thx/:comingFrom',
component: () => import('../views/Pages/thx.vue'),
component: () => import('@/pages/thx.vue'),
beforeEnter: (to, from, next) => {
const validFrom = ['password', 'reset', 'register', 'login', 'checkEmail']
if (!validFrom.includes(from.path.split('/')[1])) {
@ -60,27 +60,27 @@ const routes = [
},
{
path: '/password',
component: () => import('../views/Pages/ForgotPassword.vue'),
component: () => import('@/pages/ForgotPassword.vue'),
},
{
path: '/password/:comingFrom',
component: () => import('../views/Pages/ForgotPassword.vue'),
component: () => import('@/pages/ForgotPassword.vue'),
},
{
path: '/register-community',
component: () => import('../views/Pages/RegisterCommunity.vue'),
component: () => import('@/pages/RegisterCommunity.vue'),
},
{
path: '/select-community',
component: () => import('../views/Pages/RegisterSelectCommunity.vue'),
component: () => import('@/pages/SelectCommunity.vue'),
},
{
path: '/reset/:optin',
component: () => import('../views/Pages/ResetPassword.vue'),
component: () => import('@/pages/ResetPassword.vue'),
},
{
path: '/checkEmail/:optin',
component: () => import('../views/Pages/ResetPassword.vue'),
component: () => import('@/pages/ResetPassword.vue'),
},
{ path: '*', component: NotFound },
]