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

Toolbar5 #330

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
eb426a6
Added the ShapeSelector omponent
arcteggzz Sep 1, 2021
db14a81
Update Whiteboard.js
arcteggzz Sep 1, 2021
0e07f44
Toolbar
itz-jherie Sep 1, 2021
27e21a1
Submission for issue #250 by Dorcas Bamisile
Dorcas-BD Sep 1, 2021
5e04396
Added Whiteboard Canvas to the component
Dorcas-BD Sep 1, 2021
1c702b4
Merge pull request #255 from itz-jherie/toolbar
kenny-67 Sep 2, 2021
512b7b9
Merge pull request #254 from arcteggzz/ShapeSelector_Issue248
kenny-67 Sep 2, 2021
a1bd140
Make Some Changes on the Whiteboard Canvas
Dorcas-BD Sep 2, 2021
fb13a54
Commit
Dorcas-BD Sep 2, 2021
8cb7bc5
Commit
Dorcas-BD Sep 2, 2021
f8b24a6
Merge branch 'main' into issue-250
Dorcas-BD Sep 2, 2021
e6b8c3b
Update Whiteboard.js
Dorcas-BD Sep 2, 2021
03a6f9c
Merge pull request #256 from Dorcas-BD/issue-250
kenny-67 Sep 2, 2021
df6b9f2
organised the way components are displayed
jefedcreator Sep 1, 2021
5175ea5
feat: Implement the participant avatar view
abdulsalamcodes Sep 1, 2021
4bfeade
merge develop to main
abdulsalamcodes Sep 1, 2021
3a0eb6d
showed created component to screen
kenny-67 Sep 2, 2021
00ecb3f
code cleanup for merge to main branch
kenny-67 Sep 2, 2021
0cc6e2e
Merge pull request #261 from zurichat/merge-to-develop
kenny-67 Sep 2, 2021
27d3863
toolbar 5 issue 268
dretoba91 Sep 3, 2021
840d61f
colorpicker component
Diseyi Sep 3, 2021
770cc12
Merge pull request #284 from Diseyi/colorpicker
kenny-67 Sep 3, 2021
bd59053
toolbar5 issues 268
dretoba91 Sep 3, 2021
90ec060
remove conflicts
FunsoAdetola Sep 3, 2021
01e8cf5
created saved file view
FunsoAdetola Sep 3, 2021
4724905
resolve conflict
FunsoAdetola Sep 3, 2021
811ac18
correction
FunsoAdetola Sep 3, 2021
ef2bed0
Merge branch 'zurichat-main' into main
FunsoAdetola Sep 3, 2021
ebdfb73
toolbar5 issues 268
dretoba91 Sep 3, 2021
f2bd963
Merge pull request #287 from FunsoAdetola/main
kenny-67 Sep 3, 2021
abca304
toolbar5
dretoba91 Sep 3, 2021
fd4060d
Update main.yml
themobileprof Sep 3, 2021
ba9100d
Merge branch 'main' of https://github.com/zurichat/zc_plugin_whiteboa…
dretoba91 Sep 3, 2021
4b4f5c8
Update main.yml
themobileprof Sep 3, 2021
384c299
Update main.yml
themobileprof Sep 3, 2021
dd8845c
Update start.yml
themobileprof Sep 3, 2021
f9cee2e
Update start.yml
themobileprof Sep 3, 2021
5e51eb2
Update start.yml
themobileprof Sep 3, 2021
48469e9
Merge branch 'main' of github.com:dretoba91/zc_plugin_whiteboard into…
dretoba91 Sep 4, 2021
bac4087
toolbar5
dretoba91 Sep 5, 2021
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
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ jobs:
password: ${{ secrets.PASSWORD }}
script: |
cd /var/www/zc_plugin_whiteboard/
git clean -fd
git stash
git pull
cd /var/www/zc_plugin_whiteboard/whiteboard-client/
npm update
npm run build
cd /var/www/zc_plugin_whiteboard/whiteboard-server/
npm update
pm2 reload whiteboard 2>/dev/null || pm2 start app.js --name "whiteboard"
pm2 reload whiteboard 2>/dev/null || pm2 start index.js --name "whiteboard"
8 changes: 6 additions & 2 deletions .github/workflows/start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,9 @@ jobs:
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
script: |
cd /var/www/zc_plugin_whiteboard/whiteboard-server/
pm2 start app.js --name "whiteboard"
cd /var/www/zc_plugin_whiteboard/whiteboard-client/src/
pm2 ls
pm2 stop whiteboard
pm2 delete whiteboard
pm2 start npm --name "whiteboard" -- start
pm2 save
3 changes: 3 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions whiteboard-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ This project was bootstrapped with [Create React App](https://github.com/faceboo

In the project directory, you can run:

### `yarn start`
### `npm start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.

The page will reload if you make edits.\
You will also see any lint errors in the console.

### `yarn test`
### `npm test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `yarn build`
### `npm run build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.
Expand All @@ -29,7 +29,7 @@ Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `yarn eject`
### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

Expand Down Expand Up @@ -65,6 +65,6 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/a

This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)

### `yarn build` fails to minify
### `npm run build` fails to minify

This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
Loading