Alguns ajustes

thauska · Sep 6, 2020 · 31a9fef · 31a9fef
1 parent cb97023
commit 31a9fef
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 23 deletions.
diff --git a/images/Ada_Lovelace_portrait.jpg b/images/Ada_Lovelace_portrait.jpg
diff --git a/images/Babbage.jpg b/images/Babbage.jpg
diff --git a/quasar.conf.js b/quasar.conf.js
@@ -32,7 +32,7 @@ module.exports = function (/* ctx */) {
     extras: [
       // 'ionicons-v4',
       // 'mdi-v5',
-      'fontawesome-v5',
+      // 'fontawesome-v5',
       // 'eva-icons',
       // 'themify',
       // 'line-awesome',

diff --git a/src/css/app.sass b/src/css/app.sass
@@ -12,3 +12,6 @@
 
 .container-logo-bmg
   height: 50px !important
+
+.q-toolbar .q-btn--round
+  margin-bottom: 1rem;
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
@@ -2,6 +2,9 @@
   <q-layout view="hhh lpR fff">
     <q-header reveal bordered class="purplebg text-white">
       <q-toolbar>
+         <q-btn dense flat round icon="keyboard_arrow_left" @click="goBack()"  />
+         <q-toolbar-title></q-toolbar-title>
+         <q-btn dense flat round icon="home" @click="goHome()"  />
       </q-toolbar>
     </q-header>
     <q-page-container>
@@ -19,6 +22,16 @@ export default {
   data () {
     return {
     }
+  },
+  methods: {
+    goBack () {
+      if (this.$router.path !== '/') {
+        this.$router.go(-1)
+      }
+    },
+    goHome () {
+      this.$router.push('/dashboard')
+    }
   }
 }
 </script>

diff --git a/src/pages/AdaClub.vue b/src/pages/AdaClub.vue
@@ -0,0 +1,17 @@
+<template>
+  <q-page class="container">
+      <div class="row q-pt-sm center">
+          <span>Clube ADA!</span>
+      </div>
+  </q-page>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
@@ -1,11 +1,8 @@
 <template>
   <q-page class="container">
-    <div class="row q-pt-sm justify-center">
+    <div class="row q-pt-md justify-center">
       <div class="row col-11">
-        <span> Olá, </span>
-      </div>
-      <div class="row col-11">
-        <span> Maria </span>
+        <span> Olá, Maria </span>
       </div>
     </div>
     <div class="row q-pt-lg justify-center">
@@ -27,7 +24,7 @@
         </q-card-section>
       </q-card>
     </div>
-    <div class="row q-pt-sm q-gutter-xs no-wrap justify-center">
+    <div class="row q-pt-lg q-gutter-xs no-wrap justify-center">
       <q-card class="card bg-secondary">
         <q-card-section class="row justify-center">
           <img class="q-mb-sm" src="../../public/scan-barcode.svg" height="30"/>
@@ -60,26 +57,35 @@
 export default {
   data () {
     return {
-      actionsCard: [
-        {
-          label: 'Pagar conta',
-          icon: 'svg://192.168.0.9:8080/assets/scan-barcode.svg'
-        },
-        {
-          label: 'Transferir dinheiro',
-          icon: 'svg://192.168.0.9:8080/assets/icone-transacao.svg'
-        }
-      ]
+      actionsCard: []
     }
   }
 }
 </script>
 
+<script>
+  window.watsonAssistantChatOptions = {
+      integrationID: "043cdc85-9cb6-4348-afe8-49dcd567aeac", // The ID of this integration.
+      region: "us-south", // The region your integration is hosted in.
+      serviceInstanceID: "d723d7dd-5e60-457a-a10f-6fa5d1fb919e", // The ID of your service instance.
+      onLoad: function(instance) { instance.render(); }
+    };
+  setTimeout(function(){
+    const t=document.createElement('script');
+    t.src="https://web-chat.global.assistant.watson.appdomain.cloud/loadWatsonAssistantChat.js";
+    document.head.appendChild(t);
+  });
+</script>
+
 <style>
 .border-card {
   border: 1px solid purple;
 }
 .card {
   width: 23%;
 }
+
+#WACContainer.WACContainer .WACLauncher__ButtonContainer {
+  margin-bottom: 1rem;
+}
 </style>
diff --git a/src/pages/Index.vue b/src/pages/Index.vue
@@ -5,10 +5,10 @@
     </div>
     <div class="row col-12 justify-center">
       <div class="col-12 row justify-center">
-        <q-btn class="q-px-md btn" color="secondary" label="Seja uma cliente" no-caps outline dense @click="goSignUp()"/>
+        <q-btn class="q-px-xl btn login" color="secondary" label="Entrar" no-caps dense @click="goLogin()"/>
       </div>
       <div class="col-12 row justify-center">
-        <q-btn class="q-px-xl btn login" color="secondary" label="Entrar" no-caps dense @click="goLogin()"/>
+        <q-btn class="q-px-md btn" color="secondary" label="Seja uma cliente" no-caps outline dense @click="goSignUp()"/>
       </div>
     </div>
   </q-page>

diff --git a/src/pages/Login.vue b/src/pages/Login.vue
@@ -4,11 +4,13 @@
       <img class="logo-ada" src="../../public/ADA2.png" height="100"/>
     </div>
     <div class="row align-data">
-      <div class="row col-12">
-        <div class="text-secondary text-body1 text-weight-bold"> Oi, Fulaninha </div>
+      <div class="row q-pt-sm justify-center">
+      <div class="row col-11">
+        <span> Olá, Maria</span>
       </div>
+    </div>
       <div class="row col-12">
-        <span class="text-secondary text-body1 text-weight-bold"> Conta: 111111-1 </span>
+        <span class="text-secondary text-body1 text-weight-bold"> Conta: 846486877-0 </span>
       </div>
     </div>
     <div class="row col-8 justify-center">

diff --git a/src/router/routes.js b/src/router/routes.js
@@ -8,7 +8,8 @@ const routes = [
       { path: 'cadastro', component: () => import('pages/SignUp.vue') },
       { path: 'login', component: () => import('pages/Login.vue') },
       { path: 'recuperar-senha', component: () => import('pages/RecoverPassword.vue') },
-      { path: 'dashboard', component: () => import('pages/Dashboard.vue') }
+      { path: 'dashboard', component: () => import('pages/Dashboard.vue') },
+      { path: 'clube-ada', component: () => import('pages/AdaClub.vue') }
     ]
   },