David пре 9 година
родитељ
комит
eb143f5075
5 измењених фајлова са 27 додато и 12 уклоњено
  1. 2 1
      src/App.js
  2. 1 0
      src/Router.js
  3. 9 5
      src/scenes/Clase.js
  4. 2 1
      src/scenes/Cursada.js
  5. 13 5
      src/scenes/ListaCursadas.js

+ 2 - 1
src/App.js

@@ -12,9 +12,10 @@ class App extends Component {
     return (
         <Provider store={store}>
   	  	  <Router />
-        </Provider>
+       </Provider>
     );
   }
 }
 
+
 export default App;

+ 1 - 0
src/Router.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { View, Text } from 'react-native';
 import { Scene, Router, Actions } from 'react-native-router-flux';
+
 import RegisterForm from './components/RegisterForm';
 import LoginForm from './components/LoginForm';
 import LiveVideo from './scenes/LiveVideo';

+ 9 - 5
src/scenes/Clase.js

@@ -7,6 +7,7 @@ import { claseFetch } from '../actions/';
 import Teoria from './Clase/Teoria';
 import Comentarios from './Clase/Comentarios';
 import { Spinner } from '../components/common/';
+import MyActionButton from '../components/ActionButton';
 
 class Clase extends Component {
   state = { page: 'Teoria' };
@@ -34,11 +35,14 @@ class Clase extends Component {
     const { titulo, profesor, texto, comentarios, respuestas } = this.props.clase;
 
     return (
-      <ScrollableTabView style={styles.container, {flex:1}}>
-		 <Teoria titulo={titulo} profesor={profesor} texto={texto} style={{flex:1}} tabLabel="Teoria" />
-		 <View tabLabel="Videos" />
-		 <Comentarios style={{flex:1}} comentarios={comentarios} respuestas={respuestas} tabLabel="Comentarios" />
-      </ScrollableTabView>
+	  <View style={{flex:1}}>
+        <ScrollableTabView style={styles.container, {flex:1}}>
+  		 <Teoria titulo={titulo} profesor={profesor} texto={texto} style={{flex:1}} tabLabel="Teoria" />
+  		 <View tabLabel="Videos" />
+  		 <Comentarios style={{flex:1}} comentarios={comentarios} respuestas={respuestas} tabLabel="Comentarios" />
+        </ScrollableTabView>
+  	  <MyActionButton />
+	  </View>
     );
   }
 };

+ 2 - 1
src/scenes/Cursada.js

@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import { Actions } from 'react-native-router-flux';
 import { cursadaFetch } from '../actions/';
 import { Card, CardSection, Button } from '../components/common/';
+import MyActionButton from '../components/ActionButton';
 
 class Cursada extends Component  {
 	componentWillMount() {
@@ -85,7 +86,7 @@ class Cursada extends Component  {
           dataSource={this.dataSource}
           renderRow={this.renderRow.bind(this)}
         />
-
+		<MyActionButton />
       </View>
 		);
 	}

+ 13 - 5
src/scenes/ListaCursadas.js

@@ -1,9 +1,12 @@
 import _ from 'lodash';
 import React, { Component } from 'react';
-import { Text, ListView } from 'react-native';
+import { View, Text, ListView } from 'react-native';
 import { connect } from 'react-redux';
 import { cursadasFetch } from '../actions/';
 import ItemCursada from './Cursada/ItemCursada';
+import MyActionButton from '../components/ActionButton';
+
+
 class ListaCursadas extends Component  {
 
 	componentWillMount() {
@@ -29,10 +32,15 @@ class ListaCursadas extends Component  {
 
 	render() {
 		return (
-      <ListView
-        enableEmptySections
-        dataSource={this.dataSource}
-        renderRow={this.renderRow} />
+		<View>
+		      <ListView
+		        enableEmptySections
+		        dataSource={this.dataSource}
+		        renderRow={this.renderRow}>
+	
+			</ListView>
+			<MyActionButton />
+		</View>	
 		);
 	}
 };