Skip to content
This repository has been archived by the owner on Jan 9, 2025. It is now read-only.

Commit

Permalink
Merge pull request #192 from Redot-Engine/develop
Browse files Browse the repository at this point in the history
Merge develop into main
  • Loading branch information
charlottewiltshire0 authored Nov 5, 2024
2 parents 566976b + 8d1a8f6 commit 03dda0a
Show file tree
Hide file tree
Showing 13 changed files with 1,532 additions and 47 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Lint

on: pull_request

jobs:
lint:
runs-on: ubuntu-latest

steps:
- name: Check out Git repository
uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20.18.0

- name: Install dependencies
run: yarn

- name: Validate current commit (last commit) with commitlint
run: npx commitlint --last --verbose

- name: Typecheck
run: yarn typecheck

- name: Lint
run: yarn lint

- name: Format check
run: yarn format-check
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npm run lint
2 changes: 2 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
npm run lint
npm run typecheck
1 change: 1 addition & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default { extends: ["@commitlint/config-conventional"] };
12 changes: 6 additions & 6 deletions components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,42 @@ const links = useLinks();
alt="Redot logo"
class="footer-logo"
src="~/assets/images/TopBarLogo.svg"
/>
>
<div class="footer-spacer" />
<NuxtLink :href="links.githubUrl" aria-label="github">
<img
alt="GitHub"
class="footer-social"
src="~/assets/images/social-github.svg"
/>
>
</NuxtLink>
<NuxtLink :href="links.discordUrl" aria-label="discord">
<img
alt="Discord"
class="footer-social"
src="~/assets/images/social-discord.svg"
/>
>
</NuxtLink>
<NuxtLink :href="links.twitterUrl" aria-label="twitter">
<img
alt="Twitter"
class="footer-social"
src="~/assets/images/social-twitter.svg"
/>
>
</NuxtLink>
<NuxtLink :href="links.redditUrl" aria-label="reddit">
<img
alt="Reddit"
class="footer-social"
src="~/assets/images/social-reddit.svg"
/>
>
</NuxtLink>
</div>

<div class="footer-columns">
<div class="footer-column">
<SectionTitle variant="h2" small>Redot Engine</SectionTitle>
<NuxtLink href="/donate" aria-label="donate" class="footer-link">
<NuxtLink aria-label="donate" class="footer-link" href="/donate">
Donate
</NuxtLink>
<NuxtLink
Expand Down
4 changes: 2 additions & 2 deletions components/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ onMounted(() => {
alt="Redot logo"
class="header-logo"
src="~/assets/images/TopBarLogo.svg"
/>
>
</NuxtLink>
<button
aria-label="mobile-menu"
Expand Down Expand Up @@ -115,7 +115,7 @@ onMounted(() => {
Contribute
<Icon name="code" />
</LinkButton>
<LinkButton aria-label="donate" :href="links.donation">
<LinkButton :href="links.donation" aria-label="donate">
Donate
<Icon name="heart" />
</LinkButton>
Expand Down
6 changes: 4 additions & 2 deletions error.vue
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
<script setup lang="ts">
import type { NuxtError } from "#app";
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const props = defineProps({
// eslint-disable-next-line vue/require-default-prop
error: Object as () => NuxtError,
});
</script>

<template>
<div class="error-page">
<h1>{{ error.statusCode }} - Page not found!</h1>
<img src="/img/mascott/Rune_Expression_2.avif" alt="404 mascot" />
<img alt="404 mascot" src="/img/mascott/Rune_Expression_2.avif">
<p class="note">
Oops! It seems like you’ve ventured off the path in the Redot Engine
universe.
</p>
<NuxtLink to="/" class="back-home">Go back home</NuxtLink>
<NuxtLink class="back-home" to="/">Go back home</NuxtLink>
</div>
</template>

Expand Down
27 changes: 27 additions & 0 deletions functions/api/mirrorlists/[mirrorlist].js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
export async function onRequest(context)
{
if (!context.params.mirrorlist.includes(".json"))
{
return new Response(JSON.stringify({ error: "Bad request: Expected .json format" }), {
status: 400,
headers: { "Content-Type": "application/json" },
});
}

const version = context.params.mirrorlist.replace(".json", "");

const downloadPathVersion = version.replace(".mono", "");

const mirrorlist = {
mirrors: [
{
name: "Official GitHub Releases mirror",
url: `https://github.com/Redot-Engine/redot-engine/releases/download/redot-${ downloadPathVersion }/Redot_v${ version }_export_templates.tpz`,
},
],
};

return new Response(JSON.stringify(mirrorlist), {
headers: { "Content-Type": "application/json" },
});
}
Loading

0 comments on commit 03dda0a

Please sign in to comment.