Skip to content

Commit f5a74fc

Browse files
abhi-824abhi-824
committed
Addded Video support and ready functionslity
1 parent 190f5f4 commit f5a74fc

File tree

3 files changed

+97
-89
lines changed

3 files changed

+97
-89
lines changed

‎publicis/index.html

Lines changed: 86 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
3232
crossorigin="anonymous"
3333
/>
34+
35+
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css">
36+
<!-- Google Fonts -->
37+
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap">
38+
<!-- Bootstrap core CSS -->
39+
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.0/css/bootstrap.min.css" rel="stylesheet">
40+
<!-- Material Design Bootstrap -->
41+
<link href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.19.1/css/mdb.min.css" rel="stylesheet">
3442
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
3543
<!-- Font Awesome -->
3644
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css">
@@ -79,8 +87,8 @@ <h1 class="heading">Brain Teaser</h1>
7987
</div>
8088
<div class="hidden krr">
8189
<!--solve buttons-->
82-
Solve: <button type="button" class="js-solve-step-btn">One Step</butto><button type="button" class="js-solve-all-btn">All</button>
83-
<br>
90+
Solve: <button type="button" class="js-solve-step-btn">One Step</button><button type="button" class="js-solve-all-btn">All</button>
91+
<br/>
8492
<!--clear board btn-->
8593
<button type="button" class="js-clear-board-btn">Clear Board</button>
8694

@@ -153,6 +161,7 @@ <h2>Enter Username</h2>
153161
<button class="ask-room-submit" type="submit">Submit</button>
154162
</form>
155163
<div class="after_room">
164+
<div class="roomIDFill"></div>
156165
<div class="video-grid"></div>
157166

158167
</div>
@@ -168,99 +177,92 @@ <h2>Enter Username</h2>
168177
</p>
169178
</footer>
170179
</div>
171-
<!-- The core Firebase JS SDK is always required and must be listed first -->
172-
<script src="https://www.gstatic.com/firebasejs/7.21.1/firebase-app.js"></script>
173-
<script src="https://www.gstatic.com/firebasejs/7.21.1/firebase-auth.js"></script>
174-
<script src="https://www.gstatic.com/firebasejs/8.0.1/firebase-analytics.js"></script>
180+
<!-- The core Firebase JS SDK is always required and must be listed first -->
181+
<script src="https://www.gstatic.com/firebasejs/7.21.1/firebase-app.js"></script>
182+
<script src="https://www.gstatic.com/firebasejs/7.21.1/firebase-auth.js"></script>
183+
<script src="https://www.gstatic.com/firebasejs/8.0.1/firebase-analytics.js"></script>
175184

176-
<script src="https://www.gstatic.com/firebasejs/7.21.1/firebase-database.js"></script>
177-
<script src="https://www.gstatic.com/firebasejs/7.21.1/firebase-firestore.js"></script>
178-
<!-- TODO: Add SDKs for Firebase products that you want to use
179-
https://firebase.google.com/docs/web/setup#available-libraries -->
185+
<script src="https://www.gstatic.com/firebasejs/7.21.1/firebase-database.js"></script>
186+
<script src="https://www.gstatic.com/firebasejs/7.21.1/firebase-firestore.js"></script>
187+
<!-- TODO: Add SDKs for Firebase products that you want to use
188+
https://firebase.google.com/docs/web/setup#available-libraries -->
180189

