diff --git a/backend/index.ts b/backend/index.ts index 7ea28f2..b82a145 100644 --- a/backend/index.ts +++ b/backend/index.ts @@ -1,16 +1,23 @@ import "dotenv/config"; import { Hono } from "hono"; import { cors } from "hono/cors"; +import fs from "node:fs"; import { HTTPException } from "hono/http-exception"; import { serveStatic } from "@hono/node-server/serve-static"; import { serve } from "@hono/node-server"; import routes from "./routes/_routes"; import createWsServer from "./websocket"; +const PUBLIC_DIR = "./public"; + const app = new Hono() .use(cors()) - .use("*", serveStatic({ root: "./public" })) - .route("/", routes) + .route("/api", routes) + .use("*", serveStatic({ root: PUBLIC_DIR }), async (c) => { + const index = fs.readFileSync(PUBLIC_DIR + "/index.html", "utf8"); + c.header("Content-Type", "text/html"); + return c.html(index); + }) .onError((err, c) => { if (err instanceof HTTPException) { return err.getResponse(); diff --git a/backend/public/_expo/static/js/web/entry-a989ba6dbc16efcaea6aa0b62000b62c.js b/backend/public/_expo/static/js/web/entry-00f3c2d1c7f748816f9f7bad0e7a55f0.js similarity index 99% rename from backend/public/_expo/static/js/web/entry-a989ba6dbc16efcaea6aa0b62000b62c.js rename to backend/public/_expo/static/js/web/entry-00f3c2d1c7f748816f9f7bad0e7a55f0.js index 9991e49..26293d9 100644 --- a/backend/public/_expo/static/js/web/entry-a989ba6dbc16efcaea6aa0b62000b62c.js +++ b/backend/public/_expo/static/js/web/entry-00f3c2d1c7f748816f9f7bad0e7a55f0.js @@ -733,7 +733,7 @@ __d((function(g,r,i,a,m,e,d){'use strict';m.exports=function(t){if('[object Obje __d((function(g,r,i,a,m,e,d){var t=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.useAsyncStorage=function(t){return{getItem:function(){for(var u=arguments.length,f=new Array(u),o=0;o=300)?(n=!0,A&&A({response:o}),a=String(o.status)):S&&S({response:o})}catch(e){n=!0,A&&A({error:e})}}));return function(r){return e.apply(this,arguments)}})())(r),n&&e.control&&(e.control._subjects.state.next({isSubmitSuccessful:!1}),e.control.setError('root.server',{type:a}))}));return function(e){return r.apply(this,arguments)}})();return i.default.useEffect((function(){f(!0)}),[]),x?i.default.createElement(i.default.Fragment,null,x({submit:w})):i.default.createElement("form",v({noValidate:o,action:h,method:b,encType:F,onSubmit:w},k),p)},_e.set=_e.get=_e.appendErrors=_e.FormProvider=void 0,_e.useController=re,_e.useFieldArray=function(e){var t=W(),u=e.control,s=void 0===u?t.control:u,o=e.name,l=e.keyName,f=void 0===l?'id':l,d=e.shouldUnregister,c=i.default.useState(s._getFieldArray(o)),y=(0,a.default)(c,2),p=y[0],h=y[1],_=i.default.useRef(s._getFieldArray(o).map(ae)),b=i.default.useRef(p),V=i.default.useRef(o),F=i.default.useRef(!1);V.current=o,b.current=p,s._names.array.add(o),e.rules&&s.register(o,e.rules),J({next:function(e){var r=e.values,t=e.name;if(t===V.current||!t){var n=O(r,V.current);Array.isArray(n)&&(h(n),_.current=n.map(ae))}},subject:s._subjects.array});var A=i.default.useCallback((function(e){F.current=!0,s._updateFieldArray(o,e)}),[s,o]);return i.default.useEffect((function(){if(s._state.action=!1,se(o,s._names)&&s._subjects.state.next(v({},s._formState)),F.current&&(!ie(s._options.mode).isOnSubmit||s._formState.isSubmitted))if(s._options.resolver)s._executeSchema([o]).then((function(e){var r=O(e.errors,o),t=O(s._formState.errors,o);(t?!r&&t.type||r&&(t.type!==r.type||t.message!==r.message):r&&r.type)&&(r?ee(s._formState.errors,o,r):Be(s._formState.errors,o),s._subjects.state.next({errors:s._formState.errors}))}));else{var e=O(s._fields,o);!e||!e._f||ie(s._options.reValidateMode).isOnSubmit&&ie(s._options.mode).isOnSubmit||xe(e,s._formValues,s._options.criteriaMode===j.all,s._options.shouldUseNativeValidation,!0).then((function(e){return!I(e)&&s._subjects.state.next({errors:le(s._formState.errors,e,o)})}))}s._subjects.values.next({name:o,values:v({},s._formValues)}),s._names.focus&&oe(s._fields,(function(e,r){if(s._names.focus&&r.startsWith(s._names.focus)&&e.focus)return e.focus(),1})),s._names.focus='',s._updateValid(),F.current=!1}),[p,o,s]),i.default.useEffect((function(){return!O(s._formValues,o)&&s._updateFieldArray(o),function(){(s._options.shouldUnregister||d)&&s.unregister(o)}}),[o,s,f,d]),{swap:i.default.useCallback((function(e,r){var t=s._getFieldArray(o);je(t,e,r),je(_.current,e,r),A(t),h(t),s._updateFieldArray(o,t,je,{argA:e,argB:r},!1)}),[A,o,s]),move:i.default.useCallback((function(e,r){var t=s._getFieldArray(o);we(t,e,r),we(_.current,e,r),A(t),h(t),s._updateFieldArray(o,t,we,{argA:e,argB:r},!1)}),[A,o,s]),prepend:i.default.useCallback((function(e,r){var t=H(D(e)),n=Oe(s._getFieldArray(o),t);s._names.focus=ue(o,0,r),_.current=Oe(_.current,t.map(ae)),A(n),h(n),s._updateFieldArray(o,n,Oe,{argA:De(e)})}),[A,o,s]),append:i.default.useCallback((function(e,r){var t=H(D(e)),n=Se(s._getFieldArray(o),t);s._names.focus=ue(o,n.length-1,r),_.current=Se(_.current,t.map(ae)),A(n),h(n),s._updateFieldArray(o,n,Se,{argA:De(e)})}),[A,o,s]),remove:i.default.useCallback((function(e){var r=Ee(s._getFieldArray(o),e);_.current=Ee(_.current,e),A(r),h(r),s._updateFieldArray(o,r,Ee,{argA:e})}),[A,o,s]),insert:i.default.useCallback((function(e,r,t){var n=H(D(r)),a=ke(s._getFieldArray(o),e,n);s._names.focus=ue(o,e,t),_.current=ke(_.current,e,n.map(ae)),A(a),h(a),s._updateFieldArray(o,a,ke,{argA:e,argB:De(r)})}),[A,o,s]),update:i.default.useCallback((function(e,t){var n=D(t),a=Ne(s._getFieldArray(o),e,n);_.current=(0,r.default)(a).map((function(r,t){return r&&t!==e?_.current[t]:ae()})),A(a),h((0,r.default)(a)),s._updateFieldArray(o,a,Ne,{argA:e,argB:n},!0,!1)}),[A,o,s]),replace:i.default.useCallback((function(e){var t=H(D(e));_.current=t.map(ae),A((0,r.default)(t)),h((0,r.default)(t)),s._updateFieldArray(o,(0,r.default)(t),(function(e){return e}),{},!0,!1)}),[A,o,s]),fields:i.default.useMemo((function(){return p.map((function(e,r){return v(v({},e),{},(0,n.default)({},f,_.current[r]||ae()))}))}),[p,f])}},_e.useForm=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},r=i.default.useRef(),t=i.default.useRef(),n=i.default.useState({isDirty:!1,isValidating:!1,isLoading:de(e.defaultValues),isSubmitted:!1,isSubmitting:!1,isSubmitSuccessful:!1,isValid:!1,submitCount:0,dirtyFields:{},touchedFields:{},validatingFields:{},errors:e.errors||{},disabled:e.disabled||!1,defaultValues:de(e.defaultValues)?void 0:e.defaultValues}),u=(0,a.default)(n,2),s=u[0],o=u[1];r.current||(r.current=v(v({},nr(e)),{},{formState:s}));var l=r.current.control;return l._options=e,J({subject:l._subjects.state,next:function(e){$(e,l._proxyFormState,l._updateFormState,!0)&&o(v({},l._formState))}}),i.default.useEffect((function(){return l._disableForm(e.disabled)}),[l,e.disabled]),i.default.useEffect((function(){if(l._proxyFormState.isDirty){var e=l._getDirty();e!==s.isDirty&&l._subjects.state.next({isDirty:e})}}),[l,s.isDirty]),i.default.useEffect((function(){e.values&&!Me(e.values,t.current)?(l._reset(e.values,l._options.resetOptions),t.current=e.values,o((function(e){return v({},e)}))):l._resetDefaultValues()}),[e.values,l]),i.default.useEffect((function(){e.errors&&l._setErrors(e.errors)}),[e.errors,l]),i.default.useEffect((function(){l._state.mount||(l._updateValid(),l._state.mount=!0),l._state.watch&&(l._state.watch=!1,l._subjects.state.next(v({},l._formState))),l._removeUnmounted()})),i.default.useEffect((function(){e.shouldUnregister&&l._subjects.values.next({values:l._getWatch()})}),[e.shouldUnregister,l]),r.current.formState=q(s,l),r.current},_e.useFormContext=void 0,_e.useFormState=z,_e.useWatch=X;var r=e(_r(_d[1])),t=e(_r(_d[2])),n=e(_r(_d[3])),a=e(_r(_d[4])),u=e(_r(_d[5])),i=e(_r(_d[6])),s=["children"],o=["name"],l=["control","onSubmit","children","action","method","headers","encType","onError","render","onSuccess","validateStatus"],f=["_f"],d=["_f"];function c(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);r&&(n=n.filter((function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable}))),t.push.apply(t,n)}return t}function v(e){for(var r=1;r3&&void 0!==arguments[3])||arguments[3],a={defaultValues:r._defaultValues},u=function(u){Object.defineProperty(a,u,{get:function(){var a=u;return r._proxyFormState[a]!==j.all&&(r._proxyFormState[a]=!n||j.all),t&&(t[a]=!0),e[a]}})};for(var i in e)u(i);return a}),I=function(e){return b(e)&&!Object.keys(e).length},$=function(e,r,t,n){t(e);e.name;var a=(0,u.default)(e,o);return I(a)||Object.keys(a).length>=Object.keys(r).length||Object.keys(a).find((function(e){return r[e]===(!n||j.all)}))},H=function(e){return Array.isArray(e)?e:[e]},G=function(e,r,t){return!e||!r||e===r||H(e).some((function(e){return e&&(t?e===r:e.startsWith(r)||r.startsWith(e))}))};function J(e){var r=i.default.useRef(e);r.current=e,i.default.useEffect((function(){var t=!e.disabled&&r.current.subject&&r.current.subject.subscribe({next:r.current.next});return function(){t&&t.unsubscribe()}}),[e.disabled])}function z(e){var r=W(),t=e||{},n=t.control,u=void 0===n?r.control:n,s=t.disabled,o=t.name,l=t.exact,f=i.default.useState(u._formState),d=(0,a.default)(f,2),c=d[0],y=d[1],p=i.default.useRef(!0),h=i.default.useRef({isDirty:!1,isLoading:!1,dirtyFields:!1,touchedFields:!1,validatingFields:!1,isValidating:!1,isValid:!1,errors:!1}),_=i.default.useRef(o);return _.current=o,J({disabled:s,next:function(e){return p.current&&G(_.current,e.name,l)&&$(e,h.current,u._updateFormState)&&y(v(v({},u._formState),e))},subject:u._subjects.state}),i.default.useEffect((function(){return p.current=!0,h.current.isValid&&u._updateValid(!0),function(){p.current=!1}}),[u]),q(c,u,h.current,!1)}var K=function(e){return'string'==typeof e},Q=function(e,r,t,n,a){return K(e)?(n&&r.watch.add(e),O(t,e,a)):Array.isArray(e)?e.map((function(e){return n&&r.watch.add(e),O(t,e)})):(n&&(r.watchAll=!0),t)};function X(e){var r=W(),t=e||{},n=t.control,u=void 0===n?r.control:n,s=t.name,o=t.defaultValue,l=t.disabled,f=t.exact,d=i.default.useRef(s);d.current=s,J({disabled:l,subject:u._subjects.values,next:function(e){G(d.current,e.name,f)&&p(D(Q(d.current,u._names,e.values||u._formValues,!1,o)))}});var c=i.default.useState(u._getWatch(s,o)),v=(0,a.default)(c,2),y=v[0],p=v[1];return i.default.useEffect((function(){return u._removeUnmounted()})),y}var Y=function(e){return/^\w*$/.test(e)},Z=function(e){return k(e.replace(/["|']|\]/g,'').split(/\.|\[/))},ee=_e.set=function(e,r,t){for(var n=-1,a=Y(r)?[r]:Z(r),u=a.length,i=u-1;++n2&&void 0!==arguments[2]?arguments[2]:{};return t.shouldFocus||w(t.shouldFocus)?t.focusName||`${e}.${w(t.focusIndex)?r:t.focusIndex}.`:''},ie=function(e){return{isOnSubmit:!e||e===j.onSubmit,isOnBlur:e===j.onBlur,isOnChange:e===j.onChange,isOnAll:e===j.all,isOnTouch:e===j.onTouched}},se=function(e,t,n){return!n&&(t.watchAll||t.watch.has(e)||(0,r.default)(t.watch).some((function(r){return e.startsWith(r)&&/^\.\w+/.test(e.slice(r.length))})))},oe=function e(r,t,n,a){for(var i of n||Object.keys(r)){var s=O(r,i);if(s){var o=s._f,l=(0,u.default)(s,f);if(o){if(o.refs&&o.refs[0]&&t(o.refs[0],i)&&!a)break;if(o.ref&&t(o.ref,o.name)&&!a)break;e(l,t)}else b(l)&&e(l,t)}}},le=function(e,r,t){var n=k(O(e,t));return ee(n,'root',r[t]),ee(e,t,n),e},fe=function(e){return'file'===e.type},de=function(e){return'function'==typeof e},ce=function(e){if(!S)return!1;var r=e?e.ownerDocument:0;return e instanceof(r&&r.defaultView?r.defaultView.HTMLElement:HTMLElement)},ve=function(e){return K(e)},me=function(e){return'radio'===e.type},ye=function(e){return e instanceof RegExp},ge={value:!1,isValid:!1},pe={value:!0,isValid:!0},he=function(e){if(Array.isArray(e)){if(e.length>1){var r=e.filter((function(e){return e&&e.checked&&!e.disabled})).map((function(e){return e.value}));return{value:r,isValid:!!r.length}}return e[0].checked&&!e[0].disabled?e[0].attributes&&!w(e[0].attributes.value)?w(e[0].value)||''===e[0].value?pe:{value:e[0].value,isValid:!0}:pe:ge}return ge},be={isValid:!1,value:null},Ve=function(e){return Array.isArray(e)?e.reduce((function(e,r){return r&&r.checked&&!r.disabled?{isValid:!0,value:r.value}:e}),be):be};function Fe(e,r){var t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:'validate';if(ve(e)||Array.isArray(e)&&e.every(ve)||C(e)&&!e)return{type:t,message:ve(e)?e:'',ref:r}}var Ae=function(e){return b(e)&&!ye(e)?e:{value:e,message:''}},xe=(function(){var e=(0,t.default)((function*(e,r,t,n,a){var u=e._f,i=u.ref,s=u.refs,o=u.required,l=u.maxLength,f=u.minLength,d=u.min,c=u.max,p=u.pattern,_=u.validate,V=u.name,F=u.valueAsNumber,A=u.mount,x=u.disabled,S=O(r,V);if(!A||x)return{};var D=s?s[0]:i,k=function(e){n&&D.reportValidity&&(D.setCustomValidity(C(e)?'':e||''),D.reportValidity())},E={},j=me(i),R=y(i),W=j||R,q=(F||fe(i))&&w(i.value)&&w(S)||ce(i)&&''===i.value||''===S||Array.isArray(S)&&!S.length,$=ne.bind(null,V,t,E),H=function(e,r,t){var n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:B,a=arguments.length>4&&void 0!==arguments[4]?arguments[4]:N,u=e?r:t;E[V]=v({type:e?n:a,message:u,ref:i},$(e?n:a,u))};if(a?!Array.isArray(S)||!S.length:o&&(!W&&(q||h(S))||C(S)&&!S||R&&!he(s).isValid||j&&!Ve(s).isValid)){var G=ve(o)?{value:!!o,message:o}:Ae(o),J=G.value,z=G.message;if(J&&(E[V]=v({type:P,message:z,ref:D},$(P,z)),!t))return k(z),E}if(!(q||h(d)&&h(c))){var Q,X,Y=Ae(c),Z=Ae(d);if(h(S)||isNaN(S)){var ee=i.valueAsDate||new Date(S),re=function(e){return new Date((new Date).toDateString()+' '+e)},te='time'==i.type,ae='week'==i.type;K(Y.value)&&S&&(Q=te?re(S)>re(Y.value):ae?S>Y.value:ee>new Date(Y.value)),K(Z.value)&&S&&(X=te?re(S)Y.value),h(Z.value)||(X=ue+ie.value,le=!h(se.value)&&S.length<+se.value;if((oe||le)&&(H(oe,ie.message,se.message),!t))return k(E[V].message),E}if(p&&!q&&K(S)){var ge=Ae(p),pe=ge.value,be=ge.message;if(ye(pe)&&!S.match(pe)&&(E[V]=v({type:L,message:be,ref:i},$(L,be)),!t))return k(be),E}if(_)if(de(_)){var xe=Fe(yield _(S,r),D);if(xe&&(E[V]=v(v({},xe),$(M,xe.message)),!t))return k(xe.message),E}else if(b(_)){var Se={};for(var De in _){if(!I(Se)&&!t)break;var ke=Fe(yield _[De](S,r),D,De);ke&&(Se=v(v({},ke),$(De,ke.message)),k(ke.message),t&&(E[V]=Se))}if(!I(Se)&&(E[V]=v({ref:D},Se),!t))return E}return k(!0),E}));return function(r,t,n,a,u){return e.apply(this,arguments)}})(),Se=function(e,t){return[].concat((0,r.default)(e),(0,r.default)(H(t)))},De=function(e){return Array.isArray(e)?e.map((function(){})):void 0};function ke(e,t,n){return[].concat((0,r.default)(e.slice(0,t)),(0,r.default)(H(n)),(0,r.default)(e.slice(t)))}var we=function(e,r,t){return Array.isArray(e)?(w(e[t])&&(e[t]=void 0),e.splice(t,0,e.splice(r,1)[0]),e):[]},Oe=function(e,t){return[].concat((0,r.default)(H(t)),(0,r.default)(H(e)))};function Ce(e,t){var n=0,a=(0,r.default)(e);for(var u of t)a.splice(u-n,1),n++;return k(a).length?a:[]}var Ee=function(e,r){return w(r)?[]:Ce(e,H(r).sort((function(e,r){return e-r})))},je=function(e,r,t){var n=[e[t],e[r]];e[r]=n[0],e[t]=n[1]};function Te(e,r){for(var t=r.slice(0,-1).length,n=0;n1&&void 0!==arguments[1]?arguments[1]:{},t=Array.isArray(e);if(b(e)||t)for(var n in e)Array.isArray(e[n])||b(e[n])&&!$e(e[n])?(r[n]=Array.isArray(e[n])?[]:{},He(e[n],r[n])):h(e[n])||(r[n]=!0);return r}function Ge(e,r,t){var n=Array.isArray(e);if(b(e)||n)for(var a in e)Array.isArray(e[a])||b(e[a])&&!$e(e[a])?w(r)||Pe(t[a])?t[a]=Array.isArray(e[a])?He(e[a],[]):v({},He(e[a])):Ge(e[a],h(r)?{}:r[a],t[a]):t[a]=!Me(e[a],r[a]);return t}var Je=function(e,r){return Ge(e,r,He(r))},ze=function(e,r){var t=r.valueAsNumber,n=r.valueAsDate,a=r.setValueAs;return w(e)?e:t?''===e?NaN:e?+e:e:n&&K(e)?new Date(e):a?a(e):e};function Ke(e){var t=e.ref;if(!(e.refs?e.refs.every((function(e){return e.disabled})):t.disabled))return fe(t)?t.files:me(t)?Ve(e.refs).value:Re(t)?(0,r.default)(t.selectedOptions).map((function(e){return e.value})):y(t)?he(e.refs).value:ze(w(t.value)?e.ref.value:t.value,e)}var Qe=function(e,t,n,a){var u={};for(var i of e){var s=O(t,i);s&&ee(u,i,s._f)}return{criteriaMode:n,names:(0,r.default)(e),fields:u,shouldUseNativeValidation:a}},Xe=function(e){return w(e)?e:ye(e)?e.source:b(e)?ye(e.value)?e.value.source:e.value:e},Ye=function(e){return e.mount&&(e.required||e.min||e.max||e.maxLength||e.minLength||e.pattern||e.validate)};function Ze(e,r,t){var n=O(e,t);if(n||Y(t))return{error:n,name:t};for(var a=t.split('.');a.length;){var u=a.join('.'),i=O(r,u),s=O(e,u);if(i&&!Array.isArray(i)&&t!==u)return{name:t};if(s&&s.type)return{name:u,error:s};a.pop()}return{name:t}}var er=function(e,r,t,n,a){return!a.isOnAll&&(!t&&a.isOnTouch?!(r||e):(t?n.isOnBlur:a.isOnBlur)?!e:!(t?n.isOnChange:a.isOnChange)||e)},rr=function(e,r){return!k(O(e,r)).length&&Be(e,r)},tr={mode:j.onSubmit,reValidateMode:j.onChange,shouldFocusError:!0};function nr(){var e,a=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},i=v(v({},tr),a),s={submitCount:0,isDirty:!1,isLoading:de(i.defaultValues),isValidating:!1,isSubmitted:!1,isSubmitting:!1,isSubmitSuccessful:!1,isValid:!1,touchedFields:{},dirtyFields:{},validatingFields:{},errors:i.errors||{},disabled:i.disabled||!1},o={},l=(b(i.defaultValues)||b(i.values))&&D(i.defaultValues||i.values)||{},f=i.shouldUnregister?{}:D(l),c={action:!1,mount:!1,watch:!1},_={mount:new Set,unMount:new Set,array:new Set,watch:new Set},F=0,x={isDirty:!1,dirtyFields:!1,validatingFields:!1,touchedFields:!1,isValidating:!1,isValid:!1,errors:!1},T={values:Le(),array:Le(),state:Le()},U=ie(i.mode),B=ie(i.reValidateMode),N=i.criteriaMode===j.all,L=(function(){var e=(0,t.default)((function*(e){if(x.isValid||e){var r=i.resolver?I((yield $()).errors):yield J(o,!0);r!==s.isValid&&T.state.next({isValid:r})}}));return function(r){return e.apply(this,arguments)}})(),P=function(e,r){(x.isValidating||x.validatingFields)&&(r.forEach((function(r){ee(s.validatingFields,r,e)})),s.isValidating=Ie(s.validatingFields),T.state.next({validatingFields:s.validatingFields,isValidating:s.isValidating}))},M=function(e,r){ee(s.errors,e,r),T.state.next({errors:s.errors})},R=function(e,r,t,n){var a=O(o,e);if(a){var u=O(f,e,w(t)?O(l,e):t);w(u)||n&&n.defaultChecked||r?ee(f,e,r?u:Ke(a._f)):Y(e,u),c.mount&&L()}},W=function(e,r,t,n,a){var u=!1,i=!1,f={name:e},d=!(!O(o,e)||!O(o,e)._f.disabled);if(!t||n){x.isDirty&&(i=s.isDirty,s.isDirty=f.isDirty=z(),u=i!==f.isDirty);var c=d||Me(O(l,e),r);i=!(d||!O(s.dirtyFields,e)),c||d?Be(s.dirtyFields,e):ee(s.dirtyFields,e,!0),f.dirtyFields=s.dirtyFields,u=u||x.dirtyFields&&i!==!c}if(t){var v=O(s.touchedFields,e);v||(ee(s.touchedFields,e,t),f.touchedFields=s.touchedFields,u=u||x.touchedFields&&v!==t)}return u&&a&&T.state.next(f),u?f:{}},q=function(r,t,n,u){var i,o=O(s.errors,r),l=x.isValid&&C(t)&&s.isValid!==t;if(a.delayError&&n?(i=function(){return M(r,n)},(e=function(e){clearTimeout(F),F=setTimeout(i,e)})(a.delayError)):(clearTimeout(F),e=null,n?ee(s.errors,r,n):Be(s.errors,r)),(n?!Me(o,n):o)||!I(u)||l){var f=v(v(v({},u),l&&C(t)?{isValid:t}:{}),{},{errors:s.errors,name:r});s=v(v({},s),f),T.state.next(f)}P(!1,Object.keys(s.validatingFields).filter((function(e){return e===r})))},$=(function(){var e=(0,t.default)((function*(e){return i.resolver(f,i.context,Qe(e||_.mount,o,i.criteriaMode,i.shouldUseNativeValidation))}));return function(r){return e.apply(this,arguments)}})(),G=(function(){var e=(0,t.default)((function*(e){var r=(yield $(e)).errors;if(e)for(var t of e){var n=O(r,t);n?ee(s.errors,t,n):Be(s.errors,t)}else s.errors=r;return r}));return function(r){return e.apply(this,arguments)}})(),J=(function(){var e=(0,t.default)((function*(e,r){var t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{valid:!0};for(var n in e){var a=e[n];if(a){var o=a._f,l=(0,u.default)(a,d);if(o){var c=_.array.has(o.name),v=yield xe(a,f,N,i.shouldUseNativeValidation&&!r,c);if(v[o.name]&&(t.valid=!1,r))break;!r&&(O(v,o.name)?c?le(s.errors,v,o.name):ee(s.errors,o.name,v[o.name]):Be(s.errors,o.name))}l&&(yield J(l,r,t))}}return t.valid}));return function(r,t){return e.apply(this,arguments)}})(),z=function(e,r){return e&&r&&ee(f,e,r),!Me(ue(),l)},X=function(e,r,t){return Q(e,_,v({},c.mount?f:w(r)?l:K(e)?(0,n.default)({},e,r):r),t,r)},Y=function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},a=O(o,e),u=t;if(a){var i=a._f;i&&(!i.disabled&&ee(f,e,ze(t,i)),u=ce(i.ref)&&h(t)?'':t,Re(i.ref)?(0,r.default)(i.ref.options).forEach((function(e){return e.selected=u.includes(e.value)})):i.refs?y(i.ref)?i.refs.length>1?i.refs.forEach((function(e){return(!e.defaultChecked||!e.disabled)&&(e.checked=Array.isArray(u)?!!u.find((function(r){return r===e.value})):u===e.value)})):i.refs[0]&&(i.refs[0].checked=!!u):i.refs.forEach((function(e){return e.checked=e.value===u})):fe(i.ref)?i.ref.value='':(i.ref.value=u,i.ref.type||T.values.next({name:e,values:v({},f)})))}(n.shouldDirty||n.shouldTouch)&&W(e,u,n.shouldTouch,n.shouldDirty,!0),n.shouldValidate&&ae(e)},Z=function e(r,t,n){for(var a in t){var u=t[a],i=`${r}.${a}`,s=O(o,i);!_.array.has(r)&&Pe(u)&&(!s||s._f)||p(u)?Y(i,u,n):e(i,u,n)}},re=function(e,r){var t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},n=O(o,e),a=_.array.has(e),u=D(r);ee(f,e,u),a?(T.array.next({name:e,values:v({},f)}),(x.isDirty||x.dirtyFields)&&t.shouldDirty&&T.state.next({name:e,dirtyFields:Je(l,f),isDirty:z(e,u)})):!n||n._f||h(u)?Y(e,u,t):Z(e,u,t),se(e,_)&&T.state.next(v({},s)),T.values.next({name:c.mount?e:void 0,values:v({},f)})},te=(function(){var r=(0,t.default)((function*(r){var t=r.target,n=t.name,a=!0,u=O(o,n),l=function(e){a=Number.isNaN(e)||e===O(f,n,e)};if(u){var d,c,y=t.type?Ke(u._f):V(r),p=r.type===E.BLUR||r.type===E.FOCUS_OUT,h=!Ye(u._f)&&!i.resolver&&!O(s.errors,n)&&!u._f.deps||er(p,O(s.touchedFields,n),s.isSubmitted,B,U),b=se(n,_,p);ee(f,n,y),p?(u._f.onBlur&&u._f.onBlur(r),e&&e(0)):u._f.onChange&&u._f.onChange(r);var F=W(n,y,p,!1),A=!I(F)||b;if(!p&&T.values.next({name:n,type:r.type,values:v({},f)}),h)return x.isValid&&L(),A&&T.state.next(v({name:n},b?{}:F));if(!p&&b&&T.state.next(v({},s)),P(!0,[n]),i.resolver){var S=(yield $([n])).errors;if(l(y),a){var D=Ze(s.errors,o,n),k=Ze(S,o,D.name||n);d=k.error,n=k.name,c=I(S)}}else d=(yield xe(u,f,N,i.shouldUseNativeValidation))[n],l(y),a&&(d?c=!1:x.isValid&&(c=yield J(o,!0)));a&&(u._f.deps&&ae(u._f.deps),q(n,c,d,F))}}));return function(e){return r.apply(this,arguments)}})(),ne=function(e,r){if(O(s.errors,r)&&e.focus)return e.focus(),1},ae=(function(){var e=(0,t.default)((function*(e){var r,a,u=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},l=H(e);if(P(!0,l),i.resolver){var f=yield G(w(e)?e:l);r=I(f),a=e?!l.some((function(e){return O(f,e)})):r}else e?(a=(yield Promise.all(l.map((function(){var e=(0,t.default)((function*(e){var r=O(o,e);return yield J(r&&r._f?(0,n.default)({},e,r):r)}));return function(r){return e.apply(this,arguments)}})()))).every(Boolean),(a||s.isValid)&&L()):a=r=yield J(o);return T.state.next(v(v(v({},!K(e)||x.isValid&&r!==s.isValid?{}:{name:e}),i.resolver||!e?{isValid:r}:{}),{},{errors:s.errors,isValidating:!1})),u.shouldFocus&&!a&&oe(o,ne,e?l:_.mount),a}));return function(r){return e.apply(this,arguments)}})(),ue=function(e){var r=v(v({},l),c.mount?f:{});return w(e)?r:K(e)?O(r,e):e.map((function(e){return O(r,e)}))},ve=function(e,r){return{invalid:!!O((r||s).errors,e),isDirty:!!O((r||s).dirtyFields,e),isTouched:!!O((r||s).touchedFields,e),isValidating:!!O((r||s).validatingFields,e),error:O((r||s).errors,e)}},me=function(e,r,t){var n=(O(o,e,{_f:{}})._f||{}).ref;ee(s.errors,e,v(v({},r),{},{ref:n})),T.state.next({name:e,errors:s.errors,isValid:!1}),t&&t.shouldFocus&&n&&n.focus&&n.focus()},ye=function(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};for(var t of e?H(e):_.mount)_.mount.delete(t),_.array.delete(t),r.keepValue||(Be(o,t),Be(f,t)),!r.keepError&&Be(s.errors,t),!r.keepDirty&&Be(s.dirtyFields,t),!r.keepTouched&&Be(s.touchedFields,t),!r.keepIsValidating&&Be(s.validatingFields,t),!i.shouldUnregister&&!r.keepDefaultValue&&Be(l,t);T.values.next({values:v({},f)}),T.state.next(v(v({},s),r.keepDirty?{isDirty:z()}:{})),!r.keepIsValid&&L()},ge=function(e){var r=e.disabled,t=e.name,n=e.field,a=e.fields,u=e.value;if(C(r)){var i=r?void 0:w(u)?Ke(n?n._f:O(a,t)._f):u;ee(f,t,i),W(t,i,!1,!1,!0)}},pe=function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},a=O(o,t),u=C(n.disabled);return ee(o,t,v(v({},a||{}),{},{_f:v(v({},a&&a._f?a._f:{ref:{name:t}}),{},{name:t,mount:!0},n)})),_.mount.add(t),a?ge({field:a,disabled:n.disabled,name:t,value:n.value}):R(t,!0,n.value),v(v(v({},u?{disabled:n.disabled}:{}),i.progressive?{required:!!n.required,min:Xe(n.min),max:Xe(n.max),minLength:Xe(n.minLength),maxLength:Xe(n.maxLength),pattern:Xe(n.pattern)}:{}),{},{name:t,onChange:te,onBlur:te,ref:function(u){if(u){e(t,n),a=O(o,t);var s=w(u.value)&&u.querySelectorAll&&u.querySelectorAll('input,select,textarea')[0]||u,f=We(s),d=a._f.refs||[];if(f?d.find((function(e){return e===s})):s===a._f.ref)return;ee(o,t,{_f:v(v({},a._f),f?{refs:[].concat((0,r.default)(d.filter(qe)),[s],(0,r.default)(Array.isArray(O(l,t))?[{}]:[])),ref:{type:s.type,name:t}}:{ref:s})}),R(t,!1,void 0,s)}else(a=O(o,t,{}))._f&&(a._f.mount=!1),(i.shouldUnregister||n.shouldUnregister)&&(!A(_.array,t)||!c.action)&&_.unMount.add(t)}})},he=function(){return i.shouldFocusError&&oe(o,ne,_.mount)},be=function(e,r){return(function(){var n=(0,t.default)((function*(t){var n=void 0;t&&(t.preventDefault&&t.preventDefault(),t.persist&&t.persist());var a=D(f);if(T.state.next({isSubmitting:!0}),i.resolver){var u=yield $(),l=u.errors,d=u.values;s.errors=l,a=d}else yield J(o);if(Be(s.errors,'root'),I(s.errors)){T.state.next({errors:{}});try{yield e(a,t)}catch(e){n=e}}else r&&(yield r(v({},s.errors),t)),he(),setTimeout(he);if(T.state.next({isSubmitted:!0,isSubmitting:!1,isSubmitSuccessful:I(s.errors)&&!n,submitCount:s.submitCount+1,errors:s.errors}),n)throw n}));return function(e){return n.apply(this,arguments)}})()},Ve=function(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},t=e?D(e):l,n=D(t),u=I(e),i=u?l:n;if(r.keepDefaultValues||(l=t),!r.keepValues){if(r.keepDirtyValues)for(var d of _.mount)O(s.dirtyFields,d)?ee(i,d,O(f,d)):re(d,O(i,d));else{if(S&&w(e))for(var y of _.mount){var p=O(o,y);if(p&&p._f){var h=Array.isArray(p._f.refs)?p._f.refs[0]:p._f.ref;if(ce(h)){var b=h.closest('form');if(b){b.reset();break}}}}o={}}f=a.shouldUnregister?r.keepDefaultValues?D(l):{}:D(i),T.array.next({values:v({},i)}),T.values.next({values:v({},i)})}_={mount:r.keepDirtyValues?_.mount:new Set,unMount:new Set,array:new Set,watch:new Set,watchAll:!1,focus:''},c.mount=!x.isValid||!!r.keepIsValid||!!r.keepDirtyValues,c.watch=!!a.shouldUnregister,T.state.next({submitCount:r.keepSubmitCount?s.submitCount:0,isDirty:!u&&(r.keepDirty?s.isDirty:!(!r.keepDefaultValues||Me(e,l))),isSubmitted:!!r.keepIsSubmitted&&s.isSubmitted,dirtyFields:u?[]:r.keepDirtyValues?r.keepDefaultValues&&f?Je(l,f):s.dirtyFields:r.keepDefaultValues&&e?Je(l,e):{},touchedFields:r.keepTouched?s.touchedFields:{},errors:r.keepErrors?s.errors:{},isSubmitSuccessful:!!r.keepIsSubmitSuccessful&&s.isSubmitSuccessful,isSubmitting:!1})},Fe=function(e,r){return Ve(de(e)?e(f):e,r)};return{control:{register:pe,unregister:ye,getFieldState:ve,handleSubmit:be,setError:me,_executeSchema:$,_getWatch:X,_getDirty:z,_updateValid:L,_removeUnmounted:function(){for(var e of _.unMount){var r=O(o,e);r&&(r._f.refs?r._f.refs.every((function(e){return!qe(e)})):!qe(r._f.ref))&&ye(e)}_.unMount=new Set},_updateFieldArray:function(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],t=arguments.length>2?arguments[2]:void 0,n=arguments.length>3?arguments[3]:void 0,a=!(arguments.length>4&&void 0!==arguments[4])||arguments[4],u=!(arguments.length>5&&void 0!==arguments[5])||arguments[5];if(n&&t){if(c.action=!0,u&&Array.isArray(O(o,e))){var i=t(O(o,e),n.argA,n.argB);a&&ee(o,e,i)}if(u&&Array.isArray(O(s.errors,e))){var d=t(O(s.errors,e),n.argA,n.argB);a&&ee(s.errors,e,d),rr(s.errors,e)}if(x.touchedFields&&u&&Array.isArray(O(s.touchedFields,e))){var v=t(O(s.touchedFields,e),n.argA,n.argB);a&&ee(s.touchedFields,e,v)}x.dirtyFields&&(s.dirtyFields=Je(l,f)),T.state.next({name:e,isDirty:z(e,r),dirtyFields:s.dirtyFields,errors:s.errors,isValid:s.isValid})}else ee(f,e,r)},_updateDisabledField:ge,_getFieldArray:function(e){return k(O(c.mount?f:l,e,a.shouldUnregister?O(l,e,[]):[]))},_reset:Ve,_resetDefaultValues:function(){return de(i.defaultValues)&&i.defaultValues().then((function(e){Fe(e,i.resetOptions),T.state.next({isLoading:!1})}))},_updateFormState:function(e){s=v(v({},s),e)},_disableForm:function(e){C(e)&&(T.state.next({disabled:e}),oe(o,(function(r,t){var n=e,a=O(o,t);a&&C(a._f.disabled)&&(n||(n=a._f.disabled)),r.disabled=n}),0,!1))},_subjects:T,_proxyFormState:x,_setErrors:function(e){s.errors=e,T.state.next({errors:s.errors,isValid:!1})},get _fields(){return o},get _formValues(){return f},get _state(){return c},set _state(e){c=e},get _defaultValues(){return l},get _names(){return _},set _names(e){_=e},get _formState(){return s},set _formState(e){s=e},get _options(){return i},set _options(e){i=v(v({},i),e)}},trigger:ae,register:pe,handleSubmit:be,watch:function(e,r){return de(e)?T.values.subscribe({next:function(t){return e(X(void 0,r),t)}}):X(e,r,!0)},setValue:re,getValues:ue,reset:Fe,resetField:function(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};O(o,e)&&(w(r.defaultValue)?re(e,D(O(l,e))):(re(e,r.defaultValue),ee(l,e,D(r.defaultValue))),r.keepTouched||Be(s.touchedFields,e),r.keepDirty||(Be(s.dirtyFields,e),s.isDirty=r.defaultValue?z(e,D(O(l,e))):z()),r.keepError||(Be(s.errors,e),x.isValid&&L()),T.state.next(v({},s)))},clearErrors:function(e){e&&H(e).forEach((function(e){return Be(s.errors,e)})),T.state.next({errors:e?s.errors:{}})},unregister:ye,setError:me,setFocus:function(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},t=O(o,e),n=t&&t._f;if(n){var a=n.refs?n.refs[0]:n.ref;a.focus&&(a.focus(),r.shouldSelect&&a.select())}},getFieldState:ve}}}),674,[34,61,6,45,35,46,29]); diff --git a/backend/public/index.html b/backend/public/index.html index 8a42345..e482e5c 100644 --- a/backend/public/index.html +++ b/backend/public/index.html @@ -32,6 +32,6 @@
- + diff --git a/src/app/auth/login.tsx b/src/app/auth/login.tsx index db130fc..31982b3 100644 --- a/src/app/auth/login.tsx +++ b/src/app/auth/login.tsx @@ -38,6 +38,8 @@ const LoginPage = () => { }, }); + const onSubmit = form.handleSubmit((val) => login.mutate(val)); + return ( { form={form} path="username" className="mt-6" + onSubmitEditing={onSubmit} /> { path="password" className="mt-4" secureTextEntry + onSubmitEditing={onSubmit} /> - diff --git a/src/lib/api.ts b/src/lib/api.ts index 4986e8f..ae2b93e 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -10,7 +10,7 @@ import type { import type { AppType } from "../../backend/routes/_routes"; import authStore, { logout } from "@/stores/authStore"; -const api: ReturnType> = hc(API_BASEURL, { +const api: ReturnType> = hc(API_BASEURL + "/api", { fetch: fetchHandler, });