Skip to content

Commit

Permalink
BETA 1.1.3 BUG FIXES - SCROLLBAR, LOGIN FLOW (#270)
Browse files Browse the repository at this point in the history
* Optimized landing page

- Scaled down background to 4k width
- Web-optimized images

* fix: move backup images to backup folder

* feat: delete notes option

* feat : discord linking works

* fix: user exp bar division

* fix: add general and physed subject options

* fix: homepage width styles

* created cloud build yaml file

* timeout fail test

* cloud build time out to 900s

* feat: standard responsive avatar bar

* feat: image paste posting
NOT FINISHED

* fix: do not mutate vuex state error when posting second note
used list deconstruct on the images list, so when the original list is
modified the one stored in the vuex state isnt mutated as well

* feat: image posting through https on call function

* feat: image posting mixin + image posting on edit notes and questions

* fix: vuex state error obj destructure image list, delete image from storeImages if not included in content

* fix: vuex image list error

* padding fix and label removal for notes upload

* fix: gitignroe sw.js

* feat: expandable textbox

* feat: textarea markdown options

* feat: add more markdown options

* markdown editor menu position fix

* notes pills position fix

* fix: router fix

* fix: redirect to splash or home

* color changes and post new question modal changes (#203)

* character limit on post new note

* Update envars.ts

* edit notes character limit and style change

* added back button to newsletters

* Fixed profile button + styled settings page

* Added firebase connection

* fix: dumb filter error

* Finished Edit Profile Page

* a

* Revert "a"

This reverts commit 54b9d37.

* Made changes requested

* feat: integrate analytics

* fix: redirect queries will persist through login

* fix: redirect override from timeout function

* feat : notification bar

* Added viewable profile

* remove console logs

* auth.ts userInfo.user error fixed

* login issue fixed

* login issue fixed V2(previous one still had same issue)

* pr changes added, Error message made clear

* fix: error handling done correctly

* error thrown back

* Feature: Signup now doesn't allow signup with invalid names, emails, passwords etc

* fix user signup conflicts with redirect query

* feat : add grades 7, 8

* feat: email auth verification, watch user auth state redirects

* feat: add notifications options checkbox

* feat: add eula content accept

* refactor: use 1 total exp stat for read/write efficiency

* added character limit to questions page

* character limit change

* feat: add scroll bar

* fix: allows new users to go back to sign up from verify email

* feat: sort by popular option

* fix: show scrollbar on chrome

* feat: add phy ed as a favouritable subject

* fix: md list rendering on chromium

* fix: add firebase sw to gitignore

* feat: add scroll bar

* fix: tooltip doesn't die error

* refactor: use 1 total exp stat for read/write efficiency

Co-authored-by: Andre Benedito <[email protected]>
Co-authored-by: Vansh Sethi <[email protected]>
Co-authored-by: Jeff Huang <[email protected]>
Co-authored-by: Eshwar Chock <[email protected]>
Co-authored-by: Jeffrey Zhang <[email protected]>
  • Loading branch information
6 people authored Sep 1, 2020
1 parent 5c662b9 commit 0ff0032
Show file tree
Hide file tree
Showing 38 changed files with 692 additions and 318 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ coverage


# Service worker stuff
static/sw.js
static/sw.js
firebase-auth-sw.js
14 changes: 1 addition & 13 deletions assets/scss/components/notes_md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,7 @@
}
transition-duration: 100ms !important;
}
::-webkit-scrollbar {
height: 10px;
}

::-webkit-scrollbar-thumb {
background: rgba(90, 90, 90, 0.5);
border-radius: 15px !important;
}

::-webkit-scrollbar-track {
background: rgba(90, 90, 90, 0.1);
border-radius: 15px !important;
}
.title-content {
margin-left: 10%;
}
Expand Down Expand Up @@ -80,7 +68,7 @@
list-style-type: disc !important;
}
ol {
list-style-type: symbols !important;
list-style-type: decimal !important;
}

