tommy/mobilizon
1
0
Fork 0
forked from potsda.mn/mobilizon
Code Pull requests Activity

Fix transition test

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-10-08 22:27:14 +02:00
parent 7a453b4329
commit ecb7d9f759
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
3 changed files with 193 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/src/App.vue
View file

@ -2,7 +2,7 @@
<div id="mobilizon"> <div id="mobilizon">
<NavBar /> <NavBar />
<main> <main>
<transition name="fade"> <transition name="fade" mode="out-in">
<router-view /> <router-view />
</transition> </transition>
</main> </main>
@ -74,7 +74,7 @@ export default class App extends Vue {
@import "~buefy/src/scss/buefy"; @import "~buefy/src/scss/buefy";
.fade-enter-active, .fade-leave-active { .fade-enter-active, .fade-leave-active {
transition: opacity .75s; transition: opacity .5s;
} }
.fade-enter, .fade-leave-to { .fade-enter, .fade-leave-to {
opacity: 0; opacity: 0;

11
js/src/views/Event/Event.vue
View file

@ -1,6 +1,7 @@
<template> <template>
<div class="container"> <div class="container">
<b-loading :active.sync="$apollo.loading"></b-loading> <b-loading :active.sync="$apollo.loading"></b-loading>
<transition appear name="fade" mode="out-in">
<div v-if="event"> <div v-if="event">
<div class="header-picture container"> <div class="header-picture container">
<figure class="image is-3by1" v-if="event.picture"> <figure class="image is-3by1" v-if="event.picture">
@ -47,7 +48,6 @@
<div class="column is-three-quarters-desktop"> <div class="column is-three-quarters-desktop">
<p class="tags" v-if="event.category || event.tags.length > 0"> <p class="tags" v-if="event.category || event.tags.length > 0">
<b-tag type="is-warning" size="is-medium" v-if="event.draft">{{ $t('Draft') }}</b-tag> <b-tag type="is-warning" size="is-medium" v-if="event.draft">{{ $t('Draft') }}</b-tag>
<!-- <span class="tag" v-if="event.category">{{ event.category }}</span>-->
<b-tag type="is-success" v-if="event.tags" v-for="tag in event.tags" :key="tag.title">{{ tag.title }}</b-tag> <b-tag type="is-success" v-if="event.tags" v-for="tag in event.tags" :key="tag.title">{{ tag.title }}</b-tag>
<span v-if="event.tags > 0">⋅</span> <span v-if="event.tags > 0">⋅</span>
<span class="visibility" v-if="!event.draft"> <span class="visibility" v-if="!event.draft">
@ -98,7 +98,6 @@
<span class="addressDescription" :title="event.physicalAddress.description">{{ event.physicalAddress.description }}</span> <span class="addressDescription" :title="event.physicalAddress.description">{{ event.physicalAddress.description }}</span>
<span>{{ event.physicalAddress.floor }} {{ event.physicalAddress.street }}</span> <span>{{ event.physicalAddress.floor }} {{ event.physicalAddress.street }}</span>
<span>{{ event.physicalAddress.postalCode }} {{ event.physicalAddress.locality }}</span> <span>{{ event.physicalAddress.postalCode }} {{ event.physicalAddress.locality }}</span>
<!-- <span>{{ event.physicalAddress.region }} {{ event.physicalAddress.country }}</span>-->
</address> </address>
<span class="map-show-button" @click="showMap = !showMap" v-if="event.physicalAddress && event.physicalAddress.geom"> <span class="map-show-button" @click="showMap = !showMap" v-if="event.physicalAddress && event.physicalAddress.geom">
{{ $t('Show map') }} {{ $t('Show map') }}
@ -198,6 +197,7 @@
</identity-picker> </identity-picker>
</b-modal> </b-modal>
</div> </div>
</transition>
</div> </div>
</template> </template>
@ -482,6 +482,13 @@ export default class Event extends EventMixin {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../variables"; @import "../../variables";
.fade-enter-active, .fade-leave-active {
transition: opacity .5s;
}
.fade-enter, .fade-leave-to {
opacity: 0;
}
div.sidebar { div.sidebar {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

1
js/tests/e2e/specs/register.js
View file

@ -39,6 +39,7 @@ describe('Registration', () => {
cy.get('form').contains('button.button.is-primary', 'Register').click(); cy.get('form').contains('button.button.is-primary', 'Register').click();
cy.url().should('include', '/register/profile'); cy.url().should('include', '/register/profile');
cy.wait(1000);
cy.get('form .field').first().contains('label', 'Username').parent().find('input').type('tester'); cy.get('form .field').first().contains('label', 'Username').parent().find('input').type('tester');
cy.get('form .field').eq(2).contains('label', 'Displayed name').parent().find('input').type('tester account'); cy.get('form .field').eq(2).contains('label', 'Displayed name').parent().find('input').type('tester account');
cy.get('form .field').eq(3).contains('label', 'Description').parent().find('textarea').type('This is a test account'); cy.get('form .field').eq(3).contains('label', 'Description').parent().find('textarea').type('This is a test account');