Skip to content

F
front-ntflix
Commit ed4fde40 authored by Raul Silas's avatar Raul Silas
Browse files
Options

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

parents d67bdee2 f3701d79
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1809 additions and 116 deletions
index.html
View file @ ed4fde40
...@@ -2,13 +2,23 @@ ...@@ -2,13 +2,23 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <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> </head>
<body> <body>
<div id="app"></div>
<script src="/dist/build.js"></script> <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> </body>
......
package-lock.json
View file @ ed4fde40
This diff is collapsed.
package.json
View file @ ed4fde40
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
"build": "cross-env NODE_ENV=production webpack --progress --hide-modules" "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
}, },
"dependencies": { "dependencies": {
"cli": "^1.0.1",
"router": "^1.3.7",
"vue": "^2.5.11" "vue": "^2.5.11"
}, },
"browserslist": [ "browserslist": [
...@@ -18,6 +20,7 @@ ...@@ -18,6 +20,7 @@
"not ie <= 8" "not ie <= 8"
], ],
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-router": "~5.0.0",
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
"babel-loader": "^7.1.2", "babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.0", "babel-preset-env": "^1.6.0",
......
src/componentes/cadastro.vue deleted 100644 → 0
View file @ d67bdee2
<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
src/components/cadastro.vue 0 → 100644
View file @ ed4fde40
<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
src/components/home.vue 0 → 100644
View file @ ed4fde40
<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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment