LukeParke/website
1
0
Fork 0
mirror of https://github.com/LukeHagar/website.git synced 2025-12-09 21:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix?

Browse Source
This commit is contained in:
Jesse Winton
2024-08-02 09:10:09 -07:00
parent e2a76787da
commit 8b398c98e2
9 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@@ -8,6 +8,5 @@ PUBLIC_APPWRITE_PROJECT_INIT_ID=
PUBLIC_GROWTH_ENDPOINT= PUBLIC_GROWTH_ENDPOINT=
APPWRITE_DB_INIT_ID= APPWRITE_DB_INIT_ID=
APPWRITE_COL_INIT_ID= APPWRITE_COL_INIT_ID=
APPWRITE_COL_INIT_TWO_ID=
APPWRITE_API_KEY_INIT= APPWRITE_API_KEY_INIT=
SENTRY_AUTH_TOKEN= SENTRY_AUTH_TOKEN=

1
.github/workflows/production.yml vendored
View File

@@ -40,7 +40,6 @@ jobs:
"PUBLIC_GROWTH_ENDPOINT=${{ vars.PUBLIC_GROWTH_ENDPOINT }}" "PUBLIC_GROWTH_ENDPOINT=${{ vars.PUBLIC_GROWTH_ENDPOINT }}"
"APPWRITE_DB_INIT_ID=${{ secrets.APPWRITE_DB_INIT_ID }}" "APPWRITE_DB_INIT_ID=${{ secrets.APPWRITE_DB_INIT_ID }}"
"APPWRITE_COL_INIT_ID=${{ secrets.APPWRITE_COL_INIT_ID }}" "APPWRITE_COL_INIT_ID=${{ secrets.APPWRITE_COL_INIT_ID }}"
"APPWRITE_COL_INIT_TWO_ID=${{ secrets.APPWRITE_COL_INIT_TWO_ID }}"
"APPWRITE_API_KEY_INIT=${{ secrets.APPWRITE_API_KEY_INIT }}" "APPWRITE_API_KEY_INIT=${{ secrets.APPWRITE_API_KEY_INIT }}"
"GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}"
"SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}"

1
.github/workflows/staging.yml vendored
View File

@@ -42,7 +42,6 @@ jobs:
"PUBLIC_GROWTH_ENDPOINT=${{ vars.PUBLIC_GROWTH_ENDPOINT }}" "PUBLIC_GROWTH_ENDPOINT=${{ vars.PUBLIC_GROWTH_ENDPOINT }}"
"APPWRITE_DB_INIT_ID=${{ secrets.APPWRITE_DB_INIT_ID }}" "APPWRITE_DB_INIT_ID=${{ secrets.APPWRITE_DB_INIT_ID }}"
"APPWRITE_COL_INIT_ID=${{ secrets.APPWRITE_COL_INIT_ID }}" "APPWRITE_COL_INIT_ID=${{ secrets.APPWRITE_COL_INIT_ID }}"
"APPWRITE_COL_INIT_TWO_ID=${{ secrets.APPWRITE_COL_INIT_TWO_ID }}"
"APPWRITE_API_KEY_INIT=${{ secrets.APPWRITE_API_KEY_INIT }}" "APPWRITE_API_KEY_INIT=${{ secrets.APPWRITE_API_KEY_INIT }}"
"GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}"
"SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}"

1
.github/workflows/tests.yml vendored
View File

@@ -43,7 +43,6 @@ jobs:
PUBLIC_GROWTH_ENDPOINT: ${{ secrets.PUBLIC_GROWTH_ENDPOINT }} PUBLIC_GROWTH_ENDPOINT: ${{ secrets.PUBLIC_GROWTH_ENDPOINT }}
APPWRITE_DB_INIT_ID: ${{ secrets.APPWRITE_DB_INIT_ID }} APPWRITE_DB_INIT_ID: ${{ secrets.APPWRITE_DB_INIT_ID }}
APPWRITE_COL_INIT_ID: ${{ secrets.APPWRITE_COL_INIT_ID }} APPWRITE_COL_INIT_ID: ${{ secrets.APPWRITE_COL_INIT_ID }}
APPWRITE_COL_INIT_TWO_ID: ${{ secrets.APPWRITE_COL_INIT_TWO_ID }}
APPWRITE_API_KEY_INIT: ${{ secrets.APPWRITE_API_KEY_INIT }} APPWRITE_API_KEY_INIT: ${{ secrets.APPWRITE_API_KEY_INIT }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: pnpm run build run: pnpm run build

3
Dockerfile
View File

@@ -27,9 +27,6 @@ ENV APPWRITE_DB_INIT_ID ${APPWRITE_DB_INIT_ID}
ARG APPWRITE_COL_INIT_ID ARG APPWRITE_COL_INIT_ID
ENV APPWRITE_COL_INIT_ID ${APPWRITE_COL_INIT_ID} ENV APPWRITE_COL_INIT_ID ${APPWRITE_COL_INIT_ID}
ARG APPWRITE_COL_INIT_TWO_ID
ENV APPWRITE_COL_INIT_TWO_ID ${APPWRITE_COL_INIT_TWO_ID}
ARG APPWRITE_API_KEY_INIT ARG APPWRITE_API_KEY_INIT
ENV APPWRITE_API_KEY_INIT ${APPWRITE_API_KEY_INIT} ENV APPWRITE_API_KEY_INIT ${APPWRITE_API_KEY_INIT}

6
src/routes/init/tickets/[id]/get-contributions/helpers.server.ts
View File

@@ -1,4 +1,4 @@
import { APPWRITE_DB_INIT_ID, APPWRITE_COL_INIT_TWO_ID } from '$env/static/private'; import { APPWRITE_DB_INIT_ID, APPWRITE_COL_INIT_ID } from '$env/static/private';
import { appwriteInitServer } from '$lib/appwrite/init.server'; import { appwriteInitServer } from '$lib/appwrite/init.server';
import { parse } from 'node-html-parser'; import { parse } from 'node-html-parser';
import type { TicketData, ContributionsMatrix } from '../../constants'; import type { TicketData, ContributionsMatrix } from '../../constants';
@@ -6,7 +6,7 @@ import type { TicketData, ContributionsMatrix } from '../../constants';
export async function getContributions(id: string): Promise<ContributionsMatrix | null> { export async function getContributions(id: string): Promise<ContributionsMatrix | null> {
const { gh_user, contributions } = (await appwriteInitServer.databases.getDocument( const { gh_user, contributions } = (await appwriteInitServer.databases.getDocument(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
id id
)) as unknown as TicketData; )) as unknown as TicketData;
@@ -50,7 +50,7 @@ export async function getContributions(id: string): Promise<ContributionsMatrix
// Update the document with the new contributions // Update the document with the new contributions
await appwriteInitServer.databases.updateDocument( await appwriteInitServer.databases.updateDocument(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
id, id,
{ {
contributions: matrix.flat() contributions: matrix.flat()

4
src/routes/init/tickets/[id]/og/+server.ts
View File

@@ -1,4 +1,4 @@
import { APPWRITE_COL_INIT_TWO_ID, APPWRITE_DB_INIT_ID } from '$env/static/private'; import { APPWRITE_COL_INIT_ID, APPWRITE_DB_INIT_ID } from '$env/static/private';
import { appwriteInitServer } from '$lib/appwrite/init.server'; import { appwriteInitServer } from '$lib/appwrite/init.server';
import sharp from 'sharp'; import sharp from 'sharp';
import type { TicketData } from '../../constants.js'; import type { TicketData } from '../../constants.js';
@@ -7,7 +7,7 @@ import { getTicketSvg } from './getTicketSvg.server.js';
export async function GET({ params }) { export async function GET({ params }) {
const ticket = (await appwriteInitServer.databases.getDocument( const ticket = (await appwriteInitServer.databases.getDocument(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
params.id params.id
)) as unknown as TicketData; )) as unknown as TicketData;
const svg = await getTicketSvg({ ...ticket }); const svg = await getTicketSvg({ ...ticket });

21
src/routes/init/tickets/get-ticket-doc/+server.ts
View File

@@ -1,5 +1,4 @@
import { APPWRITE_DB_INIT_ID } from '$env/static/private'; import { APPWRITE_DB_INIT_ID, APPWRITE_COL_INIT_ID } from '$env/static/private';
import { env } from '$env/dynamic/private';
import { appwriteInitServer } from '$lib/appwrite/init.server'; import { appwriteInitServer } from '$lib/appwrite/init.server';
import { isProUser } from '$lib/utils/console.js'; import { isProUser } from '$lib/utils/console.js';
import type { User } from '$routes/init/helpers.js'; import type { User } from '$routes/init/helpers.js';
@@ -36,14 +35,14 @@ async function getTicketDocByUser(user: User) {
user.github?.login user.github?.login
? appwriteInitServer.databases.listDocuments( ? appwriteInitServer.databases.listDocuments(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
env.APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
[Query.equal('gh_user', user.github.login)] [Query.equal('gh_user', user.github.login)]
) )
: null, : null,
user.appwrite?.$id user.appwrite?.$id
? appwriteInitServer.databases.listDocuments( ? appwriteInitServer.databases.listDocuments(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
env.APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
[Query.equal('aw_email', user.appwrite.email)] [Query.equal('aw_email', user.appwrite.email)]
) )
: null, : null,
@@ -60,7 +59,7 @@ async function getTicketDocByUser(user: User) {
const newest = gh_doc.id > aw_doc.id ? gh_doc.$id : aw_doc.$id; const newest = gh_doc.id > aw_doc.id ? gh_doc.$id : aw_doc.$id;
await appwriteInitServer.databases.updateDocument( await appwriteInitServer.databases.updateDocument(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
env.APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
oldest, oldest,
{ {
gh_user: null, gh_user: null,
@@ -69,7 +68,7 @@ async function getTicketDocByUser(user: User) {
); );
return (await appwriteInitServer.databases.updateDocument( return (await appwriteInitServer.databases.updateDocument(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
env.APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
newest, newest,
{ {
gh_user: user.github?.login, gh_user: user.github?.login,
@@ -84,7 +83,7 @@ async function getTicketDocByUser(user: User) {
if (!doc.gh_user || !doc.aw_email) { if (!doc.gh_user || !doc.aw_email) {
return (await appwriteInitServer.databases.updateDocument( return (await appwriteInitServer.databases.updateDocument(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
env.APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
doc.$id, doc.$id,
{ {
gh_user: user.github?.login, gh_user: user.github?.login,
@@ -97,7 +96,7 @@ async function getTicketDocByUser(user: User) {
if (!!user.appwrite && doc.is_pro !== isPro) { if (!!user.appwrite && doc.is_pro !== isPro) {
return (await appwriteInitServer.databases.updateDocument( return (await appwriteInitServer.databases.updateDocument(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
env.APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
doc.$id, doc.$id,
{ {
is_pro: isPro is_pro: isPro
@@ -111,11 +110,11 @@ async function getTicketDocByUser(user: User) {
// If no document exists, create one // If no document exists, create one
const allDocs = await appwriteInitServer.databases.listDocuments( const allDocs = await appwriteInitServer.databases.listDocuments(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
env.APPWRITE_COL_INIT_TWO_ID APPWRITE_COL_INIT_ID
); );
return (await appwriteInitServer.databases.createDocument( return (await appwriteInitServer.databases.createDocument(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
env.APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
ID.unique(), ID.unique(),
{ {
aw_email: user.appwrite?.email ?? undefined, aw_email: user.appwrite?.email ?? undefined,
@@ -130,7 +129,7 @@ async function getTicketDocByUser(user: User) {
async function getTicketDocById(id: string) { async function getTicketDocById(id: string) {
return (await appwriteInitServer.databases.getDocument( return (await appwriteInitServer.databases.getDocument(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
env.APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
id id
)) as unknown as Omit<TicketData, 'contributions' | 'variant'>; )) as unknown as Omit<TicketData, 'contributions' | 'variant'>;
} }

4
src/routes/init/tickets/update/+server.ts
View File

@@ -1,4 +1,4 @@
import { APPWRITE_COL_INIT_TWO_ID, APPWRITE_DB_INIT_ID } from '$env/static/private'; import { APPWRITE_COL_INIT_ID, APPWRITE_DB_INIT_ID } from '$env/static/private';
import { appwriteInitServer } from '$lib/appwrite/init.server'; import { appwriteInitServer } from '$lib/appwrite/init.server';
export async function POST({ request }) { export async function POST({ request }) {
@@ -6,7 +6,7 @@ export async function POST({ request }) {
await appwriteInitServer.databases.updateDocument( await appwriteInitServer.databases.updateDocument(
APPWRITE_DB_INIT_ID, APPWRITE_DB_INIT_ID,
APPWRITE_COL_INIT_TWO_ID, APPWRITE_COL_INIT_ID,
data.ticketId, data.ticketId,
{ {
name: data.name, name: data.name,