c3lf/c3lf-system-3
7
0
Fork 0
Code Issues 51 Pull requests Projects 2 Releases Wiki Activity Actions

make indentation consistent

Browse source
This commit is contained in:
j3d1 2023-11-27 01:14:52 +01:00
parent d52575aa42
commit 9f63414ba2
27 changed files with 858 additions and 804 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/.editorconfig
View file

@ -1,7 +1,7 @@
root = true root = true
[*.js] [*.js]
indent_size = 2 indent_size = 4
[*.vue] [*.vue]
indent_size = 2 indent_size = 4

3
web/.eslintrc.js
View file

@ -17,8 +17,7 @@ module.exports = {
'rules': { 'rules': {
"no-console": "off", "no-console": "off",
'indent': [ 'indent': [
'error', 'error', 4
2
], ],
'linebreak-style': [ 'linebreak-style': [
'off', 'off',

3
web/public/index.html
View file

@ -9,7 +9,8 @@
</head> </head>
<body> <body>
<noscript> <noscript>
<strong>We're sorry but c3cloc doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>We're sorry but c3cloc doesn't work properly without JavaScript enabled. Please enable it to
continue.</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->

3
web/src/App.vue
View file

@ -6,7 +6,8 @@
<div aria-live="polite" aria-atomic="true" <div aria-live="polite" aria-atomic="true"
class="d-flex justify-content-end align-items-start fixed-top mx-1 my-5 py-3" class="d-flex justify-content-end align-items-start fixed-top mx-1 my-5 py-3"
style="min-height: 200px; z-index: 100000; pointer-events: none"> style="min-height: 200px; z-index: 100000; pointer-events: none">
<Toast v-for="toast in toasts" :key="toast" :title="toast.title" :message="toast.message" :color="toast.color" <Toast v-for="toast in toasts" :key="toast" :title="toast.title" :message="toast.message"
:color="toast.color"
@close="removeToast(toast.key)" style="pointer-events: auto"/> @close="removeToast(toast.key)" style="pointer-events: auto"/>
</div> </div>
</div> </div>

10
web/src/components/Cards.vue
View file

@ -55,12 +55,18 @@ export default {
name: 'Cards', name: 'Cards',
mixins: [DataContainer], mixins: [DataContainer],
created() { created() {
this.columns.map(e => ({k: e, v: this.$store.getters.getFilters[e]})).filter(e => e.v).forEach(e => this.setFilter(e.k, e.v)); this.columns.map(e => ({
k: e,
v: this.$store.getters.getFilters[e]
})).filter(e => e.v).forEach(e => this.setFilter(e.k, e.v));
}, },
methods: { methods: {
changeFilter(col, val) { changeFilter(col, val) {
this.setFilter(col, val); this.setFilter(col, val);
let newquery = Object.entries({...this.$store.getters.getFilters, [col]: val}).reduce((a,[k,v]) => (v ? {...a, [k]:v} : a), {}); let newquery = Object.entries({
...this.$store.getters.getFilters,
[col]: val
}).reduce((a, [k, v]) => (v ? {...a, [k]: v} : a), {});
router.push({query: newquery}); router.push({query: newquery});
}, },
}, },

6
web/src/components/Navbar.vue
View file

@ -13,7 +13,8 @@
<div class="custom-control-inline mr-1"> <div class="custom-control-inline mr-1">
<button type="button" class="btn mx-1 text-nowrap btn-success" @click="$emit('addClicked')"> <button type="button" class="btn mx-1 text-nowrap btn-success" @click="$emit('addClicked')">
<font-awesome-icon icon="plus"/><span class="d-none d-md-inline">&nbsp;Add</span> <font-awesome-icon icon="plus"/>
<span class="d-none d-md-inline">&nbsp;Add</span>
</button> </button>
<div class="btn-group btn-group-toggle"> <div class="btn-group btn-group-toggle">
<button :class="['btn', 'btn-info', { active: layout === 'cards' }]" @click="setLayout('cards')"> <button :class="['btn', 'btn-info', { active: layout === 'cards' }]" @click="setLayout('cards')">
@ -50,7 +51,8 @@
{{ getActiveView }} {{ getActiveView }}
</button> </button>
<ul class="dropdown-menu bg-dark" aria-labelledby="dropdownMenuButton2"> <ul class="dropdown-menu bg-dark" aria-labelledby="dropdownMenuButton2">
<li class="" v-for="(link, index) in views" v-bind:key="index" :class="{ active: link.path === getActiveView }"> <li class="" v-for="(link, index) in views" v-bind:key="index"
:class="{ active: link.path === getActiveView }">
<a class="nav-link text-nowrap" href="#" @click="changeView(link)">{{ link.title }}</a> <a class="nav-link text-nowrap" href="#" @click="changeView(link)">{{ link.title }}</a>
</li> </li>
</ul> </ul>

10
web/src/components/Table.vue
View file

@ -46,12 +46,18 @@ export default {
name: 'Table', name: 'Table',
mixins: [DataContainer], mixins: [DataContainer],
created() { created() {
this.columns.map(e => ({k: e, v: this.$store.getters.getFilters[e]})).filter(e => e.v).forEach(e => this.setFilter(e.k, e.v)); this.columns.map(e => ({
k: e,
v: this.$store.getters.getFilters[e]
})).filter(e => e.v).forEach(e => this.setFilter(e.k, e.v));
}, },
methods: { methods: {
changeFilter(col, val) { changeFilter(col, val) {
this.setFilter(col, val); this.setFilter(col, val);
let newquery = Object.entries({...this.$store.getters.getFilters, [col]: val}).reduce((a,[k,v]) => (v ? {...a, [k]:v} : a), {}); let newquery = Object.entries({
...this.$store.getters.getFilters,
[col]: val
}).reduce((a, [k, v]) => (v ? {...a, [k]: v} : a), {});
router.push({query: newquery}); router.push({query: newquery});
}, },
}, },

8
web/src/components/inputs/InputCombo.vue
View file

@ -7,7 +7,8 @@
class="btn btn-outline-secondary dropdown-toggle" class="btn btn-outline-secondary dropdown-toggle"
type="button" type="button"
data-toggle="dropdown" data-toggle="dropdown"
>Search</button> >Search
</button>
<div class="dropdown-menu"> <div class="dropdown-menu">
<a <a
v-for="(option, index) in sortedOptions" v-for="(option, index) in sortedOptions"
@ -50,7 +51,10 @@ export default {
}), }),
computed: { computed: {
isValid: ({options, nameKey, internalName}) => options.some(e => e[nameKey] == internalName), isValid: ({options, nameKey, internalName}) => options.some(e => e[nameKey] == internalName),
sortedOptions: ({options, nameKey}) => options.sort((a, b) => a[nameKey].localeCompare(b[nameKey], 'en', { numeric: true })), sortedOptions: ({
options,
nameKey
}) => options.sort((a, b) => a[nameKey].localeCompare(b[nameKey], 'en', {numeric: true})),
}, },
watch: { watch: {
internalName(newValue) { internalName(newValue) {

6
web/src/components/inputs/InputPhoto.vue
View file

@ -101,7 +101,11 @@ export default {
self.closeStream(); self.closeStream();
}; };
reader.onerror = function (error) { reader.onerror = function (error) {
this.createToast({ title: 'Error: Failed to parse image file', message: error.toString(), color: 'danger' }); this.createToast({
title: 'Error: Failed to parse image file',
message: error.toString(),
color: 'danger'
});
console.log('Error: ', error); console.log('Error: ', error);
}; };
} }

21
web/src/main.js
View file

@ -11,7 +11,26 @@ import 'bootstrap/dist/js/bootstrap.min.js';
// fontawesome // fontawesome
import {library} from '@fortawesome/fontawesome-svg-core'; import {library} from '@fortawesome/fontawesome-svg-core';
import { faPlus, faCheckCircle, faEdit, faTrash, faCat, faSyncAlt, faSort, faSortUp, faSortDown, faTh, faList, faWindowClose, faCamera, faStop, faPen, faCheck, faTimes, faSave } from '@fortawesome/free-solid-svg-icons'; import {
faPlus,
faCheckCircle,
faEdit,
faTrash,
faCat,
faSyncAlt,
faSort,
faSortUp,
faSortDown,
faTh,
faList,
faWindowClose,
faCamera,
faStop,
faPen,
faCheck,
faTimes,
faSave
} from '@fortawesome/free-solid-svg-icons';
import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome'; import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
import vueDebounce from 'vue-debounce'; import vueDebounce from 'vue-debounce';

1
web/src/router.js
View file

@ -8,7 +8,6 @@ import VueRouter from 'vue-router';
import Vue from 'vue'; import Vue from 'vue';
Vue.use(VueRouter); Vue.use(VueRouter);
const routes = [ const routes = [

6
web/src/views/Events.vue
View file

@ -10,10 +10,12 @@
> >
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-secondary" @click.stop="changeEvent(item)"> <button class="btn btn-secondary" @click.stop="changeEvent(item)">
<font-awesome-icon icon="archive"/> use <font-awesome-icon icon="archive"/>
use
</button> </button>
<button class="btn btn-danger" @click.stop=""> <button class="btn btn-danger" @click.stop="">
<font-awesome-icon icon="trash"/> delete <font-awesome-icon icon="trash"/>
delete
</button> </button>
</div> </div>
</Table> </Table>

3
web/src/views/Files.vue
View file

@ -10,7 +10,8 @@
> >
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-danger" @click.stop=""> <button class="btn btn-danger" @click.stop="">
<font-awesome-icon icon="trash"/> delete <font-awesome-icon icon="trash"/>
delete
</button> </button>
</div> </div>
</Table> </Table>

28
web/src/views/HowTo.vue
View file

@ -20,7 +20,8 @@
<li>Der Gegenstand wird in das c3lf-System eingetragen <li>Der Gegenstand wird in das c3lf-System eingetragen
<ul> <ul>
<li>Foto vom Gegenstand mit der Webcam machen</li> <li>Foto vom Gegenstand mit der Webcam machen</li>
<li>Beschreibung des Gegenstands eintragen (gerne wie Tags behandeln die durch Leerzeichen getrennt <li>Beschreibung des Gegenstands eintragen (gerne wie Tags behandeln die durch Leerzeichen
getrennt
sind) sind)
</li> </li>
<li>Nummer der Box eintragen in die der Gegenstand gelegt wird</li> <li>Nummer der Box eintragen in die der Gegenstand gelegt wird</li>
@ -31,7 +32,9 @@
<h3>Lost (Jemand versucht einen Gegenstand wiederzufinden)</h3> <h3>Lost (Jemand versucht einen Gegenstand wiederzufinden)</h3>
<ul> <ul>
<li>Jemand möchte einen Gegenstand wiederfinden</li> <li>Jemand möchte einen Gegenstand wiederfinden</li>
<li>Die Person soll möglichst genau beschreiben was sie sucht (insbesondere bei wertvolleren Dingen)</li> <li>Die Person soll möglichst genau beschreiben was sie sucht (insbesondere bei wertvolleren
Dingen)
</li>
<li>Du schaust im System nach ob der Gegenstand vorhanden ist</li> <li>Du schaust im System nach ob der Gegenstand vorhanden ist</li>
<li>Wenn ein passender Gegenstand gefunden ist: <li>Wenn ein passender Gegenstand gefunden ist:
<ul> <ul>
@ -42,9 +45,12 @@
<li>Wenn kein passender Gegenstand existiert: <li>Wenn kein passender Gegenstand existiert:
<ul> <ul>
<li>Sagen, dass es den Gegenstand nicht gibt</li> <li>Sagen, dass es den Gegenstand nicht gibt</li>
<li>Darauf verweisen dass die Person entweder zu späterem Zeitpunkt wiederkommt, oder ein Ticket bei <a <li>Darauf verweisen dass die Person entweder zu späterem Zeitpunkt wiederkommt, oder ein
href="mailto:camp23@c3lf.de" target="_blank" rel="noopener">camp23@c3lf.de</a> aufmacht. Außerdem ist es Ticket bei <a
gut möglich dass der Himmel und andere Villages eigene, kleinere Lost+Founds während des Events href="mailto:camp23@c3lf.de" target="_blank" rel="noopener">camp23@c3lf.de</a>
aufmacht. Außerdem ist es
gut möglich dass der Himmel und andere Villages eigene, kleinere Lost+Founds während des
Events
aufgemacht haben. Rumfragen lohnt sich also. aufgemacht haben. Rumfragen lohnt sich also.
<ul> <ul>
<li><b>Achtung: Tickets werden erst nach Ende des Events bearbeitet.</b></li> <li><b>Achtung: Tickets werden erst nach Ende des Events bearbeitet.</b></li>
@ -62,7 +68,8 @@
<h2>Lost&Found (English version)</h2> <h2>Lost&Found (English version)</h2>
<p>Welcome to Lost&Found of $Event!</p> <p>Welcome to Lost&Found of $Event!</p>
<p>Your tasks are to accept and register lost items, as well as to return items to their owners.</p> <p>Your tasks are to accept and register lost items, as well as to return items to their owners.</p>
<p><b>Please do not leave the contents of the Lost+Found lying around or show them around. Ask for a description of the item first, then show them (if the description seems correct).</b></p> <p><b>Please do not leave the contents of the Lost+Found lying around or show them around. Ask for a
description of the item first, then show them (if the description seems correct).</b></p>
<h3>Found (Someone brings a lost item)</h3> <h3>Found (Someone brings a lost item)</h3>
<ul> <ul>
<li>Get as much information as possible about the circumstances <li>Get as much information as possible about the circumstances
@ -83,7 +90,8 @@
<h3>Lost (Someone tries to find an item)</h3> <h3>Lost (Someone tries to find an item)</h3>
<ul> <ul>
<li>Someone wants to find an item</li> <li>Someone wants to find an item</li>
<li>The person should describe as precisely as possible what they are looking for (especially for more <li>The person should describe as precisely as possible what they are looking for (especially for
more
valuable things) valuable things)
</li> </li>
<li>You check the system to see if the item is available</li> <li>You check the system to see if the item is available</li>
@ -97,8 +105,10 @@
<ul> <ul>
<li>Say that the item does not exist</li> <li>Say that the item does not exist</li>
<li>Point out that the person either comes back at a later time, or opens a ticket at <a <li>Point out that the person either comes back at a later time, or opens a ticket at <a
href="mailto:camp23@c3lf.de" target="_blank" rel="noopener">camp23@c3lf.de</a>. It is also possible that href="mailto:camp23@c3lf.de" target="_blank" rel="noopener">camp23@c3lf.de</a>. It is
the Himmel and other Villages have their own, smaller Lost+Founds during the event. So it's worth asking also possible that
the Himmel and other Villages have their own, smaller Lost+Founds during the event. So
it's worth asking
around. around.
<ul> <ul>
<li><b>Attention: Tickets will not be processed until after the event.</b></li> <li><b>Attention: Tickets will not be processed until after the event.</b></li>