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.

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

Web rtc sharing position #986

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
558e256
2020-11-03
JeongYeonUk Nov 3, 2020
668bfca
test
MinwooJi Nov 3, 2020
b285de1
Merge pull request #1 from JeongYeonUk/test
JeongYeonUk Nov 3, 2020
6e06023
first
MinwooJi Nov 3, 2020
f8833dc
Merge pull request #2 from JeongYeonUk/webRTC-demo
JeongYeonUk Nov 3, 2020
c9d9654
[Add] url /rtc
hyojin38 Nov 3, 2020
06c324a
Merge pull request #3 from JeongYeonUk/webRTC-demo-url
JeongYeonUk Nov 3, 2020
9320807
[Add] record data sharing test
MinwooJi Nov 5, 2020
ed9c72b
Merge pull request #4 from JeongYeonUk/webRTC-recordtest
JeongYeonUk Nov 5, 2020
6037adb
[Add] share media by dataURL text
MinwooJi Nov 8, 2020
d10e24a
[Add] media sharing
MinwooJi Nov 8, 2020
6468c59
Merge pull request #5 from JeongYeonUk/webRTC-sendObjectURL-fileSend
JeongYeonUk Nov 8, 2020
8907f67
Modify config.json
JeongYeonUk Nov 9, 2020
58768f2
[Add] dataURL demo
MinwooJi Nov 9, 2020
db881e1
Merge pull request #6 from JeongYeonUk/webRTC-sendDATAURL-demo
JeongYeonUk Nov 9, 2020
c65fc45
[Add] sharing media sync demo
MinwooJi Nov 10, 2020
6dcaf4a
[Add] canvas tools 정리
MinwooJi Nov 10, 2020
48e59a3
Merge pull request #8 from JeongYeonUk/webRTC-sync-demo
JeongYeonUk Nov 10, 2020
a548b1d
[Add] communicate to server(record-data)
MinwooJi Nov 11, 2020
4c7a1bc
Merge pull request #9 from JeongYeonUk/webRTC-comm-server
JeongYeonUk Nov 11, 2020
067bf1c
rtc chat
hyojin38 Nov 11, 2020
28dfb49
merging1
hyojin38 Nov 11, 2020
edc8442
Merge pull request #10 from JeongYeonUk/webRTC-chat
JeongYeonUk Nov 11, 2020
0b6d65b
[Add]White board sharing
MinwooJi Nov 12, 2020
a698647
Merge pull request #13 from JeongYeonUk/webRTC-whiteboard-sharing
JeongYeonUk Nov 12, 2020
e1c10b3
1112commit
hyojin38 Nov 12, 2020
ca11d97
merging 1112
hyojin38 Nov 12, 2020
7e84af7
Merge pull request #14 from JeongYeonUk/webRTC-chat
hyojin38 Nov 12, 2020
f4c56f5
menu
hyojin38 Nov 13, 2020
19cd92c
Merge pull request #15 from JeongYeonUk/webRTC-chat
hyojin38 Nov 13, 2020
89037b1
[Add] particpant
MinwooJi Nov 13, 2020
823245b
Merge pull request #16 from JeongYeonUk/webRTC-participant-list
MinwooJi Nov 13, 2020
62df1cd
[Add] canvas 위치조정
hyojin38 Nov 13, 2020
3861e5d
[Add]Video info label modify share media error
MinwooJi Nov 13, 2020
9988918
Merge pull request #17 from JeongYeonUk/webrtc-sharescreen
hyojin38 Nov 13, 2020
f2bd8a7
MERGING
MinwooJi Nov 13, 2020
82749dd
Merge pull request #18 from JeongYeonUk/WebRTC-labeling
MinwooJi Nov 13, 2020
6f02d15
페이징 붙이기
yoonsh16 Nov 13, 2020
75e7494
Merge pull request #21 from JeongYeonUk/RTC-paging
s1neng Nov 13, 2020
c227df6
bugfix refresh
JeongYeonUk Nov 13, 2020
36721f5
[Add] mobile function
MinwooJi Nov 13, 2020
e018391
Merge pull request #22 from JeongYeonUk/WebRTC-mobile-draw
MinwooJi Nov 13, 2020
7286dc3
화면공유 시 화면 올리기
yoonsh16 Nov 14, 2020
2c2ef2d
merge
yoonsh16 Nov 14, 2020
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
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@

Signaling server has a separate repository:

* https://github.com/muaz-khan/RTCMultiConnection-Server
- https://github.com/muaz-khan/RTCMultiConnection-Server

## Demos
## rtc

* https://rtcmulticonnection.herokuapp.com/
- https://rtcmulticonnection.herokuapp.com/

