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

Develop #12

Merged
merged 57 commits into from
Aug 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
13aa8ba
push branch
Emil307 Jul 14, 2023
34e82b6
add pages bg
Emil307 Jul 25, 2023
4cfafc1
fix: changing the click area on the profile in the header
BodySites Jul 25, 2023
325337a
Merge branch 'develop' of https://github.com/Student-Labs-2023/networ…
BodySites Jul 25, 2023
283fcdb
'New class' button now opens the class creation form
BodySites Jul 25, 2023
ee9f36b
fix bug with copyLink, add Lodash, add list of devices in JoinCall an…
BodySites Jul 27, 2023
531339f
add background with text for the camera turned off
BodySites Jul 27, 2023
7323da4
resolve conflict
Emil307 Jul 27, 2023
97d0928
push readme
Emil307 Jul 27, 2023
a0c5a60
fix error
Emil307 Jul 27, 2023
2288f72
add Controllers Wrapper
Emil307 Jul 29, 2023
e9f5a97
layout features microphone controller
Emil307 Jul 29, 2023
c3cbed3
layout features leave call button
Emil307 Jul 29, 2023
c863831
add controller layout
Emil307 Jul 29, 2023
fd06c90
layout feature camera controller
Emil307 Jul 29, 2023
075b36a
layout feature record controller
Emil307 Jul 29, 2023
0bfb712
layout feature hand controller
Emil307 Jul 29, 2023
a2045f3
layout feature screen controller
Emil307 Jul 29, 2023
48d8044
layout feature menu controller
Emil307 Jul 29, 2023
f105db1
layout widget call controllers
Emil307 Jul 29, 2023
955625e
Merge pull request #8 from Student-Labs-2023/feature/callPage
Emil307 Jul 29, 2023
39855aa
add api to dotenv
Emil307 Jul 30, 2023
f49d342
layout lobby forms
Emil307 Jul 30, 2023
3d50c3f
intergate create func and fix api
Emil307 Jul 30, 2023
38c10ea
add creating room feature
Emil307 Jul 30, 2023
afe99c1
change layout of Back button, add highlight when the microphone is ac…
BodySites Aug 1, 2023
984bf78
add room slist
Emil307 Aug 1, 2023
3510431
add chat state
Emil307 Aug 1, 2023
6e14768
end work session
Emil307 Aug 1, 2023
eed9771
layout lesson info
Emil307 Aug 1, 2023
15d793c
Merge pull request #9 from Student-Labs-2023/feature/callPage
Emil307 Aug 2, 2023
c456ea2
load code from callinfo
Emil307 Aug 2, 2023
c5ff5a9
fix information stack in rooms list
Emil307 Aug 2, 2023
b4a3665
change dev api url
Emil307 Aug 2, 2023
856d887
add prod api url
Emil307 Aug 2, 2023
f025710
create searching rooms in lobby
Emil307 Aug 2, 2023
11ecb95
fix swithing ispublic in editroomform
Emil307 Aug 3, 2023
dcbb8e1
fix create room form
Emil307 Aug 3, 2023
54d5fcf
fix roomcard layout
Emil307 Aug 3, 2023
912353e
create delete thunk
Emil307 Aug 3, 2023
e22003c
Merge pull request #10 from Student-Labs-2023/feature/apiintegrations
Emil307 Aug 3, 2023
3e491f4
fix errors in roomcard
Emil307 Aug 3, 2023
d250396
fix errors in search input
Emil307 Aug 3, 2023
ba850a2
fix errors in lobby
Emil307 Aug 3, 2023
a4a6f8c
fix errors lobbyaccess & lobbymy
Emil307 Aug 3, 2023
f8941e0
add grid layout of peoples, fix layout in CallPage
BodySites Aug 3, 2023
08641d9
fix delete error
Emil307 Aug 3, 2023
d36b48b
Merge branch 'develop' of https://github.com/Student-Labs-2023/networ…
Emil307 Aug 5, 2023
6293260
split grid into pages of 15 elements and change its layout
BodySites Aug 6, 2023
0c4da62
remove fixed width and fix layout of the CallPage
BodySites Aug 6, 2023
fb9a88c
change scrollbar in the CallPage
BodySites Aug 6, 2023
f5f5327
Merge branch 'develop' of https://github.com/Student-Labs-2023/networ…
Emil307 Aug 10, 2023
8a73e5a
add adaptive for CallPage and its grid, add sidebar of participants
BodySites Aug 10, 2023
c8b26ea
Merge branch 'develop' of https://github.com/Student-Labs-2023/networ…
Emil307 Aug 10, 2023
da5e377
fix: when closing participants, an empty grid could appear
BodySites Aug 10, 2023
652a691
Merge branch 'develop' of https://github.com/Student-Labs-2023/networ…
Emil307 Aug 10, 2023
94ae101
add fetching my rooms
Emil307 Aug 10, 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
4 changes: 3 additions & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
VITE_AUTH0_DOMAIN="dev-txpc5harm481cb6o.us.auth0.com"
VITE_AUTH0_CLIENT_ID="BOU97TMrp85ftAnrXSLTiYYiuifp9jfz"
VITE_AUTH0_CLIENT_ID="BOU97TMrp85ftAnrXSLTiYYiuifp9jfz"
VITE_API='http://185.104.114.229:8000'
VITE_WS_API='ws://185.104.114.229:8000'
4 changes: 3 additions & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
VITE_AUTH0_DOMAIN="dev-txpc5harm481cb6o.us.auth0.com"
VITE_AUTH0_CLIENT_ID="fOB3CWsgCnNLI5q7OMWe9DfWaAXOme2o"
VITE_AUTH0_CLIENT_ID="fOB3CWsgCnNLI5q7OMWe9DfWaAXOme2o"
VITE_API='http://185.104.114.229:8000'
VITE_WS_API='ws://185.104.114.229:8000'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ lerna-debug.log*

node_modules
.env.development
.env.production
dist
dist-ssr
*.local
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"#create repo network-class-frontend"
"#review_code"
12 changes: 12 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
"dependencies": {
"@auth0/auth0-react": "^2.1.1",
"@jitsi/react-sdk": "^1.3.0",
"@types/lodash": "^4.14.196",
"@types/react-webcam": "^3.0.0",
"axios": "^1.4.0",
"dotenv": "^16.3.1",
"jest": "^29.5.0",
"lib-jitsi-meet": "^1.0.6",
"lodash": "^4.17.21",
"mobx": "^6.9.0",
"mobx-react-lite": "^3.4.3",
"react": "^18.2.0",
Expand Down
4 changes: 4 additions & 0 deletions public/icons/arrow-left-active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

5 changes: 0 additions & 5 deletions public/icons/bracket--code-angle-programming-file-bracket.svg

This file was deleted.

6 changes: 6 additions & 0 deletions public/icons/camera-mini-gray-off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/camera-mini-gray-on.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/icons/chat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/icons/close-participiants.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/copy-active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/icons/hand-up-mini.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions public/icons/micro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions public/icons/microphone-mini-gray-off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/icons/microphone-mini-gray-on.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/icons/microphone-mini-white-on.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions public/icons/monitor-green-eye2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/icons/monitor-mini-gray-off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/icons/monitor-mini-white-off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions public/icons/monitor-red-eye.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/icons/one-switch.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/icons/participants.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading