Merge Development Files into Main - #57

Open

NotYourAlejandro wants to merge 272 commits into

mainfrom

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 24, 2024

Added pseudocode and empty functions for groupController
NotYourAlejandro
committed
08277b7

Commits on Oct 25, 2024

Refactor groupController.js and groupRoutes.js
NotYourAlejandro
committed
1540f97
Refactor groupController.js and groupRoutes.js
NotYourAlejandro
committed
17f8a7f
Refactor groupController.js and groupRoutes.js
NotYourAlejandro
committed
0f1c4b5
Added components GroupChatModule and TextRegion. Made styleistic changes and changes App.js to render correctly.
JLealos
committed
e4b1e98
Merge branch 'dev_frontend' of https://github.com/jadynlaila/Study_Group_Platform into Jack_frontend
JLealos
committed
e34ddae

Commits on Oct 26, 2024

Something with HTTP reqs isn't working
NotYourAlejandro
committed
9ca8fa6
im in pain
NotYourAlejandro
committed
6d31121
Fixed pre-branch bugs
NotYourAlejandro
committed
7bfeb25
send message pt2
rudraamin06
committed
36686f7
changed from req to res in some functions
NotYourAlejandro
committed
13e25b7
Fixed messageRoutes
NotYourAlejandro
committed
5ba688f
Refactor server.js file
NotYourAlejandro
committed
a5b7c02
committing to go to another branch
Jadyn Calhoun
committed
7bef33a
Refactor groupController.js and groupRoutes.js
NotYourAlejandro
committed
c8fa772
sendMessage pt.3
rudraamin06
committed
9c0a614
Added testing capabilities
NotYourAlejandro
committed
985eb03
Added tests for studentController
NotYourAlejandro
committed
315e3af
stash
Jadyn Calhoun
committed
3bb319d
testing test.js
Jadyn Calhoun
committed
279bbd3
testing again
Jadyn Calhoun
committed
0db93bc
messageController
rudraamin06
committed
cf06ff0
messageController
rudraamin06
committed
559adec
messageController
rudraamin06
committed
f0b867c
Completely cranked out a ton of changes
NotYourAlejandro
committed
5bf6af9
github debug
Jadyn Calhoun
committed
bf70a61
Refactor package.json and groupController.js
NotYourAlejandro
committed
b1a4dbe
Updated several aspects to make things consistent
NotYourAlejandro
committed
a95627f
GET req now uses parameter for groupID instead of body
NotYourAlejandro
committed
3c923c7
Created Deliverable 4 file with instructions and assignments
JLealos
committed
53fd128
Updated tests
NotYourAlejandro
committed
1485b9e
Completed functions and tests
Jadyn Calhoun
committed
e00beb0
Restarted tests file
NotYourAlejandro
committed
f4e56f6
Merge branch 'messageController' into 65-dev_backend_groupController
NotYourAlejandro
committed
35b7a97
Merge branch 'student_controller' into 65-dev_backend_groupController
NotYourAlejandro
committed
bc8518b
introduction and adopted technologies
Jadyn Calhoun
committed
884fc06
introduction and adopted technologies done
Jadyn Calhoun
committed
518b4b9

Commits on Oct 27, 2024

