Commit 7abcf0f3 authored by Edgar Z. Alvarenga's avatar Edgar Z. Alvarenga

Minor corrections on design and submit login form when enter is pressed

parent 2bb63a5e
module.exports = {
NODE_ENV: '"production"',
BASE_API: '"https://beta.aula.de/api/"',
assetsPublicPath: '/',
assetsPublicPath: './',
assetsSubDirectory: './'
}
......@@ -10439,11 +10439,10 @@
"object-visit": "1.0.1"
}
},
"material-design-icons-iconfont": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-3.0.3.tgz",
"integrity": "sha1-FUoQhAR9Ticjf6f1o34Qdc7qbfI=",
"dev": true
"material-design-icons-font": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/material-design-icons-font/-/material-design-icons-font-2.2.3.tgz",
"integrity": "sha1-+2F7QDQI7V3jjvJWr3Kx6tJ7wdo="
},
"math-expression-evaluator": {
"version": "1.2.17",
......@@ -10979,9 +10978,9 @@
}
},
"moment": {
"version": "2.22.2",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
"integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
"version": "2.24.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
},
"move-concurrently": {
"version": "1.0.1",
......@@ -17157,9 +17156,9 @@
"dev": true
},
"vee-validate": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-2.1.3.tgz",
"integrity": "sha512-j8/3z3AoW2qAzlUmBYOm/frUsGgAsRM2mGQTgDkTZj9O92aifgx61JXWzh8WKI/r2PixBfWfSE1JqUh1L8W4vw=="
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-2.1.6.tgz",
"integrity": "sha512-J1ZAh2g7FOopgly2Er8j8EIZ39fOlOtjvRvbdfTsahQb6nKpGL5lsFqAKZSb6N5J6l00EOAvsOvdzd7qmc22Hw=="
},
"vendors": {
"version": "1.0.2",
......@@ -17321,9 +17320,9 @@
"integrity": "sha512-ssMsLVwth62T4usPAFbn8yk69qqBDp4VWPmlY4XiYZ7aGMPoa/sQ08BlAeG8J81y+K60bY88FZ2gquQKlGqlsg=="
},
"vuetify-upload-button": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/vuetify-upload-button/-/vuetify-upload-button-1.2.0.tgz",
"integrity": "sha512-f57EHo9lXMd98vBRfyd0JxuI96d0S2zwIwFk+nFj2e7c7OnzqmevjO0nFtQ+/fQRMgUhP9BtEPZpIbAOLnr9xg=="
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/vuetify-upload-button/-/vuetify-upload-button-1.2.2.tgz",
"integrity": "sha512-WQmAevQl4F2musSLpPzyT3fCBCksFiL7V6Jh8qD1fxGxHjAvjGywJKWjPLMzXDHkJfo6q2OPJtynPU0QXN5hGA=="
},
"vuex": {
"version": "3.0.1",
......
......@@ -2,9 +2,7 @@
<v-app light>
<AppBar />
<v-content>
<div v-if="$auth.ready()">
<router-view></router-view>
</div>
<router-view v-if="$auth.ready()"></router-view>
<div v-if="!$auth.ready()">
Loading ...
</div>
......
<template>
<v-toolbar fixed app class="white">
<router-link to="/">
<img class="header_logo" src="/static/img/Aula_Logo.svg"/>
<img class="header_logo" src="../static/img/Aula_Logo.svg"/>
</router-link>
<v-spacer></v-spacer>
<Menu v-if="$auth.ready()"></Menu>
......
<template>
<v-container fluid grid-list-md>
<v-layout row wrap justify-center>
<v-flex md2 v-for="(category, index) in categories" :key="category.id" align-center @click="selectCategory(category)" :class="{selected: category.id === selectedCategory}">
<v-flex class="category-button" md2 v-for="(category, index) in categories" :key="category.id" align-center @click="selectCategory(category)" :class="{selected: category.id === selectedCategory}">
<v-layout column>
<v-flex class="category-title">
<h3>{{ category.name }}</h3>
......@@ -57,7 +57,12 @@ export default {
margin: auto;
}
.category-button {
border: 2px solid rgba(0,0,0,0);
}
.selected {
border: 1px solid var(--v-secondary-base);
border: 2px solid var(--v-secondary-base);
border-radius: 4px;
}
</style>
......@@ -33,7 +33,7 @@
</v-flex>
<v-flex d-flex xs12 sm12 pa-2>
<v-layout columm>
<v-flex :class="{ selectedImage: image === newIdeaSpace.image }" pa-2 v-for="(image, index) of defaultIdeaSpacesImages" :key="index" >
<v-flex class="ideaSpaceImage-button" :class="{ selectedImage: image === newIdeaSpace.image }" pa-2 v-for="(image, index) of defaultIdeaSpacesImages" :key="index" >
<v-img :src="image"height="100" width="200" @click="selectImage(image)"/>
</v-flex>
</v-layout>
......@@ -42,7 +42,7 @@
<v-btn
@click="addIdeaSpace"
>
{{ $vuetify.t('$vuetify.AdminIdeaSpace.add') }}
{{ $vuetify.t('$vuetify.Form.save') }}
</v-btn>
<v-btn
@click="ideaSpaceCreationDialog = false"
......@@ -159,8 +159,12 @@ export default {
}
</script>
<style scss>
.selectedImage {
border: 1px solid black;
<style lang="scss">
.ideaSpaceImage-button {
border: 2px solid rgba(0,0,0,0);
border-radius: 4px;
&.selectedImage {
border: 2px solid var(--v-secondary-base);
}
}
</style>
<template>
<v-container fluid grid-list-md>
<v-layout row wrap justify-center align-center>
<v-flex md8>
<v-flex md10>
<v-layout row wrap justify-center align-center>
<!-- Default Idea Space -->
<v-flex d-flex xs12 sm4 pa-2 class="idea-space">
......
<template>
<v-app id="inspire">
<v-container fluid fill-height>
<v-layout align-center justify-center>
<v-flex xs12 sm8 md4>
<v-card class="elevation-12">
<v-toolbar dark color="primary">
<v-toolbar-title>{{ $vuetify.t('$vuetify.Login.welcome') }}</v-toolbar-title>
<v-spacer></v-spacer>
</v-toolbar>
<v-card-text>
<v-form id="login">
<v-autocomplete
name='school'
prepend-icon="school"
:items="schools"
label="Schule"
@change="handleChangeSchool"
v-validate="'required'"
v-model="selectedSchoolId"
:error-messages="errors.collect('school')"
></v-autocomplete>
<v-text-field
name='username'
prepend-icon="person"
v-model="username"
:label="$vuetify.t('$vuetify.Login.login')"
v-validate="'required'"
:error-messages="errors.collect('username')"
type="text">
</v-text-field>
<v-text-field
name='password'
id="password"
prepend-icon="lock"
v-model="password"
:label="$vuetify.t('$vuetify.Login.password')"
v-validate="'required'"
:error-messages="errors.collect('password')"
type="password">
</v-text-field>
</v-form>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn
dark
type="submit"
color="green darken-1"
form="check-login-form"
@click.stop="login">
{{ $vuetify.t('$vuetify.Login.button') }}
</v-btn>
</v-card-actions>
</v-card>
</v-flex>
</v-layout>
</v-container>
<v-snackbar
v-model="showSnackbar"
:bottom="true"
<v-container fluid fill-height>
<v-layout align-center justify-center>
<v-flex xs12 sm8 md4>
<v-card class="elevation-12">
<v-toolbar dark color="primary">
<v-toolbar-title>{{ $vuetify.t('$vuetify.Login.welcome') }}</v-toolbar-title>
<v-spacer></v-spacer>
</v-toolbar>
<v-card-text>
<v-form id="login" @submit="login">
<v-autocomplete
name='school'
prepend-icon="school"
:items="schools"
label="Schule"
@change="handleChangeSchool"
v-validate="'required'"
v-model="selectedSchoolId"
:error-messages="errors.collect('school')"
></v-autocomplete>
<v-text-field
name='username'
prepend-icon="person"
v-model="username"
:label="$vuetify.t('$vuetify.Login.login')"
v-validate="'required'"
:error-messages="errors.collect('username')"
type="text">
</v-text-field>
<v-text-field
name='password'
id="password"
prepend-icon="lock"
v-model="password"
:label="$vuetify.t('$vuetify.Login.password')"
v-validate="'required'"
@keyup.native.enter="login"
:error-messages="errors.collect('password')"
type="password">
</v-text-field>
</v-form>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn
dark
type="submit"
color="green darken-1"
form="check-login-form"
@click.stop="login">
{{ $vuetify.t('$vuetify.Login.button') }}
</v-btn>
</v-card-actions>
</v-card>
</v-flex>
</v-layout>
<v-snackbar
v-model="showSnackbar"
:bottom="true"
>
{{ snackbarMsg }}
<v-btn
color="pink"
flat
@click="showSnackbar = false"
>
{{ snackbarMsg }}
<v-btn
color="pink"
flat
@click="showSnackbar = false"
>
{{ $vuetify.t('$vuetify.Snackbar.close') }}
</v-btn>
</v-snackbar>
</v-app>
{{ $vuetify.t('$vuetify.Snackbar.close') }}
</v-btn>
</v-snackbar>
</v-container>
</template>
<script>
......
......@@ -306,7 +306,7 @@ export default {
'formIdeaSpaceName': 'Klass Name',
'formIdeaSpaceDescription': 'Beschreibung',
'formIdeaSpaceUrlName': 'Klass Url Name',
'add': 'Add Klass'
'add': 'Klasse hinzufügen'
},
AdminCommunity: {
'tableHeaderName': 'Name',
......
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import 'material-design-icons-iconfont/dist/material-design-icons.css'
import 'material-design-icons-font/iconfont/material-icons.css'
import Vue from 'vue'
import Vuetify from 'vuetify'
import VueAxios from 'vue-axios'
......
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