Skip to content

Deployment test2 #354

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

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ae600d7
testing
Jan 24, 2025
e4dbac8
positioning of add answer
Jan 24, 2025
c27457f
Work in progress
Jan 24, 2025
145d1c7
testing add answer button functinality
Jan 27, 2025
a627110
just a safeguard
Jan 28, 2025
557bcee
test
Feb 2, 2025
b968f18
created deployment-test branch, looking at yml file and where to add …
rchldn Feb 3, 2025
d2d6f20
added developer names, changed token name on github to reflect what's…
rchldn Feb 3, 2025
1758cf7
testing webrtc messaging between two peers
Feb 3, 2025
917ff37
fixing github pull issues
Feb 3, 2025
de251d6
Modified datachannel.onmessage event
Feb 4, 2025
ac43ed4
fixed double-answer and answer in offer text box bug
rchldn Feb 6, 2025
2073521
update
Iloveeverything Feb 6, 2025
e533d1a
videostreamtested
Iloveeverything Feb 7, 2025
5ab39eb
togglerefreshbuttons
Iloveeverything Feb 11, 2025
930734d
toggle conditional rendering
Iloveeverything Feb 11, 2025
781580c
added reducer for reset, started building it into react component in …
rchldn Feb 11, 2025
0a2a10c
further work on refresh functionality
rchldn Feb 11, 2025
b6ced88
functioning refresh button, useEffect and useRef additions, used code…
rchldn Feb 11, 2025
57c0383
Merge branch 'deployment-test' into dev
rchldn Feb 13, 2025
2a27916
merging deployment-test branch
rchldn Feb 13, 2025
78bc5c4
changed yaml branch back to master from dev
rchldn Feb 13, 2025
16eff44
changed node version in yaml
rchldn Feb 13, 2025
0daf589
trying to update versions
rchldn Feb 13, 2025
af29f17
added step to codeql-analysis yml
rchldn Feb 13, 2025
38647fe
more changes to the yml files, codeql specifically
rchldn Feb 13, 2025
3417405
explicitly naming node versions instead of dynamic updating; deleted …
rchldn Feb 13, 2025
69ba844
further changes
rchldn Feb 13, 2025
e70eadc
added set NODE_OPTIONS for windows tests
rchldn Feb 13, 2025
8fcef8a
more windows updates
rchldn Feb 13, 2025
7322ce8
more windows changes
rchldn Feb 13, 2025
80d9889
changed node_options to node_env
rchldn Feb 13, 2025
4719c48
separated out patches step
rchldn Feb 13, 2025
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
27 changes: 20 additions & 7 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,23 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Use Node.js 18
uses: actions/setup-node@v3
with:
node-version: 18.20.6 # Or your preferred 18.x version

- name: Print Node.js version
run: node -v

- name: Install dependencies
run: npm ci # Or npm install if you prefer

- name: Build project
run: |
make boostrap
make release
npm run build

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand All @@ -43,19 +60,15 @@ jobs:

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

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

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
# uses a compiled language (we moved the "below" lines up to 42 and edited them)

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
18 changes: 9 additions & 9 deletions .github/workflows/createPackages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ jobs:
tests:
strategy:
matrix:
node-version: [16]
node-version: [18.20.6]
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout repo
uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
- 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.
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
node-version: 18.20.6
- name: Install dependencies
run: npm i && npm ci
- name: Run unit tests
Expand All @@ -40,15 +40,15 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: '16.15'
node-version: '18.20.6'
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
with:
tag_name: v1.16.0 # Replace with your desired tag or version number
release_name: Release v1.16.0 # Replace with your desired release name
tag_name: v1.19.0 # Replace with your desired tag or version number
release_name: Release v1.19.0 # Replace with your desired release name
draft: true
body: |
<Temporary Body for Github Release>
Expand All @@ -67,7 +67,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: '16.15'
node-version: '18.20.6'

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

- name: Install Dependencies
run: npm install
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: '16.15' # Use the specific version of Node that your project requires
node-version: '18.20.6' # Use the specific version of Node that your project requires

