Merge branch 'master' into mod-management

This commit is contained in:
Geometrically
2023-03-30 15:41:23 -07:00
committed by GitHub
22 changed files with 1553 additions and 342 deletions

View File

@@ -0,0 +1,132 @@
<script setup>
import {ChevronLeftIcon, ChevronRightIcon} from 'omorphia'
import Instance from '@/components/ui/Instance.vue'
import News from '@/components/ui/News.vue'
import {onMounted, onUnmounted, ref} from 'vue'
const props = defineProps({
instances: Array,
news: Array,
label: String,
canPaginate: Boolean,
})
const allowPagination = ref(false)
const modsRow = ref(null)
const newsRow = ref(null)
// Remove after state is populated with real data
const shouldRenderNormalInstances = props.instances && props.instances?.length !== 0
const shouldRenderNews = props.news && props.news?.length !== 0
onUnmounted(() => {
if (props.canPaginate) window.removeEventListener('resize', handlePaginationDisplay)
})
const handleLeftPage = () => {
if (shouldRenderNormalInstances) modsRow.value.scrollLeft -= 170
else if (shouldRenderNews) newsRow.value.scrollLeft -= 170
}
const handleRightPage = () => {
if (shouldRenderNormalInstances) modsRow.value.scrollLeft += 170
else if (shouldRenderNews) newsRow.value.scrollLeft += 170
}
</script>
<template>
<div class="row">
<div class="header">
<p>{{ props.label }}</p>
<hr>
<div v-if="allowPagination" class="pagination">
<ChevronLeftIcon @click="handleLeftPage"/>
<ChevronRightIcon @click="handleRightPage"/>
</div>
</div>
<section ref="modsRow" class="instances">
<Instance
v-for="instance in props.instances"
:key="instance.id"
display="card"
:instance="instance"
/>
</section>
</div>
</template>
<style lang="scss" scoped>
.row {
display: flex;
flex-direction: column;
align-items: center;
width: 100%;
padding: 1rem;
.header {
display: flex;
justify-content: space-between;
align-items: inherit;
width: 100%;
margin-bottom: 1rem;
gap: 1rem;
p {
font-size: 1rem;
white-space: nowrap;
color: var(--color-contrast);
}
hr {
background-color: var(--color-gray);
height: 1px;
width: 100%;
border: none;
}
.pagination {
display: inherit;
align-items: inherit;
svg {
background: var(--color-raised-bg);
border-radius: var(--radius-lg);
width: 1.3rem;
height: 1.2rem;
cursor: pointer;
margin-right: 0.5rem;
transition: all ease-in-out 0.1s;
&:hover {
filter: brightness(150%);
}
}
}
}
section {
display: flex;
align-items: inherit;
transition: all ease-in-out 0.4s;
gap: 1rem;
}
.instances {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(12rem, 1fr));
width: 100%;
gap: 1rem;
margin-right: auto;
margin-top: 0.8rem;
scroll-behavior: smooth;
overflow-x: scroll;
overflow-y: hidden;
&::-webkit-scrollbar {
width: 0px;
background: transparent;
}
}
}
.dark-mode {
.row {
&:nth-child(odd) {
background-color: rgb(30, 31, 34);
}
}
}
</style>

View File

