Skip to content

Commit e652dc7

Browse files
Merge remote-tracking branch 'origin/main'
2 parents d4b43b4 + 092ba01 commit e652dc7

File tree

2 files changed

+38
-12
lines changed

2 files changed

+38
-12
lines changed

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2023 Brent Quackenbush
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ STOMP (Simple/Streaming Text Oriented Messaging Protocol) is a simple, text-base
1515
In Spring Boot, STOMP over WebSocket facilitates real-time communication. It manages subscriptions and messaging, simplifying the development of applications like chat services.
1616

1717
## Project Structure
18-
![Screenshot 2023-12-30 at 5.54.17 PM.png](..%2FScreenshot%202023-12-30%20at%205.54.17%E2%80%AFPM.png)
18+
![Screenshot 2023-12-30 at 5 54 17 PM](https://github.com/brentquackenbush/chatroom/assets/50753562/d5b2ee25-efff-4ee5-9340-07a60c29d917)
1919

2020
## Configuring WebSocket in Spring Boot
2121

@@ -152,14 +152,19 @@ class ChatRoomController {
152152

153153
## Creating a front-end UI
154154

155-
### Bobby joins chatroom 1
156-
![Screenshot 2023-12-30 at 7.04.55 PM.png](..%2FScreenshot%202023-12-30%20at%207.04.55%E2%80%AFPM.png)
157-
![Screenshot 2023-12-30 at 7.05.05 PM.png](..%2FScreenshot%202023-12-30%20at%207.05.05%E2%80%AFPM.png)
158-
### Timothy joins chatroom 1
159-
![Screenshot 2023-12-30 at 7.06.01 PM.png](..%2FScreenshot%202023-12-30%20at%207.06.01%E2%80%AFPM.png)
160-
### Timothy says `Hello` (Timothy perspective)
161-
![Screenshot 2023-12-30 at 7.06.11 PM.png](..%2FScreenshot%202023-12-30%20at%207.06.11%E2%80%AFPM.png)
162-
### Bobby responds with `Yo` (Bobby perspective)
163-
![Screenshot 2023-12-30 at 7.06.24 PM.png](..%2FScreenshot%202023-12-30%20at%207.06.24%E2%80%AFPM.png)
164-
### John Cena tries to join chatroom 1, but max capacity is 2
165-
![Screenshot 2023-12-30 at 7.06.44 PM.png](..%2FScreenshot%202023-12-30%20at%207.06.44%E2%80%AFPM.png)
155+
### Bobby tries joining chatroom 1
156+
![Pt1 Bobby Joins](https://github.com/brentquackenbush/chatroom/assets/50753562/c7fa72e7-0101-4c1a-9541-2828961a5af4)
157+
### Bobby is successful
158+
![Pt2 Bobby Joins](https://github.com/brentquackenbush/chatroom/assets/50753562/a3278a01-569e-43b5-bd6a-203b51d8bb6c)
159+
### Carrie tries joining chatroom 1
160+
![Pt3 Carrie Joins](https://github.com/brentquackenbush/chatroom/assets/50753562/c98c26f9-d209-4ccd-914b-5e52dcfc083f)
161+
### Carrie is successful
162+
![Pt4 Carrie Joins](https://github.com/brentquackenbush/chatroom/assets/50753562/83bb583c-6990-442f-ac89-60e7533fb42a)
163+
### (Bobby perspective) Bobby sends `Hello`
164+
![Pt5 Bobby Perspective](https://github.com/brentquackenbush/chatroom/assets/50753562/3ade8931-5a1e-4b10-949e-1aad19a26b2a)
165+
### (Carrie perspective) Carrie receives `Hello`
166+
![Pt6 Carrie Perspective](https://github.com/brentquackenbush/chatroom/assets/50753562/15112acb-cd3f-4181-b19c-5072c68ac0a4)
167+
### New user Cena tries joining chatroom 1, but max capacity is set to 2
168+
![Pt8 Chatroom full](https://github.com/brentquackenbush/chatroom/assets/50753562/9d9e291c-2c75-4923-9abc-e8040d1890a6)
169+
### Cena is successful in joining chatroom 2 (currently empty)
170+
![Screenshot 2023-12-30 at 7 37 16 PM](https://github.com/brentquackenbush/chatroom/assets/50753562/c1ee7f83-f651-42c7-b202-522f1c6dabf3)

0 commit comments

Comments
 (0)