npm - @stanlemon/app-template - Versions diffs - 0.1.2 → 0.2.2 - Mend

@stanlemon/app-template 0.1.2 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/app.js ADDED Viewed

@@ -0,0 +1,18 @@
+import {
+  createAppServer,
+  asyncJsonHandler as handler,
+  SimpleUsersDao,
+} from "@stanlemon/server-with-auth";
+const users = new SimpleUsersDao();
+const app = createAppServer({
+  webpack: "http://localhost:8080",
+  secure: ["/api/"],
+  ...users,
+});
+app.get(
+  "/api/users",
+  handler(() => ({ users: users.users }))
+);

package/index.html CHANGED Viewed

@@ -4,6 +4,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.min.css">
   <title>App</title>
 </head>

package/package.json CHANGED Viewed

@@ -1,19 +1,23 @@
 {
   "name": "@stanlemon/app-template",
-  "version": "0.1.2",
+  "version": "0.2.2",
   "description": "A template for creating apps using the webdev package.",
   "author": "Stan Lemon <stanlemon@users.noreply.github.com>",
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "start": "webpack serve",
-    "build": "NODE_ENV=production webpack",
+    "start": "node app.js",
+    "build": "npm run webpack:build",
+    "webpack:serve": "webpack serve",
+    "webpack:build": "NODE_ENV=production webpack",
     "test": "jest",
+    "test:watch": "jest -w",
     "test:coverage": "jest --coverage",
     "lint": "eslint --ext js,jsx,ts,tsx ./src/",
     "lint:format": "eslint --fix --ext js,jsx,ts,tsx ./src/"
   },
   "dependencies": {
-    "@stanlemon/webdev": "*"
+    "@stanlemon/webdev": "*",
+    "@stanlemon/server-with-auth": "*"
   }
 }

package/src/App.less CHANGED Viewed

