Skip to content
This repository has been archived by the owner on Jan 19, 2023. It is now read-only.

Issue28 Jetzt sehen Schüler nur noch den Lehrer und der Lehrer alle am linken Rand #35

Closed
wants to merge 6 commits into from

Conversation

albrecht-flo
Copy link
Collaborator

@albrecht-flo albrecht-flo commented Mar 21, 2020

Issues: #28 #20

package.json Outdated
"vue": "^2.6.11"
"vue": "^2.6.11",
"paper": "0.12.4",
"vue-slider-component": "3.1.1"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wenn ihr vuex verwendet muss das auch in die dependencies

@SebastianSpeitel SebastianSpeitel changed the base branch from master to develop March 21, 2020 22:31
src/state.js Outdated
// Set the teacher id
console.log("DEBUG DEBUG" + state.teacher_stream.find(webrtc.io.id) >= 0 )
if(state.teacher &&
!(state.teacher_stream.find(webrtc.io.id) >= 0) ) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

state.teacher_stream.find(s => s.id === webrtc.io.id)

@albrecht-flo albrecht-flo changed the title Issue28 DEBUG Issue28 Jetzt sehen Schüler nur noch den Lehrer und der Lehrer alle am linken Rand Mar 21, 2020
@SebastianSpeitel
Copy link
Collaborator

Könntest du schauen, dass du die Konflikte irgendwie gelöst bekommst?

@albrecht-flo
Copy link
Collaborator Author

Kann nicht gemerged Werden alle Files wurden erheblich geändert.
Merge würde keinen Sinn machen, da sich die UI Struktur geändert hat.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants