diff --git a/public/favicon.ico b/public/favicon.ico old mode 100644 new mode 100755 index df36fcfb..a568cedf Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/img/icons/favicon-16x16.png b/public/img/icons/favicon-16x16.png old mode 100644 new mode 100755 index 42af0096..a568cedf Binary files a/public/img/icons/favicon-16x16.png and b/public/img/icons/favicon-16x16.png differ diff --git a/public/img/icons/favicon-32x32.png b/public/img/icons/favicon-32x32.png old mode 100644 new mode 100755 index 46ca04de..a568cedf Binary files a/public/img/icons/favicon-32x32.png and b/public/img/icons/favicon-32x32.png differ diff --git a/src/components/FestivalCarousel.vue b/src/components/FestivalCarousel.vue index 899aa9e3..8b7c4d8a 100644 --- a/src/components/FestivalCarousel.vue +++ b/src/components/FestivalCarousel.vue @@ -1,6 +1,11 @@ - + diff --git a/src/components/common/cards/CaptainComponent.vue b/src/components/common/cards/CaptainComponent.vue index 99329b6c..e448d948 100644 --- a/src/components/common/cards/CaptainComponent.vue +++ b/src/components/common/cards/CaptainComponent.vue @@ -3,12 +3,7 @@ v-flex v-avatar.elevation-4.ma-2(size="180") v-img( - v-if="profile.avatar.sizes" - :src="profile.avatar.sizes.find(e => e.name === 'full_size').url" - ) - v-img( - v-else - src="require('@/assets/avatar_default.png')" + :src="profile.avatar.sizes.length?profile.avatar.sizes.find(e => e.name === 'full_size').url:require('@/assets/avatar_default.png')" ) v-flex.mt-4.font-weight-medium | {{ profile.user.firstName }} {{ profile.user.lastName }} diff --git a/src/components/common/cards/CoreMemberComponent.vue b/src/components/common/cards/CoreMemberComponent.vue index 3e6afe8f..c80be080 100644 --- a/src/components/common/cards/CoreMemberComponent.vue +++ b/src/components/common/cards/CoreMemberComponent.vue @@ -3,13 +3,7 @@ v-flex.md4 v-card.elevation-6 v-img( - v-if="profile.avatar.sizes" - :src="profile.avatar.sizes.find(e => e.name === 'full_size').url" max-height="200" - ) - v-img( - v-else - src="require('@/assets/avatar_default.png')" - max-height="200" + :src="profile.avatar.sizes.length?profile.avatar.sizes.find(e => e.name === 'medium_square_crop').url:require('@/assets/avatar_default.png')" ) v-flex.md4 v-layout(column).align-center.ma-4 diff --git a/src/components/common/cards/StripedCard.vue b/src/components/common/cards/StripedCard.vue index 09eb6afa..d94e6f82 100644 --- a/src/components/common/cards/StripedCard.vue +++ b/src/components/common/cards/StripedCard.vue @@ -8,7 +8,7 @@ width="80%" ) v-img( - :src="node.cover.sizes.length ? node.cover.sizes.find(e => e.name === 'full_size').url : require('../../../assets/cover4.svg')" + :src="node.cover.sizes.length ? node.cover.sizes.find(e => e.name === 'medium_square_crop').url : require('../../../assets/cover4.svg')" min-height="250px" ) v-layout.align-end.fill-height diff --git a/src/components/common/headers/Header.vue b/src/components/common/headers/Header.vue index ba1b5282..85587bf3 100644 --- a/src/components/common/headers/Header.vue +++ b/src/components/common/headers/Header.vue @@ -1,19 +1,29 @@ @@ -28,6 +38,20 @@ export default { } }, name: "Header", + data: () => ({ + toolbarItems: [ + { title: "Forum", icon: "mdi-forum", to: { name: "forum-home" } }, + { title: "Konnekt", icon: "mdi-web", to: { name: "konnekt-home" } }, + { + title: "Account", + icon: "mdi-account", + children: [ + { title: "Profile", to: { name: "profile" } }, + { title: "Logout" } + ] + } + ] + }), computed: { logo: () => GymkhanaLogo } diff --git a/src/components/konnekt/ProfileTemplate.vue b/src/components/konnekt/ProfileTemplate.vue index 8d9c6c7a..d6d5ed10 100644 --- a/src/components/konnekt/ProfileTemplate.vue +++ b/src/components/konnekt/ProfileTemplate.vue @@ -2,7 +2,7 @@ v-flex v-parallax( dark - src="require(@/assets/banner.jpg)" + :src="require('@/assets/banner.jpg')" :height="$vuetify.theme.options.parallaxHeight" ) v-layout.justify-center.align-center.fill-height @@ -47,6 +47,7 @@ v-divider.mx-2 v-card-text(v-if="profile.skills") v-chip.elevation-2.font-weight-bold.ma-1( + v-if="profile.skills.length" xs2 color="light-blue darken-1 white--text" v-for="(skill, i) in profile.skills.split(',')" diff --git a/src/views/Club.vue b/src/views/Club.vue index 49601640..04d22a27 100644 --- a/src/views/Club.vue +++ b/src/views/Club.vue @@ -30,7 +30,7 @@ v-card-text(v-if="club.eventSet.edges.length") EventTable(:eventsList="club.eventSet.edges") v-card-text(v-else).text-center.subtitle-1.ml-2 There are currently no events. - v-flex.md7.offset-md1.elevation-0(flat tile depressed).pl-5.xs12 + v-flex.md7.offset-md1.elevation-0(flat tile depressed).pl-md-5.xs12 v-card-title.headline.justify-center v-icon(left large) mdi-newspaper-plus | Activities and News diff --git a/src/views/Home.vue b/src/views/Home.vue index 98c783b1..7ca136d6 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -45,7 +45,7 @@ v-col(v-else).text-center.title | There is no News. v-col(md="6" sm="6") - v-row.pa-2.justify-center.title.font-weight-regular + v-row.pa-2.justify-center.title.font-weight-regular.text-center v-icon(left) mdi-note-text | Upcoming Events EventTable( @@ -57,7 +57,7 @@ v-parallax( v-if="!$apollo.queries.festivals.loading" src="../assets/hero.jpeg" - :height="carouselHeight" + :height="$vuetify.breakpoint.smAndDown?'auto':carouselHeight" ) v-content.align-center.mask v-container.container--fluid.mb-12 diff --git a/src/views/ProfileDetail.vue b/src/views/ProfileDetail.vue index b82eea93..daf0c3c3 100644 --- a/src/views/ProfileDetail.vue +++ b/src/views/ProfileDetail.vue @@ -9,10 +9,9 @@ v-on="on" dark icon - :to='{name : "profile-edit"}' ) v-icon(size="30") mdi-plus - span Add Social Link + span Add Social Link! Coming Soon! v-tooltip(left color="black") template(v-slot:activator="{ on }") v-btn.ma-5( diff --git a/src/views/ProfileEdit.vue b/src/views/ProfileEdit.vue index 78d35361..8a64069d 100644 --- a/src/views/ProfileEdit.vue +++ b/src/views/ProfileEdit.vue @@ -31,7 +31,7 @@ v-col.pb-0 p.mb-0.font-weight-light Skills v-chip.elevation-2.font-weight-bold.ma-1( - v-if="skills" + v-if="skills.length" xs2 color="light-blue darken-1 white--text" v-for="(skill, i) in skills" @@ -53,6 +53,7 @@ import ProfileCard from "../components/ProfileCard"; import { VIEWER_PROFILE_QUERY } from "../graphql/queries/viewerProfileQuery"; import { UPDATE_PROFILE_MUTATION } from "../graphql/mutations/updateProfileMutation"; + export default { apollo: { viewer: { @@ -118,7 +119,9 @@ export default { this.hometown = this.viewer.userprofile.hometown; this.about = this.viewer.userprofile.about; this.select = this.yearItems.find(e => e.text === this.viewer.userprofile.year); - this.skills = this.viewer.userprofile.skills.split(","); + if (this.viewer.userprofile.skills) { + this.skills = this.viewer.userprofile.skills.split(","); + } /* eslint-enable */ return this.viewer.userprofile;