@@ -1,5 +1,5 @@
-@primaryFont: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+@errorColor: "red";
-body {
-  font-family: @primaryFont;
+noscript {
+  background-color: @errorColor;
 }

package/src/App.test.tsx CHANGED Viewed

@@ -1,18 +1,45 @@
-import { render, screen, fireEvent } from "@testing-library/react";
+import {
+  render,
+  screen,
+  fireEvent,
+  waitFor,
+  act,
+} from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import App from "./App";
-test("<App/>", () => {
-  render(<App />);
+global.fetch = jest.fn(() =>
+  Promise.resolve({
+    ok: true,
+    json: () =>
+      Promise.resolve({
+        token: "token",
+        user: {
+          name: "Test Tester",
+          email: "test@test.com",
+          username: "test",
+          password: "password",
+        },
+      }),
+  })
+) as jest.Mock;
-  // The header is present
-  expect(screen.getByRole("heading")).toHaveTextContent("Hello World!");
+test("<App/>", async () => {
+  act(() => {
+    render(<App />);
+  });
+  // A fetch request will be made, and then the page will be initialized, wait for that
+  await waitFor(() => {
+    // The header is present
+    expect(screen.getByRole("heading")).toHaveTextContent("Hello World!");
+  });
   // Type some data into the input
-  userEvent.type(screen.getByRole("textbox"), "The first item");
+  userEvent.type(screen.getByLabelText("Item"), "The first item");
   // Click the add button
-  fireEvent.click(screen.getByRole("button"));
+  fireEvent.click(screen.getByText("Add", { selector: "button" }));
   // Now we should have a list item with the text we entered
   expect(screen.getByRole("listitem")).toHaveTextContent("The first item");

package/src/App.tsx CHANGED Viewed

@@ -1,19 +1,119 @@
-import { useState } from "react";
+import { useState, useEffect, createContext } from "react";
 import "./App.less";
 import Header from "./Header";
 import Input from "./Input";
+import Login from "./Login";
+import Register from "./Register";
+export const SessionContext = createContext<{
+  session: Session | null;
+  setSession: React.Dispatch<React.SetStateAction<Session | null>>;
+} | null>(null);
+export type ErrorMessage = {
+  message: string;
+};
+export type FormErrors = {
+  errors: Record<string, string>;
+};
+export type Session = {
+  token: string | null;
+  user: User | null;
+};
+export type User = {
+  name: string | null;
+  email: string | null;
+  username: string;
+  password: string;
+};
 export default function App() {
+  const [initialized, setInitialized] = useState<boolean>(false);
+  const [session, setSession] = useState<Session | null>(null);
+  const [value, setValue] = useState<string>("");
   const [items, setItems] = useState<string[]>([]);
+  const contextValue = { session, setSession };
+  useEffect(() => {
+    fetch("/auth/session", {
+      headers: {
+        Authorization: `Bearer ${session?.token || ""}`,
+        Accept: "application/json",
+        "Content-Type": "application/json",
+      },
+    })
+      .then((response) => {
+        setInitialized(true);
+        if (!response.ok) {
+          throw new Error(response.statusText);
+        }
+        return response;
+      })
+      .then((response) => response.json())
+      .then((session: Session) => {
+        setSession(session);
+      })
+      .catch((err) => {
+        console.error(err);
+      });
+  }, [session?.token, initialized]);
+  const addItem = () => {
+    setItems([...items, value]);
+    setValue("");
+  };
+  if (!initialized) {
+    return (
+      <div>
+        <em>Loading...</em>
+      </div>
+    );
+  }
   return (
-    <div>
+    <SessionContext.Provider value={contextValue}>
       <Header />
-      <Input onClick={(item) => setItems([...items, item])} />
+      <div>
+        {!session && (
+          <>
+            <p>
+              <em>You are not currently logged in.</em>
+            </p>
+            <Login />
+            <Spacer />
+            <Register />
+            <Spacer />
+          </>
+        )}
+        {session?.user && (
+          <p>
+            <em>You logged in as {session.user.username}.</em>
+          </p>
+        )}
+      </div>
+      <Input
+        label="Item"
+        name="item"
+        value={value}
+        onChange={(value) => setValue(value)}
+        onEnter={addItem}
+      />
+      <button onClick={addItem}>Add</button>
       <ul>
         {items.map((item, i) => (
           <li key={i}>{item}</li>
         ))}
       </ul>
-    </div>
+    </SessionContext.Provider>
   );
 }
+function Spacer() {
+  return <div style={{ minHeight: "2em" }} />;
+}

package/src/Input.tsx CHANGED Viewed

@@ -1,37 +1,48 @@
-import { useState } from "react";
 export default function Input({
-  onClick,
+  type = "text",
+  name,
+  value = "",
+  label,
+  placeholder,
+  onChange = () => {
+    /* noop */
+  },
+  onEnter = () => {
+    /* noop */
+  },
+  error,
 }: {
-  onClick: (value: string) => void;
+  type?: string;
+  name: string;
+  value?: string;
+  label?: string;
+  placeholder?: string;
+  onChange?: (value: string) => void;
+  onEnter?: () => void;
+  error?: string;
 }) {
-  const [value, setValue] = useState("");
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
-    setValue(e.currentTarget.value);
+    onChange(e.currentTarget.value);
   };
   const handleKeyPress = (e: React.KeyboardEvent<HTMLInputElement>): void => {
     if (e.key === "Enter") {
       e.preventDefault();
-      handleClick();
+      onEnter();
     }
   };
-  const handleClick = () => {
-    onClick(value);
-    setValue("");
-  };
   return (
     <>
+      {label && <label htmlFor={name}>{label}</label>}
       <input
-        type="text"
+        type={type}
+        id={name}
         onChange={handleChange}
         onKeyPress={handleKeyPress}
+        placeholder={placeholder}
         value={value}
       />
-      <button onClick={handleClick}>Add</button>
+      {error && <div>{error}</div>}
     </>
   );
 }

package/src/Login.tsx ADDED Viewed

@@ -0,0 +1,81 @@
+import { useState, useContext } from "react";
+import { Session, User, SessionContext, ErrorMessage } from "./App";
+import Input from "./Input";
+export default function Login() {
+  const [error, setError] = useState<string | null>(null);
+  const [values, setValues] = useState<User>({
+    name: "",
+    email: "",
+    username: "",
+    password: "",
+  });
+  const { setSession } = useContext(SessionContext) || {
+    setSession: () => {},
+  };
+  const onSubmit = () => {
+    setError(null);
+    fetch("/auth/login", {
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json",
+      },
+      method: "POST",
+      body: JSON.stringify(values),
+    })
+      .then((response) =>
+        response.json().then((data: Record<string, unknown>) => ({
+          ok: response.ok,
+          status: response.status,
+          data,
+        }))
+      )
+      .then(
+        ({
+          ok,
+          status,
+          data,
+        }: {
+          ok: boolean;
+          status: number;
+          data: Record<string, unknown>;
+        }) => {
+          if (ok) {
+            setSession(data as Session);
+          } else {
+            setError((data as ErrorMessage).message);
+          }
+        }
+      )
+      .catch((err) => {
+        console.error("error", err);
+      });
+  };
+  return (
+    <div>
+      {error && (
+        <div>
+          <strong>{error}</strong>
+        </div>
+      )}
+      <Input
+        name="username"
+        label="Username"
+        value={values.username}
+        onChange={(value) => setValues({ ...values, username: value })}
+      />
+      <Input
+        name="password"
+        type="password"
+        label="Password"
+        value={values.password}
+        onChange={(value) => setValues({ ...values, password: value })}
+        onEnter={onSubmit}
+      />
+      <button onClick={onSubmit}>Login</button>
+    </div>
+  );
+}

package/src/Register.tsx ADDED Viewed

@@ -0,0 +1,78 @@
+import { useState, useContext } from "react";
+import { Session, User, SessionContext, FormErrors } from "./App";
+import Input from "./Input";
+// eslint-disable-next-line max-lines-per-function
+export default function Register() {
+  const [errors, setErrors] = useState<Record<string, string>>({});
+  const [values, setValues] = useState<User>({
+    name: "",
+    email: "",
+    username: "",
+    password: "",
+  });
+  const { setSession } = useContext(SessionContext) || {
+    setSession: () => {},
+  };
+  const onSubmit = () => {
+    setErrors({});
+    fetch("/auth/register", {
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json",
+      },
+      method: "POST",
+      body: JSON.stringify(values),
+    })
+      .then((response) =>
+        response.json().then((data: Record<string, unknown>) => ({
+          ok: response.ok,
+          status: response.status,
+          data,
+        }))
+      )
+      .then(
+        ({
+          ok,
+          status,
+          data,
+        }: {
+          ok: boolean;
+          status: number;
+          data: Record<string, unknown>;
+        }) => {
+          if (ok) {
+            setSession(data as Session);
+          } else {
+            setErrors((data as FormErrors).errors);
+          }
+        }
+      )
+      .catch((err) => {
+        console.error("error", err);
+      });
+  };
+  return (
+    <div>
+      <Input
+        name="username"
+        label="Username"
+        value={values.username}
+        onChange={(value) => setValues({ ...values, username: value })}
+        error={errors.username}
+      />
+      <Input
+        name="password"
+        type="password"
+        label="Password"
+        value={values.password}
+        onChange={(value) => setValues({ ...values, password: value })}
+        error={errors.password}
+      />
+      <button onClick={onSubmit}>Register</button>
+    </div>
+  );
+}