Browse Source

ign4...

master
jfinn 4 years ago
parent
commit
9e497d2ccf
11 changed files with 319 additions and 21 deletions
  1. 3
    1
      rf/filmstrip_mod/m.css
  2. 127
    12
      rf/i4m/m.css
  3. 11
    2
      rf/i4m/m.html
  4. 97
    5
      rf/i4m/m.js
  5. 16
    0
      rf/i4m/welcome.css
  6. 8
    0
      rf/i4n/m.html
  7. 23
    0
      rf/i4n/m.js
  8. 4
    0
      rf/i4n/m0.js
  9. 18
    1
      rf/m/m_req.js
  10. 5
    0
      rf/m/m_utils.js
  11. 7
    0
      rf/m2/m2.css

+ 3
- 1
rf/filmstrip_mod/m.css View File

@@ -147,4 +147,6 @@
147 147
 
148 148
 .remote-videos-container {
149 149
 	outline: 
150
-}
150
+}
151
+
152
+

+ 127
- 12
rf/i4m/m.css View File

@@ -9,43 +9,75 @@
9 9
 /*rx2*/
10 10
 
11 11
 
12
+
13
+
14
+
15
+
12 16
 .lobby_root {
17
+	/*opacity: .5;*/
18
+	/*opacity: 0;*/
19
+	/*display: none;*/
13 20
 	top: 0;
14 21
 	left: 0;
15 22
 	right: 0;
16 23
 	bottom: 0;
17
-	outline: 3px solid red;
24
+	/*outline: 3px solid red;*/
18 25
 	outline-offset: -20px;
19 26
 	position: absolute;
20 27
 	z-index: 10;
21 28
 	/*background-image: url("../../media/examples/lizard.png");*/
22 29
 	/*background-image: url("/ign/rf/img/image.png");*/
23 30
 	/*background-image: url("/ign/rf/img/img3.jpg");*/
24
-	background-image: url("/ign/rf/img/cropped_bak.jpg");
31
+	/*background-image: url("/ign/rf/img/cropped_bak.jpg");*/
32
+	/*--vurlx:url("/ign/rf/artists/fisher.png");*/
25 33
 	/*background-position: 50% 100%; */
26 34
 	/*background-position: 20% 0%; */
27
-	background-position: 50% 50%; 
35
+	/*background-position: 50% 50%; */
28 36
 	/*background-attachment: fixed;*/
29 37
 	/*background-repeat: no-repeat;*/
30
-	background-size: cover; 
38
+	/*background-size: cover; */
31 39
 
32 40
 	/*background-image: url("/ign/rf/img/img3.jpg");*/
33 41
 	/*vertical-align: middle;*/
34 42
 }
43
+html {
44
+  scroll-behavior: smooth;
45
+}
46
+
35 47
 
