You've already forked AstralRinth
forked from didirus/AstralRinth
Shaderpack support (#798)
* Shader support PR * Make search page work * Fix env showing * Make moderation look reasonable * Fix search for shaders
This commit is contained in:
@@ -249,7 +249,7 @@ body {
|
|||||||
--size-mobile-navbar-height-expanded: 9.25rem;
|
--size-mobile-navbar-height-expanded: 9.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 517px) {
|
@media screen and (min-width: 625px) {
|
||||||
--size-mobile-navbar-height-expanded: 7rem;
|
--size-mobile-navbar-height-expanded: 7rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -121,6 +121,8 @@ export default {
|
|||||||
return 'unsupported'
|
return 'unsupported'
|
||||||
case 'resourcepack':
|
case 'resourcepack':
|
||||||
return 'required'
|
return 'required'
|
||||||
|
case 'shader':
|
||||||
|
return 'required'
|
||||||
default:
|
default:
|
||||||
return 'unknown'
|
return 'unknown'
|
||||||
}
|
}
|
||||||
@@ -131,6 +133,8 @@ export default {
|
|||||||
return 'required'
|
return 'required'
|
||||||
case 'resourcepack':
|
case 'resourcepack':
|
||||||
return 'unsupported'
|
return 'unsupported'
|
||||||
|
case 'shader':
|
||||||
|
return 'unsupported'
|
||||||
default:
|
default:
|
||||||
return 'unknown'
|
return 'unknown'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
</span>
|
</span>
|
||||||
<span
|
<span
|
||||||
v-else-if="
|
v-else-if="
|
||||||
type !== 'resourcepack' &&
|
!['resourcepack', 'shader'].includes(type) &&
|
||||||
!(projectTypeDisplay === 'plugin' && search)
|
!(projectTypeDisplay === 'plugin' && search)
|
||||||
"
|
"
|
||||||
class="environment"
|
class="environment"
|
||||||
|
|||||||
@@ -33,7 +33,11 @@
|
|||||||
href: '/plugins',
|
href: '/plugins',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Resource Packs',
|
label: 'Shaders',
|
||||||
|
href: '/shaders',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Resourcepacks',
|
||||||
href: '/resourcepacks',
|
href: '/resourcepacks',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -197,14 +201,21 @@
|
|||||||
>
|
>
|
||||||
<span>Plugins</span>
|
<span>Plugins</span>
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
|
<NuxtLink
|
||||||
|
:tabindex="isBrowseMenuOpen ? 0 : -1"
|
||||||
|
to="/shaders"
|
||||||
|
class="tab iconified-button"
|
||||||
|
@click.native="isBrowseMenuOpen = false"
|
||||||
|
>
|
||||||
|
<span>Shaders</span>
|
||||||
|
</NuxtLink>
|
||||||
<NuxtLink
|
<NuxtLink
|
||||||
:tabindex="isBrowseMenuOpen ? 0 : -1"
|
:tabindex="isBrowseMenuOpen ? 0 : -1"
|
||||||
to="/resourcepacks"
|
to="/resourcepacks"
|
||||||
class="tab iconified-button"
|
class="tab iconified-button"
|
||||||
@click.native="isBrowseMenuOpen = false"
|
@click.native="isBrowseMenuOpen = false"
|
||||||
>
|
>
|
||||||
<span>Resource Packs</span>
|
<span>Resourcepacks</span>
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
<NuxtLink
|
<NuxtLink
|
||||||
:tabindex="isBrowseMenuOpen ? 0 : -1"
|
:tabindex="isBrowseMenuOpen ? 0 : -1"
|
||||||
|
|||||||
@@ -165,6 +165,11 @@ export default {
|
|||||||
component: resolve(__dirname, 'pages/search/resourcepacks.vue'),
|
component: resolve(__dirname, 'pages/search/resourcepacks.vue'),
|
||||||
name: 'resourcepacks',
|
name: 'resourcepacks',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/shaders',
|
||||||
|
component: resolve(__dirname, 'pages/search/shaders.vue'),
|
||||||
|
name: 'shaders',
|
||||||
|
},
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -501,7 +501,8 @@
|
|||||||
<div
|
<div
|
||||||
v-if="
|
v-if="
|
||||||
project.project_type !== 'resourcepack' &&
|
project.project_type !== 'resourcepack' &&
|
||||||
project.project_type !== 'plugin'
|
project.project_type !== 'plugin' &&
|
||||||
|
project.project_type !== 'shader'
|
||||||
"
|
"
|
||||||
class="info"
|
class="info"
|
||||||
>
|
>
|
||||||
@@ -513,7 +514,8 @@
|
|||||||
<div
|
<div
|
||||||
v-if="
|
v-if="
|
||||||
project.project_type !== 'resourcepack' &&
|
project.project_type !== 'resourcepack' &&
|
||||||
project.project_type !== 'plugin'
|
project.project_type !== 'plugin' &&
|
||||||
|
project.project_type !== 'shader'
|
||||||
"
|
"
|
||||||
class="info"
|
class="info"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -224,7 +224,10 @@
|
|||||||
</button>
|
</button>
|
||||||
</section>
|
</section>
|
||||||
<section
|
<section
|
||||||
v-if="project.project_type !== 'resourcepack'"
|
v-if="
|
||||||
|
project.project_type !== 'resourcepack' &&
|
||||||
|
project.project_type !== 'shader'
|
||||||
|
"
|
||||||
class="card game-sides"
|
class="card game-sides"
|
||||||
>
|
>
|
||||||
<div class="columns">
|
<div class="columns">
|
||||||
@@ -864,6 +867,9 @@ export default {
|
|||||||
this.newProject.client_side = this.clientSideType.toLowerCase()
|
this.newProject.client_side = this.clientSideType.toLowerCase()
|
||||||
this.newProject.server_side = this.serverSideType.toLowerCase()
|
this.newProject.server_side = this.serverSideType.toLowerCase()
|
||||||
|
|
||||||
|
this.newProject.client_side = this.clientSideType.toLowerCase()
|
||||||
|
this.newProject.server_side = this.serverSideType.toLowerCase()
|
||||||
|
|
||||||
this.$emit('update:project', this.newProject)
|
this.$emit('update:project', this.newProject)
|
||||||
|
|
||||||
this.isEditing = false
|
this.isEditing = false
|
||||||
|
|||||||
@@ -70,7 +70,7 @@
|
|||||||
</aside>
|
</aside>
|
||||||
</div>
|
</div>
|
||||||
<div class="normal-page__content">
|
<div class="normal-page__content">
|
||||||
<div class="project-list display-mode--gallery">
|
<div class="project-list display-mode--list">
|
||||||
<ProjectCard
|
<ProjectCard
|
||||||
v-for="project in $route.query.type !== undefined
|
v-for="project in $route.query.type !== undefined
|
||||||
? projects.filter((x) => x.project_type === $route.query.type)
|
? projects.filter((x) => x.project_type === $route.query.type)
|
||||||
|
|||||||
@@ -53,6 +53,16 @@
|
|||||||
return (
|
return (
|
||||||
a.name.replace(/\D/g, '') - b.name.replace(/\D/g, '')
|
a.name.replace(/\D/g, '') - b.name.replace(/\D/g, '')
|
||||||
)
|
)
|
||||||
|
} else if (header === 'performance impact') {
|
||||||
|
const x = [
|
||||||
|
'potato',
|
||||||
|
'low',
|
||||||
|
'medium',
|
||||||
|
'high',
|
||||||
|
'screenshot',
|
||||||
|
]
|
||||||
|
|
||||||
|
return x.indexOf(a.name) - x.indexOf(b.name)
|
||||||
}
|
}
|
||||||
return 0
|
return 0
|
||||||
})"
|
})"
|
||||||
@@ -147,7 +157,9 @@
|
|||||||
/>
|
/>
|
||||||
</section>
|
</section>
|
||||||
<section
|
<section
|
||||||
v-if="!['resourcepack', 'plugin'].includes(projectType.id)"
|
v-if="
|
||||||
|
!['resourcepack', 'plugin', 'shader'].includes(projectType.id)
|
||||||
|
"
|
||||||
aria-label="Environment filters"
|
aria-label="Environment filters"
|
||||||
>
|
>
|
||||||
<h3 class="sidebar-menu-heading">Environments</h3>
|
<h3 class="sidebar-menu-heading">Environments</h3>
|
||||||
|
|||||||
11
pages/search/shaders.vue
Normal file
11
pages/search/shaders.vue
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<template>
|
||||||
|
<div></div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
name: 'Shaders',
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped></style>
|
||||||
@@ -160,6 +160,7 @@ export default {
|
|||||||
plugin: 'list',
|
plugin: 'list',
|
||||||
resourcepack: 'gallery',
|
resourcepack: 'gallery',
|
||||||
modpack: 'list',
|
modpack: 'list',
|
||||||
|
shader: 'gallery',
|
||||||
user: 'list',
|
user: 'list',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -240,7 +240,12 @@ export const formatCategory = (name) => {
|
|||||||
return '512x or higher'
|
return '512x or higher'
|
||||||
} else if (name === 'kitchen-sink') {
|
} else if (name === 'kitchen-sink') {
|
||||||
return 'Kitchen Sink'
|
return 'Kitchen Sink'
|
||||||
|
} else if (name === 'path-tracing') {
|
||||||
|
return 'Path Tracing'
|
||||||
|
} else if (name === 'pbr') {
|
||||||
|
return 'PBR'
|
||||||
}
|
}
|
||||||
|
|
||||||
return capitalizeString(name)
|
return capitalizeString(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ export const defaults = {
|
|||||||
plugin: 'list',
|
plugin: 'list',
|
||||||
resourcepack: 'gallery',
|
resourcepack: 'gallery',
|
||||||
modpack: 'list',
|
modpack: 'list',
|
||||||
|
shader: 'gallery',
|
||||||
user: 'list',
|
user: 'list',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,11 @@ export const state = () => ({
|
|||||||
id: 'modpack',
|
id: 'modpack',
|
||||||
display: 'modpack',
|
display: 'modpack',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
actual: 'shader',
|
||||||
|
id: 'shader',
|
||||||
|
display: 'shader',
|
||||||
|
},
|
||||||
],
|
],
|
||||||
loaderData: {
|
loaderData: {
|
||||||
pluginLoaders: ['bukkit', 'spigot', 'paper', 'purpur', 'sponge'],
|
pluginLoaders: ['bukkit', 'spigot', 'paper', 'purpur', 'sponge'],
|
||||||
|
|||||||
Reference in New Issue
Block a user