Skip to content

hotfix: switch to inertiajs v1 #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2024
Merged

hotfix: switch to inertiajs v1 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 12 additions & 20 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
"@fortawesome/free-brands-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/vue-fontawesome": "^3.0.8",
"@inertiajs/inertia": "^0.11.1",
"@inertiajs/inertia-vue3": "^0.6.0",
"@inertiajs/vue3": "^1.2.0",
"@vitejs/plugin-vue": "^5.1.4",
"@vueuse/core": "^11.1.0",
"nprogress": "^0.2.0",
Expand Down
211 changes: 133 additions & 78 deletions resources/js/Pages/App/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,94 +1,149 @@
<template>
<LayoutContainer>
<div class="flex flex-wrap gap-4 justify-center md:col-span-2 lg:col-span-4">
<AppButton title="Alle" bgColor="bg-gray-500 dark:bg-gray-700 hover:bg-gray-700" bgColorActive="bg-gray-900" :icon="['fas', 'users']" :active="filter == 'all'" @click="filter = 'all'"/>
<AppButton title="INF" bgColor="bg-blue-500 hover:bg-blue-700" bgColorActive="bg-blue-700" :icon="['fas', 'code']" :active="filter == 'inf'" @click="filter = 'inf'"/>
<AppButton title="ET" bgColor="bg-yellow-500 hover:bg-yellow-700" bgColorActive="bg-yellow-700" :icon="['fas', 'bolt']" :active="filter == 'et'" @click="filter = 'et'"/>
<AppButton title="WI" bgColor="bg-green-500 hover:bg-green-700" bgColorActive="bg-green-700" :icon="['fas', 'chart-line']" :active="filter == 'wi'" @click="filter = 'wi'"/>
<AppButton title="DIB" bgColor="bg-fuchsia-500 hover:bg-fuchsia-700" bgColorActive="bg-fuchsia-700" :icon="['fas', 'briefcase']" :active="filter == 'dib'" @click="filter = 'dib'"/>
<AppButton title="MCD" bgColor="bg-purple-500 hover:bg-purple-700" bgColorActive="bg-purple-700" :icon="['fas', 'paint-brush']" :active="filter == 'mcd'" @click="filter = 'mcd'"/>
<AppButton title="Tutor" bgColor="bg-indigo-500 hover:bg-indigo-700" bgColorActive="bg-indigo-700" :icon="['fas', 'robot']" :active="filter == 'tutor'" @click="filter = 'tutor'"/>
<AppButton title="Special" bgColor="bg-pink-500 hover:bg-pink-700" bgColorActive="bg-pink-700" :icon="['fas', 'star']" :active="filter == 'special'" @click="filter = 'special'"/>
</div>
<div class="grid gap-4 grid-cols-2 sm:grid-cols-3 md:col-span-2 md:grid-cols-4 lg:col-span-4">
<Link
v-for="person in filteredPersons"
:key="person.id"
:href="'/person/' + person.id + '/'">
<PersonCard
:person="person"
class="h-full"
/>
</Link>
</div>
</LayoutContainer>
<LayoutContainer>
<div
class="flex flex-wrap gap-4 justify-center md:col-span-2 lg:col-span-4"
>
<AppButton
title="Alle"
bgColor="bg-gray-500 dark:bg-gray-700 hover:bg-gray-700"
bgColorActive="bg-gray-900"
:icon="['fas', 'users']"
:active="filter == 'all'"
@click="filter = 'all'"
/>
<AppButton
title="INF"
bgColor="bg-blue-500 hover:bg-blue-700"
bgColorActive="bg-blue-700"
:icon="['fas', 'code']"
:active="filter == 'inf'"
@click="filter = 'inf'"
/>
<AppButton
title="ET"
bgColor="bg-yellow-500 hover:bg-yellow-700"
bgColorActive="bg-yellow-700"
:icon="['fas', 'bolt']"
:active="filter == 'et'"
@click="filter = 'et'"
/>
<AppButton
title="WI"
bgColor="bg-green-500 hover:bg-green-700"
bgColorActive="bg-green-700"
:icon="['fas', 'chart-line']"
:active="filter == 'wi'"
@click="filter = 'wi'"
/>
<AppButton
title="DIB"
bgColor="bg-fuchsia-500 hover:bg-fuchsia-700"
bgColorActive="bg-fuchsia-700"
:icon="['fas', 'briefcase']"
:active="filter == 'dib'"
@click="filter = 'dib'"
/>
<AppButton
title="MCD"
bgColor="bg-purple-500 hover:bg-purple-700"
bgColorActive="bg-purple-700"
:icon="['fas', 'paint-brush']"
:active="filter == 'mcd'"
@click="filter = 'mcd'"
/>
<AppButton
title="Tutor"
bgColor="bg-indigo-500 hover:bg-indigo-700"
bgColorActive="bg-indigo-700"
:icon="['fas', 'robot']"
:active="filter == 'tutor'"
@click="filter = 'tutor'"
/>
<AppButton
title="Special"
bgColor="bg-pink-500 hover:bg-pink-700"
bgColorActive="bg-pink-700"
:icon="['fas', 'star']"
:active="filter == 'special'"
@click="filter = 'special'"
/>
</div>
<div
class="grid gap-4 grid-cols-2 sm:grid-cols-3 md:col-span-2 md:grid-cols-4 lg:col-span-4"
>
<Link
v-for="person in filteredPersons"
:key="person.id"
:href="'/person/' + person.id + '/'"
>
<PersonCard :person="person" class="h-full" />
</Link>
</div>
</LayoutContainer>
</template>
<script>
import { computed, defineComponent, ref, watch } from "vue";
import { Link } from '@inertiajs/inertia-vue3'
import { Link } from "@inertiajs/vue3";
import AppButton from "../../components/AppButton.vue";
import LayoutContainer from "../../components/LayoutContainer.vue";
import PersonCard from "../../components/PersonCard.vue";
import NProgress from 'nprogress';
import NProgress from "nprogress";

