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

move to cloudflare workers (#1229)

Browse Source 
* move to cloudflare workers

* remove junk
This commit is contained in:
Geometrically
2023-07-03 17:23:19 -07:00
committed by GitHub
parent 05d994889d
commit 4c8c35a25a
7 changed files with 1771 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -5,7 +5,9 @@ node_modules
.cache
.output
.env
.dev.vars
dist
.wrangler/
generated/
!.gitkeep
nuxt.config.ts
+8 -4
View File
@@ -258,8 +258,10 @@ export default defineNuxtConfig({
},
},
runtimeConfig: {
apiBaseUrl: process.env.BASE_URL ?? getApiUrl(),
rateLimitKey: process.env.RATE_LIMIT_IGNORE_KEY,
// @ts-ignore
apiBaseUrl: process.env.BASE_URL ?? globalThis.BASE_URL ?? getApiUrl(),
// @ts-ignore
rateLimitKey: process.env.RATE_LIMIT_IGNORE_KEY ?? globalThis.RATE_LIMIT_IGNORE_KEY,
public: {
apiBaseUrl: getApiUrl(),
ariadneBaseUrl: getAriadneUrl(),
@@ -294,11 +296,13 @@ export default defineNuxtConfig({
})
function getApiUrl() {
return process.env.BROWSER_BASE_URL ?? STAGING_API_URL
// @ts-ignore
return process.env.BROWSER_BASE_URL ?? globalThis.BROWSER_BASE_URL ?? STAGING_API_URL
}
function getAriadneUrl() {
return process.env.BROWSER_ARIADNE_URL ?? STAGING_ARIADNE_URL
// @ts-ignore
return process.env.BROWSER_ARIADNE_URL ?? globalThis.BROWSER_ARIADNE_URL ?? STAGING_ARIADNE_URL
}
function getDomain() {
package.json
+3 -2
View File
@@ -5,7 +5,7 @@
"dev": "nuxi dev",
"generate": "nuxi generate",
"preview": "nuxi preview",
"postinstall": "nuxi prepare",
"postinstall": "nuxi prepare && patch-package",
"lint:js": "eslint . --ext .js,.vue,.ts",
"lint": "npm run lint:js && prettier --check .",
"fix": "eslint . --fix --ext .js,.vue,.ts && prettier --write .",
@@ -33,7 +33,8 @@
"typescript": "^5.0.4",
"vite-plugin-eslint": "^1.8.1",
"vite-svg-loader": "^4.0.0",
"vue-tsc": "^1.6.5"
"vue-tsc": "^1.6.5",
"patch-package": "^7.0.0"
},
"dependencies": {
"@ltd/j-toml": "^1.38.0",
pages/search/[searchProjectType].vue
+141 -189
View File
@@ -341,7 +341,7 @@
</section>
</div>
</template>
<script>
<script setup>
import { Multiselect } from 'vue-multiselect'
import ProjectCard from '~/components/ui/ProjectCard.vue'
import Pagination from '~/components/ui/Pagination.vue'
@@ -361,91 +361,61 @@ import ImageIcon from '~/assets/images/utils/image.svg'
import Promotion from '~/components/ads/Promotion.vue'
export default defineNuxtComponent({
components: {
LogoAnimated,
Promotion,
ProjectCard,
Pagination,
Multiselect,
SearchFilter,
Checkbox,
ClientIcon,
ServerIcon,
SearchIcon,
ClearIcon,
FilterIcon,
GridIcon,
ListIcon,
ImageIcon,
},
data() {
return {
previousMaxResults: 20,
const sidebarMenuOpen = ref(false)
const showAllLoaders = ref(false)
maxResultsForView: {
list: [5, 10, 15, 20, 50, 100],
grid: [6, 12, 18, 24, 48, 96],
gallery: [6, 10, 16, 20, 50, 100],
},
const data = useNuxtApp()
const route = useRoute()
sidebarMenuOpen: false,
showAllLoaders: false,
}
},
setup() {
const data = useNuxtApp()
const route = useRoute()
const query = ref('')
const facets = ref([])
const orFacets = ref([])
const selectedVersions = ref([])
const onlyOpenSource = ref(false)
const showSnapshots = ref(false)
const selectedEnvironments = ref([])
const sortTypes = shallowReadonly([
const query = ref('')
const facets = ref([])
const orFacets = ref([])
const selectedVersions = ref([])
const onlyOpenSource = ref(false)
const showSnapshots = ref(false)
const selectedEnvironments = ref([])
const sortTypes = shallowReadonly([
{ display: 'Relevance', name: 'relevance' },
{ display: 'Download count', name: 'downloads' },
{ display: 'Follow count', name: 'follows' },
{ display: 'Recently published', name: 'newest' },
{ display: 'Recently updated', name: 'updated' },
])
const sortType = ref({ display: 'Relevance', name: 'relevance' })
const maxResults = ref(20)
const currentPage = ref(1)
const projectType = ref({ id: 'mod', display: 'mod', actual: 'mod' })
])
const sortType = ref({ display: 'Relevance', name: 'relevance' })
const maxResults = ref(20)
const currentPage = ref(1)
const projectType = ref({ id: 'mod', display: 'mod', actual: 'mod' })
const metaDescription = computed(
const metaDescription = computed(
() =>
`Search and browse thousands of Minecraft ${data.$formatProjectType(
projectType.value.display
)}s on Modrinth with instant, accurate search results. Our filters help you quickly find the best Minecraft ${data.$formatProjectType(
projectType.value.display
)}s.`
)
if (route.query.q) {
)
if (route.query.q) {
query.value = route.query.q
}
if (route.query.f) {
}
if (route.query.f) {
facets.value = getArrayOrString(route.query.f)
}
if (route.query.g) {
}
if (route.query.g) {
orFacets.value = getArrayOrString(route.query.g)
}
if (route.query.v) {
}
if (route.query.v) {
selectedVersions.value = getArrayOrString(route.query.v)
}
if (route.query.l) {
}
if (route.query.l) {
onlyOpenSource.value = route.query.l === 'true'
}
if (route.query.h) {
}
if (route.query.h) {
showSnapshots.value = route.query.h === 'true'
}
if (route.query.e) {
}
if (route.query.e) {
selectedEnvironments.value = getArrayOrString(route.query.e)
}
if (route.query.s) {
}
if (route.query.s) {
sortType.value.name = route.query.s
switch (sortType.value.name) {
@@ -465,25 +435,25 @@ export default defineNuxtComponent({
sortType.value.display = 'Follow count'
break
}
}
}
if (route.query.m) {
if (route.query.m) {
maxResults.value = route.query.m
}
if (route.query.o) {
}
if (route.query.o) {
currentPage.value = Math.ceil(route.query.o / maxResults.value) + 1
}
}
projectType.value = data.$tag.projectTypes.find(
projectType.value = data.$tag.projectTypes.find(
(x) => x.id === route.path.substring(1, route.path.length - 1)
)
)
const noLoad = ref(false)
const {
const noLoad = ref(false)
const {
data: rawResults,
refresh: refreshSearch,
pending: searchLoading,
} = useLazyFetch(
} = useLazyFetch(
() => {
const config = useRuntimeConfig()
const base = process.server ? config.apiBaseUrl : config.public.apiBaseUrl
@@ -491,7 +461,7 @@ export default defineNuxtComponent({
const params = [`limit=${maxResults.value}`, `index=${sortType.value.name}`]
if (query.value.length > 0) {
params.push(`query=${query.value.replace(/ /g, '+')}`)
params.push(`query=${encodeURIComponent(query.value.replace(/ /g, '+'))}`)
}
if (
@@ -511,9 +481,7 @@ export default defineNuxtComponent({
formattedFacets.push(orFacets.value)
} else if (projectType.value.id === 'plugin') {
formattedFacets.push(
data.$tag.loaderData.allPluginLoaders.map(
(x) => `categories:'${encodeURIComponent(x)}'`
)
data.$tag.loaderData.allPluginLoaders.map((x) => `categories:'${encodeURIComponent(x)}'`)
)
} else if (projectType.value.id === 'mod') {
formattedFacets.push(
@@ -521,9 +489,7 @@ export default defineNuxtComponent({
)
} else if (projectType.value.id === 'datapack') {
formattedFacets.push(
data.$tag.loaderData.dataPackLoaders.map(
(x) => `categories:'${encodeURIComponent(x)}'`
)
data.$tag.loaderData.dataPackLoaders.map((x) => `categories:'${encodeURIComponent(x)}'`)
)
}
@@ -568,7 +534,7 @@ export default defineNuxtComponent({
formattedFacets.push([`project_type:${projectType.value.actual}`])
}
params.push(`facets=${JSON.stringify(formattedFacets)}`)
params.push(`facets=${encodeURIComponent(JSON.stringify(formattedFacets))}`)
}
const offset = (currentPage.value - 1) * maxResults.value
@@ -587,19 +553,19 @@ export default defineNuxtComponent({
return `${base}${url}`
},
{
transform(hits) {
transform: (hits) => {
noLoad.value = false
return hits
},
}
)
)
const results = shallowRef(toRaw(rawResults))
const pageCount = computed(() =>
const results = shallowRef(toRaw(rawResults))
const pageCount = computed(() =>
results.value ? Math.ceil(results.value.total_hits / results.value.limit) : 1
)
)
const onSearchChange = (newPageNumber) => {
function onSearchChange(newPageNumber) {
noLoad.value = true
currentPage.value = newPageNumber
@@ -615,9 +581,9 @@ export default defineNuxtComponent({
const obj = getSearchUrl((currentPage.value - 1) * maxResults.value, true)
router.replace({ path: route.path, query: obj })
}
}
}
const getSearchUrl = (offset, useObj) => {
function getSearchUrl(offset, useObj) {
const queryItems = []
const obj = {}
@@ -673,35 +639,12 @@ export default defineNuxtComponent({
}
return useObj ? obj : url
}
}
return {
query,
results,
facets,
orFacets,
selectedVersions,
onlyOpenSource,
showSnapshots,
selectedEnvironments,
sortTypes,
sortType,
maxResults,
currentPage,
pageCount,
projectType,
onSearchChange,
getSearchUrl,
searchLoading,
noLoad,
metaDescription,
}
},
computed: {
categoriesMap() {
const categoriesMap = computed(() => {
const categories = {}
for (const category of this.$sortedCategories) {
for (const category of data.$sortedCategories) {
if (categories[category.header]) {
categories[category.header].push(category)
} else {
@@ -709,129 +652,138 @@ export default defineNuxtComponent({
}
}
const newVals = Object.keys(categories).reduce((obj, key) => {
return Object.keys(categories).reduce((obj, key) => {
obj[key] = categories[key]
return obj
}, {})
})
return newVals
},
},
methods: {
clearFilters() {
for (const facet of [...this.facets]) {
this.toggleFacet(facet, true)
function clearFilters() {
for (const facet of [...facets.value]) {
toggleFacet(facet, true)
}
for (const facet of [...this.orFacets]) {
this.toggleOrFacet(facet, true)
for (const facet of [...orFacets.value]) {
toggleOrFacet(facet, true)
}
this.onlyOpenSource = false
this.selectedVersions = []
this.selectedEnvironments = []
this.onSearchChange(1)
},
toggleFacet(elementName, doNotSendRequest = false) {
const index = this.facets.indexOf(elementName)
onlyOpenSource.value = false
selectedVersions.value = []
selectedEnvironments.value = []
onSearchChange(1)
}
function toggleFacet(elementName, doNotSendRequest = false) {
const index = facets.value.indexOf(elementName)
if (index !== -1) {
this.facets.splice(index, 1)
facets.value.splice(index, 1)
} else {
this.facets.push(elementName)
facets.value.push(elementName)
}
if (!doNotSendRequest) {
this.onSearchChange(1)
onSearchChange(1)
}
},
toggleOrFacet(elementName, doNotSendRequest) {
const index = this.orFacets.indexOf(elementName)
}
function toggleOrFacet(elementName, doNotSendRequest) {
const index = orFacets.value.indexOf(elementName)
if (index !== -1) {
this.orFacets.splice(index, 1)
orFacets.value.splice(index, 1)
} else {
if (elementName === 'categories:purpur') {
if (!this.orFacets.includes('categories:paper')) {
this.orFacets.push('categories:paper')
if (!orFacets.value.includes('categories:paper')) {
orFacets.value.push('categories:paper')
}
if (!this.orFacets.includes('categories:spigot')) {
this.orFacets.push('categories:spigot')
if (!orFacets.value.includes('categories:spigot')) {
orFacets.value.push('categories:spigot')
}
if (!this.orFacets.includes('categories:bukkit')) {
this.orFacets.push('categories:bukkit')
if (!orFacets.value.includes('categories:bukkit')) {
orFacets.value.push('categories:bukkit')
}
} else if (elementName === 'categories:paper') {
if (!this.orFacets.includes('categories:spigot')) {
this.orFacets.push('categories:spigot')
if (!orFacets.value.includes('categories:spigot')) {
orFacets.value.push('categories:spigot')
}
if (!this.orFacets.includes('categories:bukkit')) {
this.orFacets.push('categories:bukkit')
if (!orFacets.value.includes('categories:bukkit')) {
orFacets.value.push('categories:bukkit')
}
} else if (elementName === 'categories:spigot') {
if (!this.orFacets.includes('categories:bukkit')) {
this.orFacets.push('categories:bukkit')
if (!orFacets.value.includes('categories:bukkit')) {
orFacets.value.push('categories:bukkit')
}
} else if (elementName === 'categories:waterfall') {
if (!this.orFacets.includes('categories:bungeecord')) {
this.orFacets.push('categories:bungeecord')
if (!orFacets.value.includes('categories:bungeecord')) {
orFacets.value.push('categories:bungeecord')
}
}
this.orFacets.push(elementName)
orFacets.value.push(elementName)
}
if (!doNotSendRequest) {
this.onSearchChange(1)
onSearchChange(1)
}
},
toggleEnv(environment, sendRequest) {
const index = this.selectedEnvironments.indexOf(environment)
}
function toggleEnv(environment, sendRequest) {
const index = selectedEnvironments.value.indexOf(environment)
if (index !== -1) {
this.selectedEnvironments.splice(index, 1)
selectedEnvironments.value.splice(index, 1)
} else {
this.selectedEnvironments.push(environment)
selectedEnvironments.value.push(environment)
}
if (!sendRequest) {
this.onSearchChange(1)
onSearchChange(1)
}
},
onSearchChangeToTop(newPageNumber) {
}
function onSearchChangeToTop(newPageNumber) {
if (process.client) {
window.scrollTo({ top: 0, behavior: 'smooth' })
}
this.onSearchChange(newPageNumber)
},
onMaxResultsChange(newPageNumber) {
onSearchChange(newPageNumber)
}
function cycleSearchDisplayMode() {
data.$cosmetics.searchDisplayMode[projectType.value.id] = data.$cycleValue(
data.$cosmetics.searchDisplayMode[projectType.value.id],
data.$tag.projectViewModes
)
saveCosmetics()
setClosestMaxResults()
}
const previousMaxResults = ref(20)
const maxResultsForView = ref({
list: [5, 10, 15, 20, 50, 100],
grid: [6, 12, 18, 24, 48, 96],
gallery: [6, 10, 16, 20, 50, 100],
})
function onMaxResultsChange(newPageNumber) {
newPageNumber = Math.max(
1,
Math.min(
Math.floor(newPageNumber / (this.maxResults / this.previousMaxResults)),
this.pageCount
Math.floor(newPageNumber / (maxResults.value / previousMaxResults.value)),
pageCount.value
)
)
this.previousMaxResults = this.maxResults
this.onSearchChange(newPageNumber)
},
cycleSearchDisplayMode() {
this.$cosmetics.searchDisplayMode[this.projectType.id] = this.$cycleValue(
this.$cosmetics.searchDisplayMode[this.projectType.id],
this.$tag.projectViewModes
)
saveCosmetics()
this.setClosestMaxResults()
},
setClosestMaxResults() {
const view = this.$cosmetics.searchDisplayMode[this.projectType.id]
const maxResultsOptions = this.maxResultsForView[view] ?? [20]
const currentMax = this.maxResults
previousMaxResults.value = maxResults.value
onSearchChange(newPageNumber)
}
function setClosestMaxResults() {
const view = data.$cosmetics.searchDisplayMode[projectType.value.id]
const maxResultsOptions = maxResultsForView.value[view] ?? [20]
const currentMax = maxResults.value
if (!maxResultsOptions.includes(currentMax)) {
this.maxResults = maxResultsOptions.reduce(function (prev, curr) {
maxResults.value = maxResultsOptions.reduce(function (prev, curr) {
return Math.abs(curr - currentMax) <= Math.abs(prev - currentMax) ? curr : prev
})
}
},
},
})
}
</script>
<style lang="scss" scoped>
patches/markdown-it+13.0.1.patch
+482
View File
File diff suppressed because one or more lines are too long
pnpm-lock.yaml
Generated
+857 -478
View File
File diff suppressed because it is too large Load Diff
wrangler.toml
+9
View File
@@ -0,0 +1,9 @@
name = "knossos"
main = "./.output/server/index.mjs"
workers_dev = true
compatibility_date = "2022-07-12"
account_id = "9ddae624c98677d68d93df6e524a6061"
node_compat = true
[site]
bucket = ".output/public"