stash
This commit is contained in:
parent
5ebd26119f
commit
00f7ba0b19
6 changed files with 22 additions and 33 deletions
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
[submodule "frontend/extras"]
|
||||
path = frontend/extras
|
||||
url = https://git.neulandlabor.de/j3d1/vue-extras.git
|
1
frontend/extras
Submodule
1
frontend/extras
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 98d7936a50a148e0c2c718b3d7b8662ffcb3fde8
|
|
@ -23,9 +23,6 @@
|
|||
|
||||
<script>
|
||||
import {mapGetters, mapMutations, mapState} from 'vuex';
|
||||
import * as BIcons from "bootstrap-icons-vue";
|
||||
import Footer from "@/components/Footer.vue";
|
||||
import Sidebar from "@/components/Sidebar.vue";
|
||||
import Notifications from "@/components/Notifications.vue";
|
||||
import Messages from "@/components/Messages.vue";
|
||||
import Footer from "@/components/Footer.vue";
|
||||
|
@ -43,29 +40,16 @@ export default {
|
|||
Messages,
|
||||
Notifications
|
||||
},
|
||||
computed: {
|
||||
...mapState(['messages']),
|
||||
...mapGetters(['notifications']),
|
||||
},
|
||||
props: {
|
||||
hideSearch: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: false
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
...mapState(['messages']),
|
||||
...mapGetters(['notifications']),
|
||||
username() {
|
||||
return this.$route.params.username
|
||||
},
|
||||
top_notifications() {
|
||||
return this.notifications.slice(0, 5)
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
toggleSidebar() {
|
||||
closeAllDropdowns();
|
||||
document.getElementById("sidebar").classList.toggle("collapsed");
|
||||
},
|
||||
...mapMutations(['logout'])
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
toggleSidebar() {
|
||||
|
|
|
@ -12,6 +12,7 @@ import InventoryDetail from '@/views/InventoryDetail.vue';
|
|||
import InventoryNew from '@/views/InventoryNew.vue';
|
||||
import InventoryEdit from '@/views/InventoryEdit.vue';
|
||||
import Admin from '@/views/Admin.vue';
|
||||
import Swatch from '@/views/Swatch.vue';
|
||||
import Files from '@/views/Files.vue';
|
||||
|
||||
|
||||
|
@ -26,6 +27,7 @@ const routes = [
|
|||
{path: '/friends', component: Friends, meta: {requiresAuth: true}},
|
||||
{path: '/files', component: Files, meta: {requiresAuth: true}},
|
||||
{path: '/admin', component: Admin, meta: {requiresAuth: true}},
|
||||
{path: '/swatch', component: Swatch, meta: {requiresAuth: true}},
|
||||
{path: '/search/:query', component: Search, meta: {requiresAuth: true}, props: true},
|
||||
{path: '/login', component: Login, meta: {requiresAuth: false}},
|
||||
{path: '/register', component: Register, meta: {requiresAuth: false}},
|
||||
|
@ -50,4 +52,4 @@ router.beforeEach((to/*, from*/) => {
|
|||
}
|
||||
})
|
||||
|
||||
export default router
|
||||
export default router
|
|
@ -20,10 +20,9 @@
|
|||
<div class="card-body">
|
||||
<div class="m-sm-4">
|
||||
<form role="form" method="post" @submit.prevent="do_register">
|
||||
<div class="mb-3">
|
||||
<div :class="errors.username||errors.domain?['mb-3','is-invalid']:['mb-3']">
|
||||
<label class="form-label">Username</label>
|
||||
<div class="input-group"
|
||||
:class="errors.username||errors.domain?['is-invalid']:[]">
|
||||
<div class="input-group">
|
||||
<input class="form-control form-control-lg"
|
||||
type="text" v-model="form.username" id="validationCustomUsername"
|
||||
placeholder="Enter your username" required/>
|
||||
|
@ -42,7 +41,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<div :class="errors.email?['mb-3','is-invalid']:['mb-3']">
|
||||
<label class="form-label">Email</label>
|
||||
<input class="form-control form-control-lg" type="email"
|
||||
:class="errors.email?['is-invalid']:[]"
|
||||
|
@ -50,7 +49,7 @@
|
|||
<div class="invalid-feedback">{{ errors.email }}</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<div :class="errors.password?['mb-3','is-invalid']:['mb-3']">
|
||||
<label class="form-label">Password</label>
|
||||
<input class="form-control form-control-lg" type="password"
|
||||
:class="errors.password?['is-invalid']:[]"
|
||||
|
@ -58,7 +57,7 @@
|
|||
<div class="invalid-feedback">{{ errors.password }}</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<div :class="errors.password2?['mb-3','is-invalid']:['mb-3']">
|
||||
<label class="form-label">Password Check</label>
|
||||
<input class="form-control form-control-lg" type="password"
|
||||
:class="errors.password2?['is-invalid']:[]"
|
||||
|
|
|
@ -2309,7 +2309,7 @@
|
|||
|
||||
<div class="ht-tm-codeblock">
|
||||
<div class="ht-tm-element card">
|
||||
<img class="card-img-top" src="/bootstrap-themes/demo/images/card.png"
|
||||
<img class="card-img-top" src=""
|
||||
alt="Card image cap">
|
||||
<div class="card-body">
|
||||
<h4 class="card-title">Card title</h4>
|
||||
|
@ -2375,7 +2375,7 @@
|
|||
|
||||
<div class="ht-tm-codeblock">
|
||||
<div class="card ht-tm-element">
|
||||
<img class="card-img-top" src="/bootstrap-themes/demo/images/card.png"
|
||||
<img class="card-img-top" src=""
|
||||
alt="Card image cap">
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item list-group-item-action">Cras justo odio</li>
|
||||
|
@ -2421,15 +2421,15 @@
|
|||
<div id="carouselExampleControls" class="ht-tm-element carousel slide" data-ride="carousel">
|
||||
<div class="carousel-inner" role="listbox">
|
||||
<div class="carousel-item active">
|
||||
<img class="d-block img-fluid" src="/bootstrap-themes/demo/images/slider1.png"
|
||||
<img class="d-block img-fluid" src=""
|
||||
alt="First slide">
|
||||
</div>
|
||||
<div class="carousel-item">
|
||||
<img class="d-block img-fluid" src="/bootstrap-themes/demo/images/slider2.png"
|
||||
<img class="d-block img-fluid" src=""
|
||||
alt="Second slide">
|
||||
</div>
|
||||
<div class="carousel-item">
|
||||
<img class="d-block img-fluid" src="/bootstrap-themes/demo/images/slider3.png"
|
||||
<img class="d-block img-fluid" src=""
|
||||
alt="Third slide">
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue