mtd/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Migrate to Nuxt 3 (#933)

Browse Source 
* Migrate to Nuxt 3

* Update vercel config

* remove tsconfig comment

* Changelog experiment + working proj pages

* Fix package json

* Prevent vercel complaining

* fix deploy (hopefully)

* Tag generator

* Switch to yarn

* Vercel pls 🙏

* Fix tag generation bug

* Make (most) non-logged in pages work

* fix base build

* Linting + state

* Eradicate axios, make most user pages work

* Fix checkbox state being set incorrectly

* Make most things work

* Final stretch

* Finish (most) things

* Move to update model value

* Fix modal text getting blurred from transforms (#964)

* Adjust nav-link border radius when focused (#961)

* Transition between animation states on TextLogo (#955)

* Transition between animation states on TextLogo

* Remove unused refs

* Fixes from review

* Disable tabbing to pagination arrows when disabled (#972)

* Make position of the "no results" text on grid/gallery views consistent (fixes #963) (#965)

* Fix position of the "no results" text on grid view

* fix padding

* Remove extra margin on main page, fixes #957 (#959)

* Fix layout shift and placeholder line height (#973)

* Fix a lot of issues

* Fix more nuxt 3 issues

* fix not all versions showing up (temp)

* inline inter css file

* More nuxt 3 fixes

* [skip ci] broken- backup changes

* Change modpack warnings to blue instead of red (#991)

* Fix some hydration issues

* Update nuxt

* Fix some images not showing

* Add pagination to versions page + fix lag

* Make changelog page consistent with versions page

* sync before merge

* Delete old file

* Fix actions failing

* update branch

* Fixes navbar transition animation. (#1012)

* Fixes navbar transition animation.

* Fixes Y-axis animation. Fixes mobile menu. Removes highlightjs prop.

* Changes xss call to renderString.

* Fixes renderString call.

* Removes unnecessary styling.

* Reverts mobile nav change.

* Nuxt 3 Lazy Loading Search (#1022)

* Uses lazyFetch for results. onSearchChange refreshes. Adds loading circle.

* Removes console.log

* Preserves old page when paging.

* Diagnosing filtering bugs.

* Fix single facet filtering

* Implements useAuth in settings/account.

* tiny ssr fix

* Updating nuxt.config checklist.

* Implements useAuth in revenue, moneitzation, and dashboard index pages.

* Fixes setups.

* Eliminates results when path changes. Adds animated logo.

* Ensures loading animation renders on search page.

---------

Co-authored-by: Jai A <jaiagr+gpg@pm.me>

* Fix navigation issues

* Square button fix (#1023)

* Removes checklist from nuxt.config.

* Modifies Nuxt CI to build after linting.

* Fixes prettierignore file.

* bug fixes

* Update whitelist domains

* Page improvements, fix CLS

* Fix a lot of things

* Fix project type redirect

* Fix 404 errors

* Fix user settings + hydration error

* Final fixes

* fix(creator-section): border radius on icons not aligning with bg (#1027)

Co-authored-by: MagnusHJensen <magnus.holm.jensen@lego.dk>

* Improvements to the mobile navbar (#984)

* Transition between animation states on TextLogo

* Remove unused refs

* Fixes from review

* Improvements to the mobile nav menu

* fix avatar alt text

* Nevermind, got confused for a moment

* Tab bar, menu layout improvements

* Highlight search icon when menu is open

* Update layouts/default.vue

Co-authored-by: Magnus Jensen <magnushjensen.mail@gmail.com>

* Fix some issues

* Use caret instead

* Run prettier

* Add create a project

---------

Co-authored-by: Magnus Jensen <magnushjensen.mail@gmail.com>
Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>
Co-authored-by: Jai A <jaiagr+gpg@pm.me>

* Fix mobile menu issues

* More issues

* Fix lint

---------

Co-authored-by: Kaeden Murphy <kmurphy@kaedenmurphy.dev>
Co-authored-by: triphora <emmaffle@modrinth.com>
Co-authored-by: Zach Baird <30800863+ZachBaird@users.noreply.github.com>
Co-authored-by: stairman06 <36215135+stairman06@users.noreply.github.com>
Co-authored-by: Zachary Baird <zdb1994@yahoo.com>
Co-authored-by: Magnus Jensen <magnushjensen.mail@gmail.com>
Co-authored-by: MagnusHJensen <magnus.holm.jensen@lego.dk>
This commit is contained in:
Geometrically
2023-03-09 10:05:32 -07:00
committed by GitHub
parent 5638f0f24b
commit 740357d120
145 changed files with 12371 additions and 37478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/moderation.vue
+58 -96
View File
@@ -11,22 +11,21 @@
<aside class="universal-card">
<h1>Moderation</h1>
<NavStack>
<NavStackItem link="" label="All"> </NavStackItem>
<NavStackItem link="/moderation" label="All" />
<NavStackItem
v-for="type in moderationTypes"
:key="type"
:link="'?type=' + type"
:link="'/moderation/' + type"
:label="$formatProjectType(type) + 's'"
>
</NavStackItem>
/>
</NavStack>
</aside>
</div>
<div class="normal-page__content">
<div class="project-list display-mode--list">
<ProjectCard
v-for="project in $route.query.type !== undefined
? projects.filter((x) => x.project_type === $route.query.type)
v-for="project in $route.params.type !== undefined
? projects.filter((x) => x.project_type === $route.params.type)
: projects"
:id="project.slug || project.id"
:key="project.id"
@@ -47,56 +46,40 @@
@click="
setProjectStatus(
project,
project.requested_status
? project.requested_status
: 'approved'
project.requested_status ? project.requested_status : 'approved'
)
"
>
<CheckIcon />
Approve
</button>
<button
class="iconified-button"
@click="setProjectStatus(project, 'withheld')"
>
<button class="iconified-button" @click="setProjectStatus(project, 'withheld')">
<UnlistIcon />
Withhold
</button>
<button
class="iconified-button"
@click="setProjectStatus(project, 'rejected')"
>
<button class="iconified-button" @click="setProjectStatus(project, 'rejected')">
<CrossIcon />
Reject
</button>
</ProjectCard>
</div>
<div
v-if="
$route.query.type === 'report' || $route.query.type === undefined
"
v-if="$route.params.type === 'report' || $route.params.type === undefined"
class="reports"
>
<div
v-for="(item, index) in reports"
:key="index"
class="card report"
>
<div v-for="(item, index) in reports" :key="index" class="card report">
<div class="info">
<div class="title">
<h3>
{{ item.item_type }}
<nuxt-link :to="item.url">{{ item.item_id }}</nuxt-link>
<nuxt-link :to="item.url">
{{ item.item_id }}
</nuxt-link>
</h3>
reported by
<a :href="`/user/${item.reporter}`">{{ item.reporter }}</a>
</div>
<div
v-highlightjs
class="markdown-body"
v-html="$xss($md.render(item.body))"
/>
<div class="markdown-body" v-html="renderHighlightedString(item.body)" />
<Badge :type="`Marked as ${item.report_type}`" color="orange" />
</div>
<div class="actions">
@@ -104,21 +87,17 @@
<TrashIcon /> Delete report
</button>
<span
v-tooltip="
$dayjs(item.created).format(
'[Created at] YYYY-MM-DD [at] HH:mm A'
)
"
v-tooltip="$dayjs(item.created).format('[Created at] YYYY-MM-DD [at] HH:mm A')"
class="stat"
>
<CalendarIcon />
Created {{ $dayjs(item.created).fromNow() }}
Created {{ fromNow(item.created) }}
</span>
</div>
</div>
</div>
<div v-if="reports.length === 0 && projects.length === 0" class="error">
<Security class="icon"></Security>
<Security class="icon" />
<br />
<span class="text">You are up-to-date!</span>
</div>
@@ -131,18 +110,18 @@
import ProjectCard from '~/components/ui/ProjectCard'
import Badge from '~/components/ui/Badge'
import CheckIcon from '~/assets/images/utils/check.svg?inline'
import UnlistIcon from '~/assets/images/utils/eye-off.svg?inline'
import CrossIcon from '~/assets/images/utils/x.svg?inline'
import TrashIcon from '~/assets/images/utils/trash.svg?inline'
import CalendarIcon from '~/assets/images/utils/calendar.svg?inline'
import Security from '~/assets/images/illustrations/security.svg?inline'
import CheckIcon from '~/assets/images/utils/check.svg'
import UnlistIcon from '~/assets/images/utils/eye-off.svg'
import CrossIcon from '~/assets/images/utils/x.svg'
import TrashIcon from '~/assets/images/utils/trash.svg'
import CalendarIcon from '~/assets/images/utils/calendar.svg'
import Security from '~/assets/images/illustrations/security.svg'
import NavStack from '~/components/ui/NavStack'
import NavStackItem from '~/components/ui/NavStackItem'
import ModalModeration from '~/components/ui/ModalModeration'
import { renderHighlightedString } from '~/helpers/highlight'
export default {
name: 'Moderation',
export default defineNuxtComponent({
components: {
ModalModeration,
NavStack,
@@ -156,13 +135,17 @@ export default {
TrashIcon,
CalendarIcon,
},
async asyncData(data) {
const [projects, reports] = (
await Promise.all([
data.$axios.get(`moderation/projects`, data.$defaultHeaders()),
data.$axios.get(`report`, data.$defaultHeaders()),
])
).map((it) => it.data)
async setup() {
const data = useNuxtApp()
definePageMeta({
middleware: 'auth',
})
const [projects, reports] = await Promise.all([
useBaseFetch('moderation/projects', data.$defaultHeaders()),
useBaseFetch('report', data.$defaultHeaders()),
])
const newReports = await Promise.all(
reports.map(async (report) => {
@@ -173,48 +156,26 @@ export default {
let url = ''
if (report.item_type === 'user') {
const user = (
await data.$axios.get(
`user/${report.item_id}`,
data.$defaultHeaders()
)
).data
const user = await useBaseFetch(`user/${report.item_id}`, data.$defaultHeaders())
url = `/user/${user.username}`
report.item_id = user.username
} else if (report.item_type === 'project') {
const project = (
await data.$axios.get(
`project/${report.item_id}`,
data.$defaultHeaders()
)
).data
const project = await useBaseFetch(`project/${report.item_id}`, data.$defaultHeaders())
report.item_id = project.slug || report.item_id
url = `/${project.project_type}/${report.item_id}`
} else if (report.item_type === 'version') {
const version = (
await data.$axios.get(
`version/${report.item_id}`,
data.$defaultHeaders()
)
).data
const project = (
await data.$axios.get(
`project/${version.project_id}`,
data.$defaultHeaders()
)
).data
const version = await useBaseFetch(`version/${report.item_id}`, data.$defaultHeaders())
const project = await useBaseFetch(
`project/${version.project_id}`,
data.$defaultHeaders()
)
report.item_id = version.version_number || report.item_id
url = `/${project.project_type}/${
project.slug || project.id
}/version/${report.item_id}`
url = `/${project.project_type}/${project.slug || project.id}/version/${report.item_id}`
}
report.reporter = (
await data.$axios.get(
`user/${report.reporter}`,
data.$defaultHeaders()
)
).data.username
await useBaseFetch(`user/${report.reporter}`, data.$defaultHeaders())
).username
return {
...report,
@@ -232,8 +193,8 @@ export default {
)
return {
projects,
reports: newReports,
projects: shallowRef(projects),
reports: ref(newReports),
}
},
data() {
@@ -261,6 +222,7 @@ export default {
},
},
methods: {
renderHighlightedString,
setProjectStatus(project, status) {
this.currentProject = project
this.currentStatus = status
@@ -275,28 +237,28 @@ export default {
this.currentProject = null
},
async deleteReport(index) {
this.$nuxt.$loading.start()
startLoading()
try {
await this.$axios.delete(
`report/${this.reports[index].id}`,
this.$defaultHeaders()
)
await useBaseFetch(`report/${this.reports[index].id}`, {
method: 'DELETE',
...this.$defaultHeaders(),
})
this.reports.splice(index, 1)
} catch (err) {
console.error(err)
this.$notify({
group: 'main',
title: 'An error occurred',
text: err.response.data.description,
text: err.data.description,
type: 'error',
})
}
this.$nuxt.$loading.finish()
stopLoading()
},
},
}
})
</script>
<style lang="scss" scoped>