Post New Note
-
@@ -67,9 +65,26 @@
+
+
+
diff --git a/components/GroupsCard.vue b/components/GroupsCard.vue
new file mode 100644
index 0000000..8cc5873
--- /dev/null
+++ b/components/GroupsCard.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/ListCard.vue b/components/ListCard.vue
new file mode 100644
index 0000000..e0a1b25
--- /dev/null
+++ b/components/ListCard.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
diff --git a/components/NotesCard.vue b/components/NotesCard.vue
index 434d35b..9a61660 100644
--- a/components/NotesCard.vue
+++ b/components/NotesCard.vue
@@ -1,12 +1,102 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
Grade {{ grade }}
+ {{ school }}
+
+
+
+
+
+
+
+
+ {{group.approved ? 'Verified' : 'Pending Approval'}}
+
+ {{ group.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{group.subject}}
+ {{group.subject}}
+ {{group.school}}
+ {{group.school}}
+ Grade {{group.grade}}
+ Grade {{group.grade}}
+
+
+ Description
+ + + +Members
+{{group.memberList.length}}
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{ item.userDisplayName }}
+
+ {{ item.userDisplayName }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+ {{ item.contents }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
\ No newline at end of file
diff --git a/components/NotesSearchBar.vue b/components/NotesSearchBar.vue
new file mode 100644
index 0000000..ea30b8e
--- /dev/null
+++ b/components/NotesSearchBar.vue
@@ -0,0 +1,169 @@
+
+
-
-
+
+
+
+
+
+
+
-
diff --git a/components/ResponseCard.vue b/components/ResponseCard.vue
index 633a73e..9937660 100644
--- a/components/ResponseCard.vue
+++ b/components/ResponseCard.vue
@@ -1,5 +1,5 @@
- Grade {{ note.grade }}
{{ note.subject }}
+ {{note.school}}
+ {{note.school}}
+ {{ note.title }}
+
-
+
-
-
+
- ![]()
+
Bookmark
+
+
+ ![]()
+ 
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/QuestionCard.vue b/components/QuestionCard.vue
index 1e81e5f..01086ac 100644
--- a/components/QuestionCard.vue
+++ b/components/QuestionCard.vue
@@ -1,59 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Notes +
+
+
+
+
+
+
+
+ + Questions +
+
+
+
+
+
+
+
+
+
-
+
-
+
+
-
-
- {{ question.subject }}
+ class="rounded-full w-10 h-10 ml-2 vx-row items-center justify-center font-ginger-b text-white bottom-icon"
+ style="background-color: #ed8936;"
+ >{{ question.grade }}
+
-
+
+
+
+
+
+
+
+
+
+
+
+ Grade {{ question.grade }}
+
+
+ {{ question.subject }}
+
+ {{question.school}}
+ {{question.school}}
+ {{ question.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ question.upVotes }}
+
+
+
+
+ {{ question.views }}
+
+ {{ question.views }} Views
+
+
+
+
+
+ {{ question.responses }}
+
+ {{ question.responses }} Responses
+
+
+
diff --git a/components/Sidebar.vue b/components/Sidebar.vue
index 52e3efc..ab8965a 100644
--- a/components/Sidebar.vue
+++ b/components/Sidebar.vue
@@ -1,82 +1,73 @@
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
- ![]()
+
-
-
+
+
{{ item.name }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Coming Soon
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
+
+
diff --git a/pages/groups/g/_id/groupQuestions.vue b/pages/groups/g/_id/groupQuestions.vue
new file mode 100644
index 0000000..8bcd75d
--- /dev/null
+++ b/pages/groups/g/_id/groupQuestions.vue
@@ -0,0 +1,177 @@
+
+
diff --git a/pages/notes/index.vue b/pages/notes/index.vue
index d954acd..8363ae1 100644
--- a/pages/notes/index.vue
+++ b/pages/notes/index.vue
@@ -5,83 +5,167 @@
id="notes-screen-container"
>
- QUENTO
+ Github
+ Discord
+ QUENTO
+ Coming Soon
Github
- Discord
-
+
+
+ Group Not Found
+ Sorry! Something went wrong when fetching the Group. Please Try
+ Again.
+
+
+
+
+
+
+
+
diff --git a/pages/groups/g/_id/index.vue b/pages/groups/g/_id/index.vue
new file mode 100644
index 0000000..0baa3b7
--- /dev/null
+++ b/pages/groups/g/_id/index.vue
@@ -0,0 +1,426 @@
+
+
+
+
+
+
+
+
+
+ {{group.title}}'s Questions
+ Post New Question
+
+
+
+
+
+
+
+ Something Went Wrong
+ Sorry! Something went wrong when fetching the Newsletter. Please Try
+ Again.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/groups/index.vue b/pages/groups/index.vue
new file mode 100644
index 0000000..0450127
--- /dev/null
+++ b/pages/groups/index.vue
@@ -0,0 +1,103 @@
+
+ Are You Sure You Want To Continue?
+
+
+
+
+ Are you sure you want to remove {{kickUser.displayName}}?
+ Are you sure you want to leave this group?
+
+
+
+
+
+ Confirm
+
+
+
+
+
+
+
+
+ {{group.title}}
+
+
+
+
+
+ {{inGroup ? 'Group Member' : 'Join Group'}}
+
+
+
+
+
+ {{group.approved ? 'Verified' : 'Pending Approval'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Summary
+ Notes
+ Questions
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{inGroup ? 'Group Member' : 'Join Group'}}
+
+ Description
+ {{group.description}}
+
+ Date Created:
+ {{group.createdAt.toDateString().slice(4, 10) + ',' + group.createdAt.toDateString().slice(10)}}
+
+
+ Grade:
+ {{group.grade}}
+
+
+ Subject:
+ {{group.subject}}
+
+
+ School:
+ {{group.school}}
+
+
+
+ Generate Join Link
+
+ Join Link
+
+
+
+
+
+ Members ({{group.memberList.length}}):
+
+
+
+ ![]()
+
+
+
+
+
+ {{user.displayName}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/groups/join.vue b/pages/groups/join.vue
new file mode 100644
index 0000000..62480e3
--- /dev/null
+++ b/pages/groups/join.vue
@@ -0,0 +1,32 @@
+
+
+
\ No newline at end of file
diff --git a/pages/notes/_id.vue b/pages/notes/_id.vue
index a203a5d..082c379 100644
--- a/pages/notes/_id.vue
+++ b/pages/notes/_id.vue
@@ -20,7 +20,7 @@
+
+
+
+
+
+
+
+
+
+ Introducing Groups
+
+ Groups - A way to keep all of your content and learning material in one place.
+
+
+ Discover Groups
+
+
+
+
+
+
+
+
+
+
+
+ Add Or Join A Group
+
+
+ Post New Note
+ {{listViewText}}
+
+
+
+
+
+
+
-
+ />
-
- No Notes Found For This Search
-
+ No Notes Found For This Search
Sorry! Something went wrong when fetching the Note. Please Try
Again.
- Load More
-
-
+
+
diff --git a/pages/user/discord.vue b/pages/user/discord.vue
index 6d9df9a..9050847 100644
--- a/pages/user/discord.vue
+++ b/pages/user/discord.vue
@@ -28,8 +28,6 @@ export default class DiscordAuth extends Vue {
code,
scope
})
- console.log({ request })
- await authStore.refreshUserData();
this.$vs.notification({
title : "Success, Discord Linked!",
message : 'Use the `/profile` command in the Quento Discord',
diff --git a/pages/user/profile.vue b/pages/user/profile.vue
index a922286..b1cd76f 100644
--- a/pages/user/profile.vue
+++ b/pages/user/profile.vue
@@ -16,28 +16,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
@@ -46,7 +38,7 @@
-
{{ UserData.displayName }}
+
+ {{ UserData.displayName }}
+ Friends
+
Grade {{ UserData.currentGrade }} at {{ UserData.school }}
-
-
-
-
-
{{ UserData.discordUsername }}
- Link Discord
- Level
+
@@ -99,10 +91,153 @@
- ({
components: {
NotesCard
},
- mounted() {
- this.getUserNotes()
+ async mounted() {
+ await this.getUserNotes()
+ await this.getFriends()
+ if (this.$route.query.followers) {
+ this.followerModal = true
+ }
}
})
export default class UserProfile extends mixins(UserMixin) {
@@ -185,6 +328,158 @@ export default class UserProfile extends mixins(UserMixin) {
}
UserNotes: Note[] = []
+ followerModal = false
+ userInfo: UserData | null = null
+ followers: any = []
+ following: any = []
+ following_for_real: any = []
+ async fetchUser(uid: string) {
+ try {
+ const doc = await firestore.doc(`users/${uid}`).get()
+ const userData2 = doc.data() as UserData
+
+ const userDataReq = Object.assign({}, userData2)
+ return userDataReq
+ } catch (error) {
+ console.error({ error })
+ return
+ }
+ }
+
+ async removePending(uid: string) {
+ const loading = this.$vs.loading()
+ try {
+ const doc = await firestore
+ .collection('users')
+ .doc(this.AuthUser?.uid)
+ .update({
+ pendingFollowing: firebase.firestore.FieldValue.arrayRemove(uid)
+ })
+
+ const doc2 = await firestore
+ .collection('users')
+ .doc(uid)
+ .collection('followers')
+ .doc(this.AuthUser?.uid)
+ .delete()
+ } catch (e) {
+ }
+ this.getFriends()
+ loading.close()
+ }
+
+ async userFollowPerson(person: UserData) {
+ if (!person.following) {
+ return false
+ }
+ if (person.following.includes(this.AuthUser?.uid as string)) {
+ return true
+ } else {
+ return false
+ }
+ }
+
+ async getFriends() {
+ if (!this.AuthUser) {
+ return
+ }
+
+ var friends = []
+
+ // Get pending friends
+ const userObject = await this.fetchUser(this.AuthUser?.uid as string)
+ const pendingFriends = userObject?.pendingFollowing
+
+ if (!pendingFriends) {
+ return
+ }
+ for (var i = 0; i < pendingFriends?.length; i++) {
+ const friendInfo = await this.fetchUser(pendingFriends[i])
+ friends.push({
+ name: friendInfo?.displayName,
+ photoURL: friendInfo?.photoURL,
+ status: 'pending',
+ uid: pendingFriends[i]
+ })
+ }
+
+ // Get friends
+ const doc = await firestore
+ .collection('users')
+ .doc(this.AuthUser?.uid)
+ .collection('followers')
+ .get()
+ const followers2 = doc.docs.map((follower: any) => follower.data())
+
+ this.following = Object.assign({}, friends)
+ this.followers = Object.assign({}, followers2)
+ // const followerList = doc as UserData
+
+ // Get Following
+ this.following_for_real = (
+ await Promise.all(
+ this.UserData?.following?.map((id) =>
+ firestore.collection('users').doc(id).get()
+ ) || []
+ )
+ ).map((doc) => ({ ...doc.data(), uid: doc.id }))
+
+ }
+
+ async acceptFriend(uid: string, displayName: string, photoURL: string) {
+ const loading = this.$vs.loading()
+
+ // Add friend to user's collection
+ const doc = await firestore
+ .collection('users')
+ .doc(this.AuthUser?.uid)
+ .collection('followers')
+ .doc(uid)
+ .update({
+ accepted: true
+ })
+
+ await this.getFriends()
+ loading.close()
+ }
+
+ async declineFriend(uid: string) {
+ const loading = this.$vs.loading()
+ // Remove the pending follow request from user's collection
+
+ const doc = await firestore
+ .collection('users')
+ .doc(this.AuthUser?.uid)
+ .collection('followers')
+ .doc(uid)
+ .delete()
+
+ // Delete pending following for friend
+ await this.getFriends()
+ loading.close()
+ }
+
+ async unFollowFriend(uid: string) {
+ const loading = this.$vs.loading()
+
+ const doc = await firestore
+ .collection('users')
+ .doc(this.AuthUser?.uid)
+ .update({
+ following: firebase.firestore.FieldValue.arrayRemove(uid)
+ })
+
+ const unFollowQuery = await firestore
+ .collection('users')
+ .doc(uid)
+ .collection('followers')
+ .doc(this.AuthUser?.uid)
+ .delete()
+
+ await this.getFriends()
+ loading.close()
+ }
+
async getUserNotes() {
if (!this.AuthUser) {
return
@@ -218,8 +513,26 @@ export default class UserProfile extends mixins(UserMixin) {
getIcon(subject: SubjectGroup_O | Subject_O) {
return SubjectIconList[subject]
}
+
+ cmyk(color: number) {
+ const minBlack = 10
+ const maxBlack = 90
+ return (
+ 255 *
+ (1 - color / 100) *
+ (1 - (Math.floor(Math.random() * (maxBlack - minBlack)) + minBlack) / 100)
+ )
+ }
randomColor() {
- return Math.floor(Math.random() * 16777215).toString(16)
+ return (
+ 'rgb(' +
+ this.cmyk(Math.floor(Math.random() * 100)).toString() +
+ ', ' +
+ this.cmyk(Math.floor(Math.random() * 100)).toString() +
+ ', ' +
+ this.cmyk(Math.floor(Math.random() * 100)).toString() +
+ ')'
+ )
}
}
diff --git a/pages/user/view/_id.vue b/pages/user/view/_id.vue
index 2e04a19..7242029 100644
--- a/pages/user/view/_id.vue
+++ b/pages/user/view/_id.vue
@@ -20,7 +20,46 @@
+
Edit Profile
+
+
+
+
+
+
+
+
@@ -166,12 +301,20 @@ import firestore from '~/plugins/firestore'
import { SubjectGroup_O, Subject_O, SubjectIconList } from '~/types/subjects'
import NotesCard from '~/components/NotesCard.vue'
import { Note_t, Note, Note_t_F } from '~/types/notes'
+import { auth } from 'firebase'
+import { UserData } from '~/types/user'
+import { User } from '~/types'
+import firebase from 'firebase/app'
@Component{{ UserData.discordUsername }}
+ Link Discord
+ + My Followers +
+ + + + + + + + + + + +
-
{{ userInfo.displayName }}
+
+ {{ userInfo.displayName }}
+ Follow
+
+ Follow Request Pending
+
+
+ Unfollow
+ Follows You
+
+
+
\ No newline at end of file
diff --git a/screens/groups/groupCreateModal.vue b/screens/groups/groupCreateModal.vue
new file mode 100644
index 0000000..d4991eb
--- /dev/null
+++ b/screens/groups/groupCreateModal.vue
@@ -0,0 +1,275 @@
+
+ Your note cannot exceed 5000 characters
-
@@ -102,9 +122,9 @@
+ Your note cannot exceed 5000 characters
+ Create a class to keep all your work in one place.
+
+
+
+
\ No newline at end of file
diff --git a/screens/groups/groupJoinModal.vue b/screens/groups/groupJoinModal.vue
new file mode 100644
index 0000000..798542a
--- /dev/null
+++ b/screens/groups/groupJoinModal.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Any
+
+
+
+ {{ subjectGroup.name }}
+ {{ subject.name }}
+ Any
+ Grade {{ grade }}
+ Any
+ {{ school }}
+
+
+
+
+
+
+
+ Back
+
+ CREATE
+
+
+
+
+
+
\ No newline at end of file
diff --git a/screens/groups/groupModal.vue b/screens/groups/groupModal.vue
new file mode 100644
index 0000000..1123af6
--- /dev/null
+++ b/screens/groups/groupModal.vue
@@ -0,0 +1,38 @@
+
+
+ Enter an invite below to join an existing group.
+
+
+
+
+
+
+
+
+
+ Back
+
+ Join
+
+
+
+
+
\ No newline at end of file
diff --git a/screens/notes/EditNotesModal.vue b/screens/notes/EditNotesModal.vue
index 431d4c8..fa2dbe8 100644
--- a/screens/notes/EditNotesModal.vue
+++ b/screens/notes/EditNotesModal.vue
@@ -12,11 +12,13 @@
>
+
+
+
+
+
+
+ Create a New Group and Add Your Friends
+
+
+ Create a group
+
+
+
+
+
+
+
+ Join a group with an invite code or link
+
+
+ Join a group
+
-
Posted Notes
++ Posted Notes +
+
+
+ {{ActiveNote.groupName}}
+
+
-
+
-
@@ -62,6 +68,7 @@
class="block mb-3 w-6 mt-3 w-full lg:w-1/2"
placeholder="Grade"
v-model="ActiveNote.grade"
+ :disabled="ActiveNote.groupId"
>
Grade {{ grade }}
+
+
+
+
-
+ />
@@ -92,9 +114,7 @@
:disabled="formErrors || contents.length > characterLimit"
@click="PreviewNote()"
>
-
-
- {{ subjectGroup.name }}
-
+ {{ subjectGroup.name }}
- {{ subject.name }}
-
+ {{ subject.name }}
{{ school }}
+
- PREVIEW NOTE
-
+ PREVIEW NOTE