diff --git a/.DS_Store b/.DS_Store index d9f8cbca..8fd6af04 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/App/app/screens/Jogo.js b/App/app/screens/Jogo.js index cbd19652..2c1ff7f1 100644 --- a/App/app/screens/Jogo.js +++ b/App/app/screens/Jogo.js @@ -333,7 +333,8 @@ const styles = StyleSheet.create({ marginTop: -25, marginLeft: 10, fontWeight: "bold", - color: "#CC1A17" + color: "#CC1A17", + // backgroundColor:"#cc1a17", }, cromosContainer: { @@ -418,9 +419,11 @@ const styles = StyleSheet.create({ marginTop: 156 }, number: { - marginTop: -18, - marginLeft: 103, - textAlign: "center" + marginTop: -13, + marginLeft: 100, + textAlign: "center", + + color:'#cc1a17' } }); diff --git a/App/app/screens/map.js b/App/app/screens/map.js index f3df30e1..feb9cf03 100644 --- a/App/app/screens/map.js +++ b/App/app/screens/map.js @@ -30,7 +30,7 @@ import ImageViewer from 'react-native-image-zoom-viewer'; import PTRView from "react-native-pull-to-refresh"; const images = [{ - url: 'https://avatars2.githubusercontent.com/u/7970947?v=3&s=460' + url: 'https://enei.pt/imgs/mapa.png' },] class map extends React.Component { @@ -41,22 +41,10 @@ class map extends React.Component { this.props.internalToken ); }; - state = { - index: 0, - routes: [ - { key: "first", title: "Festarola" }, - { key: "second", title: "Febrada" }, - { key: "third", title: "Rally" }, - { key: "fourth", title: "Peddy" } - ] - }; + componentDidMount() { - this.props.getAllEvents(this.props.internalToken); - this.props.getEventLocsVisited( - this.props.team.id, - this.props.internalToken - ); + } render() { @@ -71,54 +59,7 @@ class map extends React.Component { } const styles = StyleSheet.create({ - cardHours: { - textAlign: "center", - color: "white", - margin: 10, - width:'45%' - }, - - cardDesc: { - //alignSelf:'center', - backgroundColor: "#CC1A17", - // flex:1, - flexDirection: "row" - }, - cardDescText: { - fontWeight: "bold", - color: "white", - fontSize: 18, - - width: "45%", - margin: 10 - }, - container: { - backgroundColor: "white", - flex: 1, - flexGrow: 1, - flexDirection: "column", - paddingBottom: 20 - }, - - scroll: { - flex: 1 - }, - - cardContainer: { - flex: 1, - //flexDirection: 'row', - //padding: 10, - margin: 20, - marginBottom: 0, - backgroundColor: "#fff", - height: SCREEN_WIDTH * 0.62, - borderRadius: 5 - //borderWidth: 2, - }, - - scene: { - flex: 1 - } + }); function mapStateToProps(state, props) { diff --git a/api/.DS_Store b/api/.DS_Store index d0d9208c..de029e90 100755 Binary files a/api/.DS_Store and b/api/.DS_Store differ diff --git a/api/wwwroot/.DS_Store b/api/wwwroot/.DS_Store index 651c26e1..e98a9bea 100755 Binary files a/api/wwwroot/.DS_Store and b/api/wwwroot/.DS_Store differ diff --git a/api/wwwroot/logos/accenture-logo.jpg b/api/wwwroot/logos/accenture-logo.jpg old mode 100755 new mode 100644 index 052a407e..7b315ecd Binary files a/api/wwwroot/logos/accenture-logo.jpg and b/api/wwwroot/logos/accenture-logo.jpg differ diff --git a/website/.DS_Store b/website/.DS_Store index 52494b59..4ae5d732 100644 Binary files a/website/.DS_Store and b/website/.DS_Store differ