Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/validate-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ jobs:
- name: Prettier
run: npx prettier --check .
working-directory: app
continue-on-error: true

test:
runs-on: ubuntu-24.04
Expand Down
5 changes: 1 addition & 4 deletions app/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
]
}
},
"forwardPorts": [
3000,
"db:5432"
],
"forwardPorts": [3000, "db:5432"],
"postCreateCommand": "./.devcontainer/postCreateCommand.sh",
"remoteUser": "node"
}
2 changes: 1 addition & 1 deletion app/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const eslintConfig = defineConfig([
...tanstackQuery.configs["flat/recommended"],
reactYouMightNotNeedAnEffect.configs.recommended,
prettier,
reactCompiler.configs.recommended,

globalIgnores([
".next/**",
Expand All @@ -39,7 +40,6 @@ const eslintConfig = defineConfig([
name: "custom-rules",
plugins: {
"@typescript-eslint": tseslint.plugin,
"react-compiler": reactCompiler,
},
languageOptions: {
parserOptions: {
Expand Down
13 changes: 7 additions & 6 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"csv": "6.4.1",
"eslint": "9.39.3",
"eslint-config-next": "16.1.6",
"eslint-plugin-react-compiler": "latest",
"eslint-plugin-react-compiler": "19.1.0-rc.2",
"eslint-plugin-react-you-might-not-need-an-effect": "0.9.1",
"postcss": "8.5.6",
"prettier": "3.8.1",
Expand All @@ -123,14 +123,16 @@
"tailwindcss": "4.2.1",
"typescript": "5.9.3",
"vercel": "50.22.1",
"vitest": "3.2.4"
"vitest": "3.2.4",
"zod-validation-error": "4.0.2"
},
"prisma": {
"schema": "./prisma/schema"
},
"packageManager": "npm@10.9.4",
"overrides": {
"@types/react-dom": "19.2.3",
"@types/react": "19.2.14"
"@types/react": "19.2.14",
"zod-validation-error": "4.0.2"
}
}
2 changes: 1 addition & 1 deletion app/postcss.config.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const config = {
plugins: {
'@tailwindcss/postcss': {},
"@tailwindcss/postcss": {},
},
};

Expand Down
17 changes: 0 additions & 17 deletions app/src/app/api/health/throw/route.ts

This file was deleted.

26 changes: 13 additions & 13 deletions app/src/app/app/help/contributing/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export default async function Page() {
<div className="flex-1 flex flex-col gap-2">
<section className="bg-secondary rounded-primary p-4">
<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#mithilfe`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#mithilfe`}
level={1}
className="mb-4"
>
Expand All @@ -117,7 +117,7 @@ export default async function Page() {

<section className="bg-secondary rounded-primary p-4">
<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#arten-der-mithilfe`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#arten-der-mithilfe`}
className="mb-4"
>
Arten der Mithilfe
Expand Down Expand Up @@ -156,7 +156,7 @@ export default async function Page() {

<section className="mt-[2px] bg-secondary rounded-primary p-4">
<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#integrierte-apps`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#integrierte-apps`}
className="mb-4"
>
Integrierte Apps
Expand All @@ -180,7 +180,7 @@ export default async function Page() {

<section className="mt-[2px] bg-secondary rounded-primary p-4">
<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#externe-apps`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#externe-apps`}
className="mb-4"
>
Externe Apps
Expand Down Expand Up @@ -238,7 +238,7 @@ export default async function Page() {
</ul>

<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#iframe-integration`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#iframe-integration`}
level={3}
className="mt-8 mb-4"
>
Expand Down Expand Up @@ -296,7 +296,7 @@ export default async function Page() {
</RichText>

<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#benutzerauthentifizierung-single-sign-on-sso`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#benutzerauthentifizierung-single-sign-on-sso`}
level={3}
className="mt-8 mb-4"
>
Expand Down Expand Up @@ -335,7 +335,7 @@ export default async function Page() {
</RoadmapNote>

<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#rest-schnittstellen`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#rest-schnittstellen`}
level={3}
className="mt-8 mb-4"
>
Expand Down Expand Up @@ -364,7 +364,7 @@ export default async function Page() {
</RoadmapNote>

<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#webhooks`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#webhooks`}
level={3}
className="mt-8 mb-4"
>
Expand All @@ -388,14 +388,14 @@ export default async function Page() {

<section className="mt-[2px] bg-secondary rounded-primary p-4">
<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#frequently-asked-questions-faq`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#frequently-asked-questions-faq`}
className="mb-4"
>
Frequently Asked Questions (FAQ)
</SectionHeading>

<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#bei-wem-melde-ich-mich`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#bei-wem-melde-ich-mich`}
level={3}
className="mt-8 mb-4"
>
Expand All @@ -411,7 +411,7 @@ export default async function Page() {
</RichText>

<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#wie-starte-ich`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#wie-starte-ich`}
level={3}
className="mt-8 mb-4"
>
Expand All @@ -434,7 +434,7 @@ export default async function Page() {
</RichText>

<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#wie-hoste-ich-meine-app`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#wie-hoste-ich-meine-app`}
level={3}
className="mt-8 mb-4"
>
Expand All @@ -452,7 +452,7 @@ export default async function Page() {
</RichText>

<SectionHeading
url={`${env.BASE_URL}/app/help/contributing#wann-verfügbar`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/contributing#wann-verfügbar`}
level={3}
className="mt-8 mb-4"
>
Expand Down
2 changes: 1 addition & 1 deletion app/src/app/app/help/support/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default async function Page() {
<div className="flex-1 flex flex-col gap-2">
<section className="bg-secondary rounded-primary p-4">
<SectionHeading
url={`${env.BASE_URL}/app/help/support#support`}
url={`${env.NEXT_PUBLIC_BASE_URL}/app/help/support#support`}
level={1}
className="mb-4"
>
Expand Down
14 changes: 6 additions & 8 deletions app/src/app/dogfight-trainer/opengraph-image.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@ export default async function og() {
).then((res) => res.arrayBuffer());

return new ImageResponse(
(
<div tw="w-full h-full flex flex-col justify-between items-center uppercase font-bold p-24 bg-neutral-900">
<p tw="text-9xl text-white m-0 w-full">Dogfight Trainer</p>
<div tw="w-full h-full flex flex-col justify-between items-center uppercase font-bold p-24 bg-neutral-900">
<p tw="text-9xl text-white m-0 w-full">Dogfight Trainer</p>

<div tw="flex flex-col w-full">
<p tw="text-6xl text-[#BB2222] m-0 w-full">Sinister Inc</p>
<p tw="text-3xl text-white m-0 w-full">Hoist the Black</p>
</div>
<div tw="flex flex-col w-full">
<p tw="text-6xl text-[#BB2222] m-0 w-full">Sinister Inc</p>
<p tw="text-3xl text-white m-0 w-full">Hoist the Black</p>
</div>
),
</div>,
{
...size,
fonts: [
Expand Down
38 changes: 20 additions & 18 deletions app/src/app/icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,27 @@ export const contentType = "image/png";

export default function icon() {
return new ImageResponse(
(
<svg
width="100%"
height="100%"
viewBox="0 0 128 128"
xmlns="http://www.w3.org/2000/svg"
<svg
width="100%"
height="100%"
viewBox="0 0 128 128"
xmlns="http://www.w3.org/2000/svg"
>
<rect x="0" y="0" width="128" height="128" rx="24" ry="24" fill="#000" />
<g
transform="translate(12.025 11.89) scale(0.27)"
fill="#fff"
fillRule="nonzero"
>
<rect x="0" y="0" width="128" height="128" rx="24" ry="24" fill="#000" />
<g transform="translate(12.025 11.89) scale(0.27)" fill="#fff" fillRule="nonzero">
<path d="M59.779,18.639L175.182,89.006L192.293,4.643L208.755,89.107L325.208,18.344L215.473,119.958L208.755,89.107L192.451,99.013L175.182,89.006L169.008,119.879L59.779,18.639Z" />
<path d="M169.031,131.832L60.347,36.864L178.012,181.399L169.031,131.832Z" />
<path d="M206.39,181.383L215.498,131.485L325.066,36.005L206.39,181.383Z" />
<path d="M173.462,236.943L60.779,55.36L166.696,186.311L173.462,236.943Z" />
<path d="M211.093,237.044L324.9,53.954L217.748,186.235L211.093,237.044Z" />
<path d="M173.462,236.943L192.299,267.423L211.093,237.044L192.253,380.36L173.462,236.943Z" />
<path d="M192.201,260.684L178.012,181.399L192.194,193.013L206.39,181.383L192.241,260.696L192.201,260.684Z" />
</g>
</svg>
),
<path d="M59.779,18.639L175.182,89.006L192.293,4.643L208.755,89.107L325.208,18.344L215.473,119.958L208.755,89.107L192.451,99.013L175.182,89.006L169.008,119.879L59.779,18.639Z" />
<path d="M169.031,131.832L60.347,36.864L178.012,181.399L169.031,131.832Z" />
<path d="M206.39,181.383L215.498,131.485L325.066,36.005L206.39,181.383Z" />
<path d="M173.462,236.943L60.779,55.36L166.696,186.311L173.462,236.943Z" />
<path d="M211.093,237.044L324.9,53.954L217.748,186.235L211.093,237.044Z" />
<path d="M173.462,236.943L192.299,267.423L211.093,237.044L192.253,380.36L173.462,236.943Z" />
<path d="M192.201,260.684L178.012,181.399L192.194,193.013L206.39,181.383L192.241,260.696L192.201,260.684Z" />
</g>
</svg>,
size,
);
}
2 changes: 1 addition & 1 deletion app/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const robotMono = Roboto_Mono({
});

export const metadata: Metadata = {
metadataBase: new URL(env.BASE_URL),
metadataBase: new URL(env.NEXT_PUBLIC_BASE_URL),
title: {
default: "SAM - Sinister Incorporated",
template: "%s | SAM - Sinister Incorporated",
Expand Down
8 changes: 4 additions & 4 deletions app/src/app/manifest.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { env } from "@/env";
import { type MetadataRoute } from "next";
import faviconSrc from "../assets/favicon.svg";
import screenshotDashboardMobileSrc from "../assets/screenshots/screenshot-dashboard-mobile.avif";
import screenshotDashboardSrc from "../assets/screenshots/screenshot-dashboard.avif";
import screenshotAppsMobileSrc from "../assets/screenshots/screenshot-apps-mobile.avif";
import screenshotAppsSrc from "../assets/screenshots/screenshot-apps.avif";
import screenshotDashboardMobileSrc from "../assets/screenshots/screenshot-dashboard-mobile.avif";
import screenshotDashboardSrc from "../assets/screenshots/screenshot-dashboard.avif";

export default function manifest(): MetadataRoute.Manifest {
return {
Expand All @@ -13,8 +13,8 @@ export default function manifest(): MetadataRoute.Manifest {
description:
"Sinister Administration Module (SAM) for the Star Citizen organization Sinister Incorporated",
categories: ["entertainment", "games"], // https://github.com/w3c/manifest/wiki/Categories
scope: env.BASE_URL, // Will open links outside the app in the browser
start_url: `${env.BASE_URL}/app`,
scope: env.NEXT_PUBLIC_BASE_URL, // Will open links outside the app in the browser
start_url: `${env.NEXT_PUBLIC_BASE_URL}/app`,
shortcuts: [
// Can't be individualized based on permissions
{
Expand Down
10 changes: 4 additions & 6 deletions app/src/app/opengraph-image.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ export default async function og() {
).then((res) => res.arrayBuffer());

return new ImageResponse(
(
<div tw="w-full h-full flex flex-col justify-end items-center uppercase font-bold p-24 bg-neutral-900">
<p tw="text-9xl text-[#BB2222] m-0 w-full">SAM</p>
<p tw="text-6xl text-white m-0 w-full">Sinister Incorporated</p>
</div>
),
<div tw="w-full h-full flex flex-col justify-end items-center uppercase font-bold p-24 bg-neutral-900">
<p tw="text-9xl text-[#BB2222] m-0 w-full">SAM</p>
<p tw="text-6xl text-white m-0 w-full">Sinister Incorporated</p>
</div>,
{
...size,
fonts: [
Expand Down
14 changes: 6 additions & 8 deletions app/src/app/preview-channel/_opengraph-image.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@ export default async function og() {
).then((res) => res.arrayBuffer());

return new ImageResponse(
(
<div tw="w-full h-full flex flex-col justify-between items-center uppercase font-bold p-24 bg-neutral-900">
<p tw="text-9xl text-white m-0 w-full">Preview Channel</p>
<div tw="w-full h-full flex flex-col justify-between items-center uppercase font-bold p-24 bg-neutral-900">
<p tw="text-9xl text-white m-0 w-full">Preview Channel</p>

<div tw="flex flex-col w-full">
<p tw="text-6xl text-[#BB2222] m-0 w-full">Sinister Inc</p>
<p tw="text-3xl text-white m-0 w-full">Hoist the Black</p>
</div>
<div tw="flex flex-col w-full">
<p tw="text-6xl text-[#BB2222] m-0 w-full">Sinister Inc</p>
<p tw="text-3xl text-white m-0 w-full">Hoist the Black</p>
</div>
),
</div>,
{
...size,
fonts: [
Expand Down
Loading
Loading