Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feedback #1

Open
wants to merge 205 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
205 commits
Select commit Hold shift + click to select a range
d7f5f20
Setting up GitHub Classroom Feedback
github-classroom[bot] May 18, 2023
4670b43
created team.md
maplepolis May 18, 2023
c2d4af9
added Kai to team.md
maplepolis May 18, 2023
02652a0
feat: add Amy to team.md
amiaxys May 18, 2023
067c42b
Update team.md
youngjaeheo2002 May 18, 2023
cad6d97
Add Gary to team.md
garychen2002 May 19, 2023
5f8eb0b
Add product.md template
garychen2002 May 19, 2023
2ec1c4a
Update team.md
AugustynowiczL May 19, 2023
e0bf679
feat: move sprint0 text files into folder
amiaxys May 29, 2023
2c26ebc
chore: add gitignore file
amiaxys May 29, 2023
573ade9
added product_backlog.md
maplepolis May 29, 2023
334a757
docs: first attempt at Q1 of product.md
AugustynowiczL May 29, 2023
40a6145
Merge branch 'main' of https://github.com/CSCC012023/final-project-s2…
AugustynowiczL May 29, 2023
6f2cab4
Create README.md first draft
garychen2002 May 29, 2023
329f91c
fix readme formatting
garychen2002 May 29, 2023
f67a65b
fix readme draft typo
garychen2002 May 29, 2023
04382b7
feat:skeleton of mean
youngjaeheo2002 May 29, 2023
bf17e07
docs: updated Q2 in product.md
AugustynowiczL May 29, 2023
90646e5
feat: environment
youngjaeheo2002 May 30, 2023
2790552
Revert "feat: environment"
youngjaeheo2002 May 30, 2023
235fc30
Add user stories about filtering
garychen2002 May 30, 2023
9c5af57
feat: mvc demo
youngjaeheo2002 May 30, 2023
d85cedf
delete node_modules
youngjaeheo2002 May 30, 2023
f6aa728
Merge pull request #2 from CSCC012023/stack-skeleton
youngjaeheo2002 May 30, 2023
4eac07e
fix: remove similar stories + rearrange order
amiaxys May 30, 2023
c78792d
feat: installation in readme.md and add environment example file
youngjaeheo2002 May 30, 2023
b9b7880
fix doc/sprint0/readme.md
youngjaeheo2002 May 30, 2023
83d43ea
Update README.md
youngjaeheo2002 May 30, 2023
3c352e8
Update README.md
youngjaeheo2002 May 30, 2023
f6d2e63
write .env.example in backend
youngjaeheo2002 May 31, 2023
a672223
update readme.md
youngjaeheo2002 May 31, 2023
8d9911f
feat: format README files
amiaxys May 31, 2023
ccfac83
update readme.md
youngjaeheo2002 May 31, 2023
83f4a5d
feat: format README files
amiaxys May 31, 2023
4958882
Merge remote-tracking branch 'origin/main'
amiaxys May 31, 2023
12007d3
Update sprint0 readme and remove old readme
garychen2002 May 31, 2023
66b91de
remove extra header underlines from readme
garychen2002 May 31, 2023
ca31ad8
updated product.md Q3
AugustynowiczL May 31, 2023
1cf00a5
finished product.md Q4 and added one point to highlights
AugustynowiczL May 31, 2023
375c81b
replace title placeholder in product.md
garychen2002 Jun 1, 2023
bdb8b65
added more points to highlights, finished product.md
AugustynowiczL Jun 1, 2023
a475942
feat: add limeade UI/UX figma mockup
amiaxys Jun 2, 2023
35e0d33
fix: grammar + spelling edits
amiaxys Jun 2, 2023
7f4cb32
feat(user): Add user functionality
youngjaeheo2002 Jun 5, 2023
64518d8
Create iteration-01.plan.md
garychen2002 Jun 5, 2023
2b5cd7e
feat: user login api
youngjaeheo2002 Jun 5, 2023
237fe15
Merge pull request #3 from CSCC012023/backend-starter
youngjaeheo2002 Jun 5, 2023
c64be64
feat: create RPM file
amiaxys Jun 7, 2023
0dd2f61
feat:more components
youngjaeheo2002 Jun 7, 2023
3a5119f
feat:implement signup form in frontend
youngjaeheo2002 Jun 7, 2023
1d92ce6
feat: login and logout
youngjaeheo2002 Jun 11, 2023
8f102d2
Merge pull request #4 from CSCC012023/feature/signup-login-logout
youngjaeheo2002 Jun 11, 2023
102ece8
feat:switch to premium
youngjaeheo2002 Jun 11, 2023
885bb46
Merge pull request #5 from CSCC012023/feat/switchtopremium
youngjaeheo2002 Jun 12, 2023
637e049
rebased
maplepolis Jun 13, 2023
d3639d6
[new] Add system design document
garychen2002 Jun 16, 2023
d8632a9
Update team.md
youngjaeheo2002 Jun 16, 2023
5713b45
Update iteration-01.plan.md
garychen2002 Jun 16, 2023
df51a4b
fix bullet points
garychen2002 Jun 16, 2023
aa46372
Upload sprint review meeting document
garychen2002 Jun 16, 2023
b3e08ef
added eventboard
maplepolis Jun 16, 2023
26ec1be
Merge pull request #6 from CSCC012023/lim-9/add-event-board
maplepolis Jun 16, 2023
3b284e4
bugfix: session info does not persist in the frontend
youngjaeheo2002 Jun 19, 2023
8447ee6
Merge pull request #7 from CSCC012023/bugfix/loginpersistence
youngjaeheo2002 Jun 19, 2023
0f3b9c3
Add sprint2 planning document
garychen2002 Jun 29, 2023
a51f076
Update iteration-02.plan.md
garychen2002 Jun 29, 2023
627a0aa
feat:user profile and edit user profile
youngjaeheo2002 Jul 1, 2023
acc3196
Merge pull request #8 from CSCC012023/feat/userprofile
youngjaeheo2002 Jul 1, 2023
4878846
Create sprint 2 product backlog
garychen2002 Jul 2, 2023
d5f2cea
block backend api and blcoked field in user model
AugustynowiczL Jul 2, 2023
a336038
Merge pull request #9 from CSCC012023/feat/blockbackend
youngjaeheo2002 Jul 2, 2023
2b00f52
feat:search frontend
youngjaeheo2002 Jul 2, 2023
fc87227
Copy sprint 1 review doc
garychen2002 Jul 4, 2023
b1cc59b
feat:user search todo:block feature in frontend
youngjaeheo2002 Jul 4, 2023
978cc0d
Merge pull request #10 from CSCC012023/feat/searchuser
youngjaeheo2002 Jul 4, 2023
208fbf7
fix: add event form not having a date field
amiaxys Jul 4, 2023
c14ca85
chore: run prettier
amiaxys Jul 4, 2023
d27eb9b
feat: add filtering for user for events api
amiaxys Jul 4, 2023
dd2ed30
feat: add event-info component
amiaxys Jul 4, 2023
5aa04f6
feat/block user in frontend
youngjaeheo2002 Jul 4, 2023
30580a7
Merge pull request #12 from CSCC012023/feat/blockuserfrontend
youngjaeheo2002 Jul 4, 2023
0da7643
fix: padding issues + remove default text
amiaxys Jul 5, 2023
8679cd7
feat: clean up css + fix formatting
amiaxys Jul 5, 2023
8c6ecf0
feat: add my event buttons
amiaxys Jul 5, 2023
7898783
Merge remote-tracking branch 'origin/development' into lim-25/clean-u…
amiaxys Jul 5, 2023
4267481
fix: add padding to user search
amiaxys Jul 5, 2023
1332c6d
chore: run prettier
amiaxys Jul 5, 2023
c517d23
Merge branch 'lim-25/clean-up-css' into lim-24/create-my-events
amiaxys Jul 5, 2023
1857247
fix: reading undefined variable
amiaxys Jul 5, 2023
a2474b0
Merge pull request #14 from CSCC012023/lim-24/create-my-events
youngjaeheo2002 Jul 6, 2023
75c987a
bugfix: ApiService now properly holds userId
youngjaeheo2002 Jul 6, 2023
9aced72
Merge pull request #15 from CSCC012023/bugfix/apipersistence
youngjaeheo2002 Jul 6, 2023
211d04a
feat: add margins to event info card
amiaxys Jul 6, 2023
138bc7a
Merge remote-tracking branch 'origin/development' into lim-25/clean-u…
amiaxys Jul 6, 2023
75fb7e5
feat: change button colour per my/all events
amiaxys Jul 6, 2023
b451e6a
feat: style event info card
amiaxys Jul 6, 2023
65bdb10
bugfix: login persistence in frontend
youngjaeheo2002 Jul 6, 2023
542c1de
Merge pull request #16 from CSCC012023/bugfix/loginpersistenceinfrontent
youngjaeheo2002 Jul 6, 2023
02f3099
Merge remote-tracking branch 'origin/development' into lim-25/clean-u…
amiaxys Jul 6, 2023
423c48e
feat: add spacing between link and profile
amiaxys Jul 6, 2023
b036cee
feat: enlarge event card font sizes
amiaxys Jul 6, 2023
64a1652
feat: consolidate common form properties in styles
amiaxys Jul 6, 2023
86924c2
feat: style user search
amiaxys Jul 6, 2023
2be4917
Merge pull request #17 from CSCC012023/lim-25/clean-up-css
amiaxys Jul 6, 2023
18995e3
feat: create RPM file
amiaxys Jun 7, 2023
08ae230
[new] Add system design document
garychen2002 Jun 16, 2023
1523972
Update team.md
youngjaeheo2002 Jun 16, 2023
24274f3
Update iteration-01.plan.md
garychen2002 Jun 16, 2023
3dd47d0
fix bullet points
garychen2002 Jun 16, 2023
e919e69
Upload sprint review meeting document
garychen2002 Jun 16, 2023
9c8e532
Add sprint2 planning document
garychen2002 Jun 29, 2023
9fcb9a4
Update iteration-02.plan.md
garychen2002 Jun 29, 2023
545561e
Create sprint 2 product backlog
garychen2002 Jul 2, 2023
e6fb4f4
Copy sprint 1 review doc
garychen2002 Jul 4, 2023
4a36efb
added join event
maplepolis Jul 6, 2023
3455c56
added join event
maplepolis Jul 6, 2023
69dbf79
Merge pull request #19 from CSCC012023/lim-10/event-join
maplepolis Jul 6, 2023
25f19dd
feat: add event-info margin + remove redundancy
amiaxys Jul 6, 2023
1576a34
Merge pull request #20 from CSCC012023/lim-25/clean-up-css
amiaxys Jul 6, 2023
a22b2f4
fix: profile styles not showing due to class name + additional styling
amiaxys Jul 6, 2023
446483e
feat: generalize event styling
amiaxys Jul 6, 2023
7c4dce9
chore: run prettier
amiaxys Jul 6, 2023
f3d37dd
Merge pull request #21 from CSCC012023/lim-25/clean-up-css
amiaxys Jul 6, 2023
03d8e91
feat: change event form description input
amiaxys Jul 7, 2023
caeffe5
Merge pull request #22 from CSCC012023/lim-25/clean-up-css
amiaxys Jul 7, 2023
0bc4592
Add burndown and schedule pdfs
garychen2002 Jul 7, 2023
32ffc13
Update documentation for start of sprint 3
garychen2002 Jul 12, 2023
d57ef98
feat:chat implemented in frontend adn backend
youngjaeheo2002 Jul 17, 2023
05baf3b
Merge pull request #23 from CSCC012023/feat/usersearch3
youngjaeheo2002 Jul 17, 2023
96e177b
feat:backend report api
AugustynowiczL Jul 18, 2023
56f8690
feat: create event filter form
amiaxys Jul 19, 2023
8b02f3a
feat: added sorting + event date filtering
amiaxys Jul 20, 2023
a561f55
fix: chat formatting + scroll issue
amiaxys Jul 20, 2023
8d9bb53
chore: run prettier
amiaxys Jul 20, 2023
779215d
Merge pull request #24 from CSCC012023/fix/chat-room-order
amiaxys Jul 20, 2023
e78423f
feat: add event location regex filtering
amiaxys Jul 20, 2023
df50c0e
chore: run prettier
amiaxys Jul 20, 2023
1c3e3cc
Merge pull request #25 from CSCC012023/lim-21/event-filtering
amiaxys Jul 20, 2023
5f50014
feat:report on chat implemented in frontend
AugustynowiczL Jul 20, 2023
859e3fd
feat: profile report implemented in frontend
AugustynowiczL Jul 20, 2023
59b7264
Merge branch 'development' into feat/report
youngjaeheo2002 Jul 20, 2023
b72105a
Merge pull request #26 from CSCC012023/feat/report
youngjaeheo2002 Jul 20, 2023
3d76ebe
resolved conflicts in merge
AugustynowiczL Jul 20, 2023
03d676b
style: edit api for clarity
amiaxys Jul 20, 2023
9615c6a
fix: add back removed chat ordering + formatting
amiaxys Jul 20, 2023
9441c80
chore: run prettier
amiaxys Jul 20, 2023
9e2c412
style: clean up + add interface for type checking
amiaxys Jul 20, 2023
8657391
Merge remote-tracking branch 'origin/development' into lim-11/event-r…
amiaxys Jul 20, 2023
7c9a839
chore: run prettier
amiaxys Jul 20, 2023
39fea50
feat: style report
amiaxys Jul 20, 2023
158797e
fix: user profile form not showing checked
amiaxys Jul 20, 2023
62dc872
Merge pull request #27 from CSCC012023/fix/profile-form-not-showing-c…
amiaxys Jul 20, 2023
2eb730e
fix: date label filter
amiaxys Jul 20, 2023
999f08f
Merge pull request #28 from CSCC012023/fix/date-label-filter
amiaxys Jul 20, 2023
5834209
feat:staff features in backend
youngjaeheo2002 Jul 21, 2023
7cffb46
feat:staff feature in frontend
youngjaeheo2002 Jul 21, 2023
a55ee9f
Merge pull request #29 from CSCC012023/feat/staff
youngjaeheo2002 Jul 21, 2023
672b0c9
finished event search
maplepolis Jul 21, 2023
239e5e2
Merge pull request #30 from CSCC012023/lim-8/event-search
maplepolis Jul 21, 2023
49ab462
feat: add event types (interests) to event
amiaxys Jul 21, 2023
5152e91
feat: create recommended events backend + carousel
amiaxys Jul 22, 2023
29efa63
Merge remote-tracking branch 'origin/development' into lim-11/event-r…
amiaxys Jul 22, 2023
dc3c696
chore: run prettier
amiaxys Jul 22, 2023
b369c8a
Merge pull request #31 from CSCC012023/lim-11/event-recommendation
amiaxys Jul 22, 2023
59052fe
feat: limit recommended events to 10 + not created by user
amiaxys Jul 22, 2023
b18b2cc
feat: add empty recommended events + type messages
amiaxys Jul 22, 2023
5a77c50
Merge pull request #34 from CSCC012023/lim-11/event-recommendation
amiaxys Jul 22, 2023
80c68fd
Add sprint 3 final docs
garychen2002 Jul 22, 2023
a70bfac
Update system design document for sprint 3
garychen2002 Jul 22, 2023
4f57b9c
Add documentation for sprint 4
garychen2002 Jul 27, 2023
fd07983
Add blocked user list and unblocking
garychen2002 Jul 29, 2023
f6321a0
Merge pull request #35 from CSCC012023/lim-28/unblock-users
garychen2002 Jul 29, 2023
0136dad
fix: change classlist use to ngclass (#36)
amiaxys Aug 1, 2023
0e97b9e
invite notification created in frontned and backend
youngjaeheo2002 Aug 1, 2023
da6779c
Lim 27/event interest filter (#37)
amiaxys Aug 1, 2023
29158a1
feat: my invites page
youngjaeheo2002 Aug 2, 2023
b8d3e66
Merge pull request #38 from CSCC012023/feat/LIM-13
youngjaeheo2002 Aug 2, 2023
2737682
Fix/remove banned events (#39)
amiaxys Aug 2, 2023
32b3222
Fix/banned events (#40)
amiaxys Aug 2, 2023
5fe800a
feat: filter interested users by interests
youngjaeheo2002 Aug 2, 2023
0991191
feat:filter interested users by interest
AugustynowiczL Aug 2, 2023
11f0004
feat: authguard to protect routes
AugustynowiczL Aug 2, 2023
01d837a
Merge pull request #42 from CSCC012023/feat/authguard
youngjaeheo2002 Aug 2, 2023
d27e286
Merge pull request #41 from CSCC012023/feat/LIM-22
youngjaeheo2002 Aug 3, 2023
aa51bf7
feat: style website + run prettier (#43)
amiaxys Aug 3, 2023
0ed2640
fix: repeat function (#44)
amiaxys Aug 3, 2023
9777ec7
feat: add event advertising + styling + fix invite msg bug (#45)
amiaxys Aug 3, 2023
00ecff5
feat: add format code github action (#46)
amiaxys Aug 3, 2023
aac6d91
Fix/add workflows folder (#47)
amiaxys Aug 3, 2023
28f105c
Fix/prettier action syntax error (#48)
amiaxys Aug 3, 2023
b6a970d
fix: remove extra format code file
amiaxys Aug 3, 2023
690fe75
feat: switch to basic. bugfix: authguard not persist on reload and pa…
youngjaeheo2002 Aug 3, 2023
f962eaa
Merge branch 'development' into feat/authguard
youngjaeheo2002 Aug 3, 2023
bd3dd8b
Merge pull request #49 from CSCC012023/feat/authguard
youngjaeheo2002 Aug 3, 2023
16aa5df
fix: prettier action permissions
amiaxys Aug 3, 2023
053e38e
chore: run prettier
amiaxys Aug 3, 2023
dc34934
finished edit form (#50)
maplepolis Aug 4, 2023
362dddb
Add Sprint 4 burndown and schedule docs
garychen2002 Aug 4, 2023
2301757
fix: add event argument placement
amiaxys Aug 4, 2023
1156730
Merge branch 'main' into development
garychen2002 Aug 8, 2023
9a4c40c
Merge pull request #51 from CSCC012023/development
garychen2002 Aug 8, 2023
cbbdfcf
feat: change styling
amiaxys Aug 9, 2023
e8bd8b9
Upload presentation
garychen2002 Aug 9, 2023
f57fffe
docs(marking): apply s3 + s4 remarks
AryPat Aug 16, 2023
46581bd
docs: made into .md
AryPat Aug 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/format-code.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Format Code

on:
push:
branches:
- development
pull_request:
branches:
- development

permissions:
contents: write

jobs:
format:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}

- name: Run prettier
uses: creyD/[email protected]
with:
commit_message: "chore: run prettier"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# OS files
.DS_Store
Binary file added CSCC01 final presentation.pdf
Binary file not shown.
2 changes: 2 additions & 0 deletions backend/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FRONTEND=apiendpoint
MONGO_URI=anymongouri
2 changes: 2 additions & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.env
/node_modules
6 changes: 6 additions & 0 deletions backend/middleware/auth.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const isAuthenticated = function (req, res, next) {
if (!req.session.userId) {
return res.status(401).json({ error: "Not authenticated" });
}
next();
};
14 changes: 14 additions & 0 deletions backend/models/chat.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import mongoose from "mongoose";

const chatMessageSchema = new mongoose.Schema({
senderName: String,
message: String,
date: String,
});

const chatRoomSchema = new mongoose.Schema({
name: String,
messages: [chatMessageSchema],
});

export const ChatRoom = mongoose.model("ChatRoom", chatRoomSchema);
18 changes: 18 additions & 0 deletions backend/models/invite.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import mongoose, { mongo } from "mongoose";

const inviteSchema = new mongoose.Schema({
eventId: {
type: mongoose.Schema.Types.ObjectId,
ref: "limeEvent",
},
inviterId: {
type: mongoose.Schema.Types.ObjectId,
ref: "User",
},
invitedId: {
type: mongoose.Schema.Types.ObjectId,
ref: "User",
},
});

export const Invitation = mongoose.model("Invitation", inviteSchema);
50 changes: 50 additions & 0 deletions backend/models/limeEvents.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import mongoose from "mongoose";
import { interestsEnum } from "./users.js";

const limeEventSchema = new mongoose.Schema({
eventName: {
required: true,
type: String,
},
eventDescription: {
required: true,
type: String,
},
eventDate: {
type: Date,
required: true,
},
eventLocation: {
required: true,
type: String,
},
eventTypes: [
{
type: String,
enum: interestsEnum,
default: [],
},
],
eventCost: {
type: String,
required: true,
},
interestedUsers: [
{
type: mongoose.Schema.Types.ObjectId,
ref: "User",
default: [],
},
],
advertise: {
type: Boolean,
default: false,
},
userId: {
type: mongoose.Schema.Types.ObjectId,
ref: "User",
required: true,
},
});

export const limeEvent = mongoose.model("limeEvent", limeEventSchema);
28 changes: 28 additions & 0 deletions backend/models/report.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import mongoose from "mongoose";

const report = new mongoose.Schema({
reportedId: {
type: mongoose.Schema.Types.ObjectId,
ref: "User",
required: true,
},
reporterId: {
type: mongoose.Schema.Types.ObjectId,
ref: "User",
required: true,
},
reportMsg: {
type: String,
required: true,
},
createdAt: {
type: Date,
default: Date.now,
},
messageText: {
type: String,
},
resolved: Boolean,
});

export const Report = mongoose.model("Report", report);
73 changes: 73 additions & 0 deletions backend/models/users.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import mongoose from "mongoose";

export const interestsEnum = [
"Music concerts",
"Art exhibitions",
"Film screenings",
"Theater performances",
"Dance shows",
"Stand-up comedy",
"Literary readings",
"Food festivals",
"Wine tasting events",
"Sporting events",
"Outdoor adventures",
"Fashion shows",
"Technology conferences",
"Gaming conventions",
"Yoga and wellness retreats",
"Photography workshops",
"Charity fundraisers",
"Historical reenactments",
"Science fairs",
"Cultural festivals",
];

const userSchema = new mongoose.Schema({
username: {
required: true,
type: String,
unique: true,
},
firstName: {
required: true,
type: String,
},
lastName: {
required: true,
type: String,
},
type: {
type: String,
enum: ["Basic", "Premium", "Staff"],
required: true,
},
password: {
type: String,
required: true,
},
interests: [
{
type: String,
enum: interestsEnum,
default: [],
},
],
blocked: [
{
type: mongoose.Schema.Types.ObjectId,
ref: "User",
required: true,
default: [],
},
],
banned: {
type: Boolean,
default: false,
},
bannedDate: {
type: Date,
},
});

export const User = mongoose.model("User", userSchema);
Loading