fix lint issues and errors
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
parent
2749220832
commit
0820866bb8
@ -82,6 +82,7 @@ import { ICurrentUser, ICurrentUserRole } from '@/types/current-user.model';
|
|||||||
import Logo from '@/components/Logo.vue';
|
import Logo from '@/components/Logo.vue';
|
||||||
import SearchField from '@/components/SearchField.vue';
|
import SearchField from '@/components/SearchField.vue';
|
||||||
import { RouteName } from '@/router';
|
import { RouteName } from '@/router';
|
||||||
|
import { GraphQLError } from 'graphql';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
apollo: {
|
apollo: {
|
||||||
|
@ -310,17 +310,18 @@ export default class EditIdentity extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async buildVariables() {
|
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 avatarObj = buildFileVariable(this.avatarFile, 'avatar', `${this.identity.preferredUsername}'s avatar`);
|
||||||
const res = Object.assign({}, this.identity, avatarObj);
|
const res = Object.assign({}, this.identity, avatarObj);
|
||||||
/**
|
/**
|
||||||
* If the avatar didn't change, no need to try reuploading it
|
* If the avatar didn't change, no need to try reuploading it
|
||||||
*/
|
*/
|
||||||
|
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) {
|
if (oldAvatarFileContent === newAvatarFileContent) {
|
||||||
res.avatar = {};
|
res.avatar = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
@ -152,7 +152,7 @@ import { IConfig } from '@/types/config.model';
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class Home extends Vue {
|
export default class Home extends Vue {
|
||||||
events: Event[] = [];
|
events: IEvent[] = [];
|
||||||
locations = [];
|
locations = [];
|
||||||
city = { name: null };
|
city = { name: null };
|
||||||
country = { name: null };
|
country = { name: null };
|
||||||
@ -225,8 +225,8 @@ export default class Home extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get filteredFeaturedEvents() {
|
get filteredFeaturedEvents() {
|
||||||
if (this.currentUser.isLoggedIn === false || !this.currentActor.id) return this.events;
|
if (!this.currentUser.isLoggedIn || !this.currentActor.id) return this.events;
|
||||||
return this.events.filter(event => event.organizerActor.id !== this.currentActor.id);
|
return this.events.filter(event => event.organizerActor && event.organizerActor.id !== this.currentActor.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
geoLocalize() {
|
geoLocalize() {
|
||||||
|
Loading…
Reference in New Issue
Block a user