Merge remote-tracking branch 'origin/develop-cadastro' into develop-home

ed4fde40 · Raul Silas · d67bdee2 · f3701d79 · ed4fde40 · ed4fde40
Commit ed4fde40 authored May 24, 2022 by Raul Silas
6 changed files
--- a/index.html
+++ b/index.html
@@ -2,13 +2,23 @@
 <html lang="en">
  <head>
    <meta charset="utf-8">
-    <title>ntflix-ntlabs</title>
+    <!--<meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <mate name="viewport" context="width=device-width,initial-scale=1.0">
+    <link real = 'icon' href= "<% = BASE_URL%>faicon."ico">
+    <title>ntflix-ntlabs</title> -->
+
+   
+ 
  </head>
  <body>
-    <div id="app"></div>
+    
    <script src="/dist/build.js"></script>
-
+    <!-- <div id="app"></div> -->
    
+     
+    <!--<script src="<https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.js>"></script> -->
+ 
+     <!--<script src="app.js"></script> -->


  </body>

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -10,6 +10,8 @@
    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
  },
  "dependencies": {
+    "cli": "^1.0.1",
+    "router": "^1.3.7",
    "vue": "^2.5.11"
  },
  "browserslist": [
@@ -18,6 +20,7 @@
    "not ie <= 8"
  ],
  "devDependencies": {
+    "@vue/cli-plugin-router": "~5.0.0",
    "babel-core": "^6.26.0",
    "babel-loader": "^7.1.2",
    "babel-preset-env": "^1.6.0",

--- a/src/componentes/cadastro.vue
+++ b/src/componentes/cadastro.vue
-<template>
-    <h1>cadastro</h1>
-</template>
-<script>
-import { defineComponent } from '@vue/composition-api'
-
-export default defineComponent({
-    setup() {
-        
-    },
-})
-</script>
-<style >
-
-</style>
\ No newline at end of file
--- a/src/components/cadastro.vue
+++ b/src/components/cadastro.vue
+<template>
+<div id="cadastro">
+     <router-view></router-view>
+     <h1>cadastro</h1>
+</div>
+  
+</template>
+<script>
+//import { defineComponent } from '@vue/composition-api'
+
+import {currentView} from "@vue/cli-plugin-router"
+
+
+
+export default ({
+    cadastro() {
+      
+   
+    },
+})
+</script>
+<style >
+
+</style>
\ No newline at end of file
--- a/src/components/home.vue
+++ b/src/components/home.vue
+<template>
+    <router-view>
+         <h1>OI PAGINA HOME</h1> 
+    </router-view>
+   
+</template>
+<script>
+import {currentView} from "@vue/cli-plugin-router"
+
+export default ({
+    name : "home"
+})
+</script>
+<style >
+
+</style>
\ No newline at end of file