export default defineComponent({
name: "Index",
components: {
AppButton,
LayoutContainer,
Link,
PersonCard,
},
props: {
persons: {
type: Array,
required: true,
name: "Index",
components: {
AppButton,
LayoutContainer,
Link,
PersonCard,
},
},
setup(props) {
var filter = ref("all");
props: {
persons: {
type: Array,
required: true,
},
},
setup(props) {
var filter = ref("all");

watch(filter, (filter, prevFilter) => {
console.log(filter, prevFilter);
NProgress.start();
})

var filteredPersons = computed(() => {
if (filter.value === "all") {
const tmp = props.persons;
NProgress.done();
return tmp;
}
const tmp = props.persons.filter((person) => {
if(filter.value === "inf") {
return person.course === "INF";
} else if(filter.value === "et") {
return person.course === "ET";
} else if(filter.value === "wi") {
return person.course === "WI";
} else if(filter.value === "dib") {
return person.course === "DIB";
} else if(filter.value === "mcd") {
return person.course === "MCD";
} else if(filter.value === "tutor") {
return person.is_tutor;
} else if(filter.value === "special") {
return person.is_special;
}
});
NProgress.done();
return tmp;
});
watch(filter, (filter, prevFilter) => {
console.log(filter, prevFilter);
NProgress.start();
});

var filteredPersons = computed(() => {
if (filter.value === "all") {
const tmp = props.persons;
NProgress.done();
return tmp;
}
const tmp = props.persons.filter((person) => {
if (filter.value === "inf") {
return person.course === "INF";
} else if (filter.value === "et") {
return person.course === "ET";
} else if (filter.value === "wi") {
return person.course === "WI";
} else if (filter.value === "dib") {
return person.course === "DIB";
} else if (filter.value === "mcd") {
return person.course === "MCD";
} else if (filter.value === "tutor") {
return person.is_tutor;
} else if (filter.value === "special") {
return person.is_special;
}
});
NProgress.done();
return tmp;
});

return {
filter,
filteredPersons,
};
},
return {
filter,
filteredPersons,
};
},
});
</script>

<style>

</style>
<style></style>
Loading