Skip to content

Commit

Permalink
vid test
Browse files Browse the repository at this point in the history
  • Loading branch information
Tzikas committed Jun 23, 2021
1 parent 533c565 commit 79b05e5
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ DEV_ELECTRON_WEBPACK_APP_JITSI_URL=https://jitsi.local.cowbell.club:8443
#ELECTRON_WEBPACK_APP_API_URL=https://local.plshelp.live:5001
#ELECTRON_WEBPACK_APP_JITSI_URL=https://jitsi.local.plshelp.live:8443

ELECTRON_WEBPACK_APP_API_URL=https://local.cowbell.club:5001
ELECTRON_WEBPACK_APP_JITSI_URL=https://jitsi.local.cowbell.club:8443
#ELECTRON_WEBPACK_APP_API_URL=https://local.cowbell.club:5001
#ELECTRON_WEBPACK_APP_JITSI_URL=https://jitsi.local.cowbell.club:8443

#ELECTRON_WEBPACK_APP_API_URL=https://cowbell.club
#ELECTRON_WEBPACK_APP_JITSI_URL=https://jitsi.cowbell.club
ELECTRON_WEBPACK_APP_API_URL=https://cowbell.club
ELECTRON_WEBPACK_APP_JITSI_URL=https://jitsi.cowbell.club

ELECTRON_WEBPACK_APP_VAPID_PUBLICKEY=BG2QxzujwzP60oqKoT0ZxArqtcI-d1k6CWjhFrfdd2HWh7SLQDAyYjavm7cfvVrkzd_2pMRBcOuPVDpWaB_vKYk
7 changes: 7 additions & 0 deletions frontend/src/components/NavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import TheContext from '../TheContext'
import SideBar from './SideBar'
import { version } from '../../../package.json'
console.log(version, ' version number: ');
// const remote = require('electron').remote;


// const win = remote.getCurrentWindow();
// console.log(remote, win)
// sound.play(path.join(__dirname, "resources/cowbell.wav"))


Expand Down Expand Up @@ -47,6 +51,9 @@ export function NavBar({ user }) {
// console.log('chat room ==> ', pathname.split('/').pop() === lobby_id ? 'lobby' : pathname)

return (<>
{/* <header id="titlebar"
//onClick={() => { console.log(win); win.setPosition(0, 0, true) }}
>-</header> */}
<nav className="top-nav">


Expand Down
2 changes: 1 addition & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ function createJitsiMeetWindow() {
webSecurity: true,
preload: path.resolve(basePath, './build/preload.js')
},
//frame: false
frame: false
};

mainWindow = new BrowserWindow(options);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "CowBellClub",
"version": "1.5.1",
"version": "1.5.2",
"description": "Electron application for Cowbell Club",
"main": "./build/main.js",
"productName": "CowbellClub",
Expand Down

0 comments on commit 79b05e5

Please sign in to comment.