48
+.tile_overlay{
49
+	position: absolute;
50
+		top: 0;
51
+	bottom: 0;
52
+	left: 0;
53
+	right: 0;
54
+	/*border-radius: 20px; */
55
+	/*background-image: #0004;*/
56
+	/*background-color: #0004;*/
57
+	/*background-color: linear-gradient(#0000 #0ff8 #0009);*/
58
+	/*background-image: linear-gradient(to bottom #0000, #0ff8, #0009);*/
59
+		/*background-image: linear-gradient( 10% #0000, 30% #0ff0, 60% #0009);*/
36 60
 
61
+	background-image: linear-gradient( #0000 , #0000, #000a);
37 62
 
63
+}
64
+.rooms_dir0{
65
+	top: 50%;
66
+	transform: translate(0,-50%);
67
+	position: relative;
68
+
69
+}
38 70
 .rooms_dir {
39 71
 	/*padding-top: auto;*/
40 72
 	/*top: 50%;*/
41 73
 	top: 50%;
42 74
 	vertical-align: middle;
43 75
 	/*display: inline-block;*/
44
-	transform: translate(0,-50%);
45
-	width: calc(100% - 50px);
46
-	height: 300px;
76
+	/*transform: translate(0,-50%);*/
77
+	width: calc(100% - 150px);
78
+	height: 400px;
47 79
 	position: relative;
48
-	outline: 6px solid green;
80
+	/*outline: 6px solid green;*/
49 81
 	margin: auto;
50 82
 	overflow-x: scroll;
51 83
 
@@ -63,22 +95,33 @@
63 95
 	/*right: 0;*/
64 96
 	bottom: 0;
65 97
 }
66
-
98
+/*159/256*/
67 99
 
68 100
 
69 101
 .room_span {
70 102
 	/*top: 0;*/
71 103
 	/*bottom: 0;*/
72 104
 	height: 200px;
105
+	height: calc(200px * (256/159));
73 106
 	/*width: 20%;*/
107
+	background-size: cover;
74 108
 	/*margin: 20em;*/
75 109
 	margin: 20px;
110
+	border-radius: 20px; 
111
+
112
+
113
+
76 114
 	width: 200px;
77
-	outline: 2px solid #ff0;
115
+	/*outline: 2px solid #ff0;*/
78 116
 	position: relative;
79 117
 	display: flex;
80 118
 	display: inline;
81 119
 	display: inline-block;
120
+	overflow: hidden;
121
+	/*style="--vurl:/ign/rf/artists/fisher.png; --vtitle:"Fisher";"*/
122
+	/*background-image: url(--vurlx);*/
123
+	background-image: var(--vurl);
124
+	/*background-image: url("/ign/rf/artists/fisher.png");*/
82 125
 	/*display: inline-flex;*/
83 126
 }
84 127
 
@@ -88,15 +131,87 @@
88 131
 	/*width: 100%;*/
89 132
 	text-align: center;
90 133
 	position: relative;
134
+	/*bottom: 20px;*/
135
+	/*top: 100%;*/
136
+	color: #fff;
137
+	top: calc(100% - 40px - 2em);
138
+	/*position: absolute;*/
91 139
 	/*display: inline;*/
92 140
 	font-size: 2em;
141
+
142
+}
143
+.tile_title:after{
144
+	top: 0;
145
+	bottom: 0;
146
+	left: 0;
147
+	right: 0;
148
+	position: absolute;
149
+content:var(--vtitle);
150
+
93 151
 }
152
+
94 153
 .tile_button{
154
+	/*top:40px;*/
155
+	bottom:40px;
156
+	bottom:20px;
157
+	/*margin: 20px;*/
158
+	left: 50%;
159
+	
160
+	--vcolor:#eee;
161
+	color: var(--vcolor);
162
+	outline: 2px solid var(--vcolor);
163
+	line-height:25px;
164
+	font-size: 15px;
165
+	text-align: center;
166
+
167
+	transform: translate(-50%,0);
168
+	/*padding: 20px;*/
169
+	/*bottom:40px;*/
170
+
171
+	/*position: relative;*/
172
+	position: absolute;
95 173
 	width: 125px;
96 174
 	height: 25px;
97
-	outline: 3px solid blue;
98 175
 	/*margin: 0 50%;*/
99 176
 	margin: 0 auto;
100 177
 
101 178
 
102
-}
179
+}
180
+
181
+.tile_button:hover{
182
+	--vcolor:#fff;
183
+	background-color: #0009; 
184
+}
185
+
186
+
187
+
188
+
189
+.arrow {
190
+  border: solid #bbb;
191
+  width: 13px;
192
+  height: 13px;
193
+  border-width: 0 4px 4px 0;
194
+  display: inline-block;
195
+  padding: 3px;
196
+
197
+}
198
+.arrow:hover {
199
+  border-color: #fff;
200
+
201
+
202
+}
203
+
204
+.right {
205
+	position: absolute;
206
+	transform: rotate(-45deg);
207
+	right: 20px;
208
+	top: 50%;
209
+	/*transform: rotate(45);*/
210
+}
211
+.left {
212
+	left: 20px;
213
+	position: absolute;
214
+	top: 50%;
215
+	transform: rotate(135deg);
216
+	/*transform: rotate(45);*/
217
+}

+ 11
- 2
rf/i4m/m.html View File

