Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge develop into main #4

Merged
merged 58 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
d442fc3
ahhhh
Hoishin Jun 2, 2024
da895f7
oops
Hoishin Jun 2, 2024
a2291fc
engines
Hoishin Jun 2, 2024
837fd52
add node-version
Hoishin Jun 2, 2024
4508413
npm-run-all2
Hoishin Jun 2, 2024
9386693
switch
Hoishin Jun 2, 2024
5a65e55
patch jsonexport
Hoishin Jun 3, 2024
5094f56
ci allow fail
Hoishin Jun 3, 2024
d413f9c
some refactoring
Hoishin Jun 5, 2024
3efe48d
fix patch package
Hoishin Jun 5, 2024
b96a1a9
fix dependencies
Hoishin Jun 7, 2024
08fe7d9
generate?
Hoishin Jun 7, 2024
021c604
back to npm
Hoishin Jun 7, 2024
04eeded
remove prepare
Hoishin Jun 7, 2024
fd899ca
maybe?
Hoishin Jun 7, 2024
a9e314d
or this
Hoishin Jun 7, 2024
812d756
don't use internal deps
Hoishin Jun 7, 2024
ea89267
hoge
Hoishin Jun 7, 2024
20cfd9d
sign-in and register
Hoishin Jun 7, 2024
517c680
update
Hoishin Jun 7, 2024
131c103
simplify
Hoishin Jun 7, 2024
6967976
change session data
Hoishin Jun 7, 2024
3e8196c
init admin
Hoishin Jun 7, 2024
da93ee7
ra validation simplified
Hoishin Jun 10, 2024
4797ed5
new var
Hoishin Jun 10, 2024
cfde3cd
assign user as an admin
Hoishin Jun 10, 2024
6ca3dc6
empty favicon
Hoishin Jun 10, 2024
529e344
sort import
Hoishin Jun 10, 2024
c68fe3e
remove entry files
Hoishin Jun 11, 2024
79b32ee
add vars
Hoishin Jun 11, 2024
bfababc
pnpm version
Hoishin Jun 11, 2024
c1293b3
corepack
Hoishin Jun 11, 2024
0051b01
remove pnpm version
Hoishin Jun 11, 2024
feee62e
no corepack
Hoishin Jun 11, 2024
6ac28a4
this???
Hoishin Jun 11, 2024
dd97aa5
Revert "this???"
Hoishin Jun 11, 2024
7abe152
Revert "no corepack"
Hoishin Jun 11, 2024
c1e448a
Revert "remove pnpm version"
Hoishin Jun 11, 2024
d108c2a
Revert "corepack"
Hoishin Jun 11, 2024
ca68b7b
prisma generate
Hoishin Jun 11, 2024
9769669
renew session
Hoishin Jun 12, 2024
7b5dde5
sign out without redirect
Hoishin Jun 12, 2024
a24a868
event and runs sync
Hoishin Jun 12, 2024
1b9c044
update packages
Hoishin Jun 12, 2024
34fbab3
bare event page
Hoishin Jun 12, 2024
be18b27
header
Hoishin Jun 12, 2024
c348601
use route guard
Hoishin Jun 12, 2024
fefa1bd
sign in redirect
Hoishin Jun 12, 2024
a7c99ac
vod url
Hoishin Jun 12, 2024
d15d3e8
styling
Hoishin Jun 12, 2024
8f289a3
japanese
Hoishin Jun 12, 2024
717b783
proper header
Hoishin Jun 13, 2024
0cd0a13
prompt
Hoishin Jun 13, 2024
301cba9
profile display name edit
Hoishin Jun 13, 2024
ae4c1a5
dark theme
Hoishin Jun 13, 2024
ceba21c
combine styles
Hoishin Jun 13, 2024
a686ce1
breakpoints
Hoishin Jun 13, 2024
e9974b5
better cache
Hoishin Jun 14, 2024
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
2 changes: 2 additions & 0 deletions .dev.vars.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ SESSION_COOKIE_SECRET=supersecret123

DISCORD_CLIENT_ID=123
DISCORD_CLIENT_SECRET=123

SUPER_ADMIN_DISCORD_ID=123
2 changes: 1 addition & 1 deletion .github/workflows/pr-develop-to-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- run: |
gh pr create --base main --head develop --title "merge develop into main" --body ""
gh pr create --base main --head develop --title "merge develop into main" --body "" || true
env:
GH_TOKEN: ${{ github.token }}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,7 @@ dist
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*

## Panda
styled-system
styled-system-studio
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20.14.0
8 changes: 0 additions & 8 deletions .vscode/extensions.json

This file was deleted.

21 changes: 21 additions & 0 deletions app/components/link.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { Button, Link as RadixLink } from "@radix-ui/themes";
import { Link as RemixLink } from "@remix-run/react";
import type { ComponentProps } from "react";

export const Link = (props: ComponentProps<typeof RemixLink>) => {
return (
<RadixLink asChild>
<RemixLink {...props} />
</RadixLink>
);
};

export const ButtonLink = (props: ComponentProps<typeof RemixLink>) => {
return (
<Button asChild>
<RemixLink {...props} />
</Button>
);
};

export { RadixLink, RemixLink };
18 changes: 0 additions & 18 deletions app/entry.client.tsx

This file was deleted.

45 changes: 0 additions & 45 deletions app/entry.server.tsx

This file was deleted.

15 changes: 15 additions & 0 deletions app/lib/api/gdq-tracker/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import ky from "ky";

import type RunsSample from "./sample/runs.json";

export const gdqTracker = async (trackerId: string) => {
const runsApiUrl = `https://tracker.gamesdonequick.com/tracker/api/v2/events/${trackerId}/runs`;
const runs = await ky.get(runsApiUrl).json<typeof RunsSample>();
return runs.results.map((run) => ({
id: run.id.toString(),
name: run.name,
category: run.category,
playedWith: run.console,
startsAt: new Date(run.starttime),
}));
};
Loading