Merge pull request #4 from BureauTech/dev

Sprint 2

.gitignore

@@ -2,5 +2,6 @@
 **/package-lock.json
 **/temp/*
 **/dist
+**/resources/img/upload/*
 
 !.keep

README.md

@@ -12,11 +12,10 @@ Desenvolvido pela [BureauTech](https://github.com/BureauTech).
 
    * [Sobre](#bureauto)
    * [Sumário](#sumário)
-   * [Protótipo das telas da aplicação](#protótipo-das-telas-da-aplicação)
    * [Entregas](#entregas)
         * [Modelagem de Dados](#modelagem-de-dados)
       * [Burndown](#burndown)
-      * [Backlog](#backlog)
+      * [Documentações](#documentações)
    * [Como executar localmente](#como-executar-localmente)
       * [Pré-Requisitos](#pré-requisitos)
       * [Servidor](#servidor)
@@ -25,36 +24,40 @@ Desenvolvido pela [BureauTech](https://github.com/BureauTech).
    * [Tecnologias](#tecnologias)
    * [Autores](#autores)
 
-## Protótipo das telas da aplicação 
+## Aplicação 
 
-- Wireframe Aplicação Web
+- Gif com a aplicação em execução
 <div align="center">
-  <img src="./doc/gif/wireframe_web.gif" />
+  <img src="./doc/gif/entrega-sprint-2.gif" />
 </div>
 
 <br>
 
-- Wireframe Aplicação Mobile
-<div align="center">
-  <img src="./doc/gif/wireframe_app.gif" />
-</div>
-
-<br>
-
-Protótipo interativo das <b>telas web</b> está disponível neste link: https://bit.ly/BureAuto
-
-Protótipo interativo das <b>telas mobile</b> está disponível neste link: https://bit.ly/BureAutoMobile
-
-<br>
 
 # Entregas
 
 - [Sprint 1](https://github.com/BureauTech/BureAuto/releases/tag/1.0.0) entrega realizada em 19/09/2021.
+- [Sprint 2](https://github.com/BureauTech/BureAuto/releases/tag/1.1.0) entrega realizada em 10/10/2021.
 
-## Entregas propostas
+## Visão geral do projeto
+<div align="center">
+  <img src="./doc/img/funcionalidades_projeto.png" />
+</div>
+<div align="center">
+  <img src="./doc/img/abordagem_spritns.png" />
+</div>
+
+<br/> 
 
+## Entregas propostas Sprint 2
+<div align="center">
+  <img src="./doc/img/cards.png" />
+</div>
 <div align="center">
-  <img src="./doc/img/cards_bureauto.png" />
+  <img src="./doc/img/cards2.png" />
+</div>
+<div align="center">
+  <img src="./doc/img/cards3.png" />
 </div>
 <br/> 
 
@@ -76,14 +79,16 @@ Protótipo interativo das <b>telas mobile</b> está disponível neste link: http
 ## Burndown
 
 <div align="center">
-  <img src="./doc/img/burndown.png" />
+  <img src="./doc/img/burndown2.png" />
 </div>
 <br/> 
 
-## Backlog 
+## Documentações 
 
 - [Product Backlog](./doc/artefatos/product_backlog_bureauto.pdf)
 
+- [Documentação BureAuto](./doc/artefatos/documentacao_BureAuto.pdf)
+
 # Como executar localmente
 
 Para executar a aplicação completa localmente, siga as intruções a seguir:
@@ -98,6 +103,8 @@ PostgreSQL - Versão: 12.x
 VueJS - Versão 2.x
 ```
 
+Por padrão, o usuário e senha do banco estão definidos como `postgres`, caso essas configurações não sejam as mesmas do seu ambiente, altere as propriedades `USER_DB` e `PWD_DB` no arquivo [***src/server/.env***](/src/server/.env)
+
 Além disso é bom ter um editor para trabalhar com o código como VSCode.
 
 ## Servidor
@@ -111,7 +118,7 @@ npm run dev
 
 Ficará disponível em [localhost:3000](http://localhost/3000)
 
-2. Execute no seu SGBD, todos os scripts SQL disponíveis na pasta [***src/server/resources***](/src/server/resources/)
+1. Execute no seu SGBD, o script SQL disponível na pasta [***src/server/resources***](/src/server/resources/). Caso não queira executar o script SQL, execute o script `UpdateDB.js` diretamente pelo seu terminal.
 
 ## Cliente
 
@@ -169,12 +176,13 @@ Bibliotecas:
   <tr>
     <td align="center"><a href="https://github.com/anaclaragraciano"><img src="https://avatars.githubusercontent.com/u/64653864?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ana Clara<br>PO</b></sub></a><br /><a href="https://github.com/BureauTech/BureAuto/commits?author=anaclaragraciano" title="PO">:sparkles::iphone::open_book:</a></td>
     <td align="center"><a href="https://github.com/bibiacoutinho"><img src="https://avatars.githubusercontent.com/u/56437723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Beatriz Coutinho<br>Master</b></sub></a><br /><a href="https://github.com/BureauTech/BureAuto/commits?author=bibiacoutinho" title="Master">:headphones::nail_care::computer_mouse:</a></td>
-    <td align="center"><a href="https://github.com/caiquesjc"><img src="https://avatars.githubusercontent.com/u/54915913?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Caique Nascimento<br>Dev</b></sub></a><br /><a href="https://github.com/BureauTech/BureAuto/commits?author=caiquesjc" title="Dev Team">:keyboard::desktop_computer::computer_mouse:</a></td>     
+    <td align="center"><a href="https://github.com/caiquesjc"><img src="https://avatars.githubusercontent.com/u/54915913?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Caique Nascimento<br>Dev</b></sub></a><br /><a href="https://github.com/BureauTech/BureAuto/commits?author=caiquesjc" title="Dev Team">:keyboard::desktop_computer::computer_mouse:</a></td>    
+    <td align="center"><a href="https://github.com/charles-ramos"><img src="https://avatars.githubusercontent.com/u/25464287?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Charles Ramos<br>Dev</b></sub></a><br /><a href="https://github.com/BureauTech/BureAuto/commits?author=charles-ramos" title="Dev Team">:fist_raised::open_book::hamburger:</a></td> 
 </table>
 <table align="center">
-    <td align="center"><a href="https://github.com/charles-ramos"><img src="https://avatars.githubusercontent.com/u/25464287?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Charles Ramos<br>Dev</b></sub></a><br /><a href="https://github.com/BureauTech/BureAuto/commits?author=charles-ramos" title="Dev Team">:fist_raised::open_book::hamburger:</a></td>
     <td align="center"><a href="https://github.com/danielsantosoliveira"><img src="https://avatars.githubusercontent.com/u/55162125?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Oliveira<br>Dev</b></sub></a><br /><a href="https://github.com/BureauTech/BureAuto/commits?author=danielsantosoliveira" title="Dev Team">:computer::guitar::soccer:</a></td>
     <td align="center"><a href="https://github.com/Denis-Lima"><img src="https://avatars.githubusercontent.com/u/55518511?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Denis Lima<br>Dev</b></sub></a><br /><a href="https://github.com/BureauTech/BureAuto/commits?author=Denis-Lima" title="Dev Team">:computer::v::pizza:</a></td>
+    <td align="center"><a href="https://github.com/RobertaAb"><img src="https://avatars.githubusercontent.com/u/27467246?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roberta Abreu<br>Dev</b></sub></a><br /><a href="https://github.com/BureauTech/BureAuto/commits?author=RobertaAb" title="Dev Team">:v::art::sparkling_heart:</a></td>
     <td align="center"><a href="https://github.com/WeDias"><img src="https://avatars.githubusercontent.com/u/56437612?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wesley Dias<br>Dev</b></sub></a><br /><a href="https://github.com/BureauTech/BureAuto/commits?author=WeDias" title="Dev Team">:rocket::milky_way::new_moon:</a></td>
   </tr>
-</table>
+</table>

src/client/package.json

@@ -9,6 +9,7 @@
   "dependencies": {
     "axios": "^0.21.3",
     "core-js": "^3.6.5",
+    "file-saver": "^2.0.5",
     "vue": "^2.6.14",
     "vue-router": "^3.2.0",
     "vue-toasted": "^1.1.28",

src/client/public/index.html

@@ -20,7 +20,7 @@
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
-    <script src="./main.js"></script>
+    <script type="text/javascript" src="/main.js"></script>
 
   </body>
 </html>

src/client/src/App.vue

@@ -34,4 +34,8 @@ export default {
 .toasted-font {
   font-family: "Roboto", sans-serif;
 }
+
+.v-card__text, .v-card__title {
+  word-break: normal !important;
+}
 </style>

src/client/src/components/Button/Button.js

@@ -1,7 +1,4 @@
 export default {
-    props: {
-        buttonText: String
-    },
     methods: {
         emit: function(e) {
             this.$emit("click", e)

src/client/src/components/Button/Button.vue

@@ -2,12 +2,13 @@
   <v-btn
     elevation="2"
     rounded
-    v-text="buttonText"
     color="bahama"
     class="white--text text-none text-h5"
     v-bind="$attrs"
     @click="emit"
-  ></v-btn>
+  >
+    <slot></slot>
+  </v-btn>
 </template>
 
 <script src="./Button.js"></script>

src/client/src/components/ImportCsv/ImportCsv.js

@@ -0,0 +1,20 @@
+import Card from "@/components/Card/Card.vue"
+import Button from "@/components/Button/Button.vue"
+import Input from "@/components/Input/Input.vue"
+
+export default {
+    name: "ImportCsv",
+    components: {
+        Card,
+        Button,
+        Input
+    },
+    methods: {
+        selectFile(file) {
+            this.$emit("selectFile", file)
+        },
+        importFile() {
+            this.$emit("importFile")
+        }
+    }
+}

src/client/src/components/ImportCsv/ImportCsv.vue

@@ -0,0 +1,41 @@
+<template>
+  <Card
+    :roundLevel="0"
+    class="Card "
+    colorCard="transparent"
+  >
+    <v-row class="my-2 px-10 justify-center align-center">
+      <v-col
+        cols="12"
+        sm="7"
+      >
+        <v-file-input
+          label="Clique aqui para selecionar o arquivo..."
+          outlined
+          rounded
+          dense
+          class="centered-input-text"
+          prepend-icon=""
+          @change="selectFile"
+          ref="csv"
+          accept=".csv"
+        />
+      </v-col>
+      <v-col
+        cols="12"
+        sm="3"
+      >
+        <Button
+          min-width="100%"
+          @click="importFile"
+        >
+          Importar
+        </Button>
+      </v-col>
+    </v-row>
+  </Card>
+</template>
+
+<script src="./ImportCsv.js" scoped></script>
+
+<style src="./ImportCsv.css"></style>

src/client/src/components/ReportCard/ReportCard.js

@@ -0,0 +1,10 @@
+export default {
+    name: "ReportCard",
+    props: {
+        title: String,
+        content: {
+            type: Array,
+            required: true
+        }
+    }
+}

src/client/src/components/ReportCard/ReportCard.vue

@@ -0,0 +1,26 @@
+<template>
+  <v-col
+    cols="12"
+    sm="10"
+    md="6"
+    align="center"
+  >
+    <v-card
+      min-width="100%"
+      rounded="xl"
+    >
+      <v-card-title>
+        <h3 v-text="title" class="bk-word"></h3>
+      </v-card-title>
+      <v-card-text
+        v-for="(item, index) in content"
+        :key="index"
+
+      >
+        <p class="text-body-1 bk-word">{{item.text}}<b>{{item.value}}</b> </p>
+      </v-card-text>
+    </v-card>
+  </v-col>
+</template>
+
+<script src="./ReportCard.js"></script>

src/client/src/components/Select/Select.js

@@ -0,0 +1,6 @@
+export default {
+    name: "Select",
+    props: {
+        value: String
+    }
+}

src/client/src/components/Select/Select.vue

@@ -0,0 +1,12 @@
+<template>
+  <v-select
+    outlined
+    rounded
+    color="bahama"
+    @change="$emit('change', $event)"
+    :value="value"
+    v-bind="$attrs"
+  />
+</template>
+
+<script src="./Select.js"></script>

src/client/src/components/Topbar/Topbar.js

@@ -7,5 +7,49 @@ export default {
             await axios.get("/logout")
             window.location.href = "/login"
         }
+    },
+    data: function() {
+        return {
+            drawer: false,
+            group: null,
+            links: [{
+                path: "/cadastrar/anuncio",
+                requiresAdmin: false,
+                text: "Anunciar"
+            }, {
+                path: "/",
+                requiresAdmin: false,
+                text: "Catálogo"
+            }, {
+                path: "/relatorios",
+                requiresAdmin: false,
+                text: "Relatórios"
+            }, {
+                path: "/favoritos",
+                requiresAdmin: false,
+                text: "Favoritos"
+            }, {
+                path: "/cadastrar/usuario",
+                requiresAdmin: true,
+                text: "Usuários"
+            }, {
+                path: "/perfil",
+                requiresAdmin: false,
+                text: "Perfil"
+            }]
+        }
+    },
+    computed: {
+        linksDisponiveis() {
+            return this.links.filter((link) => {
+                const {route} = this.$router.resolve(link.path)
+
+                return (
+                    !route.matched.some((record) => record.meta.requiresAdmin) ||
+          this.$store.getters.getUser.use_is_admin
+                )
+            })
+        }
+
     }
 }