Loading ...
}
},
- body: function() {
+ body: function () {
var video = null
- if(this.isErrored()) {
+ if (this.isErrored()) {
video = null
}
- else if(this.isReady()) {
- if(this.isAuthorized()) {
+ else if (this.isReady()) {
+ if (this.isAuthorized()) {
//video =
var videoCode = this.videoCode()
- if(videoCode) {
+ if (videoCode) {
var src = "https://www.youtube.com/embed/" + this.videoCode() + "?modestbranding=true&autoplay=0&rel=0"
- video =
{meat}
@@ -198,11 +233,18 @@ context.EventPage = React.createClass({
-
- {header}
-
-
return response
@@ -210,11 +252,11 @@ context.EventPage = React.createClass({
onEventsChanged: function (allEvents) {
var event = null;
- if(allEvents && allEvents.events && allEvents.events.entries && allEvents.events.entries.length > 0){
+ if (allEvents && allEvents.events && allEvents.events.entries && allEvents.events.entries.length > 0) {
event = allEvents.events.entries[0]
}
console.log("event change", event, allEvents)
- this.setState({event: event, error:allEvents.events_error})
+ this.setState({event: event, error: allEvents.events_error})
}
})
\ No newline at end of file
diff --git a/web/app/assets/javascripts/events/react-components/EventsPage.js.jsx b/web/app/assets/javascripts/events/react-components/EventsPage.js.jsx
index 67b673499..ad2df7390 100644
--- a/web/app/assets/javascripts/events/react-components/EventsPage.js.jsx
+++ b/web/app/assets/javascripts/events/react-components/EventsPage.js.jsx
@@ -14,6 +14,8 @@ context.EventsPage = React.createClass({
authorizeDone: function(response) {
this.setState({submitting:false})
EventActions.addAuthorization(response)
+
+ window.location.href ="/events/" + response.slug
},
authorizeFailed: function(e) {
diff --git a/web/app/assets/stylesheets/events/events.scss b/web/app/assets/stylesheets/events/events.scss
index 05719c098..ad26944d6 100644
--- a/web/app/assets/stylesheets/events/events.scss
+++ b/web/app/assets/stylesheets/events/events.scss
@@ -10,7 +10,8 @@ html,
body {
min-height: 100%;
overflow:auto;
- background-color:$jamkazam-background;
+ #background-color:$jamkazam-background;
+ background-color:black;
color:white;
}
@@ -24,3 +25,45 @@ body {
font-family: Raleway, Arial, Helvetica, sans-serif;
}
+
+#footer {
+ display:inline-block;
+ margin-top: 30px;
+ padding-top: 10px;
+ border-top:solid 1px #444;
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ color: white;
+ text-align: center;
+ background-color:#323232;
+}
+
+#copyright {
+ float:left;
+ font-size:11px;
+ color:#ccc;
+}
+
+#footer-links {
+ float:right;
+ font-size:11px;
+ color:#ccc;
+}
+
+#footer-links a {
+ color:#ccc;
+ text-decoration:none;
+}
+
+#footer-links a:hover {
+ color:#fff;
+ text-decoration:underline;
+}
+
+#version {
+ font-size:11px;
+ color:#ccc;
+ text-align: center;
+}
\ No newline at end of file
diff --git a/web/app/assets/stylesheets/events/react-components/EventList.scss b/web/app/assets/stylesheets/events/react-components/EventList.scss
index 09cde5513..bf2679587 100644
--- a/web/app/assets/stylesheets/events/react-components/EventList.scss
+++ b/web/app/assets/stylesheets/events/react-components/EventList.scss
@@ -15,7 +15,7 @@
}
.event-section {
- padding: 10px;
+ padding: 0 1rem;
//s border-width: 0 0 $chunkyBorderWidth;
//border-style: solid;
//border-color: $copy-color-on-dark;
@@ -27,9 +27,10 @@
.event {
display:grid;
- grid-template-columns: 10rem 20rem;
+ grid-template-columns: 33% 67%;
align-content:center;
- height:8rem;
+ min-height:8rem;
+ padding:0.5rem 0;
border-style: solid;
border-width: 2px 0 2px 0;
border-color: $copy-color-on-dark;
@@ -45,7 +46,7 @@
}
&.no-image {
- grid-template-columns: 30rem;
+ grid-template-columns: 100%;
}
}
diff --git a/web/app/assets/stylesheets/events/react-components/EventPage.scss b/web/app/assets/stylesheets/events/react-components/EventPage.scss
index cb5abbda7..2105d7856 100644
--- a/web/app/assets/stylesheets/events/react-components/EventPage.scss
+++ b/web/app/assets/stylesheets/events/react-components/EventPage.scss
@@ -2,6 +2,15 @@
@import "client/common.scss";
+#rt-e617b4394e0e49e1c234c63161bb2e15 {
+ width:38%;
+ position:absolute;
+}
+#body-content #rt-e617b4394e0e49e1c234c63161bb2e15 {
+ position:static;
+ width:100%;
+}
+
[data-react-class="EventPage"] {
width:100%;
@@ -48,7 +57,7 @@
padding-top:30px;
height:0;
overflow:hidden;
- top:-5rem;
+ #top:-5rem;
border-width: $chunkyBorderWidth;
border-style: solid;
border-color: $copy-color-on-dark;
@@ -65,7 +74,7 @@
.no-register {
text-decoration: underline;
font-weight:bold;
- margin-top:2rem;
+ #margin-top:2rem;
display:block;
}
@@ -81,11 +90,21 @@
text-align:left;
}
}
- #top-container {
+ #body-content {
background-color:black;
- display: grid;
+ display:grid;
+ grid-template-columns: 60% 2% 38%;
justify-content:center;
- padding:2rem 0 7rem 0;
+ margin-bottom:6rem;
+ padding:0 1rem;
+ }
+ #top-container {
+ #width:67%;
+ background-color:black;
+ #display: grid;
+ justify-content:center;
+ #padding:2rem 0 7rem 0;
+ padding:2rem 0 2rem 0;
text-align:center;
}
@@ -99,16 +118,57 @@
}
.listing {
- width:50%;
- margin:auto;
+ #width:67%;
+
//display:grid;
//justify-content: center;
}
+ .listing-content {
+ #width:50%;
+ #margin:auto;
+ }
- @media (min-width:1px) and (max-width: 1199px) {
+ #back-link {
+ color:#fc0;
+ position:absolute;
+ left:1rem;
+ text-decoration: none;
+ }
+
+ @media (min-width:1px) and (max-width: 1200px) {
html {
font-size: 100%;
}
+
+
+ .title {
+ position:relative;
+
+ }
+
+ #player, #no-player {
+
+ margin-bottom:3rem;
+ }
+
+ #top-container {
+ margin-top:3rem;
+ }
+
+ html {
+ font-size: 100%;
+ }
+
+ #back-link {
+ top:-3rem;
+ }
+
+ #body-content {
+ grid-template-columns: 100%;
+ }
+ #body-content #rt-e617b4394e0e49e1c234c63161bb2e15 {
+ height:400px;
+ }
}
}
\ No newline at end of file
diff --git a/web/app/assets/stylesheets/events/react-components/EventsPage.scss b/web/app/assets/stylesheets/events/react-components/EventsPage.scss
index 2c50fdcda..5c1bf7416 100644
--- a/web/app/assets/stylesheets/events/react-components/EventsPage.scss
+++ b/web/app/assets/stylesheets/events/react-components/EventsPage.scss
@@ -120,7 +120,7 @@
background-color: black;
position:relative;
top: -2rem;
- min-width: 400px;
+ min-width: 300px;
@include border_box_sizing;
border-width: 0 $chunkyBorderWidth $chunkyBorderWidth;
border-style: solid;
diff --git a/web/app/controllers/api_live_streams_controller.rb b/web/app/controllers/api_live_streams_controller.rb
index 2993171fd..b45092962 100644
--- a/web/app/controllers/api_live_streams_controller.rb
+++ b/web/app/controllers/api_live_streams_controller.rb
@@ -34,7 +34,7 @@ class ApiLiveStreamsController < ApiController
render :json => {}, :status => 404, layout: nil
else
EventBriteOrder.where(id: event_brite_order.id).update_all(times_claimed: event_brite_order.times_claimed + 1)
- render :json => {event_id: event_brite_order.live_stream.id, order_id: event_brite_order.order_id, event_type: 'eventbrite'}, :status => :ok, layout: nil
+ render :json => {event_id: event_brite_order.live_stream.id, order_id: event_brite_order.order_id, event_type: 'eventbrite', slug: event_brite_order.live_stream.slug}, :status => :ok, layout: nil
end
end
diff --git a/web/app/views/events/event.slim b/web/app/views/events/event.slim
index 7ddad31ba..8021b068c 100644
--- a/web/app/views/events/event.slim
+++ b/web/app/views/events/event.slim
@@ -3,4 +3,7 @@
- provide(:title, @title)
#root
- = react_component 'EventPage'
+ #chat
+ div id="rt-e617b4394e0e49e1c234c63161bb2e15" class="rumble-chat"
+ script src="https://rumbletalk.com/client/?VHi@pnno"
+ = react_component 'EventPage'
\ No newline at end of file
diff --git a/web/app/views/layouts/events.html.erb b/web/app/views/layouts/events.html.erb
index 1f7d46b6b..3b505262a 100644
--- a/web/app/views/layouts/events.html.erb
+++ b/web/app/views/layouts/events.html.erb
@@ -26,7 +26,15 @@
<%= javascript_include_tag "events/events" %>