Commit df06f4b5 authored by Adam Procter's avatar Adam Procter

Merge branch 'instance_select'

parents 3a3d3e42 13e35d56
Pipeline #62 passed with stage
in 2 minutes and 3 seconds
{"remainingRequest":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js??vue-loader-options!/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue?vue&type=template&id=7ba5bd90&","dependencies":[{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue","mtime":1534177597090},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/loaders/templateLoader.js","mtime":1534157857478},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js","mtime":1534157857478}],"contextDependencies":[],"result":["\n<main id=\"app\">\n \n<nav>\n <ul>\n <li> <router-link v-if=\"authenticated\" to=\"/start\" v-on:click.native=\"signout()\" replace>Sign Out</router-link></li>\n <li> <router-link to=\"/home\">Home</router-link></li>\n <li> <router-link to=\"/about\">About</router-link></li>\n\n </ul>\n </nav> \n <router-view @authenticated=\"setAuthenticated\" />\n </main>\n",null]}
\ No newline at end of file
{"remainingRequest":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js??vue-loader-options!/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue?vue&type=template&id=7ba5bd90&","dependencies":[{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue","mtime":1534184809945},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/loaders/templateLoader.js","mtime":1534157857478},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js","mtime":1534157857478}],"contextDependencies":[],"result":["\n<main>\n \n<nav>\n <ul>\n <li> <router-link v-if=\"authenticated\" to=\"/start\" v-on:click.native=\"signout()\" replace>Sign Out</router-link></li>\n <li> <router-link v-if=\"authenticated\" to=\"/home\">Home</router-link></li>\n <li> <router-link v-if=\"authenticated\" to=\"/about\">About</router-link></li>\n\n </ul>\n </nav> \n <router-view @authenticated=\"setAuthenticated\" />\n </main>\n",null]}
\ No newline at end of file
{"remainingRequest":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js??ref--0-0!/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js??vue-loader-options!/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue?vue&type=template&id=7ba5bd90&","dependencies":[{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue","mtime":1534177597090},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/loaders/templateLoader.js","mtime":1534157857478},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js","mtime":1534157857478}],"contextDependencies":[],"result":["var render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"main\",\n { attrs: { id: \"app\" } },\n [\n _c(\"nav\", [\n _c(\"ul\", [\n _c(\n \"li\",\n [\n _vm.authenticated\n ? _c(\n \"router-link\",\n {\n attrs: { to: \"/start\", replace: \"\" },\n nativeOn: {\n click: function($event) {\n _vm.signout()\n }\n }\n },\n [_vm._v(\"Sign Out\")]\n )\n : _vm._e()\n ],\n 1\n ),\n _c(\n \"li\",\n [_c(\"router-link\", { attrs: { to: \"/home\" } }, [_vm._v(\"Home\")])],\n 1\n ),\n _c(\n \"li\",\n [_c(\"router-link\", { attrs: { to: \"/about\" } }, [_vm._v(\"About\")])],\n 1\n )\n ])\n ]),\n _c(\"router-view\", { on: { authenticated: _vm.setAuthenticated } })\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\nexport { render, staticRenderFns }"]}
\ No newline at end of file
{"remainingRequest":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js??ref--0-0!/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js??vue-loader-options!/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue?vue&type=template&id=7ba5bd90&","dependencies":[{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue","mtime":1534184809945},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/loaders/templateLoader.js","mtime":1534157857478},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js","mtime":1534157857478}],"contextDependencies":[],"result":["var render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"main\",\n [\n _c(\"nav\", [\n _c(\"ul\", [\n _c(\n \"li\",\n [\n _vm.authenticated\n ? _c(\n \"router-link\",\n {\n attrs: { to: \"/start\", replace: \"\" },\n nativeOn: {\n click: function($event) {\n _vm.signout()\n }\n }\n },\n [_vm._v(\"Sign Out\")]\n )\n : _vm._e()\n ],\n 1\n ),\n _c(\n \"li\",\n [\n _vm.authenticated\n ? _c(\"router-link\", { attrs: { to: \"/home\" } }, [\n _vm._v(\"Home\")\n ])\n : _vm._e()\n ],\n 1\n ),\n _c(\n \"li\",\n [\n _vm.authenticated\n ? _c(\"router-link\", { attrs: { to: \"/about\" } }, [\n _vm._v(\"About\")\n ])\n : _vm._e()\n ],\n 1\n )\n ])\n ]),\n _c(\"router-view\", { on: { authenticated: _vm.setAuthenticated } })\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\nexport { render, staticRenderFns }"]}
\ No newline at end of file
{"remainingRequest":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js??vue-loader-options!/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/eslint-loader/index.js??ref--13-0!/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue","dependencies":[{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue","mtime":1534177597090},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js","mtime":1534157857478},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/eslint-loader/index.js","mtime":1534157852415}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./App.vue?vue&type=template&id=7ba5bd90&\"\nimport script from \"./App.vue?vue&type=script&lang=js&\"\nexport * from \"./App.vue?vue&type=script&lang=js&\"\nimport style0 from \"./assets/css/normalize.min.css?vue&type=style&index=0&lang=css&\"\nimport style1 from \"./assets/css/main.css?vue&type=style&index=1&lang=css&\"\n\n\n/* normalize component */\nimport normalizer from \"!../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\n/* hot reload */\nif (module.hot) {\n var api = require(\"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-hot-reload-api/dist/index.js\")\n api.install(require('vue'))\n if (api.compatible) {\n module.hot.accept()\n if (!module.hot.data) {\n api.createRecord('7ba5bd90', component.options)\n } else {\n api.reload('7ba5bd90', component.options)\n }\n module.hot.accept(\"./App.vue?vue&type=template&id=7ba5bd90&\", function () {\n api.rerender('7ba5bd90', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/App.vue\"\nexport default component.exports"]}
\ No newline at end of file
{"remainingRequest":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js??vue-loader-options!/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/eslint-loader/index.js??ref--13-0!/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue","dependencies":[{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/src/App.vue","mtime":1534184809945},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-loader/lib/index.js","mtime":1534157857478},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/eslint-loader/index.js","mtime":1534157852415}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./App.vue?vue&type=template&id=7ba5bd90&\"\nimport script from \"./App.vue?vue&type=script&lang=js&\"\nexport * from \"./App.vue?vue&type=script&lang=js&\"\nimport style0 from \"./assets/css/normalize.min.css?vue&type=style&index=0&lang=css&\"\nimport style1 from \"./assets/css/main.css?vue&type=style&index=1&lang=css&\"\n\n\n/* normalize component */\nimport normalizer from \"!../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\n/* hot reload */\nif (module.hot) {\n var api = require(\"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/vue-hot-reload-api/dist/index.js\")\n api.install(require('vue'))\n if (api.compatible) {\n module.hot.accept()\n if (!module.hot.data) {\n api.createRecord('7ba5bd90', component.options)\n } else {\n api.reload('7ba5bd90', component.options)\n }\n module.hot.accept(\"./App.vue?vue&type=template&id=7ba5bd90&\", function () {\n api.rerender('7ba5bd90', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/App.vue\"\nexport default component.exports"]}
\ No newline at end of file
<template>
<main id="app">
<main>
<nav>
<ul>
<li> <router-link v-if="authenticated" to="/start" v-on:click.native="signout()" replace>Sign Out</router-link></li>
<li> <router-link to="/home">Home</router-link></li>
<li> <router-link to="/about">About</router-link></li>
<li> <router-link v-if="authenticated" to="/home">Home</router-link></li>
<li> <router-link v-if="authenticated" to="/about">About</router-link></li>
</ul>
</nav>
......@@ -31,7 +31,7 @@ name: 'auth',
setAuthenticated(status) {
this.authenticated = status;
},
logout() {
signout() {
this.authenticated = false;
}
}
......
<template>
<section id="signin">
<h3>You are connected to {{instancename}}</h3>
<h3>You are connected to instance : {{instancename}}</h3>
<h1> Sign in </h1>
<input type="text" name="email" v-model="input.email" placeholder="Email" />
......@@ -30,7 +30,7 @@ methods: {
signin() {
if(this.input.email != "") {
if(this.input.email == this.$parent.account.email) {
this.$emit("authenticated", true);
this.$parent.$emit("authenticated", true);
this.$router.replace({ name: "home" });
} else {
alert("The email is incorrect");
......
......@@ -11,6 +11,7 @@ export default new Router({
name: 'start',
component: start
},
{
path: '/home',
name: 'home',
......
......@@ -10,7 +10,7 @@ import signin from "@/components/signin.vue";
import register from "@/components/register.vue";
export default {
name: 'app',
name: 'start',
components: {
signin: signin,
register: register
......
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