Skip to content

Commit 3b6f9a6

Browse files
audio channel and toggle merged
2 parents 7d2683a + 33bad00 commit 3b6f9a6

File tree

9 files changed

+300
-161
lines changed

9 files changed

+300
-161
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,23 @@ jobs:
3030
steps:
3131
- name: Checkout repository
3232
uses: actions/checkout@v3
33+
34+
- name: Use Node.js 18
35+
uses: actions/setup-node@v3
36+
with:
37+
node-version: 18.20.6 # Or your preferred 18.x version
38+
39+
- name: Print Node.js version
40+
run: node -v
41+
42+
- name: Install dependencies
43+
run: npm ci # Or npm install if you prefer
44+
45+
- name: Build project
46+
run: |
47+
make boostrap
48+
make release
49+
npm run build
3350
3451
# Initializes the CodeQL tools for scanning.
3552
- name: Initialize CodeQL
@@ -43,19 +60,15 @@ jobs:
4360

4461
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4562
# If this step fails, then you should remove it and run the build manually (see below)
46-
- name: Autobuild
47-
uses: github/codeql-action/autobuild@v2
63+
# - name: Autobuild
64+
# uses: github/codeql-action/autobuild@v2
4865

4966
# ℹ️ Command-line programs to run using the OS shell.
5067
# 📚 https://git.io/JvXDl
5168

5269
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
5370
# and modify them (or add more) to build your code if your project
54-
# uses a compiled language
55-
56-
#- run: |
57-
# make bootstrap
58-
# make release
71+
# uses a compiled language (we moved the "below" lines up to 42 and edited them)
5972

6073
- name: Perform CodeQL Analysis
6174
uses: github/codeql-action/analyze@v2

.github/workflows/createPackages.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ jobs:
99
tests:
1010
strategy:
1111
matrix:
12-
node-version: [16]
12+
node-version: [18.20.6]
1313
os: [macos-latest, ubuntu-latest, windows-latest]
1414
runs-on: ${{ matrix.os }}
1515
steps:
1616
- name: Checkout repo
1717
uses: actions/checkout@v3
18-
- name: Use Node.js ${{ matrix.node-version }}
18+
- name: Use Node.js 18.20.6 # this used to be dynamically updated, but kept pulling an old version number. you'll have to manually update these throughout this file to be safe.
1919
uses: actions/setup-node@v3
2020
with:
21-
node-version: ${{ matrix.node-version }}
21+
node-version: 18.20.6
2222
- name: Install dependencies
2323
run: npm i && npm ci
2424
- name: Run unit tests
@@ -40,15 +40,15 @@ jobs:
4040
- name: Use Node.js
4141
uses: actions/setup-node@v2
4242
with:
43-
node-version: '16.15'
43+
node-version: '18.20.6'
4444
- name: Create Release
4545
id: create_release
4646
uses: actions/create-release@v1
4747
env:
4848
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
4949
with:
50-
tag_name: v1.16.0 # Replace with your desired tag or version number
51-
release_name: Release v1.16.0 # Replace with your desired release name
50+
tag_name: v1.19.0 # Replace with your desired tag or version number
51+
release_name: Release v1.19.0 # Replace with your desired release name
5252
draft: true
5353
body: |
5454
<Temporary Body for Github Release>
@@ -67,7 +67,7 @@ jobs:
6767
- name: Use Node.js
6868
uses: actions/setup-node@v2
6969
with:
70-
node-version: '16.15'
70+
node-version: '18.20.6'
7171

7272
- name: Install Dependencies
7373
run: npm install
@@ -89,7 +89,7 @@ jobs:
8989
- name: Use Node.js
9090
uses: actions/setup-node@v2
9191
with:
92-
node-version: '16.15' # Use the specific version of Node that your project requires
92+
node-version: '18.20.6' # Use the specific version of Node that your project requires
9393

