[WIP] Rework design (#34)

* WIP: Redesign the default layout

* Merge old & new default layouts

* Fix login logic; add proper user controls dropdown

* Fix latest version listing (#31) (#32)

Co-authored-by: Aeledfyr <45501007+Aeledfyr@users.noreply.github.com>

* First pass of design cleanup

* Improve ad integration and fix light theme

* Begin splitting up variables, change some styling to new mockup

* Continue redesign progress

* Work on some more pages

* Add missing dark theme variables for text

* Continue working on modularizing

* Continue progress, redo pagination

* Fix auth buttons in navbar layout

* Continue progress

* Continue progress more

* Redo ModResult

* Scope ModPage :irritater:

* Continue Dashboard

* Continue progress on Dashboard and cleanup

* Add missing variables for dark theme

* Small tweaks, cleanup, and continue mod page progress

* Fix user not being able to see hidden mods that they own

* Start reworking mod creation

* Continue revamp of mod creation page

* Yank v-html out

* Hotfix markdown rendering and some spacing issues

* Move legal; continue with mod creation; create reusable footer

* Create README.md

* Update README.md

* Update README.md

* Add in basic usage instructions

* Fix some stuff

* Continue with mod creation; fix some CSS errors

* Start user page

* Start transition to vue-select; fix a few bugs

* Continue mod creation page

* Finish mod pages

* Add very raw version editing

* Mod editing + creation

* Fixed versions that were in processing causing a 404 (#39)

Co-authored-by: Mikhail Oleynikov <falseresync@gmail.com>
Co-authored-by: Aeledfyr <45501007+Aeledfyr@users.noreply.github.com>
Co-authored-by: Jai A <jai.a@tuta.io>
Co-authored-by: MulverineX <mulverin3@gmail.com>
Co-authored-by: diabolical17 <calumproh28@gmail.com>
Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>
This commit is contained in:
Prospector
2020-11-30 13:55:01 -08:00
committed by GitHub
parent e025df0824
commit 7b84d8c3d5
70 changed files with 10339 additions and 3284 deletions

132
components/Categories.vue Normal file
View File

@@ -0,0 +1,132 @@
<template>
<div class="categories">
<p v-if="categories.includes('fabric')">
<FabricLoader />
Fabric
</p>
<p v-if="categories.includes('forge')">
<ForgeLoader />
Forge
</p>
<p v-if="categories.includes('technology')">
<TechCategory />
Technology
</p>
<p v-if="categories.includes('adventure')">
<AdventureCategory />
Adventure
</p>
<p v-if="categories.includes('magic')">
<MagicCategory />
Magic
</p>
<p v-if="categories.includes('utility')">
<UtilityCategory />
Utility
</p>
<p v-if="categories.includes('decoration')">
<DecorationCategory />
Decoration
</p>
<p v-if="categories.includes('library')">
<LibraryCategory />
Library
</p>
<p v-if="categories.includes('cursed')">
<CursedCategory />
Cursed
</p>
<p v-if="categories.includes('worldgen')">
<WorldGenCategory />
Worldgen
</p>
<p v-if="categories.includes('storage')">
<StorageCategory />
Storage
</p>
<p v-if="categories.includes('food')">
<FoodCategory />
Food
</p>
<p v-if="categories.includes('equipment')">
<EquipmentCategory />
Equipment
</p>
<p v-if="categories.includes('misc')">
<MiscCategory />
Misc
</p>
</div>
</template>
<script>
import TechCategory from '~/assets/images/categories/tech.svg?inline'
import AdventureCategory from '~/assets/images/categories/adventure.svg?inline'
import CursedCategory from '~/assets/images/categories/cursed.svg?inline'
import DecorationCategory from '~/assets/images/categories/decoration.svg?inline'
import EquipmentCategory from '~/assets/images/categories/equipment.svg?inline'
import FoodCategory from '~/assets/images/categories/food.svg?inline'
import LibraryCategory from '~/assets/images/categories/library.svg?inline'
import MagicCategory from '~/assets/images/categories/magic.svg?inline'
import MiscCategory from '~/assets/images/categories/misc.svg?inline'
import StorageCategory from '~/assets/images/categories/storage.svg?inline'
import UtilityCategory from '~/assets/images/categories/utility.svg?inline'
import WorldGenCategory from '~/assets/images/categories/worldgen.svg?inline'
import ForgeLoader from '~/assets/images/categories/forge.svg?inline'
import FabricLoader from '~/assets/images/categories/fabric.svg?inline'
export default {
name: 'Categories',
components: {
TechCategory,
AdventureCategory,
CursedCategory,
DecorationCategory,
EquipmentCategory,
FoodCategory,
LibraryCategory,
MagicCategory,
MiscCategory,
StorageCategory,
UtilityCategory,
WorldGenCategory,
ForgeLoader,
FabricLoader,
},
props: {
categories: {
type: Array,
default() {
return []
},
},
},
}
</script>
<style lang="scss" scoped>
.categories {
@extend %row;
flex-wrap: wrap;
p {
display: flex;
align-items: center;
flex-direction: row;
background-color: var(--color-category-bg);
border-radius: var(--size-rounded-max);
color: var(--color-category-text);
margin-top: 0.25em;
margin-bottom: 0.25em;
margin-right: 0.5em;
padding: 0.4em 0.7em;
font-size: var(--font-size-sm);
height: 1em;
svg {
width: 15px;
margin-right: 5px;
}
}
}
</style>

View File

@@ -1,86 +1,53 @@
<template>
<div>
<slot></slot>
<label class="button">
<span>
{{ prompt }}
</span>
<input
:id="inputId"
class="file-input"
type="file"
:accept="inputAccept"
:multiple="inputMultiple"
@change="onChange"
:multiple="multiple"
:accept="accept"
@change="(files) => $emit('change', files)"
/>
<label :for="inputId">{{ text }}</label>
</div>
</label>
</template>
<script>
export default {
name: 'FileInput',
props: {
defaultText: {
prompt: {
type: String,
default: '',
default: 'Select file',
},
inputId: {
type: String,
default: '',
},
inputAccept: {
type: String,
default: '',
},
inputMultiple: {
multiple: {
type: Boolean,
default: true,
default: false,
},
},
data() {
return {
text: this.defaultText,
}
},
methods: {
onChange(files) {
const length = files.target.files.length
if (length === 0) {
this.text = this.defaultText
} else if (length === 1) {
this.text = '1 file selected'
} else if (length > 1) {
this.text = length + ' files selected'
}
this.$emit('change', files)
accept: {
type: String,
default: null,
},
},
}
</script>
<style lang="scss" scoped>
[type='file'] {
border: 0;
clip: rect(0, 0, 0, 0);
height: 1px;
overflow: hidden;
padding: 0;
position: absolute !important;
white-space: nowrap;
width: 1px;
label {
display: flex;
align-items: center;
justify-content: center;
text-align: center;
padding: var(--spacing-card-sm) var(--spacing-card-md);
}
+ label {
cursor: pointer;
border-radius: 5px;
color: var(--color-grey-5);
background-color: var(--color-grey-1);
padding: 10px 20px;
}
span {
border: 2px dashed var(--color-divider-dark);
border-radius: var(--size-rounded-control);
padding: var(--spacing-card-md) var(--spacing-card-lg);
}
&:focus + label,
+ label:hover,
&:focus + label {
background-color: var(--color-grey-2);
color: var(--color-text);
}
input {
display: none;
}
</style>

79
components/MFooter.vue Normal file
View File

@@ -0,0 +1,79 @@
<template>
<footer :class="{ centered }">
<span>
Modrinth is open source software. You may view the source code at
<a target="_blank" href="https://github.com/modrinth">our GitHub page</a>.
</span>
<ul>
<li>
<nuxt-link to="/legal/terms">Terms</nuxt-link>
</li>
<li>
<nuxt-link to="/legal/privacy">Privacy</nuxt-link>
</li>
<li>
<nuxt-link to="/about">About</nuxt-link>
</li>
</ul>
<ul>
<li>
<a target="_blank" href="https://blog.modrinth.com">Blog</a>
</li>
<li>
<a target="_blank" href="https://discord.gg/gFRbNQ2">Discord</a>
</li>
<li>
<a target="_blank" href="https://twitter.com/modrinth">Twitter</a>
</li>
</ul>
<span> © Guavy LLC </span>
</footer>
</template>
<script>
export default {
props: {
centered: {
type: Boolean,
default: false,
},
},
}
</script>
<style lang="scss" scoped>
.centered {
align-items: center;
}
footer {
padding: 2rem 0 5rem 0;
display: flex;
flex-direction: column;
ul {
list-style: none;
padding: 0;
margin: 0;
display: flex;
flex-wrap: wrap;
li {
margin-bottom: var(--spacing-card-sm);
&:not(:last-child)::after {
content: '•';
padding: 0;
margin: 0 var(--spacing-card-sm);
}
}
}
& > *:not(:last-child) {
margin-bottom: var(--spacing-card-sm);
}
}
a {
text-decoration: underline;
}
</style>

View File

@@ -1,71 +1,134 @@
<template>
<div class="columns">
<div class="content column-grow-5">
<div class="mod-header columns">
<img
:src="
mod.icon_url
? mod.icon_url
: 'https://cdn.modrinth.com/placeholder.svg'
"
alt="mod-icon"
/>
<div class="mod-header-text">
<div class="columns title">
<h2>{{ mod.title }}</h2>
<nuxt-link
:to="'/user/' + members.find((x) => x.role === 'Owner').user_id"
>
<p>by {{ members.find((x) => x.role === 'Owner').name }}</p>
</nuxt-link>
<div class="page-container">
<div class="page-contents">
<div class="content">
<div class="header">
<div class="icon">
<img
:src="
mod.icon_url
? mod.icon_url
: 'https://cdn.modrinth.com/placeholder.svg'
"
alt="mod - icon"
/>
</div>
<p>{{ mod.description }}</p>
<div class="info">
<h2 class="title">{{ mod.title }}</h2>
<p class="description">
{{ mod.description }}
</p>
</div>
</div>
<client-only>
<EthicalAd type="text" />
</client-only>
<div class="mod-navigation">
<div class="tabs">
<nuxt-link :to="'/mod/' + mod.id" class="tab">
Description
</nuxt-link>
<nuxt-link :to="'/mod/' + mod.id + '/versions'" class="tab">
Versions
</nuxt-link>
<a v-if="mod.wiki_url" :href="mod.wiki_url" class="tab">
<ExternalIcon />
Wiki
</a>
<a
v-if="mod.issues_url"
:href="mod.issues_url"
target="_blank"
class="tab"
>
<ExternalIcon />
Issues
</a>
<a
v-if="mod.source_url"
:href="mod.source_url"
target="_blank"
class="tab"
>
<ExternalIcon />
Source
</a>
<nuxt-link
v-if="
this.$auth.loggedIn &&
members.find((x) => x.user_id === this.$auth.user.id)
"
:to="'/mod/' + mod.id + '/settings'"
class="tab"
>
Settings
</nuxt-link>
<div class="filler" />
</div>
</div>
<div class="mod-content">
<slot />
</div>
</div>
<div class="mod-navigation">
<nuxt-link :to="'/mod/' + mod.id">
<InfoIcon />
Description
</nuxt-link>
<nuxt-link :to="'/mod/' + mod.id + '/versions'">
<VersionIcon />
Versions
</nuxt-link>
<nuxt-link
v-if="
this.$auth.loggedIn &&
members.find((x) => x.user_id === this.$auth.user.id)
"
:to="'/mod/' + mod.id + '/settings'"
>
<SettingsIcon />
Settings
</nuxt-link>
<a v-if="mod.wiki_url" :href="mod.wiki_url">
<ExternalIcon />
Wiki
</a>
<a v-if="mod.issues_url" :href="mod.issues_url">
<ExternalIcon />
Issues
</a>
<a v-if="mod.source_url" :href="mod.source_url">
<ExternalIcon />
Source Code
</a>
<div class="filler" />
</div>
<slot />
</div>
<div>
<section class="mod-info">
<div class="mod-stats">
<h3>Info</h3>
<p>{{ mod.downloads }} Downloads</p>
<p>Created {{ $dayjs(mod.published).fromNow() }}</p>
<p>Updated {{ $dayjs(mod.updated).fromNow() }}</p>
<div class="mod-stats section">
<div class="stat">
<DownloadIcon />
<div class="info">
<h4>Downloads</h4>
<p class="value">{{ formatNumber(mod.downloads) }}</p>
</div>
</div>
<div class="stat">
<CalendarIcon />
<div class="info">
<h4>Created</h4>
<p
v-tooltip="
$dayjs(mod.published).format(
'[Created on] YYYY-MM-DD [at] HH:mm A'
)
"
class="value"
>
{{ $dayjs(mod.published).fromNow() }}
</p>
</div>
</div>
<div class="stat">
<TagIcon />
<div class="info">
<h4>Available For</h4>
<p class="value">
{{
versions[versions.length - 1]
? versions[versions.length - 1].game_versions[0]
? versions[versions.length - 1].game_versions[0]
: 'None'
: 'None'
}}
</p>
</div>
</div>
<div class="stat">
<EditIcon />
<div class="info">
<h4>Updated</h4>
<p
v-tooltip="
$dayjs(mod.updated).format(
'[Updated on] YYYY-MM-DD [at] HH:mm A'
)
"
class="value"
>
{{ $dayjs(mod.updated).fromNow() }}
</p>
</div>
</div>
<Categories :categories="mod.categories.concat(mod.loaders)" />
</div>
<div>
<div class="section">
<h3>Members</h3>
<div
v-for="member in members"
@@ -77,63 +140,75 @@
<nuxt-link :to="'/user/' + member.user_id">
<h4>{{ member.name }}</h4>
</nuxt-link>
<p>{{ member.role }}</p>
<h3>{{ member.role }}</h3>
</div>
</div>
</div>
<div v-if="versions.length > 0">
<div v-if="versions.length > 0" class="section">
<h3>Featured Versions</h3>
<div
v-for="version in versions"
:key="version.id"
class="featured-version columns"
class="featured-version"
>
<div class="version-info">
<div class="columns">
<h4 class="limit-text-width">
{{ version.name }}
</h4>
<p
<a
:href="findPrimary(version).url"
class="download"
@click.prevent="
downloadFile(
findPrimary(version).hashes.sha1,
findPrimary(version).url
)
"
>
<DownloadIcon />
</a>
<div class="info">
<div class="top">
<span
v-if="version.version_type === 'release'"
class="badge green"
>
Release
</p>
<p v-if="version.version_type === 'beta'" class="badge yellow">
</span>
<span
v-if="version.version_type === 'beta'"
class="badge yellow"
>
Beta
</p>
<p v-if="version.version_type === 'alpha'" class="badge red">
</span>
<span v-if="version.version_type === 'alpha'" class="badge red">
Alpha
</p>
</span>
<h4 class="title">
<nuxt-link :to="'/mod/' + mod.id + '/version/' + version.id">
{{ version.name }}
</nuxt-link>
</h4>
</div>
<div class="columns info-2">
<p class="version-number limit-text-width">
{{ version.version_number }}
</p>
<div class="bottom">
<span class="version-number limit-text-width">
{{ version.version_number }} ·
</span>
<FabricIcon
v-if="version.loaders.includes('fabric')"
stroke="#AC6C3A"
class="loader"
/>
<ForgeIcon
v-if="version.loaders.includes('forge')"
stroke="#8B81E6"
class="loader"
/>
<p
<span
v-if="version.game_versions.length > 0"
class="game-version limit-text-width"
>
{{ version.game_versions[0] }}
</p>
· {{ version.game_versions[0] }}
</span>
</div>
</div>
<nuxt-link :to="'/mod/' + mod.id + '/version/' + version.id">
<DownloadIcon />
</nuxt-link>
</div>
<client-only>
<EthicalAd type="image" />
</client-only>
</div>
<m-footer class="footer" />
</section>
</div>
</div>
@@ -142,11 +217,16 @@
<script>
import EthicalAd from '@/components/EthicalAd'
import Categories from '@/components/Categories'
import MFooter from '@/components/MFooter'
import axios from 'axios'
import CalendarIcon from '~/assets/images/utils/calendar.svg?inline'
import DownloadIcon from '~/assets/images/utils/download.svg?inline'
import EditIcon from '~/assets/images/utils/edit.svg?inline'
import TagIcon from '~/assets/images/utils/tag.svg?inline'
import ExternalIcon from '~/assets/images/utils/external.svg?inline'
import InfoIcon from '~/assets/images/utils/info.svg?inline'
import VersionIcon from '~/assets/images/utils/version.svg?inline'
import SettingsIcon from '~/assets/images/utils/settings.svg?inline'
import ForgeIcon from '~/assets/images/categories/forge.svg?inline'
import FabricIcon from '~/assets/images/categories/fabric.svg?inline'
@@ -154,14 +234,16 @@ import FabricIcon from '~/assets/images/categories/fabric.svg?inline'
export default {
name: 'ModPage',
components: {
MFooter,
Categories,
EthicalAd,
ExternalIcon,
InfoIcon,
VersionIcon,
SettingsIcon,
ForgeIcon,
FabricIcon,
DownloadIcon,
CalendarIcon,
EditIcon,
TagIcon,
},
props: {
mod: {
@@ -183,190 +265,168 @@ export default {
},
},
},
methods: {
formatNumber(x) {
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
},
findPrimary(version) {
let file = version.files.find((x) => x.primary)
if (!file) {
file = version.files[0]
}
if (!file) {
file = { url: `/mod/${this.mod.id}/version/${version.id}` }
}
return file
},
async downloadFile(hash, url) {
await axios.get(
`https://api.modrinth.com/api/v1/version_file/${hash}/download`
)
const elem = document.createElement('a')
elem.download = hash
elem.href = url
elem.click()
},
},
}
</script>
<style lang="scss">
.mod-header {
align-items: center;
img {
border-radius: var(--size-rounded-md);
width: 150px;
height: 150px;
object-fit: cover;
<style lang="scss" scoped>
.header {
@extend %row;
@extend %card-spaced-b;
width: 100%;
.icon {
margin: auto 0;
img {
width: 6rem;
height: 6rem;
margin: var(--spacing-card-md);
border-radius: var(--size-rounded-icon);
object-fit: contain;
}
}
.mod-header-text {
margin-left: 15px;
.info {
@extend %column;
.title {
align-items: end;
h2 {
margin: 0;
}
p {
align-self: flex-end;
margin: 0;
padding: 0 0 2px 5px;
}
margin: var(--spacing-card-md) var(--spacing-card-md) 0 0;
color: var(--color-text-dark);
font-size: var(--font-size-lg);
}
.description {
margin: var(--spacing-card-sm) var(--spacing-card-md) 0 0;
height: 100%;
color: var(--color-text-dark);
}
}
}
.mod-navigation {
display: flex;
margin-top: 20px;
a {
user-select: none;
display: flex;
align-items: center;
padding: 10px 20px;
border-bottom: 2px solid var(--color-grey-2);
svg {
margin-right: 10px;
}
&:hover,
&:focus {
border-bottom: 2px solid var(--color-grey-3);
}
&.nuxt-link-exact-active {
border-bottom: 2px solid var(--color-brand);
}
}
.filler {
flex-grow: 1;
border-bottom: 2px solid var(--color-grey-2);
}
@extend %card-spaced-b;
padding-bottom: 0.2rem;
}
.mod-info {
top: 1rem;
position: sticky;
min-width: 270px;
max-width: 270px;
margin: 1rem;
padding: 0 0.75rem 0 1rem;
overflow-y: auto;
background-color: var(--color-bg);
border: 1px solid var(--color-grey-2);
border-radius: var(--size-rounded-sm);
width: 30rem;
height: auto;
margin-left: var(--spacing-card-lg);
.section {
padding: var(--spacing-card-sm);
@extend %card-spaced-b;
margin-top: var(--spacing-card-lg);
}
h3 {
color: #718096;
font-size: 0.8rem;
letter-spacing: 0.02rem;
margin: 1.5rem 0 0.5rem 0;
text-transform: uppercase;
@extend %large-label;
}
.mod-stats {
display: flex;
flex-wrap: wrap;
margin-top: 0;
margin-left: 5px;
p {
color: var(--color-grey-4);
margin: 3px;
}
.stat {
width: 8.5rem;
margin: 0.75rem;
@extend %stat;
svg {
padding: 0.25rem;
border-radius: 50%;
background-color: var(--color-button-bg);
}
}
}
.team-member {
margin-left: 5px;
margin-bottom: 10px;
border: 1px solid var(--color-grey-1);
border-radius: var(--size-rounded-sm);
img {
border-radius: var(--size-rounded-sm);
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-radius: var(--size-rounded-icon);
height: 50px;
width: 50px;
}
.member-info {
max-width: 150px;
overflow: hidden;
margin: auto 0 auto 20px;
margin: auto 0 auto 0.5rem;
h4 {
font-weight: normal;
margin: 0;
}
p {
color: var(--color-grey-4);
font-weight: lighter;
font-size: 12pt;
margin: 0;
h3 {
margin-top: 0.1rem;
margin-bottom: 0;
}
}
}
.featured-version {
margin-left: 5px;
margin-bottom: 10px;
border: 1px solid var(--color-grey-1);
border-radius: var(--size-rounded-sm);
.version-info {
padding: 5px 10px;
h4 {
max-width: 120px;
font-weight: normal;
margin: 0 10px 0 0;
}
.badge {
margin: 0;
display: inline-block;
}
.info-2 {
overflow: hidden;
max-width: 180px;
align-items: center;
.version-number {
max-width: 80px;
}
.game-version {
max-width: 120px;
}
p {
color: var(--color-grey-4);
font-weight: lighter;
margin: 0 10px 0 0;
}
svg {
min-width: 24px;
min-height: 24px;
margin-right: 10px;
}
@extend %row;
padding-top: var(--spacing-card-sm);
padding-bottom: var(--spacing-card-sm);
.download {
display: flex;
align-items: center;
height: 2.25rem;
width: 2.25rem;
border-radius: 2rem;
background-color: var(--color-button-bg);
margin-right: var(--spacing-card-sm);
svg {
width: 1.25rem;
margin: auto;
}
}
a {
display: table-cell;
margin-left: auto;
width: 40px;
height: 60px;
background-color: var(--color-grey-1);
color: var(--color-grey-3);
svg {
margin-top: 15px;
height: 30px;
width: 40px;
.info {
@extend %column;
font-size: var(--font-size-xs);
.top {
@extend %row;
.badge {
font-size: var(--font-size-xs);
margin-right: var(--spacing-card-sm);
}
.title {
margin: auto 0;
}
}
&:hover,
&:focus {
background-color: var(--color-grey-3);
color: var(--color-grey-4);
.bottom {
margin-top: 0.25rem;
@extend %row;
.loader {
height: 1rem;
}
}
}
}

View File

@@ -1,464 +0,0 @@
<template>
<div class="result rows">
<img
class="result-icon"
:src="iconUrl ? iconUrl : 'https://cdn.modrinth.com/placeholder.svg'"
:alt="name"
/>
<div class="rows result-name-author">
<h2 class="mod-name">
<a :href="pageUrl">{{ name }}</a>
</h2>
<p v-if="author" class="author">
by <a :href="authorUrl">{{ author }}</a>
</p>
</div>
<p class="result-summary">
{{ description }}
</p>
<div class="column-grow-1 columns result-infos">
<div class="result-image columns">
<DownloadIcon stroke="#3cdb36" />
<p>{{ formatNumber(downloads) }}</p>
</div>
<div
v-tooltip="
$dayjs(createdAt).format('[Created on] YYYY-MM-DD [at] HH:mm A')
"
class="result-image columns"
>
<CalendarIcon fill="#099fef" />
<p>{{ $dayjs(createdAt).fromNow() }}</p>
</div>
<div
v-if="updatedAt"
v-tooltip="
$dayjs(updatedAt).format('[Updated on] YYYY-MM-DD [at] HH:mm A')
"
class="result-image columns"
>
<svg
viewBox="0 0 24 24"
fill="none"
stroke="#e88d0d"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
>
<path
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
></path>
<path
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
></path>
</svg>
<p>{{ $dayjs(updatedAt).fromNow() }}</p>
</div>
<div class="result-image columns">
<svg
viewBox="0 0 24 24"
fill="none"
stroke="#e8200d"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
>
<path
d="M20.59 13.41l-7.17 7.17a2 2 0 0 1-2.83 0L2 12V2h10l8.59 8.59a2 2 0 0 1 0 2.82z"
></path>
<line x1="7" y1="7" x2="7.01" y2="7"></line>
</svg>
<p>{{ latestVersion }}</p>
</div>
<div class="loaders columns">
<FabricLoader v-if="categories.includes('fabric')" stroke="#AC6C3A" />
<ForgeLoader v-if="categories.includes('forge')" stroke="#8B81E6" />
</div>
</div>
<div class="categories">
<p v-if="categories.includes('technology')">
<TechCategory />
Technology
</p>
<p v-if="categories.includes('adventure')">
<AdventureCategory />
Adventure
</p>
<p v-if="categories.includes('magic')">
<MagicCategory />
Magic
</p>
<p v-if="categories.includes('utility')">
<UtilityCategory />
Utility
</p>
<p v-if="categories.includes('decoration')">
<DecorationCategory />
Decoration
</p>
<p v-if="categories.includes('library')">
<LibraryCategory />
Library
</p>
<p v-if="categories.includes('cursed')">
<CursedCategory />
Cursed
</p>
<p v-if="categories.includes('worldgen')">
<WorldGenCategory />
Worldgen
</p>
<p v-if="categories.includes('storage')">
<StorageCategory />
Storage
</p>
<p v-if="categories.includes('food')">
<FoodCategory />
Food
</p>
<p v-if="categories.includes('equipment')">
<EquipmentCategory />
Equipment
</p>
<p v-if="categories.includes('misc')">
<MiscCategory />
Misc
</p>
</div>
</div>
</template>
<script>
import CalendarIcon from '~/assets/images/utils/calendar.svg?inline'
import DownloadIcon from '~/assets/images/utils/download.svg?inline'
import TechCategory from '~/assets/images/categories/tech.svg?inline'
import AdventureCategory from '~/assets/images/categories/adventure.svg?inline'
import CursedCategory from '~/assets/images/categories/cursed.svg?inline'
import DecorationCategory from '~/assets/images/categories/decoration.svg?inline'
import EquipmentCategory from '~/assets/images/categories/equipment.svg?inline'
import FoodCategory from '~/assets/images/categories/food.svg?inline'
import LibraryCategory from '~/assets/images/categories/library.svg?inline'
import MagicCategory from '~/assets/images/categories/magic.svg?inline'
import MiscCategory from '~/assets/images/categories/misc.svg?inline'
import StorageCategory from '~/assets/images/categories/storage.svg?inline'
import UtilityCategory from '~/assets/images/categories/utility.svg?inline'
import WorldGenCategory from '~/assets/images/categories/worldgen.svg?inline'
import ForgeLoader from '~/assets/images/categories/forge.svg?inline'
import FabricLoader from '~/assets/images/categories/fabric.svg?inline'
export default {
name: 'ModResult',
components: {
TechCategory,
AdventureCategory,
CursedCategory,
DecorationCategory,
EquipmentCategory,
FoodCategory,
LibraryCategory,
MagicCategory,
MiscCategory,
StorageCategory,
UtilityCategory,
WorldGenCategory,
ForgeLoader,
FabricLoader,
CalendarIcon,
DownloadIcon,
},
props: {
id: {
type: String,
default: 'modrinth-0',
},
name: {
type: String,
default: 'Mod Name',
},
author: {
type: String,
default: null,
},
description: {
type: String,
default: 'A mod description',
},
pageUrl: {
type: String,
default: '#',
},
authorUrl: {
type: String,
default: '#',
},
iconUrl: {
type: String,
default: '#',
},
downloads: {
type: String,
default: '0',
},
createdAt: {
type: String,
default: '0000-00-00',
},
updatedAt: {
type: String,
default: null,
},
latestVersion: {
type: String,
default: 'None',
},
categories: {
type: Array,
default() {
return []
},
},
},
methods: {
formatNumber(x) {
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
},
},
}
</script>
<style lang="scss">
.results {
margin-top: 10px;
}
.result {
display: grid;
grid-template-columns: 80px auto;
grid-template-rows: auto auto auto 30px;
max-width: 100vw;
margin-bottom: 10px;
background: var(--color-bg);
box-shadow: 0 2px 3px 1px var(--color-grey-2);
// Columns are larger to accomodate larger screens
@media screen and (min-width: 1375px) {
grid-template-columns: 120px auto;
}
}
.result * {
object-fit: contain;
margin-bottom: 0;
margin-top: 0;
}
.result-icon {
width: 60px;
height: 60px;
margin: 5px !important;
border-radius: 0.5rem;
grid-row-start: 1;
grid-row-end: 4;
grid-column-start: 1;
@media screen and (min-width: 900px) {
margin: 10px 20px 10px 10px !important;
width: 70px;
height: 70px;
}
// Larger screen, larger icon
@media screen and (min-width: 1375px) {
width: 90px;
height: 90px;
}
}
.result-name-author {
display: block;
margin-top: 10px;
min-height: 38px;
}
.result-summary {
grid-row: 2;
grid-column: 2;
max-height: 150px;
font-size: 11pt;
margin: auto 0;
}
.mod-name {
align-self: flex-end;
font-size: 13pt;
}
.author {
margin-bottom: 2px !important;
align-self: flex-end;
font-size: 12pt;
}
.result-infos {
display: grid;
grid-template-columns: 115px 115px auto;
grid-template-rows: 20px 20px;
margin-top: 5px;
grid-column: 2;
align-items: flex-start;
align-self: flex-start;
.columns:nth-child(2) {
grid-column: 1;
}
.columns:nth-child(3) {
grid-column: 2;
grid-row: 1;
}
.result-image {
p {
font-size: 10pt;
}
svg {
width: 14px;
height: 14px;
}
}
}
.result-image svg {
width: 15px;
height: 15px;
align-self: center;
}
.result-image p {
margin-left: 5px;
margin-right: 15px;
font-size: 15px;
align-self: center;
}
.categories {
display: flex;
flex-direction: row;
grid-column: 1;
margin: 0 0 auto;
}
.categories p {
display: flex;
align-items: center;
flex-direction: row;
background-color: var(--color-grey-1);
color: var(--color-text);
margin: 0 5px;
padding: 2px;
font-size: 15px;
svg {
width: 15px;
margin-right: 5px;
}
}
.loaders {
align-items: center;
grid-column: 1;
grid-row: 3;
img {
width: 15px;
}
svg {
width: 20px;
margin-top: 2px;
margin-left: 5px;
}
}
// Larger tablet-sized screens
@media screen and (min-width: 900px) {
.result {
grid-template-columns: 90px auto;
grid-template-rows: auto auto 35px;
}
.result-infos {
display: flex;
align-items: center;
margin-top: 0;
.result-image {
p {
font-size: 15px;
}
svg {
width: 15px;
height: 15px;
}
}
}
.loaders {
svg {
width: 20px;
}
}
.categories {
margin: 0 0 10px 0;
}
.result-name-author {
display: flex;
margin-top: 0;
.author {
margin-left: 5px;
}
}
.mod-name {
font-size: 18pt;
}
.result-summary {
max-height: 100px;
font-size: 13pt;
}
}
// Larger screens
@media screen and (min-width: 1375px) {
.result {
margin: 5px 0;
grid-column: 1;
grid-template-columns: 110px auto;
}
.categories {
margin: 0 5px 10px auto;
grid-row: 3;
grid-column: 3;
}
.mod-name {
font-size: 20pt;
}
}
// Desktop
@media screen and (min-width: 1500px) {
.result-name-author {
display: flex;
min-height: 38px;
grid-column: 2;
}
}
</style>

View File

@@ -1,59 +1,57 @@
<template>
<div v-if="pages.length > 1" class="columns paginates">
<svg
:class="{
'disabled-paginate': currentPage === 1,
'active-paginate': currentPage !== 1,
}"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
<button
:class="{ disabled: currentPage === 1 }"
class="paginate has-icon"
@click="currentPage !== 1 ? switchPage(currentPage - 1) : null"
>
<polyline points="15 18 9 12 15 6"></polyline>
</svg>
<p
<LeftArrowIcon />
</button>
<div
v-for="(item, index) in pages"
:key="'page-' + item"
:class="{
'active-page-number': currentPage !== item,
'page-number': currentPage !== item,
}"
@click="currentPage !== item ? switchPage(item) : null"
class="page-number-container"
>
<span v-if="pages[index - 1] + 1 !== item && item !== 1">...</span>
<span :class="{ 'disabled-page-number': currentPage === item }">{{
item
}}</span>
</p>
<div v-if="pages[index - 1] + 1 !== item && item !== 1" class="has-icon">
<GapIcon />
</div>
<button
:class="{ 'page-number current': currentPage === item }"
@click="currentPage !== item ? switchPage(item) : null"
>
{{ item }}
</button>
</div>
<svg
:class="{
'disabled-paginate': currentPage === pages[pages.length - 1],
'active-paginate': currentPage !== pages[pages.length - 1],
}"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
<button
:class="{ disabled: currentPage === pages[pages.length - 1] }"
class="paginate has-icon"
@click="
currentPage !== pages[pages.length - 1]
? switchPage(currentPage + 1)
: null
"
>
<polyline points="9 18 15 12 9 6"></polyline>
</svg>
<RightArrowIcon />
</button>
</div>
</template>
<script>
import GapIcon from '~/assets/images/utils/gap.svg?inline'
import LeftArrowIcon from '~/assets/images/utils/left-arrow.svg?inline'
import RightArrowIcon from '~/assets/images/utils/right-arrow.svg?inline'
export default {
name: 'Pagination',
components: {
GapIcon,
LeftArrowIcon,
RightArrowIcon,
},
props: {
currentPage: {
type: Number,
@@ -74,32 +72,41 @@ export default {
}
</script>
<style scoped>
.paginates {
<style scoped lang="scss">
button {
min-width: 2rem;
padding: 0 0.5rem;
height: 2rem;
border-radius: 2rem;
background: transparent;
&.page-number.current {
background: var(--color-button-bg-hover);
color: var(--color-button-text-hover);
cursor: default;
}
&.paginate.disabled {
background: none;
color: var(--color-button-text-disabled);
cursor: default;
}
&:hover {
background: var(--color-button-bg-active);
color: var(--color-button-text-active);
}
}
.has-icon {
display: flex;
align-items: center;
padding: 0 0.5rem;
height: 2rem;
svg {
width: 1rem;
}
}
.paginates p {
margin-left: 5px;
margin-right: 5px;
}
.disabled-paginate {
cursor: default;
color: var(--color-grey-5);
}
.active-page-number,
.active-paginate {
user-select: none;
cursor: pointer;
}
.disabled-page-number {
user-select: none;
cursor: default;
padding: 2px 3px;
border-radius: 3px;
background-color: var(--color-grey-1);
.page-number-container {
display: flex;
max-height: 2rem;
}
</style>

View File

@@ -27,7 +27,7 @@ export default {
position: fixed;
width: 100%;
height: 100%;
background-color: var(--color-grey-3);
background-color: var(--color-button-bg);
border: none;
opacity: 0.6;
overflow-x: hidden;
@@ -39,7 +39,7 @@ export default {
left: 50%;
transform: translate(-50%, -50%);
z-index: 2;
box-shadow: 0 2px 3px 1px var(--color-grey-2);
box-shadow: 0 2px 3px 1px var(--color-button-bg);
padding: 5px 60px 5px 20px;
border-radius: 10px;
max-height: 80%;

275
components/ProjectCard.vue Normal file
View File

@@ -0,0 +1,275 @@
<template>
<div class="project-card">
<div class="icon">
<img
:src="iconUrl ? iconUrl : 'https://cdn.modrinth.com/placeholder.svg'"
:alt="name"
/>
</div>
<div class="info">
<div class="top">
<h2 class="title">
<nuxt-link v-if="isModrinth" :to="'/mod/' + id">{{ name }}</nuxt-link>
<a v-else :href="pageUrl">{{ name }}</a>
</h2>
<p v-if="author" class="author">
by <a :href="authorUrl">{{ author }}</a>
</p>
</div>
<p class="description">
{{ description }}
</p>
<div :class="{ vertical: editMode }" class="bottom">
<div class="stats">
<div v-if="status !== null" class="stat">
<div class="info">
<h4>Status</h4>
<span v-if="status === 'approved'" class="badge green">
Approved
</span>
<span v-if="status === 'rejected'" class="badge red">
Rejected
</span>
<span v-if="status === 'draft'" class="badge yellow">Draft</span>
<span v-if="status === 'processing'" class="badge yellow">
Processing
</span>
<span v-if="status === 'unlisted'" class="badge gray">
Unlisted
</span>
<span v-if="status === 'unknown'" class="badge gray">
Unknown
</span>
</div>
</div>
<div class="stat">
<DownloadIcon />
<div class="info">
<h4>Downloads</h4>
<p class="value">{{ formatNumber(downloads) }}</p>
</div>
</div>
<div class="stat">
<CalendarIcon />
<div class="info">
<h4>Created</h4>
<p
v-tooltip="
$dayjs(createdAt).format(
'[Created on] YYYY-MM-DD [at] HH:mm A'
)
"
class="value"
>
{{ $dayjs(createdAt).fromNow() }}
</p>
</div>
</div>
<div class="stat">
<EditIcon />
<div class="info">
<h4>Updated</h4>
<p
v-tooltip="
$dayjs(updatedAt).format(
'[Updated on] YYYY-MM-DD [at] HH:mm A'
)
"
class="value"
>
{{ $dayjs(updatedAt).fromNow() }}
</p>
</div>
</div>
<div v-if="latestVersion" class="stat">
<TagIcon />
<div class="info">
<h4>Available For</h4>
<p class="value">
{{ latestVersion }}
</p>
</div>
</div>
</div>
<Categories :categories="categories" />
</div>
</div>
<div v-if="editMode" class="buttons">
<nuxt-link class="transparent-button column" :to="'/mod/' + id + '/edit'">
Edit
</nuxt-link>
</div>
</div>
</template>
<script>
import Categories from '@/components/Categories'
import CalendarIcon from '~/assets/images/utils/calendar.svg?inline'
import DownloadIcon from '~/assets/images/utils/download.svg?inline'
import EditIcon from '~/assets/images/utils/edit.svg?inline'
import TagIcon from '~/assets/images/utils/tag.svg?inline'
export default {
name: 'ProjectCard',
components: {
Categories,
CalendarIcon,
DownloadIcon,
EditIcon,
TagIcon,
},
props: {
id: {
type: String,
default: 'modrinth-0',
},
name: {
type: String,
default: 'Mod Name',
},
author: {
type: String,
default: null,
},
description: {
type: String,
default: 'A mod description',
},
pageUrl: {
type: String,
default: '#',
},
authorUrl: {
type: String,
default: '#',
},
iconUrl: {
type: String,
default: '#',
},
downloads: {
type: String,
default: '0',
},
createdAt: {
type: String,
default: '0000-00-00',
},
updatedAt: {
type: String,
default: null,
},
latestVersion: {
type: String,
default: null,
},
categories: {
type: Array,
default() {
return []
},
},
editMode: {
type: Boolean,
default: false,
},
status: {
type: String,
default: null,
},
role: {
type: String,
default: null,
},
isModrinth: {
type: Boolean,
default: false,
},
},
methods: {
formatNumber(x) {
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
},
},
}
</script>
<style lang="scss" scoped>
.project-card {
@extend %row;
@extend %card-spaced-b;
width: 100%;
.icon {
margin: auto 0;
img {
width: 6rem;
height: 6rem;
margin: var(--spacing-card-md);
border-radius: var(--size-rounded-icon);
object-fit: contain;
}
}
.info {
@extend %column;
.top {
@extend %row;
flex-wrap: wrap;
margin-top: var(--spacing-card-md);
margin-right: var(--spacing-card-md);
.title {
margin: 0;
color: var(--color-text-dark);
font-size: var(--font-size-lg);
}
.author {
margin: auto 0 0 0.5rem;
color: var(--color-text);
}
}
.description {
margin: var(--spacing-card-sm) var(--spacing-card-md) 0 0;
height: 100%;
color: var(--color-text-dark);
}
.bottom {
@extend %column;
margin-top: var(--spacing-card-sm);
margin-right: var(--spacing-card-md);
margin-bottom: var(--spacing-card-md);
@media screen and (min-width: 1024px) {
flex-direction: row;
&.vertical {
flex-direction: column;
.categories {
margin-top: var(--spacing-card-sm);
}
}
}
.stats {
@extend %row;
flex-wrap: wrap;
@media screen and (min-width: 900px) {
flex-wrap: nowrap;
}
.stat {
@extend %stat;
}
}
.categories {
@media screen and (min-width: 1024px) {
flex-direction: row;
margin: auto 0;
}
}
}
}
.buttons {
@extend %column;
}
}
</style>

View File

@@ -1,7 +1,10 @@
<template>
<p
class="filter"
:class="{ 'filter-active': activeFilters.includes(facetName) }"
:class="{
'filter-active': activeFilters.includes(facetName),
cursed: displayName == 'FlameAnvil',
}"
@click="toggle"
>
<slot></slot>
@@ -41,30 +44,28 @@ export default {
display: flex;
align-items: center;
cursor: pointer;
padding: 2px 2px 2px 20px;
margin: 0 0 0 5px;
border-left: 4px solid var(--color-grey-3);
border-radius: 0 0.25rem 0.25rem 0;
color: var(--color-grey-5);
padding: 0.4rem 0.3rem;
margin: 3px 0 0 0.5rem;
font-size: 1rem;
letter-spacing: 0.02rem;
@extend %transparent-clickable;
@media screen and (min-width: 1024px) {
padding: 0.2rem 0.3rem;
}
svg {
color: var(--color-icon);
margin-right: 5px;
height: 1rem;
flex-shrink: 0;
}
&:hover,
&:focus {
background-color: var(--color-grey-1);
color: var(--color-text);
}
}
.filter-active {
background-color: var(--color-grey-1);
color: var(--color-text);
border-left: 4px solid var(--color-brand);
@extend %transparent-clickable.selected;
svg {
color: var(--color-brand-light);
}
}
</style>