Move xservice into src, update script

coder · presleyp · Mar 18, 2022 · Mar 15, 2022 · Mar 15, 2022 · Mar 15, 2022
commit 97d94de54d942b0ebb59659861e9754ba63f1b7b
diff --git a/site/package.json b/site/package.json
@@ -18,7 +18,7 @@
     "storybook:build": "build-storybook",
     "test": "jest --selectProjects test",
     "test:coverage": "jest --selectProjects test --collectCoverage",
-    "typegen": "xstate typegen '**/*.ts'"
+    "typegen": "xstate typegen 'src/**/*.ts'"
   },
   "dependencies": {
     "@material-ui/core": "4.9.4",

diff --git a/site/src/components/Navbar/index.tsx b/site/src/components/Navbar/index.tsx
@@ -7,7 +7,7 @@ import { Logo } from "../Icons"
 import { UserDropdown } from "./UserDropdown"
 import { UserResponse } from "../../api"
 import { useActor } from "@xstate/react"
-import { userXService } from "../../../xServices/user/userXService"
+import { userXService } from "../../xServices/user/userXService"
 
 export interface NavbarProps {
   user?: UserResponse

diff --git a/site/src/components/Page/RequireAuth.tsx b/site/src/components/Page/RequireAuth.tsx
@@ -1,7 +1,7 @@
 import { useActor } from "@xstate/react"
 import React from "react"
 import { Navigate, useLocation } from "react-router"
-import { userXService } from "../../../xServices/user/userXService"
+import { userXService } from "../../xServices/user/userXService"
 import { FullScreenLoader } from "../Loader/FullScreenLoader"
 
 export interface RequireAuthProps {

diff --git a/site/src/pages/login.tsx b/site/src/pages/login.tsx
@@ -4,7 +4,7 @@ import React from "react"
 import { SignInForm } from "./../components/SignIn"
 import { Navigate, useLocation } from "react-router-dom"
 import { Location } from "history"
-import { userXService } from "../../xServices/user/userXService"
+import { userXService } from "../xServices/user/userXService"
 
 export const useStyles = makeStyles((theme) => ({
   root: {

diff --git a/site/xServices/user/userXService.ts → site/src/xServices/user/userXService.ts b/site/xServices/user/userXService.ts → site/src/xServices/user/userXService.ts
@@ -1,11 +1,10 @@
 import { createMachine, interpret, assign } from "xstate"
-import { UserResponse } from "../../api"
-import * as API from "../../api"
+import * as API from '../../api'
 
 export interface UserContext {
   getUserError?: Error | unknown // unknown is a concession while I work out typing issues
   authError?: Error | unknown
-  me?: UserResponse
+  me?: API.UserResponse
 }
 
 export type UserEvent = { type: "SIGN_OUT" } | { type: "SIGN_IN"; email: string; password: string }