9494
- name: Install Dependencies
9595
run: npm install
@@ -118,7 +118,7 @@ jobs:
118118
- name: Use Node.js
119119
uses: actions/setup-node@v2
120120
with:
121-
node-version: '16.15' # Use the specific version of Node that your project requires
121+
node-version: '18.20.6' # Use the specific version of Node that your project requires
122122

123123
- name: Install Dependencies
124124
run: npm install

.github/workflows/unit-tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
tests:
77
strategy:
88
matrix:
9-
node-version: [16]
9+
node-version: [18.20.6]
1010
os: [macos-latest, ubuntu-latest, windows-latest]
1111
runs-on: ${{ matrix.os }}
1212
steps:
@@ -18,7 +18,11 @@ jobs:
1818
node-version: ${{ matrix.node-version }}
1919
- name: Install dependencies
2020
run: npm i && npm ci
21+
- name: Apply patches
22+
env:
23+
NODE_ENV: --no-node-snapshot
24+
run: npx patch-package
2125
- name: Run unit tests
2226
uses: coactions/setup-xvfb@v1
2327
with:
24-
run: npm run test-jest
28+
run: npm run test-jest

docs/DEV-README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Thank you for your consideration and let's work together on making Swell one of
1919

2020
- TypeScript + JavaScript
2121
- React
22-
- Redux
22+
- Redux Toolkit
2323
- SASS
2424
- Node
2525
- Express
@@ -111,6 +111,7 @@ From a functionality standpoint:
111111
- HTTP/2 stress testing with `GET` requests
112112
- GraphQL stress testing with `Query`
113113
- Mock server for HTTP/2 (`Express`)
114+
- WebRTC video/audio and text channel testing
114115
- Ability to store historical requests and create/delete workspaces
115116
- Frontend conversion to TypeScript
116117
- From a codebase standpoint:
@@ -140,9 +141,9 @@ endeavour. The impacts to the product are:
140141

141142
As you iterate the product, keep in mind the footprint your new feature(s) could add to the codebase. Could you re-use some of the existing modules? Can you even refactor and/or remove the obsolete code to help maintain the health of the codebase?
142143

143-
There are many parts of the codebase that break DRY principles, and with such a large application, really keep in mind that when you add features to ask if it is completely necessary. Past iterators added an experimental feature(s) without it fully working and the following team(s) would add their own experimental feature. Fixing features the past teams couldn't get to is not only a great way to learn these technologies but also a great thing to talk about in interviews. "I fixed the webRTC feature that has been stagnant for 5 years", "I addressed the technical debt and reorganized the state...", or "Increased the quality of typeScript". These all show maturity as a developer and will allow us to focus the entire time of OSP on the final 20% problems.
144+
There are many parts of the codebase that break DRY principles, and with such a large application, really keep in mind when you add features to ask if it is completely necessary. Past iterators added an experimental feature(s) without it fully working and the following team(s) would add their own experimental feature. Fixing features the past teams couldn't get to is not only a great way to learn these technologies but also a great thing to talk about in interviews. "I fixed the webRTC feature that has been stagnant for 5 years", "I addressed the technical debt and reorganized the state...", or "Increased the quality of typeScript". These all show maturity as a developer and will allow us to focus the entire time of OSP on the final 20% problems.
144145

145-
Legacy Components - As a part of a clean up effort, all files that are no longer being used have been moved to the legacy component folder. Examples of these files come from the migration to shared components. The original location of the components is mentioned in the comments of the relocated files.
146+
Legacy Components - As a part of a cleanup effort, all files that are no longer being used have been moved to the legacy component folder. Examples of these files come from the migration to shared components. The original location of the components is mentioned in the comments of the relocated files.
146147

147148
### _Ensure consistent redux state management_
148149

@@ -250,7 +251,7 @@ Finally, if future iterators would like to completely cover the list of API-test
250251

251252
---
252253

253-
## Backlog from Iteration Group v1.18
254+
## Backlog from Iteration Groups v1.18 and v1.19
254255