181-
<script>
182-
// Your web app's Firebase configuration
183-
// For Firebase JS SDK v7.20.0 and later, measurementId is optional
184-
var firebaseConfig = {
185-
apiKey: "AIzaSyDqFVL5he87qI8hg20ngdkls9jTRXCIX7M",
186-
authDomain: "brain-teaser-77a8d.firebaseapp.com",
187-
databaseURL: "https://brain-teaser-77a8d.firebaseio.com",
188-
projectId: "brain-teaser-77a8d",
189-
storageBucket: "brain-teaser-77a8d.appspot.com",
190-
messagingSenderId: "367467694538",
191-
appId: "1:367467694538:web:e6acd6456f7e0cdb372733",
192-
measurementId: "G-1HBCV05JGG"
193-
};
194-
// Initialize Firebase
195-
firebase.initializeApp(firebaseConfig);
196-
firebase.analytics();
197-
</script>
198-
<script src="js/auth.js"></script>
199-
<script>
200-
var $candidateToggle = $(".js-candidate-toggle"),
201-
$generateBoardBtnEasy = $(".js-generate-board-btn--easy"),
202-
$generateBoardBtnMedium = $(".js-generate-board-btn--medium"),
203-
$generateBoardBtnHard = $(".js-generate-board-btn--hard"),
204-
$generateBoardBtnVeryHard = $(".js-generate-board-btn--very-hard"),
190+
<script>
191+
// Your web app's Firebase configuration
192+
// For Firebase JS SDK v7.20.0 and later, measurementId is optional
193+
var firebaseConfig = {
194+
apiKey: "AIzaSyDqFVL5he87qI8hg20ngdkls9jTRXCIX7M",
195+
authDomain: "brain-teaser-77a8d.firebaseapp.com",
196+
databaseURL: "https://brain-teaser-77a8d.firebaseio.com",
197+
projectId: "brain-teaser-77a8d",
198+
storageBucket: "brain-teaser-77a8d.appspot.com",
199+
messagingSenderId: "367467694538",
200+
appId: "1:367467694538:web:e6acd6456f7e0cdb372733",
201+
measurementId: "G-1HBCV05JGG"
202+
};
203+
// Initialize Firebase
204+
firebase.initializeApp(firebaseConfig);
205+
firebase.analytics();
206+
</script>
207+
<script src="js/script.js"></script>
208+
<script defer src="js/auth.js"></script>
209+
<script>
210+
var $candidateToggle = $(".js-candidate-toggle"),
211+
$generateBoardBtnEasy = $(".js-generate-board-btn--easy"),
212+
$generateBoardBtnMedium = $(".js-generate-board-btn--medium"),
213+
$generateBoardBtnHard = $(".js-generate-board-btn--hard"),
214+
$generateBoardBtnVeryHard = $(".js-generate-board-btn--very-hard"),
205215

206-
$solveStepBtn = $(".js-solve-step-btn"),
207-
$solveAllBtn = $(".js-solve-all-btn"),
208-
$clearBoardBtn = $(".js-clear-board-btn"),
216+
$solveStepBtn = $(".js-solve-step-btn"),
217+
$solveAllBtn = $(".js-solve-all-btn"),
218+
$clearBoardBtn = $(".js-clear-board-btn"),
209219

210-
mySudokuJS = $("#sudoku").sudokuJS({
211-
difficulty: "very hard"
212-
//change state of our candidate showing checkbox on change in sudokuJS
213-
,candidateShowToggleFn : function(showing){
214-
$candidateToggle.prop("checked", showing);
215-
}
216-
});
217-
mySudokuJS2 = $("#sudoku2").sudokuJS({
218-
difficulty: "very hard"
219-
//change state of our candidate showing checkbox on change in sudokuJS
220-
,candidateShowToggleFn : function(showing){
221-
$candidateToggle.prop("checked", showing);
222-
}
223-
});
224-
mySudokuJS2.generateBoard("medium");
220+
mySudokuJS = $("#sudoku").sudokuJS({
221+
difficulty: "very hard"
222+
//change state of our candidate showing checkbox on change in sudokuJS
223+
,candidateShowToggleFn : function(showing){
224+
$candidateToggle.prop("checked", showing);
225+
}
226+
});
227+
mySudokuJS2 = $("#sudoku2").sudokuJS({
228+
difficulty: "very hard"
229+
//change state of our candidate showing checkbox on change in sudokuJS
230+
,candidateShowToggleFn : function(showing){
231+
$candidateToggle.prop("checked", showing);
232+
}
233+
});
234+
mySudokuJS2.generateBoard("medium");
225235

226-
$solveStepBtn.on("click", mySudokuJS.solveStep);
227-
$solveAllBtn.on("click", mySudokuJS.solveAll);
228-
$clearBoardBtn.on("click", mySudokuJS.clearBoard);
236+
$solveStepBtn.on("click", mySudokuJS.solveStep);
237+
$solveAllBtn.on("click", mySudokuJS.solveAll);
238+
$clearBoardBtn.on("click", mySudokuJS.clearBoard);
229239

