zmiguel
/
ENEI2019-Public
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'Enei/master' into Borges

This commit is contained in:
João Borges 2019-01-27 16:46:47 +00:00
parent 8a3b49db15 ad1e5dd90a
commit 7674cbf104
8 changed files with 170 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
App/android/gradlew vendored Normal file → Executable file
View File

9
App/app/assets/styles.js
View File

@ -1,5 +1,9 @@
import {StyleSheet} from 'react-native';
import {RkTheme} from 'react-native-ui-kitten'
import { Dimensions} from 'react-native'
const SCREEN_HEIGHT = Dimensions.get("window").height;
const SCREEN_WIDTH = Dimensions.get("window").width;
export const UtilStyles = StyleSheet.create({
container: {
@ -97,11 +101,12 @@ export const UtilStyles = StyleSheet.create({
loginImage: {
marginTop:50,
justifyContent: 'center',
alignItems: 'center',
alignSelf: 'center',
width: 80, //160/2
height: 74.6 // 149.2/2
width: 150, //160/2
height: 150
},
//------------------//

85
App/app/screens/Login.js
View File

@ -1,8 +1,8 @@
import React, {Component, Fragment} from 'react'
import {View, Image, Vibration, Dimensions} from 'react-native'
import {View, Image, Vibration, Dimensions,Text ,Button} from 'react-native'
import Icon from "react-native-vector-icons/Ionicons";
import {UtilStyles} from '../assets/styles'
import { AsyncStorage } from 'react-native';
import axios from 'axios';
import deviceStorage from '../services/deviceStorage';
@ -12,6 +12,11 @@ import QRCodeScanner from 'react-native-qrcode-scanner';
const SCREEN_HEIGHT = Dimensions.get("window").height;
const SCREEN_WIDTH = Dimensions.get("window").width;
import {RkButton,
RkTheme , RkText} from 'react-native-ui-kitten';
export default class Login extends Component {
static navigationOptions = {
@ -24,36 +29,47 @@ export default class Login extends Component {
onSuccess = (e) => {
console.log(e.data)
console.log(e.data);
this.props.navigation.navigate('Home',);
};
render() {
console.log(AsyncStorage.getItem('userToken'))
// if(AsyncStorage.getItem('userToken')){
// this.props.navigation.navigate('Home');
// }
return (
<QRCodeScanner
showMarker
reactivate={true}
onRead={this.onSuccess.bind(this)}
cameraStyle={{ height: SCREEN_HEIGHT }}
customMarker={
<View style={styles.rectangleContainer}>
<View style={styles.topOverlay}>
<Image style={UtilStyles.loginImage}
<View style={styles.logo}>
<Image style={UtilStyles.loginImage}
source={require('../assets/img/logo.png')}
/>
</View>
<View style={{ flexDirection: "row" }}>
<View style={styles.leftAndRightOverlay}>
</View>
<View style={styles.rectangle}>
<Icon
name="ios-qr-scanner"
size={SCREEN_WIDTH}
color={"#fff"}
/>
<View style={styles.rectangle}>
</View>
@ -62,6 +78,13 @@ export default class Login extends Component {
</View>
<View style={styles.bottomOverlay}>
<View style={{flex:1, alignItems: 'center', alignContent: 'center'}}>
<RkText rkType='primary' style={styles.recover}>Recuperar pin de acesso</RkText>
<RkButton rkType='dark' style={styles.manual}>Instruções</RkButton>
</View>
</View>
</View>
}
@ -71,20 +94,50 @@ export default class Login extends Component {
}
RkTheme.setType('RkButton', 'dark', {
container: {
paddingTop:10,
backgroundColor: 'gray',
borderRadius: 90,
}
});
const rectDimensions = SCREEN_WIDTH * 0.85; // this is equivalent to 255 from a 393 device width
const overlayColor = 'rgba(0,0,0,0.85)';
const overlayColor = 'rgba(0,0,0,0.30)';
const styles = {
recover:{
paddingTop:10,
color: "red",
paddingBottom:10
},
manual:{
},
logo:{
height:SCREEN_HEIGHT*0.35,
width:SCREEN_WIDTH,
backgroundColor: overlayColor,
},
rectangleContainer: {
flex: 1,
alignItems: "center",
justifyContent: "center",
backgroundColor: "transparent"
backgroundColor: "transparent",
},
rectangle: {
height: rectDimensions,
width: rectDimensions,
alignItems: "center",
@ -94,8 +147,6 @@ const styles = {
topOverlay: {
flex: 1,
height: SCREEN_HEIGHT,
width: SCREEN_WIDTH,
backgroundColor: overlayColor,
justifyContent: "center",
alignItems: "center"
@ -106,7 +157,7 @@ const styles = {
height: SCREEN_HEIGHT,
width: SCREEN_WIDTH,
backgroundColor: overlayColor,
paddingBottom: SCREEN_WIDTH * 0.25
paddingBottom: SCREEN_WIDTH * 0.2
},
leftAndRightOverlay: {

2
App/app/services/deviceStorage.js
View File

@ -35,7 +35,7 @@ const deviceStorage = {
async deleteJWT() {
try {
await AsyncStorage.removeItem('userToken');
} catch (error) {
console.log(`Erro a ler token \n${error.message}`);
}

2
api/wwwroot/index_old.html
View File

@ -108,7 +108,7 @@
<section id="precos">
<div class="container">
<div class="col-lg-10 col-lg-offset-1">
<div class="col-lg-10 col-lg-offset-1 col-sm-12 col-xs-12">
<div class="pre-h1">ENEI 2019</div>
<h1>Preços</h1>
<hr>

57
api/wwwroot/main.css
View File

@ -159,6 +159,12 @@ h1 {
}
}
@media (max-width: 769px) {
h1 {
font-size: 30px;
}
}
h3 {
letter-spacing: 1px;
font-weight: normal;
@ -730,6 +736,12 @@ hr::after {
position: relative;
}
@media (max-width: 1024px) {
#precos {
padding-bottom: 100px;
}
}
#precos hr {
display: table;
margin: 0 auto 60px;
@ -766,6 +778,24 @@ hr::after {
-webkit-transition: transform 150ms ease-out;
}
@media (max-width: 1024px) {
#precos .price-block {
max-width: 210px;
padding: 0 15px 40px;
margin: 0 10px;
}
}
@media (max-width: 769px) {
#precos .price-block {
max-width: 350px;
min-height: inherit;
padding: 0 15px 40px;
margin: 0 auto 35px;
display: table;
}
}
#precos .price-block:hover {
transform: scale(1.05);
-webkit-transform: scale(1.05);
@ -792,6 +822,12 @@ hr::after {
font-weight: 400;
}
@media (max-width: 769px) {
#precos .price-block .price {
margin: 20px 0;
}
}
#precos .price-block .price span {
font-size: 30px;
vertical-align: super;
@ -845,6 +881,13 @@ hr::after {
color: #ffffff;
}
@media (max-width: 769px) {
#precos .price-block .buy-button {
display: inline-block;
margin-top: 30px;
}
}
#precos .ps {
position: absolute;
right: 20px;
@ -903,6 +946,14 @@ hr::after {
-webkit-transition: border-color 150ms ease-out, background-color 150ms ease-out, color 150ms ease-out;
}
@media (max-width: 769px) {
#accordion li .toggle {
font-size: 19px;
line-height: 24px;
padding: 20px;
}
}
#accordion li .content-accordion {
display: none;
padding: 45px 35px;
@ -911,6 +962,12 @@ hr::after {
border-top: 0;
}
@media (max-width: 769px) {
#accordion li .content-accordion {
padding: 25px;
}
}
#accordion li .content-accordion p {
margin-bottom: 5px;
}

2
api/wwwroot/main.css.map
View File

File diff suppressed because one or more lines are too long

37
api/wwwroot/main.scss
View File

@ -198,6 +198,9 @@ h1 {
font-size: 34px;
margin-bottom: 10px;
}
@include mobile {
font-size: 30px;
}
}
h3 {
@ -605,6 +608,9 @@ hr {
#precos {
text-align: center;
position: relative;
@include portable {
padding-bottom: 100px;
}
hr {
display: table;
margin: 0 auto 60px;
@ -627,6 +633,18 @@ hr {
margin: 0 15px;
transition: transform $transition-time ease-out;
-webkit-transition: transform $transition-time ease-out;
@include portable {
max-width: 210px;
padding: 0 15px 40px;
margin: 0 10px;
}
@include mobile {
max-width: 350px;
min-height: inherit;
padding: 0 15px 40px;
margin: 0 auto 35px;
display: table;
}
&:hover {
transform: scale(1.05);
-webkit-transform: scale(1.05);
@ -645,6 +663,9 @@ hr {
.price {
@include font($bai-font, 58px, 58px, $dark-grey);
font-weight: 400;
@include mobile {
margin: 20px 0;
}
span {
font-size: 30px;
vertical-align: super;
@ -689,6 +710,10 @@ hr {
background-color: $red;
color: $white;
}
@include mobile {
display: inline-block;
margin-top: 30px;
}
}
}
.ps {
@ -745,6 +770,11 @@ hr {
-webkit-transition: border-color $transition-time ease-out,
background-color $transition-time ease-out,
color $transition-time ease-out;
@include mobile {
font-size: 19px;
line-height: 24px;
padding: 20px;
}
}
.content-accordion {
display: none;
@ -752,6 +782,9 @@ hr {
background-color: $white;
border: 1px dashed $light-grey;
border-top: 0;
@include mobile {
padding: 25px;
}
p {
margin-bottom: 5px;
}
@ -877,8 +910,8 @@ footer {
color $transition-time ease,
background-color $transition-time ease;
margin-right: -1px;
@include portable{
padding:15px;
@include portable {
padding: 15px;
}
}
}