@@ -1,8 +1,8 @@
<script setup>
import { ChevronLeftIcon, ChevronRightIcon } from 'omorphia'
import {ChevronLeftIcon, ChevronRightIcon} from 'omorphia'
import Instance from '@/components/ui/Instance.vue'
import News from '@/components/ui/News.vue'
import { onMounted, onUnmounted, ref } from 'vue'
import {onMounted, onUnmounted, ref} from 'vue'
const props = defineProps({
instances: {
@@ -23,76 +23,64 @@ const props = defineProps({
},
canPaginate: Boolean,
})
const allowPagination = ref(false)
const modsRow = ref(null)
const newsRow = ref(null)
// Remove after state is populated with real data
const shouldRenderNormalInstances = props.instances && props.instances?.length !== 0
const shouldRenderNews = props.news && props.news?.length !== 0
const handlePaginationDisplay = () => {
let parentsRow
if (shouldRenderNormalInstances) parentsRow = modsRow.value
if (shouldRenderNews) parentsRow = newsRow.value
if (!parentsRow) return
const children = parentsRow.children
const lastChild = children[children.length - 1]
const childBox = lastChild.getBoundingClientRect()
if (childBox.x + childBox.width > window.innerWidth) allowPagination.value = true
else allowPagination.value = false
}
onMounted(() => {
if (props.canPaginate) window.addEventListener('resize', handlePaginationDisplay)
// Check if pagination should be rendered on mount
handlePaginationDisplay()
})
onUnmounted(() => {
if (props.canPaginate) window.removeEventListener('resize', handlePaginationDisplay)
})
const handleLeftPage = () => {
if (shouldRenderNormalInstances) modsRow.value.scrollLeft -= 170
else if (shouldRenderNews) newsRow.value.scrollLeft -= 170
}
const handleRightPage = () => {
if (shouldRenderNormalInstances) modsRow.value.scrollLeft += 170
else if (shouldRenderNews) newsRow.value.scrollLeft += 170
}
</script>
<template>
<div class="row">
<div class="header">
<p>{{ props.label }}</p>
<hr aria-hidden="true" />
<hr aria-hidden="true"/>
<div v-if="allowPagination" class="pagination">
<ChevronLeftIcon @click="handleLeftPage" />
<ChevronRightIcon @click="handleRightPage" />
<ChevronLeftIcon @click="handleLeftPage"/>
<ChevronRightIcon @click="handleRightPage"/>
</div>
</div>
<section v-if="shouldRenderNormalInstances" ref="modsRow" class="instances">
<Instance
v-for="instance in props.instances"
:key="instance.id"
display="card"
:instance="instance"
v-for="instance in props.instances"
:key="instance.id"
display="card"
:instance="instance"
class="row-instance"
/>
</section>
<section v-else-if="shouldRenderNews" ref="newsRow" class="news">
<News v-for="newsValue in props.news" :key="newsValue.id" :news="newsValue" />
<section ref="newsRow" class="news" v-else-if="shouldRenderNews">
<News v-for="news in props.news" :key="news.id" :news="news"/>
</section>
</div>
</template>
<style lang="scss" scoped>
.row {
display: flex;
@@ -174,7 +162,6 @@ const handleRightPage = () => {
margin-right: auto;
margin-top: 0.8rem;
scroll-behavior: smooth;
overflow-x: scroll;
overflow-y: hidden;
@@ -192,4 +179,9 @@ const handleRightPage = () => {
}
}
}
</style>
.row-instance {
min-width: 12rem;
max-width: 12rem;
}
</style>

View File

@@ -1,7 +1,7 @@
<script setup>
import { RouterLink } from 'vue-router'
import { Card, PlusIcon } from 'omorphia'
import { Card } from 'omorphia'
import { PlayIcon } from '@/assets/icons'
const props = defineProps({
display: {
type: String,
@@ -18,16 +18,16 @@ const props = defineProps({
<template>
<div>
<RouterLink v-if="display === 'list'" class="instance-list-item" :to="`${props.instance.id}`">{{
props.instance.name
}}</RouterLink>
<Card v-else-if="display === 'card'" class="instance-card-item">
<RouterLink v-if="display === 'list'" class="instance-list-item" :to="`/instance/${props.instance.id}`">{{
props.instance.name
}}</RouterLink>
<Card class="instance-card-item" v-else-if="display === 'card'" @click="this.$router.push(`/instance/${props.instance.id}`)">
<img :src="props.instance.img" alt="Trending mod card" />
<div class="project-info">
<p class="title">{{ props.instance.name }}</p>
<p class="description">{{ props.instance.version }}</p>
</div>
<div class="cta"><PlusIcon /></div>
<div class="cta"><PlayIcon /></div>
</Card>
</div>
</template>
@@ -40,32 +40,26 @@ const props = defineProps({
transition: all ease-out 0.1s;
font-size: 0.8rem;
color: var(--color-primary);
&:hover {
text-decoration: none;
filter: brightness(150%);
}
}
.instance-card-item {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
cursor: pointer;
width: 180px;
padding: 0.75rem;
transition: 0.1s ease-in-out all;
&:hover {
filter: brightness(0.85);
.cta {
opacity: 1;
bottom: 4.5rem;
}
}
.cta {
position: absolute;
display: flex;
@@ -80,27 +74,24 @@ const props = defineProps({
opacity: 0;
transition: 0.3s ease-in-out bottom, 0.1s ease-in-out opacity;
cursor: pointer;
svg {
color: #fff;
width: 1.5rem;
height: 1.5rem;
}
&:hover {
filter: brightness(0.75);
box-shadow: var(--shadow-floating);
}
}
img {
width: 160px;
width: 100%;
border-radius: var(--radius-sm);
filter: none !important;
}
.project-info {
margin-top: 1rem;
width: 100%;
.title {
color: var(--color-contrast);
max-width: 6rem;
@@ -113,7 +104,6 @@ const props = defineProps({
line-height: 110%;
display: inline-block;
}
.description {
display: -webkit-box;
-webkit-line-clamp: 2;
@@ -126,10 +116,9 @@ const props = defineProps({
}
}
}
.dark-mode {
.cta > svg {
color: #000;
}
}
</style>
</style>

View File

@@ -1,6 +1,5 @@
<script setup>
import { Card, ChevronRightIcon } from 'omorphia'
const props = defineProps({
news: {
type: Object,
@@ -38,59 +37,49 @@ const props = defineProps({
box-shadow: var(--shadow-raised-lg);
cursor: pointer;
transition: all ease-in-out 0.1s;
&:hover {
box-shadow: var(--shadow-floating);
filter: brightness(0.85);
}
img {
display: flex;
width: 8.4375rem; /* from wireframe */
height: 8.5rem; /* from wireframe */
border-radius: 0.9rem 0 0 0.9rem;
}
.body {
display: flex;
flex-direction: column;
width: 100%;
height: 8.5rem; /* from wireframe */
padding: 0.45rem;
.headline {
display: inherit;
flex-direction: inherit;
margin: 0.4rem 0;
width: 100%;
h2 {
font-size: 1rem;
text-transform: uppercase;
}
p {
font-size: 0.7rem;
}
}
.underline {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
margin-top: auto;
p {
font-size: 0.7rem;
}
a {
transition: all ease-in-out 0.2s;
width: 1.5rem;
color: var(--color-primary);
font-size: 1.3rem;
&:hover {
transform: translate(1px);
filter: brightness(150%);
@@ -99,4 +88,4 @@ const props = defineProps({
}
}
}
</style>
</style>