- name: Install Dependencies
run: npm install
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
tests:
strategy:
matrix:
node-version: [16]
node-version: [18.20.6]
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -18,7 +18,11 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: npm i && npm ci
- name: Apply patches
env:
NODE_ENV: --no-node-snapshot
run: npx patch-package
- name: Run unit tests
uses: coactions/setup-xvfb@v1
with:
run: npm run test-jest
run: npm run test-jest
6 changes: 6 additions & 0 deletions Dockerfile-dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
From node:18.20
RUN npm install -g webpack
Workdir /app
Copy package*.json /app
Run npm install
Expose 8080
4 changes: 2 additions & 2 deletions build/config.gypi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Do not edit. File was generated by node-gyp's "configure" step
{
"target_defaults": {
"cflags": [],
"cflags": ['-std=c++20'],
"default_configuration": "Release",
"defines": [],
"include_dirs": [],
Expand Down Expand Up @@ -52,7 +52,7 @@
"node_use_dtrace": "true",
"node_use_etw": "false",
"node_use_node_code_cache": "true",
"node_use_node_snapshot": "true",
"node_use_node_snapshot": "false",
"node_use_openssl": "true",
"node_use_v8_platform": "true",
"node_with_ltcg": "false",
Expand Down
11 changes: 6 additions & 5 deletions docs/DEV-README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Thank you for your consideration and let's work together on making Swell one of

- TypeScript + JavaScript
- React
- Redux
- Redux Toolkit
- SASS
- Node
- Express
Expand Down Expand Up @@ -111,6 +111,7 @@ From a functionality standpoint:
- HTTP/2 stress testing with `GET` requests
- GraphQL stress testing with `Query`
- Mock server for HTTP/2 (`Express`)
- WebRTC video/audio and text channel testing
- Ability to store historical requests and create/delete workspaces
- Frontend conversion to TypeScript
- From a codebase standpoint:
Expand Down Expand Up @@ -140,9 +141,9 @@ endeavour. The impacts to the product are:

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?

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.
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.

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.
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.

### _Ensure consistent redux state management_

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

---

## Backlog from Iteration Group v1.18
## Backlog from Iteration Groups v1.18 and v1.19

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

---
Expand Down
33 changes: 27 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "swell",
"version": "1.18.0",
"version": "1.19.0",
"description": "Swell",
"main": "main.js",
"repository": "https://github.com/open-source-labs/Swell",
Expand Down Expand Up @@ -47,7 +47,7 @@
"preload.js",
"src/server/*"
],
"nodeVersion": "16.15.0",
"nodeVersion": "18.18.0",
"nsis": {
"createDesktopShortcut": "always"
},
Expand Down Expand Up @@ -91,7 +91,7 @@
"license": "MIT",
"homepage": "http://www.getswell.io",
"engines": {
"node": ">=16.15.0",
"node": ">=18.0.0",
"npm": ">=7.0.0"
},
"dependencies": {
Expand Down Expand Up @@ -139,13 +139,14 @@
"graphql-tag": "^2.12.6",
"graphql-ws": "^5.8.1",
"highland": "^2.13.5",
"isolated-vm": "^4.6.0",
"isolated-vm": "^5.0.3",
"jest-environment-jsdom": "^29.7.0",
"mali": "^0.46.1",
"ngrok": "^4.3.1",
"node-fetch": "^3.3.0",
"node-gyp": "^11.0.0",
"npm": "^8.7.0",
"patch-package": "^6.4.7",
"patch-package": "^6.5.1",
"path": "^0.12.7",
"prop-types": "^15.8.1",
"react": "^18.0.0",
Expand All @@ -154,6 +155,7 @@
"react-dom": "^18.0.0",
"react-dropzone": "^12.1.0",
"react-github-btn": "^1.2.2",
"react-icons": "^5.4.0",
"react-redux": "^8.0.1",
"react-router-dom": "^6.3.0",
"react-split": "^2.0.14",
Expand Down Expand Up @@ -569,7 +571,26 @@
{
"name": "Nitesh Manem",
"url": "https://github.com/NManem"
},
{
"name": "Kiki Hunt",
"url": "https://github.com/Iloveeverything"
},
{
"name": "Isaac Mbambo",
"url": "https://github.com/IM236"
},
{
"name": "Ting Lee",
"url": "https://github.com/tingEng"
},
{
"name": "Rachel Dean",
"url": "https://github.com/rchldn"
},
{
"name": "Kadeem Reid",
"url": "https://github.com/Kadeem929"
}
]
}

94 changes: 94 additions & 0 deletions src/assets/style/WebRtc.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
.toggle-refresh-container {
display: flex;
justify-content: space-between;
align-items: center;
padding: 10px;
min-height: 40px;
}

.refresh-button {
width: 70px;
height: 40px;
border-radius: 30px;
border-style: none;
background-color: #58a4b0;
}

.refresh-button:hover {
box-shadow: 2px 2px 1px rgba(0, 0, 0, 0.75);
}

.Audio-Toggle-Container {
display: flex;
justify-content: flex-start;
align-items: center;
gap: 10px;
min-width: 150px;
}

.switch {
position: relative;
display: inline-block;
width: 60px;
height: 34px;
}

.switch input {
opacity: 0;
width: 0;
height: 0;
}

.slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #ccc;
-webkit-transition: 0.4s;
transition: 0.4s;
}

.slider-on {
background-color: #58a4b0 !important;
}

.slider:before {
position: absolute;
content: '';
height: 26px;
width: 26px;
left: 4px;
bottom: 4px;
background-color: white;
-webkit-transition: 0.4s;
transition: 0.4s;
}

input:focus + .slider {
box-shadow: 0 0 1px #ccc;
}

input:checked + .slider:before {
-webkit-transform: translateX(26px);
-ms-transform: translateX(26px);
transform: translateX(26px);
}

.slider.round {
border-radius: 5px;
}

.slider.round:before {
border-radius: 50%;
}

/* .is-3rem-footer.is-clickable.is-margin-top-auto {
display: flex;
justify-content: flex-end;
padding: 0;
}
*/

Loading