Added implemented requirements
Jadyn Calhoun
committed
c153314
checking out
Jadyn Calhoun
committed
c27356a
updating D4 test stuff
Jadyn Calhoun
committed
58fde32
Wrapped up D4 contributions
Jadyn Calhoun
committed
188d59a
unnecessary constant
NotYourAlejandro
committed
3ab86c2
Merge jadyns b and solving conflict
daira27
committed
2c664f1
fixed d4 outline
daira27
committed
931a9d0
Merge pull request #107 from jadynlaila/d4_outlinefix_daira
daira27
authored
4b26c5b
removed group chat module files
daira27
committed
3966dae
this is my group chat module contribution
daira27
committed
ca73f7d
added space for everyone on 2.
daira27
committed
0a5108a
Fixed joinGroup
NotYourAlejandro
committed
b826b82
Create LICENSE
NotYourAlejandro
authored
8f0b3a3
Added licensing in D4
NotYourAlejandro
committed
e536215
Added content for the Deployment section
NotYourAlejandro
committed
6f0e764
Added initial contents for D4 automated tests
NotYourAlejandro
committed
b9a2d39
STOPPED TESTS FROM DROPPING DB
NotYourAlejandro
committed
1a98313
Adding commits for frontend. Made text region and combined components
JLealos
committed
41ef194
Rewrote the tests
NotYourAlejandro
committed
702821c
Merge branch 'deliverable_4_alex' into 65-dev_backend_groupController
NotYourAlejandro
committed
b57d6ea
Merge pull request #108 from jadynlaila/Daira_frontend
daira27
authored
c7a345b
Merge pull request #111 from jadynlaila/jack_frontend_contributions
daira27
authored
80e0519
Ignore coverage directory in .gitignore
NotYourAlejandro
committed
5a0168f
Merge branch 'student_controller' into dev_backend
NotYourAlejandro
committed
c85fe05
Merge branch 'dev_backend' into dev
NotYourAlejandro
committed
fbfe0aa
Merge branch 'dev_frontend' into dev
NotYourAlejandro
committed
7b78d5b
Ignore unnecessary files and directories in .gitignore
NotYourAlejandro
committed
1090c6a
Merge .gitignore and package.json
NotYourAlejandro
committed
6098834
Launch react subprocess in another process
NotYourAlejandro
committed
a7bd77e
Now runs both servers at the same time
NotYourAlejandro
committed
d441ba6
end me
NotYourAlejandro
committed
3133a54

Commits on Oct 28, 2024

Fixed cors issue
Jadyn Calhoun
committed
c6dfaaf
Changed how getGroup gets its variable
NotYourAlejandro
committed
f9603c8
rudra final
Jadyn Calhoun
committed
619565e

Commits on Nov 16, 2024

Updated package.json and other relevant files to use 'concurrently'.
NotYourAlejandro
committed
b33d11b
changed mongoose connect uri
NotYourAlejandro
committed
b24d929
moved mongo details out of single URI var
NotYourAlejandro
committed
4c1f91f
remove .env file
NotYourAlejandro
committed
1e2016b
rename setStudent to createStudent for consistency
NotYourAlejandro
committed
824c92d
added a 'getAllGroups' function
NotYourAlejandro
committed
7a4e909
swap group post/put functions
NotYourAlejandro
committed
e0857d7
minor group routing refactor
NotYourAlejandro
committed
ef003ad
1) added ability to get single student
NotYourAlejandro
committed
04714d4
minor groupController bug fixes
NotYourAlejandro
committed
a8a921b
minor error handling fixes
NotYourAlejandro
committed
75740fc
change http type for message's 'sendMessage'
NotYourAlejandro
committed
e30c628
changed base message route to singular rather than plural
NotYourAlejandro
committed
ec3c673
Merge pull request #151 from jadynlaila/dev-concurrently
NotYourAlejandro
authored
bba9a85
added ability to search students by username in place of id
NotYourAlejandro
committed
6062d74
Merge remote-tracking branch 'origin/dev' into dev-routing_consistency
NotYourAlejandro
committed
a7f47a2
moved missing function from studentController to groupController and populated it
NotYourAlejandro
committed
b241073
Several updates to updateGroup and joinGroup
NotYourAlejandro
committed
ddb6ad7
Reverted joinGroup to old behavior
NotYourAlejandro
committed
5b65282
add created group id to owner's group list
NotYourAlejandro
committed
1771515
Added code for leaveGroup
NotYourAlejandro
committed
260344a
added code for deleteGroup
NotYourAlejandro
committed
19b5f5b
Added deleteGroup logging and changed routing
NotYourAlejandro
committed
970cf84
minor console debug statement updates
NotYourAlejandro
committed
d006c67
Created the initial data model
NotYourAlejandro
committed
c02efe5
Populated meetingController and added required references.
NotYourAlejandro
committed
b1a1a53
Forgot to export the routes
NotYourAlejandro
committed
83d6c19
Update the server.js route for consistency with refactors in other pending branches.
NotYourAlejandro
committed
3d79589
Added frequencies to meetings
NotYourAlejandro
committed
eddbbcd
Added remaining .ics requirements
NotYourAlejandro
committed
b165987
Added remaining .ics requirements and checks
NotYourAlejandro
committed
7445e8d

