mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-19 03:04:05 +00:00
Upgrade to Laravel 10, Vite 5+
This commit is contained in:
10
resources/sass/invoiceshelf.scss
vendored
10
resources/sass/invoiceshelf.scss
vendored
@@ -9,7 +9,7 @@
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: url("/fonts/Poppins-Black.ttf") format("truetype");
|
||||
src: url("$fonts/Poppins-Black.ttf") format("truetype");
|
||||
}
|
||||
|
||||
@font-face {
|
||||
@@ -17,7 +17,7 @@
|
||||
font-style: normal;
|
||||
font-weight: 300;
|
||||
font-display: swap;
|
||||
src: url("/fonts/Poppins-Light.ttf") format("truetype");
|
||||
src: url("$fonts/Poppins-Light.ttf") format("truetype");
|
||||
}
|
||||
|
||||
@font-face {
|
||||
@@ -25,7 +25,7 @@
|
||||
font-style: normal;
|
||||
font-weight: 500;
|
||||
font-display: swap;
|
||||
src: url("/fonts/Poppins-Medium.ttf") format("truetype");
|
||||
src: url("$fonts/Poppins-Medium.ttf") format("truetype");
|
||||
}
|
||||
|
||||
@font-face {
|
||||
@@ -33,7 +33,7 @@
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: url("/fonts/Poppins-Regular.ttf") format("truetype");
|
||||
src: url("$fonts/Poppins-Regular.ttf") format("truetype");
|
||||
}
|
||||
|
||||
@font-face {
|
||||
@@ -41,7 +41,7 @@
|
||||
font-style: normal;
|
||||
font-weight: 600;
|
||||
font-display: swap;
|
||||
src: url("/fonts/Poppins-SemiBold.ttf") format("truetype");
|
||||
src: url("$fonts/Poppins-SemiBold.ttf") format("truetype");
|
||||
}
|
||||
|
||||
// Default Theme
|
||||
|
||||
@@ -133,7 +133,7 @@ async function chooseTemplate() {
|
||||
}
|
||||
|
||||
function getTickImage() {
|
||||
const imgUrl = new URL('/img/tick.png', import.meta.url)
|
||||
const imgUrl = new URL('$images/tick.png', import.meta.url)
|
||||
return imgUrl
|
||||
}
|
||||
|
||||
|
||||
@@ -205,7 +205,7 @@ const adminLogo = computed(() => {
|
||||
})
|
||||
|
||||
function getDefaultAvatar() {
|
||||
const imgUrl = new URL('/img/default-avatar.jpg', import.meta.url)
|
||||
const imgUrl = new URL('$images/default-avatar.jpg', import.meta.url)
|
||||
return imgUrl
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,6 @@
|
||||
<template>
|
||||
<div class="flex flex-col items-center justify-between w-full pt-10">
|
||||
<img
|
||||
id="logo-invoiceshelf"
|
||||
src="/img/logo.png"
|
||||
alt="InvoiceShelf Logo"
|
||||
class="h-12 mb-5 md:mb-10"
|
||||
/>
|
||||
|
||||
|
||||
<BaseWizard
|
||||
:steps="7"
|
||||
@@ -30,6 +25,7 @@ import Step8CompanyPreferences from './Step8CompanyPreferences.vue'
|
||||
import { useInstallationStore } from '@/scripts/admin/stores/installation'
|
||||
import { useRouter } from 'vue-router'
|
||||
|
||||
|
||||
export default {
|
||||
components: {
|
||||
step_1: Step1RequirementsCheck,
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
:src="
|
||||
data.author_avatar
|
||||
? data.author_avatar
|
||||
: 'http://localhost:3000/img/default-avatar.jpg'
|
||||
: 'http://localhost:3000$images/default-avatar.jpg'
|
||||
"
|
||||
alt=""
|
||||
/>
|
||||
|
||||
@@ -94,7 +94,7 @@ const shareableLink = computed(() => {
|
||||
})
|
||||
|
||||
function getLogo() {
|
||||
const imgUrl = new URL('/img/logo-gray.png', import.meta.url)
|
||||
const imgUrl = new URL('$images/logo-gray.png', import.meta.url)
|
||||
return imgUrl
|
||||
}
|
||||
|
||||
|
||||
@@ -562,7 +562,7 @@ function onFileRemove(index) {
|
||||
}
|
||||
|
||||
function getDefaultAvatar() {
|
||||
const imgUrl = new URL('/img/default-avatar.jpg', import.meta.url)
|
||||
const imgUrl = new URL('$images/default-avatar.jpg', import.meta.url)
|
||||
return imgUrl
|
||||
}
|
||||
|
||||
|
||||
@@ -232,7 +232,7 @@ const previewAvatar = computed(() => {
|
||||
})
|
||||
|
||||
function getDefaultAvatar() {
|
||||
const imgUrl = new URL('/img/default-avatar.jpg', import.meta.url)
|
||||
const imgUrl = new URL('$images/default-avatar.jpg', import.meta.url)
|
||||
return imgUrl
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
|
||||
export const defineGlobalComponents = (app) => {
|
||||
const components = import.meta.globEager('./components/base/*.vue')
|
||||
const components = import.meta.glob('./components/base/*.vue', { eager: true })
|
||||
|
||||
Object.entries(components).forEach(([path, definition]) => {
|
||||
// Get name of component, based on filename
|
||||
|
||||
@@ -7,6 +7,11 @@ import * as pinia from 'pinia'
|
||||
import * as Vue from 'vue'
|
||||
import * as Vuelidate from '@vuelidate/core'
|
||||
|
||||
import.meta.glob([
|
||||
'../static/img/**',
|
||||
'../static/fonts/**',
|
||||
]);
|
||||
|
||||
window.pinia = pinia
|
||||
window.Vuelidate = Vuelidate
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<link rel="stylesheet" href="/modules/styles/{{ $name }}">
|
||||
@endforeach
|
||||
|
||||
@vite
|
||||
@vite('resources/scripts/main.js')
|
||||
</head>
|
||||
|
||||
<body
|
||||
|
||||
@@ -3,28 +3,28 @@
|
||||
font-family: 'THSarabunNew';
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
src: url("{{ resource_path('static/fonts/THSarabunNew.ttf') }}") format('truetype');
|
||||
src: url("{{ resource_path('static/static/fonts/THSarabunNew.ttf') }}") format('truetype');
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'THSarabunNew';
|
||||
font-style: normal;
|
||||
font-weight: bold;
|
||||
src: url("{{ resource_path('static/fonts/THSarabunNew-Bold.ttf') }}") format('truetype');
|
||||
src: url("{{ resource_path('static/static/fonts/THSarabunNew-Bold.ttf') }}") format('truetype');
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'THSarabunNew';
|
||||
font-style: italic;
|
||||
font-weight: normal;
|
||||
src: url("{{ resource_path('static/fonts/THSarabunNew-Italic.ttf') }}") format('truetype');
|
||||
src: url("{{ resource_path('static/static/fonts/THSarabunNew-Italic.ttf') }}") format('truetype');
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'THSarabunNew';
|
||||
font-style: italic;
|
||||
font-weight: bold;
|
||||
src: url("{{ resource_path('static/fonts/THSarabunNew-BoldItalic.ttf') }}") format('truetype');
|
||||
src: url("{{ resource_path('static/static/fonts/THSarabunNew-BoldItalic.ttf') }}") format('truetype');
|
||||
}
|
||||
|
||||
body {
|
||||
|
||||
Reference in New Issue
Block a user