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

fix lint issues and errors

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-10-08 20:00:26 +02:00
parent 2749220832
commit 0820866bb8
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
js/src/components/NavBar.vue
View file

@ -82,6 +82,7 @@ import { ICurrentUser, ICurrentUserRole } from '@/types/current-user.model';
import Logo from '@/components/Logo.vue';
import SearchField from '@/components/SearchField.vue';
import { RouteName } from '@/router';
import { GraphQLError } from 'graphql';
@Component({
apollo: {

13
js/src/views/Account/children/EditIdentity.vue
View file

@ -310,17 +310,18 @@ export default class EditIdentity extends Vue {
}
private async buildVariables() {
const oldAvatarFile = await buildFileFromIPicture(this.identity.avatar);
const oldAvatarFileContent = await readFileAsync(oldAvatarFile);
const newAvatarFileContent = await readFileAsync(this.avatarFile);
const avatarObj = buildFileVariable(this.avatarFile, 'avatar', `${this.identity.preferredUsername}'s avatar`);
const res = Object.assign({}, this.identity, avatarObj);
/**
* If the avatar didn't change, no need to try reuploading it
*/
if (oldAvatarFileContent === newAvatarFileContent) {
res.avatar = {};
if (this.identity.avatar) {
const oldAvatarFile = await buildFileFromIPicture(this.identity.avatar) as File;
const oldAvatarFileContent = await readFileAsync(oldAvatarFile);
const newAvatarFileContent = await readFileAsync(this.avatarFile as File);
if (oldAvatarFileContent === newAvatarFileContent) {
res.avatar = null;
}
}
return res;
}

6
js/src/views/Home.vue
View file

@ -152,7 +152,7 @@ import { IConfig } from '@/types/config.model';
},
})
export default class Home extends Vue {
events: Event[] = [];
events: IEvent[] = [];
locations = [];
city = { name: null };
country = { name: null };
@ -225,8 +225,8 @@ export default class Home extends Vue {
}
get filteredFeaturedEvents() {
if (this.currentUser.isLoggedIn === false || !this.currentActor.id) return this.events;
return this.events.filter(event => event.organizerActor.id !== this.currentActor.id);
if (!this.currentUser.isLoggedIn || !this.currentActor.id) return this.events;
return this.events.filter(event => event.organizerActor && event.organizerActor.id !== this.currentActor.id);
}
geoLocalize() {