Commits on Nov 17, 2024

Merge pull request #153 from jadynlaila/dev-routing_consistency
NotYourAlejandro
authored
d6ed2ef
Merge pull request #152 from jadynlaila/dev-mongo_conn_refactor
NotYourAlejandro
authored
15f248e
Merge remote-tracking branch 'origin/dev' into dev-meeting_impl
NotYourAlejandro
committed
ae3ca5e
Merge pull request #154 from jadynlaila/dev-meeting_impl
NotYourAlejandro
authored
df98e0e
Fix merge conflict that wasn't previously resolved
NotYourAlejandro
committed
532e6b1
changes from student_controller
Jadyn Calhoun
committed
f6d3f41
Delete package-lock.json
NotYourAlejandro
authored
66ea20b
Merge pull request #156 from jadynlaila/loginFunctions
NotYourAlejandro
authored
7091b3a
Added login page to frontend
vsv7nau
committed
dfe57ee
Move createMeeting and updateMeeting to groupRoutes
NotYourAlejandro
committed
37fdb32
Updated some comments
NotYourAlejandro
committed
4570680
Several misc fixes
NotYourAlejandro
committed
6c6253b
Merge pull request #158 from jadynlaila/dev-meeting_route_fix
jadynlaila
authored
42c6ec4
removed forgot password line
jadynlaila
authored
4981931
Merge pull request #157 from jadynlaila/frontend-login
jadynlaila
authored
b500d2c
Minor fix to server.js routing consistency
NotYourAlejandro
committed
2936a7b
got login and creating an account working
Jadyn Calhoun
committed
0210a11
Merge branch 'login-link' of https://github.com/jadynlaila/Study_Group_Platform into login-link
Jadyn Calhoun
committed
c9df7a3

Commits on Nov 19, 2024

Commits on Nov 21, 2024

Changed group search to search by only the group name for MVP
NotYourAlejandro
committed
9996218

Commits on Nov 22, 2024

Commits on Nov 23, 2024

Refactor createStudent function to improve logging and response handling
NotYourAlejandro
committed
262d1a4
Merge changes from laptop over to changes from desktop.
NotYourAlejandro
committed
9e63267
Changed how frontend server is called
NotYourAlejandro
committed
947ff0c
Removed unnecessary variable
NotYourAlejandro
committed
7722a42
Wrote initial meetingController test.
NotYourAlejandro
committed
af626e2
Rewrote messageController tests
NotYourAlejandro
committed
3117b1c
Fixed minor issues with messageController test
NotYourAlejandro
committed
685a32c
minor bug fixes
NotYourAlejandro
committed
ae0809e

Commits on Nov 24, 2024

reintroduce existing server dependency to minimize race conditions
NotYourAlejandro
committed
306c6e8
remove unnecessary dependencies
NotYourAlejandro
committed
0310336
fixed config errors
NotYourAlejandro
committed
df25d72
Fixed Login Issues
vsv7nau
committed
285b855
protectRoute trial
Jadyn Calhoun
committed
9594768
Merge pull request #164 from jadynlaila/Login-Reformat-Redo
vsv7nau
authored
c14d2ae
protected routes established
Jadyn Calhoun
committed
eafb31f
user info now accessible on other pages
Jadyn Calhoun
committed
f4454a5
switch to homepage upon login
Jadyn Calhoun
committed
ec1212b
fetchGroups returns a list of user's groups in console
Jadyn Calhoun
committed
47e60d3
merging dev and cookies
Jadyn Calhoun
committed
53d16f2
successfully merged dev into cookies branch
Jadyn Calhoun
committed
e1b17c7
Merge pull request #165 from jadynlaila/cookies
jadynlaila
authored
f4be746
Re-added navbar files
vsv7nau
committed
30dbda1
Changed file paths
vsv7nau
committed
92123a4
Navbar now mends with GCM
vsv7nau
committed
0d6422c
Fixed login p2 and Navbar
vsv7nau
committed
e39ca94
Rewrote some groupController tests and added some debugging lines
NotYourAlejandro
committed
c8a5945