@@ -4,11 +4,16 @@
4 4
 <span class="plugin_top abs filmstrip_template">
5 5
 
6 6
 <div class="lobby_root plugin_top">
7
+	<div class="rooms_dir0">
8
+		
9
+		<i class="arrow right"></i>
10
+		<i class="arrow left"></i>
7 11
 	<div class="rooms_dir">
8 12
 	<span class="rooms_dir_full">
9 13
 		<!-- <span class="room_span rx2"></span> -->
10 14
 	</span>
11 15
 	</div>
16
+	</div>
12 17
 </div>
13 18
 
14 19
 
@@ -18,8 +23,12 @@
18 23
 <span>
19 24
 	
20 25
 		<span class="room_span rxt">
21
-			<div class="tile_title">Title</div>
22
-			<div class="tile_button"></div>
26
+			<span class="tile_overlay">
27
+
28
+			</span>
29
+				
30
+			<div class="tile_title"></div>
31
+			<div class="tile_button">Play Now</div>
23 32
 		</span>
24 33
 </span>
25 34
 

+ 97
- 5
rf/i4m/m.js View File

@@ -4,7 +4,9 @@ mod_templates_4 = window.mod_templates_4 || $("")
4 4
 function html_js_handler_lobby(rsp) {
5 5
 	clog("html_js_handler_lobby",[...arguments])
6 6
 	mod_templates_4 = $(`<span>${rsp}</span>`)
7
+	clog("html_js_handler_lobby2")
7 8
 	init_lobby()
9
+	clog("html_js_handler_lobby3")
8 10
 	// init_api6()
9 11
 }
10 12
 
@@ -21,16 +23,93 @@ function init_lobby(){
21 23
 	// add_node(n,`.vid_toptoolbar_hook`,"append")
22 24
 	add_node(lr,"#welcome_page","append")
23 25
 	add_tiles()
26
+	$(".arrow").click(arrow_click_cb)
27
+	$(".tile_button").click(tile_button_cb)
24 28
 	clog("init_lobby........")
25 29
 	// $("#welcome_page").
26 30
 
31
+}
32
+function scroll_rt(n){
33
+	var rooms_scroll = $(".rooms_dir_full")
34
+	var room_tiles = rooms_scroll.children(".room_span")
35
+	room_tiles[n].scrollIntoView({ behavior: 'smooth', block: 'nearest' ,inline:"nearest"})
36
+	// room_span
37
+	// vid.scrollIntoView({ behavior: 'smooth', block: 'nearest' ,inline:"nearest"})
38
+}
39
+
40
+
41
+function scroll_rt2(n){
42
+	var rooms_scroll = $(".rooms_dir_full")
43
+	var room_tiles = rooms_scroll.children(".room_span")
44
+	var bcr
45
+	var bcr_rooms
46
+	var rooms_dir =  $(".rooms_dir")
47
+	// rooms_scroll
48
+
49
+	bcr_rooms = rooms_dir[0].getBoundingClientRect()
50
+	clog("~~~",bcr_rooms)
51
+	var v_last 
52
+	var r,l
53
+	var r2,l2
54
+    for (v of room_tiles){
55
+        bcr = v.getBoundingClientRect()
56
+        // clog("...",bcr.left - bcr_rooms.left,bcr)
57
+        // clog("...",bcr_rooms.left - bcr.left ,bcr)
58
+        // clog("...",bcr_rooms.right - bcr.right,bcr_rooms.left - bcr.left ,bcr)
59
+        r = bcr_rooms.right - bcr.right
60
+        l = bcr_rooms.left - bcr.left
61
+        if ((r < 0 ) != ((r2 < 0))  && (r2 != undefined)){
62
+        	clog(":::",r,r2)
63
+        }
64
+        // if (l < 0 && !(l2 < 0) ){
65
+        if ((l < 0) != ((l2 < 0))   && (l2 != undefined)){
66
+        	clog(":::2",l,l2)
67
+        	
68
+        }
69
+
70
+        r2 = r
71
+        l2 = l
72
+
73
+
74
+
75
+
76
+
77
+        clog("...",bcr_rooms.right - bcr.right,bcr_rooms.left - bcr.left ,v)
78
+        v_last = v
79
+    }
80
+
81
+
82
+	// var bcr
83
+}
84
+
85
+
86
+
87
+
88
+function arrow_click_cb(e){
89
+
90
+	clog("arrow_click_cb",{that:this,e})
91
+}
92
+function tile_button_cb(e){
93
+
94
+	var rspan = $(this).parents(".room_span")
95
+	var room_name = rspan[0].dataset["room"]
96
+
97
+	// clog("tile_button",rspan[0].dataset["room"],{that:this,e})
98
+	// clog("nav",location.pathname + rspan[0].dataset["room"])
99
+	if (!room_name){
100
+		clog("<>")
101
+		return 
102
+
103
+	}
104
+	location.assign(location.pathname + rspan[0].dataset["room"])
105
+
27 106
 }
