Commit 28ffd874 authored by Adam Procter's avatar Adam Procter

Merge branch 'instances'

parents 9a797d6c 0495bb9d
Pipeline #241 failed with stages
......@@ -4,13 +4,13 @@
<ul>
<li>
<router-link to="/home" v-if="isLoggedIn">Home</router-link>
<router-link to="/selectscreen" v-else>Start</router-link>
<router-link to="/" v-else>Start</router-link>
</li>
<li>
<router-link to="/stats" v-if="isLoggedIn">Your Stats</router-link>
</li>
<li>
<router-link to="/selectscreen" v-if="isLoggedIn" @click.native="logout()">Sign Out</router-link>
<router-link to="/" v-if="isLoggedIn" @click.native="logout()">Sign Out</router-link>
</li>
<li>
<router-link to="/about">About</router-link>
......
......@@ -145,7 +145,34 @@ body{
}
h1{
.instanceone{
line-height: 0;
font-size: 0;
position: relative;
height: 100px;
width: 100px;
border-radius: 50%;
background-color:#FACF6C;
}
.in1{
transform: translate(22%, 22%);
width: 70px;
height: 70px;
border-radius: 50%;
background-color:#F9B821;}
.instancetwo{
line-height: 0;
font-size: 0;
transform: translate(22%, 22%);
height: 70px;
width: 70px;
border-radius: 50%;
background-color:#ED5739;
}
h1, h2{
font: 4.26em "BasicCommercialW01-Bold", Helvetica Neue, Arial, Helvetica, Geneva, sans-serif;
color: #249AA6;
}
......@@ -237,7 +264,7 @@ textarea{
padding:5px;
margin-bottom:5px;
}
/*
figure{
background-color: rgb(221, 247, 243);
border-radius: 12px;
......@@ -265,7 +292,7 @@ figure{
figure > img{
transform:translate(10%);
}
} */
/* ==========================================================================
......
<template>
<section class="register">
<h2>Register</h2>
<h3>Register</h3>
<form @submit.prevent="registeraccount()">
<!-- <form @submit.prevent="registeraccount()"> -->
<input type="text" name="name" v-model="name" placeholder="Name">
......
<template>
<section class="selector">
<h2>instances</h2>
<div id="instances">
<a class="instanceone" href="/home">
instance one
<div class="in1">
</div>
</a>
<a class="instancetwo" href="/home">
instance two
</a>
<a href="#">
Create instance
</a>
</div>
</section>
</template>
<script>
export default {
name: "select-instances",
props: {}
};
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped>
</style>
<template>
<section class="signin">
<h2>Sign in</h2>
<h3>Sign in</h3>
<form @submit.prevent="login()">
<input type="text" name="email" v-model="input.email" placeholder="Email">
<button type="submit">
......
<template>
<div class="viewer">
<h2>STYLISH</h2>
<p>This is some dummy text, no real data yet. Less than ten years earlier--the top half of the population. In the afternoon hush the volume of noise. Already an excited voice was as anxious as anyone else who knew it already. With him were below ground level. The problem was how to discover, against his thigh at each other again?' 'Yes, dear, you would have. I would, if I'd been the beginnings of a future society unbelievably rich, leisured, orderly, and efficient--a glittering antiseptic world of solid men in the canteen at the end, the tongue sticking right out, and blue--a quite bright blue. That's the detail of his to
</p>
<p>This is some dummy text, no real data yet. </p>
</div>
</template>
......
......@@ -23,12 +23,6 @@ export default new Router({
component: () =>
import(/* webpackChunkName: "about" */ "./views/about.vue")
},
{
path: "/selectscreen",
name: "selectscreen",
component: () =>
import(/* webpackChunkName: "selectscreen" */ "./views/selectscreen.vue")
},
{
path: "/editor",
name: "editor",
......
......@@ -8,8 +8,9 @@
<script>
// @ is an alias to /src
import instance from "@/components/current-instance.vue";
import logo from "@/components/instance-logo.vue";
import instance from "@/components/current-instance.vue";
export default {
name: "home",
......
<template>
<div id="selector">
<header>
<logo></logo>
<h2>Welcome</h2>
<h3>Select instance</h3>
</header>
<main>
<div id="instances">
<a href="/home">
<figure>
<img src="../assets/img/mozfest.png" alt>
<figcaption>MozFest</figcaption>
</figure>
</a>
<a href="#">
<figure>
<img src="../assets/img/new.png" alt>
<figcaption>Create instance</figcaption>
</figure>
</a>
</div>
</main>
</div>
</template>
<script>
import logo from "@/components/instance-logo.vue";
export default {
name: "selectscreen",
components: {
logo: logo
}
};
</script>
\ No newline at end of file
......@@ -2,12 +2,11 @@
<div>
<header>
<logo></logo>
<h3 class="hello">You are connected to instance : {{instancename}}</h3>
</header>
<div id="start">
<signin></signin>
<!-- // <signin :instancename="instancename" :accounts="accounts"></signin> -->
<register></register>
<selectinstances></selectinstances>
</div>
</div>
</template>
......@@ -16,32 +15,15 @@
import logo from "@/components/instance-logo.vue";
import signin from "@/components/sign-in.vue";
import register from "@/components/register-account.vue";
import selectinstances from "@/components/select-instances.vue";
export default {
name: "app",
components: {
signin: signin,
register: register,
logo: logo
},
data() {
return {
instancename: "mozfest" //,
// accounts: [
// {
// id:1,
// human:'adam procter',
// email:'adamprocter@researchnot.es',
// permissions: 1
// },
// {
// id:2,
// human:'mathew parker',
// email:'mathew@researchnot.es',
// permissions: 1
// }
// ]
};
logo: logo,
selectinstances: selectinstances
}
};
</script>
......
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