ul,
Expand Down
3 changes: 1 addition & 2 deletions assets/scss/components/vxCard.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.vx-card{
width: 100%;
background: #fff;
border-radius: .5rem;
display: block;
Expand All @@ -14,7 +13,7 @@
display: flex;
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
justify-content: space-between;
padding: 1.5rem 1.5rem 0;
.vx-card__title {
h4 + h6 {
Expand Down
10 changes: 10 additions & 0 deletions assets/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,13 @@
.vs-select {
background-color: #f6f6f6;
}
html
{
height: 100vh;
overflow-y:scroll
}
body
{
height : auto;
}

3 changes: 2 additions & 1 deletion components/AvatarBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Profile Picture -->
<div class="justify-start w-5/6 m-0 vx-row items-center" style="flex-wrap: nowrap">
<div>
<vs-avatar class="icon" @click.stop="$router.push(`/user/view/${userId}`)">
<vs-avatar class="icon" @click.stop="$router.push(`/user/view/${userId}`)" >
<img v-if="photoURL" :src="photoURL" />
<template slot="text" v-else>{{ username }}</template>
</vs-avatar>
Expand All @@ -19,6 +19,7 @@
<div v-if="hasActions">
<vs-navbar-group id="menu-dots" @click.stop.prevent="() => false">
<vs-avatar
:interactivity="true"
class="profileIcon icon"
:badge="badge"
badge-color="success"
Expand Down
4 changes: 2 additions & 2 deletions components/FooterCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class="footer-card px-6 py-2"
style=""
>
<vs-tooltip v-for="(item, index) in contactInformation" :key="index">
<VxTooltip v-for="(item, index) in contactInformation" :key="index">
<vs-avatar
class="bottomIcon"
:color="item.backgroundColor"
Expand All @@ -21,7 +21,7 @@
<template #tooltip>
{{ item.toolTipText }}
</template>
</vs-tooltip>
</VxTooltip>
</vs-row>
</template>

Expand Down
13 changes: 8 additions & 5 deletions components/NotesCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,20 @@
></i>
<template #badge>{{ note.upVotes }}</template>
</vs-avatar>
<vs-tooltip>
<VxTooltip :interactivity="true">
<vs-avatar class="icon-small">
<i class="bx bx-show"></i>
<template #badge>{{ note.views }}</template>
</vs-avatar>
<template #tooltip>{{ note.views }} Views</template>
</vs-tooltip>
</VxTooltip>

<vs-avatar class="icon-small">
<i class="bx bx-bookmark"></i>
</vs-avatar>
<VxTooltip :interactivity="true">
<vs-avatar class="icon-small">
<i class="bx bx-bookmark"></i>
</vs-avatar>
<template #tooltip>Bookmark</template>
</VxTooltip>
</div>
</VxCard>
</template>
Expand Down
37 changes: 2 additions & 35 deletions components/NotesSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ SubjectList.forEach((subject) => (s[subject] = false))
@Component<NotesSidebar>({ components: {} })
export default class NotesSidebar extends Vue {
GradeList = GradeList
SortOptions = SortOptionsList
SortOptions = [...SortOptionsList]
gradeSelect: Grade_O = notesStore.ActiveGrade
allGradesSelected = true
sortSelect: SortOptions_O = notesStore.SortSelect
sortSelect = notesStore.SortSelect
subjectClicked(
name: Subject_O,
Expand Down Expand Up @@ -182,43 +182,10 @@ export default class NotesSidebar extends Vue {
this.allSelected = false
}
}
hoverStars = 3
filterStars = 3
activeStars = 3
clearFilter() {
if (!this.allSelected) {
this.selectAllSubjects()
}
this.gradeSelect = 'ALL'
this.sortSelect = 'createdAt'
}
setFilter() {
this.activeStars = this.hoverStars = this.filterStars
}
get clearDisabled() {
return this.activeStars == 0
}
get buttonDisabled() {
return this.activeStars == this.filterStars
}
starColored(index: number) {
if (index <= this.hoverStars) return 'color : orange;'
}
hoverStar(index: number) {
this.hoverStars = index
}
unhoverStar() {
this.hoverStars = this.filterStars
}
setStarsFilter(index: number) {
this.hoverStars = this.filterStars = index
}
async filterSubjects() {
Expand Down
8 changes: 4 additions & 4 deletions components/QuestionCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,21 @@
></i>
<template #badge>{{ question.upVotes }}</template>
</vs-avatar>
<vs-tooltip>
<VxTooltip>
<vs-avatar class="icon-small">
<i class="bx bx-show"></i>
<template #badge>{{ question.views }}</template>
</vs-avatar>
<template #tooltip>{{ question.views }} Views</template>
</vs-tooltip>
</VxTooltip>

<vs-tooltip>
<VxTooltip>
<vs-avatar class="icon-small">
<i class="bx bx-comment-check"></i>
<template #badge>{{ question.responses }}</template>
</vs-avatar>
<template #tooltip>{{ question.responses }} Responses</template>
</vs-tooltip>
</VxTooltip>
</div>
</VxCard>
</template>
Expand Down
4 changes: 2 additions & 2 deletions components/ResponseCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="justify-start w-1/2 m-0">
<div class="vx-row w-full justify-start items-center overflow-hidden">
<div class="vx-col">
<vs-tooltip class="inline-block">
<VxTooltip class="inline-block">
<vs-avatar class="icon">
<img
v-if="response.userPhotoUrl"
Expand All @@ -19,7 +19,7 @@
<template #tooltip>
{{ response.userDisplayName }}
</template>
</vs-tooltip>
</VxTooltip>
</div>
<div class="vx-col">
<!-- User name -->
Expand Down
1 change: 1 addition & 0 deletions components/TopNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ export default class TopNav extends mixins(UserMixin) {
}
async getNotifications() {
try {
await notificationStore.getNotifications()
} catch (error) {
this.$vs.notification({
Expand Down
4 changes: 2 additions & 2 deletions components/VxCard.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<div class="vx-card" ref="card" :class="[
<div ref="card" :class="[
{'overflow-hidden': tempHidden},
{'no-shadow': noShadow},
{'rounded-none': noRadius},
{'card-border': cardBorder},
cardClasses ]" :style="cardStyles"
cardClasses ]" :style="cardStyles" class="vx-card w-full"
v-on="$listeners">
<div class="vx-card__header" v-if="hasHeader">

Expand Down
Loading

0 comments on commit 0ff0032

Please sign in to comment.