230-
$generateBoardBtnEasy.on("click", function(){
231-
mySudokuJS.generateBoard("easy");
232-
});
233-
$generateBoardBtnMedium.on("click", function(){
234-
mySudokuJS.generateBoard("medium");
235-
});
236-
$generateBoardBtnHard.on("click", function(){
237-
mySudokuJS.generateBoard("hard");
238-
});
239-
$generateBoardBtnVeryHard.on("click", function(){
240-
mySudokuJS.generateBoard("very hard");
241-
});
240+
$generateBoardBtnEasy.on("click", function(){
241+
mySudokuJS.generateBoard("easy");
242+
});
243+
$generateBoardBtnMedium.on("click", function(){
244+
mySudokuJS.generateBoard("medium");
245+
});
246+
$generateBoardBtnHard.on("click", function(){
247+
mySudokuJS.generateBoard("hard");
248+
});
249+
$generateBoardBtnVeryHard.on("click", function(){
250+
mySudokuJS.generateBoard("very hard");
251+
});
242252

243-
$candidateToggle.on("change", function(){
244-
if($candidateToggle.is(":checked"))
245-
mySudokuJS.showCandidates();
246-
else
247-
mySudokuJS.hideCandidates();
248-
});
249-
$candidateToggle.trigger("change");
250-
</script>
253+
$candidateToggle.on("change", function(){
254+
if($candidateToggle.is(":checked"))
255+
mySudokuJS.showCandidates();
256+
else
257+
mySudokuJS.hideCandidates();
258+
});
259+
$candidateToggle.trigger("change");
260+
</script>
251261

252262
<!-- Font Awesome -->
253-
254-
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css">
255-
<!-- Google Fonts -->
256-
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap">
257-
<!-- Bootstrap core CSS -->
258-
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.0/css/bootstrap.min.css" rel="stylesheet">
259-
<!-- Material Design Bootstrap -->
260-
<link href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.19.1/css/mdb.min.css" rel="stylesheet">
263+
261264

262265

263-
<script src="js/script.js"></script>
264266
</body>
265267

266268
</html>

‎publicis/js/script.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ document.querySelector(".competitiveMode").addEventListener("click", (e) => {
130130
socket.emit('give_id');
131131
// loaderOn();
132132
socket.on('rec_id',(id)=>{
133+
console.log(id)
134+
document.querySelector(".roomIDFill").innerHTML=id;
133135
ready(id);
134136
// show_screen(ready_screen);
135137
// videoOnlyUser(`videoBeforeJoin`,1);
@@ -139,6 +141,11 @@ document.querySelector(".competitiveMode").addEventListener("click", (e) => {
139141
{
140142
let ready = document.querySelector(".ready_btn");
141143
ready.addEventListener("click", () => {
144+
145+
socket.on('start_sudoku',()=>{
146+
console.log(room);
147+
socket.emit('make_it_real',document.querySelector('#sudoku2').innerHTML,room);
148+
})
142149
ready.classList.remove("btn-outline-dark");
143150
ready.classList.remove("btn-primary");
144151
let user = firebase.auth().currentUser;
@@ -288,14 +295,11 @@ function display(str) {
288295
}, 2000);
289296
document.body.appendChild(div);
290297
}
291-
socket.on('start_sudoku',()=>{
292-
console.log(room);
293-
socket.emit('make_it_real',document.querySelector('#sudoku2').innerHTML,room);
294-
})
295-
socket.on('start_game',(data)=>{
298+
socket.on('start_game',(data )=>{
296299
loaderfor1sec();
297300
document.querySelector('#sudoku2').innerHTML=data;
298301
console.log(data);
302+
console.log("dfnwofnw")
299303
document.querySelector('#sudoku2').classList.remove('hidden');
300304
document.querySelector('.ready_btn').classList.add('hidden');
301305
})

‎server.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,12 @@ io.on('connection', (socket) => {
5757
});
5858
socket.on('make_it_real',(data,room)=>{
5959
console.log("yes");
60+
console.log(data)
6061
io.to(room).emit('start_game',data);
6162
})
6263
socket.on('join-room',(userId,roomId,username)=>{
6364
const user = userJoin(socket.id, userId,roomId);
65+
console.log(roomId)
6466
// console.log(roomId,user.room);
6567
socket.join(roomId)
6668
// console.log("heel")

0 commit comments

Comments
 (0)