255256
- Fix/Update GitHub Actions for Unit Testing
256257
- Create a feature/function/endpoint to delete a mock route
@@ -267,7 +268,7 @@ Finally, if future iterators would like to completely cover the list of API-test
267268
- Convert WebRTCSessionEntryForm to MUI
268269
- Convert WebRTC components to all use material UI as per line 7 of WebRTCComposer.tsx
269270
- Combine newRequestSlice.ts and newRequestFieldSlice.ts
270-
- Update Excalidraw if necessary with new features/redux changes
271+
- Update Excalidraw as necessary with new features/redux changes
271272
- ErrorBoundary.tsx may not be functional or necessary (Leave for now)
272273

273274
---

package.json

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "swell",
3-
"version": "1.18.0",
3+
"version": "1.19.0",
44
"description": "Swell",
55
"main": "main.js",
66
"repository": "https://github.com/open-source-labs/Swell",
@@ -31,7 +31,7 @@
3131
"gh-publish-mac": "electron-builder build --x64 --mac -p always",
3232
"gh-publish": "electron-builder build -mwl -p always",
3333
"check-types": "tsc",
34-
"postinstall": "NODE_OPTIONS=--no-node-snapshot patch-package"
34+
"postinstall": "patch-package"
3535
},
3636
"build": {
3737
"npmRebuild": false,
@@ -98,8 +98,8 @@
9898
"@apollo/client": "^3.5.0",
9999
"@apollo/server": "^4.6.0",
100100
"@emotion/cache": "^11.11.0",
101-
"@emotion/react": "^11.11.4",
102-
"@emotion/styled": "^11.11.5",
101+
"@emotion/react": "^11.14.0",
102+
"@emotion/styled": "^11.14.0",
103103
"@graphql-tools/schema": "^8.3.10",
104104
"@grpc/grpc-js": "^1.6.7",
105105
"@grpc/proto-loader": "^0.6.9",
@@ -146,7 +146,7 @@
146146
"node-fetch": "^3.3.0",
147147
"node-gyp": "^11.0.0",
148148
"npm": "^8.7.0",
149-
"patch-package": "^6.4.7",
149+
"patch-package": "^6.5.1",
150150
"path": "^0.12.7",
151151
"prop-types": "^15.8.1",
152152
"react": "^18.0.0",
@@ -156,6 +156,7 @@
156156
"react-dropzone": "^12.1.0",
157157
"react-github-btn": "^1.2.2",
158158
"react-icons": "^5.4.0",
159+
"react-joyride": "^2.9.3",
159160
"react-redux": "^8.0.1",
160161
"react-router-dom": "^6.3.0",
161162
"react-split": "^2.0.14",
@@ -184,7 +185,7 @@
184185
"@babel/runtime": "^7.17.9",
185186
"@mui/icons-material": "^5.6.2",
186187
"@mui/lab": "5.0.0-alpha.137",
187-
"@mui/material": "5.14.2",
188+
"@mui/material": "^5.14.2",
188189
"@playwright/test": "^1.21.1",
189190
"@testing-library/jest-dom": "^6.1.4",
190191
"@testing-library/react": "^14.0.0",
@@ -571,6 +572,27 @@
571572
{
572573
"name": "Nitesh Manem",
573574
"url": "https://github.com/NManem"
575+
},
576+
{
577+
"name": "Kiki Hunt",
578+
"url": "https://github.com/Iloveeverything"
579+
},
580+
{
581+
"name": "Isaac Mbambo",
582+
"url": "https://github.com/IM236"
583+
},
584+
{
585+
"name": "Ting Lee",
586+
"url": "https://github.com/tingEng"
587+
},
588+
{
589+
"name": "Rachel Dean",
590+
"url": "https://github.com/rchldn"
591+
},
592+
{
593+
"name": "Kadeem Reid",
594+
"url": "https://github.com/Kadeem929"
574595
}
575596
]
576597
}
598+

src/assets/style/WebRtc.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
height: 40px;
1212
border-radius: 30px;
1313
border-style: none;
14-
background-color: #ccc;
14+
background-color: #58a4b0;
1515
}
1616

1717
.refresh-button:hover {

0 commit comments

Comments
 (0)