Edit Views nayarahilton#3

lucasjs · Dec 1, 2017 · 6391f7e · 6391f7e
1 parent ab50fe7
commit 6391f7e
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 21 deletions.
diff --git a/src/views/CameraView.vue b/src/views/CameraView.vue
@@ -5,27 +5,35 @@
 				link="/home"
 				title="Postar"
 			/>
-			<tabs-bottom />
+			<tabs-bottom-guru />
 		</header>
 		<section class="post-section">
-			<photo-upload :src="imageData" labelText="Escolha uma foto" />
-			<main-textarea v-model="title" value="title" placeholder="Escreva uma legenda"></main-textarea>
-			<main-button text-inner="Postar conteúdo" @click.prevent.native="post">
-			</main-button>
+			<photo-upload
+				:src="imageData"
+				labelText="Escolha uma foto"
+			/>
+			<main-textarea
+				v-model="title"
+				placeholder="Escreva uma legenda"
+			/>
+			<main-button
+				text-inner="Postar conteúdo"
+				@click.prevent.native="post"
+			/>
 		</section>
 	</div>
 </template>
 <script>
 import postContent from '@/mixins/postContent';
 import StatusBar from '@/components/StatusBar';
 import MainButton from '@/components/MainButton';
-import TabsBottom from '../components/TabsBottom';
+import TabsBottomGuru from '../components/TabsBottomGuru';
 import PhotoUpload from '../components/PhotoUpload';
 import MainTextarea from '../components/MainTextarea';
 
 export default {
 	mixins: [postContent],
-	data: function returnImageData() {
+	data() {
 		return {
 			title: '',
 			imageData: 'postar',
@@ -34,7 +42,7 @@ export default {
 	components: {
 		'main-button': MainButton,
 		'status-bar': StatusBar,
-		'tabs-bottom': TabsBottom,
+		'tabs-bottom-guru': TabsBottomGuru,
 		'photo-upload': PhotoUpload,
 		'main-textarea': MainTextarea,
 	},

diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
@@ -3,7 +3,7 @@
 		<header class="home-header">
 			<slider-items />
 			<tabs-top :links="linksTop"	/>
-			<tabs-bottom />
+			<tabs-bottom-guru />
 		</header>
 		<main class="home-main">
 			<post-card resume="true" />
@@ -15,7 +15,7 @@
 import SliderItems from '@/components/SliderItems';
 import PostCard from '@/components/PostCard';
 import TabsTop from '../components/TabsTop';
-import TabsBottom from '../components/TabsBottom';
+import TabsBottomGuru from '../components/TabsBottomGuru';
 
 export default {
 	data() {
@@ -37,7 +37,7 @@ export default {
 	components: {
 		'slider-items': SliderItems,
 		'tabs-top': TabsTop,
-		'tabs-bottom': TabsBottom,
+		'tabs-bottom-guru': TabsBottomGuru,
 		'post-card': PostCard,
 	},
 };

diff --git a/src/views/ProfileView.vue b/src/views/ProfileView.vue
@@ -19,7 +19,7 @@
 		</div>
 
 		<post-card />
-		<tabs-bottom />
+		<tabs-bottom-guru />
 	</div>
 </template>
 
@@ -28,7 +28,7 @@ import { find } from 'lodash';
 import StatusBar from '@/components/StatusBar';
 import PostCard from '@/components/PostCard';
 import ProfileResume from '@/components/ProfileResume';
-import TabsBottom from '../components/TabsBottom';
+import TabsBottomGuru from '../components/TabsBottomGuru';
 
 export default {
 	data() {
@@ -40,7 +40,7 @@ export default {
 		'status-bar': StatusBar,
 		'post-card': PostCard,
 		'profile-resume': ProfileResume,
-		'tabs-bottom': TabsBottom,
+		'tabs-bottom-guru': TabsBottomGuru,
 	},
 	mounted() {
 		this.card = find(this.$root.card, card => card['.key'] === this.$route.params.id);

diff --git a/src/views/QuestionsView.vue b/src/views/QuestionsView.vue
@@ -5,7 +5,7 @@
 				link="/home"
 				title="Perguntas"
 			/>
-			<tabs-bottom />
+			<tabs-bottom-guru />
 		</header>
 		<main class="questions-main">
 			<main-titles
@@ -21,7 +21,7 @@
 import StatusBar from '@/components/StatusBar';
 import MainTitles from '@/components/MainTitles';
 import QuestionBox from '@/components/QuestionBox';
-import TabsBottom from '../components/TabsBottom';
+import TabsBottomGuru from '../components/TabsBottomGuru';
 
 export default {
 	data() {
@@ -50,7 +50,7 @@ export default {
 		'status-bar': StatusBar,
 		'question-box': QuestionBox,
 		'main-titles': MainTitles,
-		'tabs-bottom': TabsBottom,
+		'tabs-bottom-guru': TabsBottomGuru,
 	},
 };
 </script>

diff --git a/src/views/RegisterView.vue b/src/views/RegisterView.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="register">
 		<status-bar
-			:link="{ name: 'bemvindo' }"
+			link="/bemvindo"
 			title="Cadastro"
 		/>
 		<main class="register-main">

diff --git a/src/views/WelcomeView.vue b/src/views/WelcomeView.vue
@@ -16,6 +16,13 @@
 					placeholder="Email"
 					design="login"
 					v-model="email"
+					@input="$v.email.$touch()"
+					:class="{ 'input--invalid': $v.email.$error }"
+				/>
+				<feedback
+					v-if="!$v.email.email"
+					msgText="E-mail incorreto"
+					design="login"
 				/>
 				<main-input
 					type="password"
@@ -32,6 +39,7 @@
 					</router-link>
 					<button
 						class="submit-button"
+						:disabled="$v.$invalid"
 					>
 						Entrar
 					</button>
@@ -42,10 +50,12 @@
 </template>
 
 <script>
+import { required, email } from 'vuelidate/lib/validators';
 import store from '@/services/store';
 import SocialButton from '../components/SocialButton';
 import MainButton from '../components/MainButton';
 import MainInput from '../components/MainInput';
+import FeedbackMessage from '../components/FeedbackMessage';
 
 export default {
 	store,
@@ -58,9 +68,16 @@ export default {
 		};
 	},
 	components: {
-		'social-button': SocialButton,
-		'main-button': MainButton,
-		'main-input': MainInput,
+		SocialButton,
+		MainButton,
+		MainInput,
+		feedback: FeedbackMessage,
+	},
+	validations: {
+		email: {
+			required,
+			email,
+		},
 	},
 	methods: {
 		onSubmit() {