Many Changes
This commit is contained in:
@@ -15,7 +15,7 @@ export default defineAppConfig({
|
|||||||
},
|
},
|
||||||
notifications: {
|
notifications: {
|
||||||
// Show toasts at the top right of the screen
|
// Show toasts at the top right of the screen
|
||||||
position: 'top-0'
|
position: 'top-0 bottom-auto'
|
||||||
},
|
},
|
||||||
icons: {
|
icons: {
|
||||||
/*dark: 'i-ph-moon-duotone',
|
/*dark: 'i-ph-moon-duotone',
|
||||||
|
|||||||
2
app.vue
2
app.vue
@@ -43,7 +43,7 @@ useSeoMeta({
|
|||||||
<NuxtPage/>
|
<NuxtPage/>
|
||||||
</NuxtLayout>
|
</NuxtLayout>
|
||||||
|
|
||||||
<!-- <UNotifications v-if="!dev"/>-->
|
<UNotifications/>
|
||||||
<VitePwaManifest/>
|
<VitePwaManifest/>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ const fileUploadFormData = ref({
|
|||||||
})
|
})
|
||||||
|
|
||||||
const openModal = () => {
|
const openModal = () => {
|
||||||
console.log("Oepn")
|
|
||||||
uploadModalOpen.value = true
|
uploadModalOpen.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +32,7 @@ const uploadFiles = async () => {
|
|||||||
let fileData = fileUploadFormData.value
|
let fileData = fileUploadFormData.value
|
||||||
fileData[type] = elementId
|
fileData[type] = elementId
|
||||||
|
|
||||||
await dataStore.uploadF632iles(fileData, document.getElementById("fileUploadInput").files,true)
|
await dataStore.uploadFiles(fileData, document.getElementById("fileUploadInput").files,true)
|
||||||
|
|
||||||
uploadModalOpen.value = false;
|
uploadModalOpen.value = false;
|
||||||
uploadInProgress.value = false;
|
uploadInProgress.value = false;
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ export default defineNuxtConfig({
|
|||||||
colorMode: {
|
colorMode: {
|
||||||
preference: 'system'
|
preference: 'system'
|
||||||
},
|
},
|
||||||
pwa: {
|
/*pwa: {
|
||||||
manifest: {
|
manifest: {
|
||||||
name: "FEDEO",
|
name: "FEDEO",
|
||||||
short_name: "FEDEO",
|
short_name: "FEDEO",
|
||||||
@@ -72,7 +72,7 @@ export default defineNuxtConfig({
|
|||||||
enabled: false,
|
enabled: false,
|
||||||
type: "module"
|
type: "module"
|
||||||
}
|
}
|
||||||
},
|
},*/
|
||||||
tiptap: {
|
tiptap: {
|
||||||
prefix: "Tiptap"
|
prefix: "Tiptap"
|
||||||
}
|
}
|
||||||
|
|||||||
1083
package-lock.json
generated
1083
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -30,7 +30,7 @@
|
|||||||
"@fullcalendar/vue3": "^6.1.10",
|
"@fullcalendar/vue3": "^6.1.10",
|
||||||
"@iconify/json": "^2.2.171",
|
"@iconify/json": "^2.2.171",
|
||||||
"@nuxt/content": "^2.9.0",
|
"@nuxt/content": "^2.9.0",
|
||||||
"@nuxt/ui-pro": "^1.0.0",
|
"@nuxt/ui-pro": "^1.3.1",
|
||||||
"@nuxtjs/fontaine": "^0.4.1",
|
"@nuxtjs/fontaine": "^0.4.1",
|
||||||
"@nuxtjs/google-fonts": "^3.1.0",
|
"@nuxtjs/google-fonts": "^3.1.0",
|
||||||
"@nuxtjs/strapi": "^1.9.3",
|
"@nuxtjs/strapi": "^1.9.3",
|
||||||
|
|||||||
@@ -39,8 +39,10 @@ const oldItemInfo = ref({})
|
|||||||
|
|
||||||
//Functions
|
//Functions
|
||||||
const setupPage = async () => {
|
const setupPage = async () => {
|
||||||
if(mode.value === "show" || mode.value === "edit"){
|
if(mode.value === "show"){
|
||||||
itemInfo.value = await useSupabaseSelectSingle("contacts",route.params.id,"*, customer(id, name), vendor(id,name) ")
|
itemInfo.value = await useSupabaseSelectSingle("contacts",route.params.id,"*, customer(id, name), vendor(id,name) ")
|
||||||
|
} else if(mode.value === "edit") {
|
||||||
|
itemInfo.value = await useSupabaseSelectSingle("contacts",route.params.id,"*")
|
||||||
}
|
}
|
||||||
|
|
||||||
if(mode.value === "create") {
|
if(mode.value === "create") {
|
||||||
|
|||||||
@@ -45,8 +45,10 @@ const oldItemInfo = ref({})
|
|||||||
|
|
||||||
//Functions
|
//Functions
|
||||||
const setupPage = async () => {
|
const setupPage = async () => {
|
||||||
if(mode.value === "show" || mode.value === "edit"){
|
if(mode.value === "show"){
|
||||||
itemInfo.value = await useSupabaseSelectSingle("customers",route.params.id,"*, contacts(*)")
|
itemInfo.value = await useSupabaseSelectSingle("customers",route.params.id,"*, contacts(*)")
|
||||||
|
} else if(mode.value === "edit") {
|
||||||
|
itemInfo.value = await useSupabaseSelectSingle("customers",route.params.id,"*")
|
||||||
}
|
}
|
||||||
|
|
||||||
if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
|
if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
|
||||||
|
|||||||
@@ -14,6 +14,11 @@
|
|||||||
</UDashboardNavbar>
|
</UDashboardNavbar>
|
||||||
|
|
||||||
<UDashboardPanelContent>
|
<UDashboardPanelContent>
|
||||||
|
<UButton
|
||||||
|
@click="useToast().add({title: 'test'})"
|
||||||
|
>
|
||||||
|
Test
|
||||||
|
</UButton>
|
||||||
<UDashboardCard
|
<UDashboardCard
|
||||||
title="Anwesenheiten"
|
title="Anwesenheiten"
|
||||||
v-if="dataStore.getStartedWorkingTimes().length > 0"
|
v-if="dataStore.getStartedWorkingTimes().length > 0"
|
||||||
@@ -50,6 +55,7 @@ definePageMeta({
|
|||||||
})
|
})
|
||||||
|
|
||||||
const dataStore = useDataStore()
|
const dataStore = useDataStore()
|
||||||
|
const toast = useToast()
|
||||||
|
|
||||||
const { isNotificationsSlideoverOpen } = useDashboard()
|
const { isNotificationsSlideoverOpen } = useDashboard()
|
||||||
const items = [[{
|
const items = [[{
|
||||||
|
|||||||
@@ -105,8 +105,10 @@ const tags = dataStore.getDocumentTags
|
|||||||
|
|
||||||
//Functions
|
//Functions
|
||||||
const setupPage = async() => {
|
const setupPage = async() => {
|
||||||
if(mode.value === "show" || mode.value === "edit"){
|
if(mode.value === "show" ){
|
||||||
itemInfo.value = await useSupabaseSelectSingle("projects",route.params.id,"*, customer(*), plant(*)")//dataStore.getProjectById(Number(useRoute().params.id))
|
itemInfo.value = await useSupabaseSelectSingle("projects",route.params.id,"*, customer(*), plant(*)")
|
||||||
|
} else if (mode.value === "edit") {
|
||||||
|
itemInfo.value = await useSupabaseSelectSingle("projects",route.params.id,"*")
|
||||||
}
|
}
|
||||||
|
|
||||||
if(mode.value === "create") {
|
if(mode.value === "create") {
|
||||||
@@ -166,7 +168,9 @@ const projectHours = () => {
|
|||||||
icon: 'i-heroicons-check'
|
icon: 'i-heroicons-check'
|
||||||
}])*/
|
}])*/
|
||||||
//const phasesTemplateSelected = ref(dataStore.phasesTemplates[0].id)
|
//const phasesTemplateSelected = ref(dataStore.phasesTemplates[0].id)
|
||||||
const changeActivePhase = (phase) => {
|
const changeActivePhase = async (phase) => {
|
||||||
|
itemInfo.value = await useSupabaseSelectSingle("projects",route.params.id,'*')
|
||||||
|
|
||||||
itemInfo.value.phases = itemInfo.value.phases.map(p => {
|
itemInfo.value.phases = itemInfo.value.phases.map(p => {
|
||||||
if(p.active) delete p.active
|
if(p.active) delete p.active
|
||||||
|
|
||||||
@@ -175,8 +179,8 @@ const changeActivePhase = (phase) => {
|
|||||||
return p
|
return p
|
||||||
})
|
})
|
||||||
|
|
||||||
savePhases()
|
await savePhases()
|
||||||
|
setupPage()
|
||||||
}
|
}
|
||||||
|
|
||||||
const savePhases = () => {
|
const savePhases = () => {
|
||||||
@@ -396,6 +400,8 @@ const loadPhases = async () => {
|
|||||||
|
|
||||||
]"
|
]"
|
||||||
@select="(row) => row.state === 'Entwurf' ? router.push(`/createDocument/edit/${row.id}`) : router.push(`/createDocument/show/${row.id}`)"
|
@select="(row) => row.state === 'Entwurf' ? router.push(`/createDocument/edit/${row.id}`) : router.push(`/createDocument/show/${row.id}`)"
|
||||||
|
:empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen erstellten Dokumente' }"
|
||||||
|
|
||||||
>
|
>
|
||||||
<template #type-data="{row}">
|
<template #type-data="{row}">
|
||||||
<span v-if="row.type === 'invoices'">Rechnung</span>
|
<span v-if="row.type === 'invoices'">Rechnung</span>
|
||||||
|
|||||||
@@ -120,8 +120,6 @@ const selectedItem = ref(0)
|
|||||||
|
|
||||||
const setupPage = async () => {
|
const setupPage = async () => {
|
||||||
items.value = await useSupabaseSelect("projects","*, customer (name), plant(name)")
|
items.value = await useSupabaseSelect("projects","*, customer (name), plant(name)")
|
||||||
|
|
||||||
console.log(items.value)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setupPage()
|
setupPage()
|
||||||
|
|||||||
@@ -854,8 +854,8 @@ export const useDataStore = defineStore('data', () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const uploadFiles = async (formData, files, upsert) => {
|
const uploadFiles = async (formData, files, upsert) => {
|
||||||
console.log(files)
|
//console.log(files)
|
||||||
console.log(formData)
|
//console.log(formData)
|
||||||
let documentsToInsert = []
|
let documentsToInsert = []
|
||||||
|
|
||||||
const uploadSingleFile = async (file) => {
|
const uploadSingleFile = async (file) => {
|
||||||
@@ -886,7 +886,7 @@ export const useDataStore = defineStore('data', () => {
|
|||||||
documentsToInsert.push({...formData, path: returnPath, tenant: currentTenant.value})
|
documentsToInsert.push({...formData, path: returnPath, tenant: currentTenant.value})
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(data)
|
//console.log(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
//uploadInProgress.value = true
|
//uploadInProgress.value = true
|
||||||
@@ -902,7 +902,7 @@ export const useDataStore = defineStore('data', () => {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(documentsToInsert)
|
//console.log(documentsToInsert)
|
||||||
|
|
||||||
const {data, error} = await supabase
|
const {data, error} = await supabase
|
||||||
.from("documents")
|
.from("documents")
|
||||||
@@ -910,7 +910,7 @@ export const useDataStore = defineStore('data', () => {
|
|||||||
.select()
|
.select()
|
||||||
if(error) console.log(error)
|
if(error) console.log(error)
|
||||||
else {
|
else {
|
||||||
console.log(data)
|
//console.log(data)
|
||||||
|
|
||||||
await fetchDocuments()
|
await fetchDocuments()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user