Commits on Nov 25, 2024

actual group info is displayed
Jadyn Calhoun
committed
a21deb6
Merge pull request #166 from jadynlaila/groupchat-link
JLealos
authored
b6fdf0b
Merge branch 'dev' into Nav-Update
jadynlaila
authored
a4d136e
Added some more tests
NotYourAlejandro
committed
775bbab
Merge pull request #167 from jadynlaila/Nav-Update
jadynlaila
authored
1d3190a
Adding settings files
JLealos
committed
bb292ba
alex editing save
JLealos
committed
f87a206
ok lol
JLealos
committed
cb6641c
Merge branch 'dev' into group/User-settings
JLealos
committed
2930e25
Added even more tests
NotYourAlejandro
committed
994e3c9
Fixed minor routing issues
NotYourAlejandro
committed
a9e7f03
testing1
daira27
committed
eb0659d
pulling
Jadyn Calhoun
committed
fbf2616
merged changes
Jadyn Calhoun
committed
2e244f7
messages display on group chat now
Jadyn Calhoun
committed
7eebbd0
Work in progress
JLealos
committed
418d84b
lol
JLealos
committed
41e0d6a
User settings working
JLealos
committed
4cd2e78
Added more tests
NotYourAlejandro
committed
5644812
next update
JLealos
committed
5681c4a
groupsettings progress
JLealos
committed
cc380fd
Improved messageController logging
NotYourAlejandro
committed
b9b40b3
Final set of tests to add
NotYourAlejandro
committed
b63b33b
Improved error logging
NotYourAlejandro
committed
da8ccdb
Merge pull request #170 from jadynlaila/messages
jadynlaila
authored
753140b
changes
JLealos
committed
f41bba9
Wrote an initial failing thest for getMeeting
NotYourAlejandro
committed
675f6bb
css fix
JLealos
committed
008b83f
group functions added
daira27
committed
4c3b3f7
Added tests for messageController
NotYourAlejandro
committed
8c07f8c
Commented out remaining tests since we won't finish them in time.
NotYourAlejandro
committed
d347a05
Merge pull request #177 from jadynlaila/dev-backend_test_rewrite
NotYourAlejandro
authored
0963e81
Merge branch 'dev' into user_group_settings
NotYourAlejandro
committed
c9ffaf8
Merge pull request #183 from jadynlaila:user_group_settings
NotYourAlejandro
authored
65b78fb
fixed import
JLealos
committed
77ec053
baseurl fix
JLealos
committed
0de43fd

Commits on Dec 1, 2024

fixed import

JLealos
authored and
NotYourAlejandro
committed
6aa4fd6
fix: update import paths for components in GroupChatModule and TextRegion
NotYourAlejandro
committed
7db2850

Commits on Dec 2, 2024

navbar gets all student and group info
Jadyn Calhoun
committed
7d91c43
commit
daira27
committed
72ab111

Commits on Dec 3, 2024