## Getting Started Without Any Installation

* https://www.rtcmulticonnection.org/docs/getting-started/
- https://www.rtcmulticonnection.org/docs/getting-started/

## YouTube Channel

* https://www.youtube.com/playlist?list=PLPRQUXAnRydKdyun-vjKPMrySoow2N4tl
- https://www.youtube.com/playlist?list=PLPRQUXAnRydKdyun-vjKPMrySoow2N4tl

## Install On Your Own Website

* https://github.com/muaz-khan/RTCMultiConnection/tree/master/docs/installation-guide.md
- https://github.com/muaz-khan/RTCMultiConnection/tree/master/docs/installation-guide.md

```sh
mkdir demo && cd demo
Expand All @@ -46,21 +46,21 @@ node server --port=9001

## Integrate Inside Any Nodejs Application

* https://github.com/muaz-khan/RTCMultiConnection-Server/wiki/Integrate-inside-nodejs-applications
- https://github.com/muaz-khan/RTCMultiConnection-Server/wiki/Integrate-inside-nodejs-applications

## `Config.json` Explained

* https://github.com/muaz-khan/RTCMultiConnection-Server/wiki/config.json
- https://github.com/muaz-khan/RTCMultiConnection-Server/wiki/config.json

## How to Enable HTTPs?

* https://github.com/muaz-khan/RTCMultiConnection-Server/wiki/How-to-Enable-HTTPs
- https://github.com/muaz-khan/RTCMultiConnection-Server/wiki/How-to-Enable-HTTPs

## Want to Contribute?

RTCMultiConnection is using `Grunt` to compile javascript into `dist` directory:

* https://github.com/muaz-khan/RTCMultiConnection/blob/master/CONTRIBUTING.md
- https://github.com/muaz-khan/RTCMultiConnection/blob/master/CONTRIBUTING.md

## Wiki Pages

Expand Down
1 change: 1 addition & 0 deletions TTT.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TEst
12 changes: 6 additions & 6 deletions admin/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Admin on RTCMultiConnection</title>

<link rel="shortcut icon" href="/demos/logo.png">
<link rel="shortcut icon" href="/rtc/logo.png">

<link href="/demos/css/bootstrap.min.css" rel="stylesheet">
<script src="/demos/js/jquery-3.5.1.slim.min.js"></script>
<script src="/demos/js/popper.min.js"></script>
<script src="/demos/js/bootstrap.min.js"></script>
<link href="/rtc/css/bootstrap.min.css" rel="stylesheet">
<script src="/rtc/js/jquery-3.5.1.slim.min.js"></script>
<script src="/rtc/js/popper.min.js"></script>
<script src="/rtc/js/bootstrap.min.js"></script>
<script src="/socket.io/socket.io.js"></script>

<style type="text/css">
Expand Down Expand Up @@ -322,7 +322,7 @@
</div>

<header style="margin-bottom: 20px;">
<img class="logo" src="/demos/logo.png" alt="RTCMultiConnection" /> <span class="logo-text">Admin</span>
<img class="logo" src="/rtc/logo.png" alt="RTCMultiConnection" /> <span class="logo-text">Admin</span>

<div style="float: right;margin-top: 15px;">
<button class="btn btn-primary" data-toggle="modal" data-target="#exampleModal">Search User</button>
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"type": "git",
"url": "https://github.com/muaz-khan/RTCMultiConnection.git"
},
"homepage": "https://rtcmulticonnection.herokuapp.com/demos/",
"homepage": "https://rtcmulticonnection.herokuapp.com/rtc/",
"ignore": [
"**/.*",
"node_modules",
Expand Down
8 changes: 4 additions & 4 deletions config.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"socketURL": "/",
"dirPath": "",
"homePage": "/demos/index.html",
"homePage": "/rtc/index.html",
"socketMessageEvent": "RTCMultiConnection-Message",
"socketCustomEvent": "RTCMultiConnection-Custom-Message",
"port": "9001",
"enableLogs": "false",
"autoRebootServerOnFailure": "false",
"isUseHTTPs": "false",
"sslKey": "./fake-keys/privatekey.pem",
"sslCert": "./fake-keys/certificate.pem",
"sslCabundle": "",
"sslKey": "/etc/letsencrypt/live/k3d106.p.ssafy.io/privkey.pem",
"sslCert": "/etc/letsencrypt/live/k3d106.p.ssafy.io/cert.pem",
"sslCabundle": "/etc/letsencrypt/live/k3d106.p.ssafy.io/fullchain.pem",
"enableAdmin": "true",
"adminUserName": "username",
"adminPassword": "password"
Expand Down
Loading