28 107
 
29 108
 dj_tiles = [
30
-{"img":"fisher.png","title":"Fisher"},
31
-{"img":"louis_the_child.png","title":"Louis The Child"},
32
-{"img":"petit_biscuit.png","title":"Petit Biscuit"},
33
-{"img":"porter_robinson.png","title":"Porter Robinson"},
109
+{room:"fisher","img":"fisher.png","title":"Fisher"},
110
+{room:"louis_the_child","img":"louis_the_child.png","title":"Louis The Child"},
111
+{room:"petit_biscuit","img":"petit_biscuit.png","title":"Petit Biscuit"},
112
+{room:"porter_robinson","img":"porter_robinson.png","title":"Porter Robinson"},
34 113
 ]
35 114
 
36 115
 // $(".rxt")[0].style.cssText
@@ -45,8 +124,19 @@ function add_tiles(){
45 124
 
46 125
 		n = $(rtile2)
47 126
 		djt = dj_tiles[i]
127
+				// url("/ign/rf/img/cropped_bak.jpg");
48 128
 		if (djt){
49
-			n[0].cssText
129
+			n.css({
130
+				// "--vurl":`/ign/rf/artists/${djt["img"]}`,
131
+				// "--vurl":`"/ign/rf/artists/${djt["img"]}"`,
132
+				"--vurl":`url("/ign/rf/artists/${djt["img"]}")`,
133
+				"--vtitle":`"${djt["title"]}"`,
134
+			})
135
+			clog("zz")
136
+			// n[0].cssText += `--vurl:${djt["img"]};`
137
+			// n[0].cssText += `--vtitle:"${djt["title"]}"`
138
+		n.addClass(`rxz${i}`)
139
+		n[0].dataset["room"] = djt["room"]
50 140
 		}
51 141
 		n.addClass(`rx${i}`)
52 142
 		// add_node(n,".rooms_dir","append")
@@ -57,6 +147,7 @@ function add_tiles(){
57 147
 	set_width()
58 148
 }
59 149
 
150
+
60 151
 function set_width(){
61 152
 	var rdf = $('.rooms_dir_full')
62 153
   var totalWidth = 0;
@@ -97,6 +188,7 @@ $(document).ready(function(){
97 188
 clog(".....2")
98 189
 
99 190
 try {
191
+setTimeout(init_lobby,1000)
100 192
 init_lobby()
101 193
 } catch (err) {
102 194
 clog("err:",err)

+ 16
- 0
rf/i4m/welcome.css View File

@@ -0,0 +1,16 @@
1
+#welcome_page{
2
+	background-image: url("/ign/rf/img/cropped_bak.jpg");
3
+		background-size: cover; 
4
+	background-position: 50% 50%; 
5
+}
6
+.header{
7
+	/*z-index: 40;*/
8
+	display: none !important;
9
+	/*opacity: .5;*/
10
+}
11
+.welcome-watermark{
12
+	/*z-index: 40;*/
13
+	display: none !important;
14
+
15
+}
16
+

+ 8
- 0
rf/i4n/m.html View File

@@ -15,6 +15,14 @@
15 15
 
16 16
 
17 17
 
18
+<span class="plugin_top_v2 shared_vid_overlay">
19
+	<div class="shared_vid_div">
20
+		shared_vid_overlay
21
+	</div>
22
+
23
+</span>
24
+
25
+
18 26
 
19 27
 <span class="text_input_template">
20 28
 	<input type="text" class="text_input"><button class="text_input_submit">Enter</button>

+ 23
- 0
rf/i4n/m.js View File

@@ -15,6 +15,27 @@ function html_js_handler_not_lobby(rsp) {
15 15
 }
16 16
 
17 17
 
18
+
19
+
20
+// reg_qxi
21
+
22
+
23
+
24
+function add_vid_overlay(){
25
+	var n,ntxt
26
+	// plugin_top_v2 shared_vid_overlay
27
+	saftly_remove(".plugin_top_v2.shared_vid_overlay")
28
+	// saftly_remove(".plugin_top_v2.popup_root")
29
+	n = mod_templates_4n.find(".plugin_top_v2.shared_vid_overlay")
30
+	ntxt = n[0].outerHTML
31
+	// ntxt = $(n)
32
+
33
+	// add_node(ntxt,`.new_toolbox_hook`,"append")
34
+	// qxi_event
35
+	add_node(ntxt,`.lvc_overlay`,"append")
36
+}
37
+
38
+
18 39
  
19 40
 
20 41
 
@@ -135,6 +156,8 @@ function set_display_name(name){
135 156
 
136 157
 
137 158
 try {
159
+	add_vid_overlay()
160
+	// add_vid_overlay
138 161
 // show_popup()
139 162
 // build_popup()
140 163
 // build_popup_av()

+ 4
- 0
rf/i4n/m0.js View File

@@ -1 +1,5 @@
1
+/*    create_new_toolbox_hook(n){
2
+        add_node(n,`.new_toolbox_hook`,"append")
3
+    },
1 4
  
5
+*/

+ 18
- 1
rf/m/m_req.js View File

@@ -168,6 +168,22 @@ function qxi2(o){
168 168
 	}
169 169
 	clog("qxi2",o.action.type,o)
170 170
 }
171
+
172
+
173
+function qxi_event(o){
174
+	var cb
175
+	cb = glob_mx.qxi_test[o.action.type]
176
+	if (cb){
177
+		cb(o)
178
+	}
179
+	// glob_mx.qxi_test
180
+
181
+}
182
+function reg_qxi(action_type,cb){
183
+	glob_mx.qxi_test[action_type] = cb
184
+}
185
+
186
+
171 187
 // this is called with setTimeout so we can throw errors without wrecking everything
172 188
 function dev_middleware_listner(o) {
173 189
 	if (!o.action.type){
@@ -176,7 +192,8 @@ function dev_middleware_listner(o) {
176 192
 	//			/*
177 193
 	if (o.action.type != "ENDPOINT_MESSAGE_RECEIVED"){
178 194
 		// CONFERENCE_JOINED
179
-		qxi2(o)
195
+		// qxi2(o)
196
+		qxi_event(o)
180 197
 		// if (o.action.type.startsWith("SET_TOOLBOX_" || o.action.type == "TOGGLE_TOOLBOX_VISIBLE")){
181 198
 			// SET_TOOLBOX_info(o,this)
182 199
 		// }

+ 5
- 0
rf/m/m_utils.js View File

@@ -28,6 +28,11 @@ glob_mx.event_handlers = {}
28 28
 glob_mx.cb = {
29 29
 	init_db:{}
30 30
 }
31
+
32
+glob_mx.qxi_test = {
33
+
34
+}
35
+
31 36
 glob_mx.filmstrip_handlers  = {}
32 37
 //glob_mx.filmstrip_handlers = glob_mx.filmstrip_handlers || {}
33 38
 

+ 7
- 0
rf/m2/m2.css View File

@@ -128,6 +128,13 @@
128 128
 }
129 129
 
130 130
 
131
+.vspace._hide {
132
+	
133
+}
134
+
135
+
136
+
137
+
131 138
 .lvov_container._hide .toggle_ff {
132 139
 	opacity: 0;
133 140
 	/*opacity: 1;*/

Loading…
Cancel
Save