-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds support for outlaw, 4 slot spray system.
- Loading branch information
Showing
17 changed files
with
384 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| import { | ||
| Form, | ||
| useLoaderData, | ||
| useNavigate, | ||
| useParams, | ||
| useSubmit, | ||
| } from '@remix-run/react'; | ||
| import * as DialogPrimitive from '@radix-ui/react-dialog'; | ||
| import type { Loadout } from '~/utils'; | ||
| import type { ActionArgs, LoaderArgs } from '@remix-run/node'; | ||
| import { json, redirect } from '@remix-run/node'; | ||
| import { getUser, getUserConfig, saveUserConfig } from '~/utils.server'; | ||
| import { zfd } from 'zod-form-data'; | ||
| import { z } from 'zod'; | ||
|
|
||
| const schema = zfd.formData({ | ||
| sprays: z.record(z.string(), zfd.checkbox()).optional(), | ||
| }); | ||
|
|
||
| export async function action({ request, params }: ActionArgs) { | ||
| const user = await getUser(); | ||
| if (!user) { | ||
| return redirect('/login'); | ||
| } | ||
|
|
||
| const { loadoutId } = params; | ||
|
|
||
| const userConfig = await getUserConfig(user.userId); | ||
| const loadout = userConfig.loadouts.find( | ||
| (loadout) => loadout.id === loadoutId | ||
| ); | ||
|
|
||
| if (!loadout) { | ||
| return redirect('/loadouts'); | ||
| } | ||
|
|
||
| const formData = await request.formData(); | ||
|
|
||
| const out = schema.parse(formData); | ||
|
|
||
| const newLoadout: Loadout = { | ||
| ...loadout, | ||
| sprayIds: { | ||
| ...loadout.sprayIds, | ||
| right: Object.entries(out.sprays || {}).reduce<Array<string>>( | ||
| (acc, next) => { | ||
| if (next[1]) { | ||
| acc.push(next[0]); | ||
| } | ||
| return acc; | ||
| }, | ||
| [] | ||
| ), | ||
| }, | ||
| }; | ||
|
|
||
| await saveUserConfig(user.userId, { | ||
| loadouts: [ | ||
| ...userConfig.loadouts.filter((l) => l.id !== loadoutId), | ||
| newLoadout, | ||
| ], | ||
| }); | ||
|
|
||
| return json({ | ||
| success: true, | ||
| }); | ||
| } | ||
|
|
||
| export async function loader({ params }: LoaderArgs) { | ||
| const user = await getUser(); | ||
|
|
||
| if (!user) { | ||
| return redirect('/login'); | ||
| } | ||
|
|
||
| const { loadoutId } = params; | ||
|
|
||
| const userConfig = await getUserConfig(user.userId); | ||
| const loadout = userConfig.loadouts.find( | ||
| (loadout) => loadout.id === loadoutId | ||
| ); | ||
|
|
||
| if (!loadout) { | ||
| return redirect('/loadouts'); | ||
| } | ||
|
|
||
| const entitlements = await user.getEntitlements(); | ||
|
|
||
| const selectedSprays = loadout.sprayIds.right; | ||
| const ownedSprays = valorantData.sprays | ||
| .filter((spray) => | ||
| entitlements.spray.some( | ||
| (entitlement) => entitlement.ItemID === spray.uuid | ||
| ) | ||
| ) | ||
| .filter((spray) => spray.category !== 'EAresSprayCategory::Contextual') | ||
| .sort((a, b) => a.displayName.localeCompare(b.displayName)); | ||
|
|
||
| return json({ | ||
| selectedSprays, | ||
| ownedSprays, | ||
| }); | ||
| } | ||
|
|
||
| export default function AddRightSpray() { | ||
| const { ownedSprays, selectedSprays } = useLoaderData<typeof loader>(); | ||
| const navigate = useNavigate(); | ||
| const params = useParams(); | ||
| const submit = useSubmit(); | ||
|
|
||
| return ( | ||
| <DialogPrimitive.Root | ||
| open | ||
| onOpenChange={() => navigate(`/loadouts/${params.loadoutId}`)} | ||
| > | ||
| <DialogPrimitive.Portal> | ||
| <DialogPrimitive.Overlay className="bg-black/60 fixed top-0 left-0 right-0 bottom-0 grid place-items-center"> | ||
| <DialogPrimitive.Content className="w-full max-w-3xl h-3/5 overflow-auto p-4 bg-slate-700 rounded-md"> | ||
| <DialogPrimitive.Title className="text-2xl"> | ||
| Select Right Sprays | ||
| </DialogPrimitive.Title> | ||
| <Form | ||
| method="post" | ||
| onChange={(e) => { | ||
| submit(e.currentTarget, { | ||
| replace: true, | ||
| }); | ||
| }} | ||
| > | ||
| <div className="grid grid-cols-4 gap-2 mt-2"> | ||
| {ownedSprays.map((spray) => ( | ||
| <div key={spray.uuid}> | ||
| <input | ||
| id={spray.uuid} | ||
| name={`sprays[${spray.uuid}]`} | ||
| type="checkbox" | ||
| className="hidden peer" | ||
| defaultChecked={selectedSprays.includes(spray.uuid)} | ||
| /> | ||
| <label | ||
| htmlFor={spray.uuid} | ||
| className="block w-full h-full p-2 peer-checked:bg-slate-500 hover:bg-slate-500 rounded-md" | ||
| > | ||
| <div className="w-full aspect-square"> | ||
| <img | ||
| className="w-full h-full object-contain" | ||
| src={ | ||
| spray.animationGif || | ||
| spray.fullTransparentIcon || | ||
| spray.displayIcon | ||
| } | ||
| alt={spray.displayName} | ||
| /> | ||
| </div> | ||
| <h2 className="text-sm text-white font-bold text-center whitespace-nowrap overflow-hidden text-ellipsis mt-2"> | ||
| {spray.displayName.slice(0, -6)} | ||
| </h2> | ||
| </label> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| </Form> | ||
| </DialogPrimitive.Content> | ||
| </DialogPrimitive.Overlay> | ||
| </DialogPrimitive.Portal> | ||
| </DialogPrimitive.Root> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.