Skip to content

Commit f1d1f71

Browse files
MUnderbrink90MUnderbrink90
authored
Merge pull request #351 from oslabs-beta/master
feat: Swell v1.18
2 parents 5275074 + 19fa5f1 commit f1d1f71

File tree

119 files changed

+2665
-1568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+2665
-1568
lines changed

‎README.md‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ Swell is a one-stop shop for sending and monitoring your API requests:
2727
- Import and export workspaces locally
2828
- Compose test suites in JavaScript with Chai-style TDD/BDD assertion syntax
2929

30+
## Considering iterating Swell in the future?
31+
32+
We highly encourage you to check out the `DEV-README.md` in the `docs` folder. We've included a comprehensive guide on the latest updates, which areas would benefit from future iterations, as well as details of core components.
33+
3034
## Core features
3135

3236
- _HTTP2_: Swell supports full HTTP2 multiplexing of requests and responses. HTTP requests to the same host will be sent over the same connection. Swell will attempt to initiate an HTTP2 connection for all HTTPS requests by default, with the ability to revert to HTTP1.1 for legacy servers. Multiple concurrent streams are allowed for each connection.
@@ -83,6 +87,10 @@ Swell is a one-stop shop for sending and monitoring your API requests:
8387

8488
- _Collection Runner_: You can also stage requests in the workspace and automate the process of sending off each one. No need to manually press send on each one; instead each request will fire off in the order of staging.
8589

90+
- _File Upload/Dark Mode_: If you click on the body drop down menu, you can select binary, which allows you to upload a file that can be sent along with any request to test backend file upload routes. Additionally, you can toggle dark mode via the button in the top right-hand corner.
91+
92+
<img src="./ReadMeGifs/Gifs/FileUploadAndDarkMode.gif"
93+
style="display: block; margin: 10px auto 30px; border: 1px solid black;" />
8694
## Experimental Features
8795

8896
- _Mock Server_: Swell allows you to create your own HTTP/2 mock server to facilitate front-end development without depending on a fully built backend server.
@@ -115,11 +123,12 @@ Swell is a one-stop shop for sending and monitoring your API requests:
115123
- Mocha
116124
- Playwright
117125

118-
## Considering iterating Swell in the future?
119-
120-
Feel free to check out the `DEV-README.md` in the `docs` folder.
121-
122126
## Authors
127+
- **Karol Krzywon** - [kkrzywon](https://github.com/kkrzywon)
128+
- **Howard Sun** - [howardCodeGit](https://github.com/howardCodeGit)
129+
- **Carter Sarkela** - [CarterSarkela](https://github.com/CarterSarkela)
130+
- **Adeeb Bayat** - [adeebbayat](https://github.com/adeebbayat)
131+
- **Michael Underbrink** - [MUnderbrink90](https://github.com/MUnderbrink90)
123132
- **Aaron Cruz** - [AArCruz](https://github.com/AArCruz)
124133
- **Katya Villano** - [k-villano](https://github.com/k-villano)
125134
- **Brooke Sauro** - [bhsauro](https://github.com/bhsauro)

‎ReadMeGifs/Gifs/FileUploadAndDarkMode.gif‎

645 KB
Loading

‎docs/DEV-README.md‎

Lines changed: 144 additions & 60 deletions
Large diffs are not rendered by default.

‎docs/vcxsrv_alt_disable_access_control.png‎

71.4 KB
Loading

‎docs/vcxsrv_client_startup.png‎

65.7 KB
Loading

‎docs/vcxsrv_disable_access_control.png‎

11.8 KB
Loading

‎docs/vcxsrv_display_settings.png‎

93.7 KB
Loading

‎index-csp.html‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8" />
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<title>Swell</title>
7-
</head>
8-
9-
<body></body>
10-
</html>
3+
4+
<head>
5+
<meta charset="UTF-8" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<title>
8+
<%= htmlWebpackPlugin.options.title %>
9+
</title>
10+
</head>
11+
12+
<body>
13+
<div id="root"></div>
14+
15+
</body>
16+
17+
</html>

‎jest.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
// "collectCoverage": true,
77
electron: '<rootDir>/__mocks__/electronMock.js',
88
'\\.(css|less|sass|scss)$': '<rootDir>/__mocks__/styleMocks.js',
9-
'\\.(gif|ttf|eot|svg|png)$': '<rootDir>/__mocks__/fileMock.js',
9+
'\\.(gif|ttf|eot|svg|png)$': '<rootDir>/test/__mocks__/fileMock.js',
1010
'^dexie$': '<rootDir>/node_modules/dexie'
1111
},
1212
testPathIgnorePatterns: [

‎main.js‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,14 @@
3131
// app - Control your application's event lifecycle
3232
// ipcMain - Communicate asynchronously from the main process to renderer processes
3333
// ** Entry point for Electron **
34-
const { app, BrowserWindow, ipcMain, dialog, shell, session } = require('electron');
34+
const {
35+
app,
36+
BrowserWindow,
37+
ipcMain,
38+
dialog,
39+
shell,
40+
session,
41+
} = require('electron');
3542
const os = require('node:os');
3643

3744
const { autoUpdater } = require('electron-updater');
@@ -70,10 +77,8 @@ require('./main_process/main_trpcController.js')();
7077
// require mac touchbar
7178
const { touchBar } = require('./main_process/main_touchbar.js');
7279

73-
74-
75-
const contextMenu = require('electron-context-menu')
76-
contextMenu()
80+
const contextMenu = require('electron-context-menu');
81+
contextMenu();
7782

7883
// configure logging
7984
// autoUpdater.logger = log;
@@ -155,12 +160,12 @@ function createWindow() {
155160

156161
// dev mode title
157162
mainWindow.setTitle('Swell (devMode)');
158-
159-
// if we are in developer mode Add React & Redux DevTools to Electron App
160163

164+
// if we are in developer mode Add React & Redux DevTools to Electron App
161165

162166
// this manually installs the depricated dev tools that are compatible with electron
163-
session.defaultSession.loadExtension(reactDevToolsPath)
167+
session.defaultSession
168+
.loadExtension(reactDevToolsPath)
164169
.then((name) => console.log(`Added Extension: ${name}`))
165170
.catch((err) => console.log('An error occurred: ', err));
166171
// ****** if current react dev tools version did work with electron we would use the below commented code ****
@@ -229,7 +234,7 @@ app.on('ready', () => {
229234
* should not be removed. The servers must be required upon app startup (especially in
230235
* packaged versions) or else the packaged app would not recognize the servers at all.
231236
*/
232-
const express = require('./src/server/server');
237+
const express = require('./src/server/server.js');
233238
const mockServer = require('./src/server/mockServer.js');
234239
autoUpdater.checkForUpdates();
235240
}
@@ -519,7 +524,7 @@ const { fork } = require('child_process');
519524

520525
// starts the mock server by forking a Node child process
521526
ipcMain.on('start-mock-server', () => {
522-
mockServerProcess = fork('node', ['./src/server/mockServer.js']);
527+
mockServerProcess = fork('./src/server/mockServer.js');
523528
mockServerProcess.on('error', (err) => {
524529
console.log('Error starting mock server', err);
525530
});

0 commit comments

Comments
 (0)