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.

Sign up for GitHub

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

Jump to bottom

Develop #40

Merged
merged 105 commits into from
Aug 17, 2023
Merged

Develop #40

merged 105 commits into from
Aug 17, 2023

Commits on Jul 14, 2023

  1. push branch

    @Emil307
    Emil307 committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    13aa8ba View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. change default state

    @Emil307
    Emil307 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    9043dd8 View commit details
    Browse the repository at this point in the history

  2. add room state

    @Emil307
    Emil307 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    a046005 View commit details
    Browse the repository at this point in the history

  3. add opening edit form

    @Emil307
    Emil307 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    77224a2 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Fixed several issues with branches

    @ayusavin
    ayusavin committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    ce832da View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Merge pull request #4 from Student-Labs-2023/LobbyForms 

    Lobby forms
    @Emil307
    Emil307 authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    7f38656 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. add CallPage, webcam for React, fix bugs, change styles

    @BodySites
    BodySites committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    722a50c View commit details
    Browse the repository at this point in the history

  2. add changes of Emil

    @BodySites
    BodySites committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    57ee319 View commit details
    Browse the repository at this point in the history

  3. add changes of Emil

    @BodySites
    BodySites committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    a4370b6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/Student-Labs-2023/networ… 

    …k-class-frontend into develop
    @BodySites
    BodySites committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    55f4fdd View commit details
    Browse the repository at this point in the history

  5. add loader for all pages and the page header has been changed

    @BodySites
    BodySites committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    f76e78f View commit details
    Browse the repository at this point in the history

  6. bag fix

    @Emil307
    Emil307 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    652b0fc View commit details
    Browse the repository at this point in the history

  7. layout fix

    @Emil307
    Emil307 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    c8b23b5 View commit details
    Browse the repository at this point in the history

  8. first intergation with jitsi meet

    @Emil307
    Emil307 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    f7b2458 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. fix conflicts

    @Emil307
    Emil307 committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    1b16d30 View commit details
    Browse the repository at this point in the history

  2. fix errors

    @Emil307
    Emil307 committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    4f341ba View commit details
    Browse the repository at this point in the history

  3. add redirect to lesson

    @Emil307
    Emil307 committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    3992463 View commit details
    Browse the repository at this point in the history

  4. taken out of the lobbyformlayout

    @Emil307
    Emil307 committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    14b71ae View commit details
    Browse the repository at this point in the history

  5. fix editform layout

    @Emil307
    Emil307 committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    aa2921c View commit details
    Browse the repository at this point in the history

  6. fix navbar layout

    @Emil307
    Emil307 committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    5c93666 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. add dev and production auth

    @Emil307
    Emil307 committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    2210bb1 View commit details
    Browse the repository at this point in the history

  2. add production dotenv

    @Emil307
    Emil307 committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    f02c9e8 View commit details
    Browse the repository at this point in the history

  3. add dev and production auth

    @Emil307
    Emil307 committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    167eafb View commit details
    Browse the repository at this point in the history

  4. add dev and production auth

    @Emil307
    Emil307 committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    6f56253 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. add pages bg

    @Emil307
    Emil307 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    34e82b6 View commit details
    Browse the repository at this point in the history

  2. fix: changing the click area on the profile in the header

    @BodySites
    BodySites committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    4cfafc1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/Student-Labs-2023/networ… 

    …k-class-frontend into develop
    @BodySites
    BodySites committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    325337a View commit details
    Browse the repository at this point in the history

  4. 'New class' button now opens the class creation form

    @BodySites
    BodySites committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    283fcdb View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. fix bug with copyLink, add Lodash, add list of devices in JoinCall an… 

    …d fix layout, add features with microphone and camera
    @BodySites
    BodySites committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    ee9f36b View commit details
    Browse the repository at this point in the history

  2. add background with text for the camera turned off

    @BodySites
    BodySites committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    531339f View commit details
    Browse the repository at this point in the history

  3. resolve conflict

    @Emil307
    Emil307 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    7323da4 View commit details
    Browse the repository at this point in the history

  4. push readme

    @Emil307
    Emil307 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    97d0928 View commit details
    Browse the repository at this point in the history

  5. fix error

    @Emil307
    Emil307 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    a0c5a60 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2023

  1. add Controllers Wrapper

    @Emil307
    Emil307 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    2288f72 View commit details
    Browse the repository at this point in the history

  2. layout features microphone controller

    @Emil307
    Emil307 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    e9f5a97 View commit details
    Browse the repository at this point in the history

  3. layout features leave call button

    @Emil307
    Emil307 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    c3cbed3 View commit details
    Browse the repository at this point in the history

  4. add controller layout

    @Emil307
    Emil307 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    c863831 View commit details
    Browse the repository at this point in the history

  5. layout feature camera controller

    @Emil307
    Emil307 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    fd06c90 View commit details
    Browse the repository at this point in the history

  6. layout feature record controller

    @Emil307
    Emil307 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    075b36a View commit details
    Browse the repository at this point in the history

  7. layout feature hand controller

    @Emil307
    Emil307 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    0bfb712 View commit details
    Browse the repository at this point in the history

  8. layout feature screen controller

    @Emil307
    Emil307 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    a2045f3 View commit details
    Browse the repository at this point in the history

  9. layout feature menu controller

    @Emil307
    Emil307 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    48d8044 View commit details
    Browse the repository at this point in the history

  10. layout widget call controllers

    @Emil307
    Emil307 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    f105db1 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #8 from Student-Labs-2023/feature/callPage 

    Feature/call page
    @Emil307
    Emil307 authored Jul 29, 2023
    Configuration menu
    Copy the full SHA
    955625e View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2023

  1. add api to dotenv

    @Emil307
    Emil307 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    39855aa View commit details
    Browse the repository at this point in the history

  2. layout lobby forms

    @Emil307
    Emil307 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    f49d342 View commit details
    Browse the repository at this point in the history

  3. intergate create func and fix api

    @Emil307
    Emil307 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    3d50c3f View commit details
    Browse the repository at this point in the history

  4. add creating room feature

    @Emil307
    Emil307 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    38c10ea View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. change layout of Back button, add highlight when the microphone is ac… 

    …tivated
    @BodySites
    BodySites committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    afe99c1 View commit details
    Browse the repository at this point in the history

  2. add room slist

    @Emil307
    Emil307 committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    984bf78 View commit details
    Browse the repository at this point in the history

  3. add chat state

    @Emil307
    Emil307 committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    3510431 View commit details
    Browse the repository at this point in the history

  4. end work session

    @Emil307
    Emil307 committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    6e14768 View commit details
    Browse the repository at this point in the history

  5. layout lesson info

    @Emil307
    Emil307 committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    eed9771 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Merge pull request #9 from Student-Labs-2023/feature/callPage 

    Feature/call page
    @Emil307
    Emil307 authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    15d793c View commit details
    Browse the repository at this point in the history

  2. load code from callinfo

    @Emil307
    Emil307 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    c456ea2 View commit details
    Browse the repository at this point in the history

  3. fix information stack in rooms list

    @Emil307
    Emil307 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    c5ff5a9 View commit details
    Browse the repository at this point in the history

  4. change dev api url

    @Emil307
    Emil307 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    b4a3665 View commit details
    Browse the repository at this point in the history

  5. add prod api url

    @Emil307
    Emil307 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    856d887 View commit details
    Browse the repository at this point in the history

  6. create searching rooms in lobby

    @Emil307
    Emil307 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    f025710 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. fix swithing ispublic in editroomform

    @Emil307
    Emil307 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    11ecb95 View commit details
    Browse the repository at this point in the history

  2. fix create room form

    @Emil307
    Emil307 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    dcbb8e1 View commit details
    Browse the repository at this point in the history

  3. fix roomcard layout

    @Emil307
    Emil307 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    54d5fcf View commit details
    Browse the repository at this point in the history

  4. create delete thunk

    @Emil307
    Emil307 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    912353e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #10 from Student-Labs-2023/feature/apiintegrations 

    Feature/apiintegrations
    @Emil307
    Emil307 authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    e22003c View commit details
    Browse the repository at this point in the history

  6. fix errors in roomcard

    @Emil307
    Emil307 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    3e491f4 View commit details
    Browse the repository at this point in the history

  7. fix errors in search input

    @Emil307
    Emil307 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    d250396 View commit details
    Browse the repository at this point in the history

  8. fix errors in lobby

    @Emil307
    Emil307 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    ba850a2 View commit details
    Browse the repository at this point in the history

  9. fix errors lobbyaccess & lobbymy

    @Emil307
    Emil307 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    a4a6f8c View commit details
    Browse the repository at this point in the history

  10. add grid layout of peoples, fix layout in CallPage

    @BodySites
    BodySites committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    f8941e0 View commit details
    Browse the repository at this point in the history

  11. fix delete error

    @Emil307
    Emil307 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    08641d9 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2023

  1. Merge branch 'develop' of https://github.com/Student-Labs-2023/networ… 

    …k-class-frontend into develop
    @Emil307
    Emil307 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    d36b48b View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. split grid into pages of 15 elements and change its layout

    @BodySites
    BodySites committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    6293260 View commit details
    Browse the repository at this point in the history

  2. remove fixed width and fix layout of the CallPage

    @BodySites
    BodySites committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    0c4da62 View commit details
    Browse the repository at this point in the history

  3. change scrollbar in the CallPage

    @BodySites
    BodySites committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    fb9a88c View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Merge branch 'develop' of https://github.com/Student-Labs-2023/networ… 

    …k-class-frontend into develop
    @Emil307
    Emil307 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    f5f5327 View commit details
    Browse the repository at this point in the history

  2. add adaptive for CallPage and its grid, add sidebar of participants

    @BodySites
    BodySites committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    8a73e5a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/Student-Labs-2023/networ… 

    …k-class-frontend into develop
    @Emil307
    Emil307 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    c8b26ea View commit details
    Browse the repository at this point in the history

  4. fix: when closing participants, an empty grid could appear

    @BodySites
    BodySites committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    da5e377 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/Student-Labs-2023/networ… 

    …k-class-frontend into develop
    @Emil307
    Emil307 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    652a691 View commit details
    Browse the repository at this point in the history

  6. add fetching my rooms

    @Emil307
    Emil307 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    94ae101 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. update api domen

    @Emil307
    Emil307 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    d93cb93 View commit details
    Browse the repository at this point in the history

  2. update ws to wss

    @Emil307
    Emil307 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    af02e89 View commit details
    Browse the repository at this point in the history

  3. fix errors

    @Emil307
    Emil307 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    6c2e071 View commit details
    Browse the repository at this point in the history

  4. fix bugs

    @Emil307
    Emil307 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    76c2920 View commit details
    Browse the repository at this point in the history

  5. connected store of chat and participants and added chat layout

    @BodySites
    BodySites committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    d3e0f4a View commit details
    Browse the repository at this point in the history

  6. take out switchPanel to the shared and add it to header of Callpage

    @BodySites
    BodySites committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    d322643 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. fix edit delete rooms add link for videosdk

    @Emil307
    Emil307 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    cb83705 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/Student-Labs-2023/networ… 

    …k-class-frontend into develop
    @Emil307
    Emil307 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    5d80ae9 View commit details
    Browse the repository at this point in the history

  3. fix errors

    @Emil307
    Emil307 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    a7e1a50 View commit details
    Browse the repository at this point in the history

  4. change videosdk url

    @Emil307
    Emil307 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    450b1be View commit details
    Browse the repository at this point in the history

  5. fix query params

    @Emil307
    Emil307 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    2f9d23d View commit details
    Browse the repository at this point in the history

  6. add page with UserProfile, change layout of ProfilePanel in the Header

    @BodySites
    BodySites committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    3942167 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' of https://github.com/Student-Labs-2023/networ… 

    …k-class-frontend into feature/profile
    @BodySites
    BodySites committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    232a45a View commit details
    Browse the repository at this point in the history

  8. Merge pull request #35 from Student-Labs-2023/feature/profile 

    Add ProfilePage
    @BodySites
    BodySites authored Aug 15, 2023
    Configuration menu
    Copy the full SHA
    bda1c85 View commit details
    Browse the repository at this point in the history

  9. fix bugs in lobby

    @Emil307
    Emil307 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    b88329f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' of https://github.com/Student-Labs-2023/networ… 

    …k-class-frontend into develop
    @Emil307
    Emil307 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    93ee863 View commit details
    Browse the repository at this point in the history

  11. fix roomcard layout

    @Emil307
    Emil307 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    3f90d80 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. change loader

    @Emil307
    Emil307 committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    e79d019 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. add editForm for UserProfile

    @BodySites
    BodySites committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    11f4f42 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #38 from Student-Labs-2023/feature/profile 

    add editForm for UserProfile
    @BodySites
    BodySites authored Aug 17, 2023
    Configuration menu
    Copy the full SHA
    92d719d View commit details
    Browse the repository at this point in the history

  3. fix header layout

    @Emil307
    Emil307 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    88a5e6a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/Student-Labs-2023/networ… 

    …k-class-frontend into develop
    @Emil307
    Emil307 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    1404d6e View commit details
    Browse the repository at this point in the history

  5. fix opening create form

    @Emil307
    Emil307 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    8eb248d View commit details
    Browse the repository at this point in the history

  6. put styles for ProfilePage in a separate file

    @BodySites
    BodySites committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    06e6f7a View commit details
    Browse the repository at this point in the history

  7. fix error

    @BodySites
    BodySites committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    e197089 View commit details
    Browse the repository at this point in the history