Fix the error in TextRegion causing error screens.
NotYourAlejandro
committed
57580a2
Updated group counts to hide if the data is unavailable.
NotYourAlejandro
committed
57af4ee
Merge branch 'dev' into navbar-connection
NotYourAlejandro
committed
e3c7b97
Fix the text region routing
NotYourAlejandro
committed
0bff481
Merge pull request #196 from jadynlaila:navbar-connection
NotYourAlejandro
authored
0bd334f
minor changes
Jadyn Calhoun
committed
47eb677
Merge branch 'dev' into dev-groupSearch
Jadyn Calhoun
committed
ded6801
Merge branch 'dev' into dev-groupSearch
Jadyn Calhoun
committed
653e7f5
Update token on save. Also redirect to main page on save.
NotYourAlejandro
committed
68b9441
Merge pull request #197 from jadynlaila/dev-user_settings_token_update
jadynlaila
authored
b7ae063
Added logout button
NotYourAlejandro
committed
887f72d
Added not logged in behavior to group chat module
NotYourAlejandro
committed
0fcf42d
Replaced navigate() with window.location.href
NotYourAlejandro
committed
5ccac0e
Replaced stray navigate()
NotYourAlejandro
committed
cd7d641
Merge pull request #198 from jadynlaila/dev-logout_button
vsv7nau
authored
3b5a0bb
Add email attribute to student info scrub
NotYourAlejandro
committed
e136576
Initial commit
NotYourAlejandro
committed
a333cb9
users can create and add groups
Jadyn Calhoun
committed
bfd1977
fixed bugs
daira27
committed
b5368d3
Update port used by textregion when obtaining messages
NotYourAlejandro
committed
b36283d
Added icon resources
NotYourAlejandro
committed
8acd45f
Wrote initial MeetingsComponent and IndividualMeetingComponent components.
NotYourAlejandro
committed
a0d08d3
Minor MeetingsOverlay bug fixes
NotYourAlejandro
committed
a8ddaa5
Change createGroup route from put to post
NotYourAlejandro
committed
4f070c2
Fix bug in meetingController where a request was returned, not a response.
NotYourAlejandro
committed
8e7c602
Change return value in createMeeting from request to response
NotYourAlejandro
committed
813bd40
Created passing test for creating a meeting
NotYourAlejandro
committed
6f0d036

Commits on Dec 4, 2024

Fixed issue in messageController where isSender in deleteMessage wasn't being properly assigned.
NotYourAlejandro
committed
9311ea0
Wrote tests for deleting a meeting
NotYourAlejandro
committed
429f5c6
Added test for getting a meeting
NotYourAlejandro
committed
cda5831
Fixed group settings to use the backend API properly
NotYourAlejandro
committed
7792b34
Change the concurrently prefix colors
NotYourAlejandro
committed
fc45bcf
Merge branch 'dev' into dev-meeting_overlay
NotYourAlejandro
committed
46ef24c
Merge pull request #199 from jadynlaila/dev-get_student_email_scrub_fix
NotYourAlejandro
authored
9a47235
Merge pull request #200 from jadynlaila/dev-get_message_port_fix
NotYourAlejandro
authored
25e23c7
Merge pull request #201 from jadynlaila/dev-meeting_controller_tests
NotYourAlejandro
authored
b9cc767
Make the MeetingsComponent return value more concise
NotYourAlejandro
committed
077ed76
Merge branch 'dev' into dev-meeting_overlay
NotYourAlejandro
committed
640e996
Replace the textregion component for debugging
NotYourAlejandro
committed
0a4a903
Fixed groupController so that the group ID is appended properly
NotYourAlejandro
committed
92c00ea
Change the API call used to join a group
NotYourAlejandro
committed
6951470
Updated default page on startup to show "group search" component, and have it be replaced when a group is selected
NotYourAlejandro
committed
83f38fc
The meeting HTML works now
NotYourAlejandro
committed
84f8175
Added good-enough CSS for the meeting
NotYourAlejandro
committed
3821d0d
added button, improved few things
daira27
committed
30b48f4
fixed scrolling on group chat container
daira27
committed
dfa9792
Implemented the MeetingsOverlay as a sidebar to TextRegion
NotYourAlejandro
committed
4a1255a
Minor updates
NotYourAlejandro
committed
16a3b70
Made some changes to settings CSS
JLealos
committed
d383833
Merge pull request #202 from jadynlaila/dev-meeting_overlay
jadynlaila
authored
a4440b7
Merge branch 'dev' into dev-groupSearch-alex
jadynlaila
authored
53be589
Merge pull request #203 from jadynlaila/dev-groupSearch-alex
jadynlaila
authored
cd6930d
Merge pull request #204 from jadynlaila/jack_polishing
NotYourAlejandro
authored
b0cf6a2
Reversed meeting expand button rotation
NotYourAlejandro
committed
2356a86