Prepare for production
This commit is contained in:
Lizzy Hunt
parent
a862ad4d3b
commit
9e99bf0a32
9
.env.prod
Normal file
9
.env.prod
Normal file
@ -0,0 +1,9 @@
|
||||
NODE_ENV=production
|
||||
|
||||
POSTGRES_USER=friends
|
||||
POSTGRES_PASSWORD=password
|
||||
POSTGRES_DB=friends
|
||||
POSTGRES_HOSTNAME=friendsdbprod
|
||||
POSTGRES_PORT=5432
|
||||
|
||||
DATABASE_URL=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOSTNAME:$POSTGRES_PORT/$POSTGRES_DB
|
||||
@ -2,16 +2,15 @@
|
||||
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg">
|
||||
<meta name="viewport" content=
|
||||
"width=device-width, initial-scale=1.0">
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/people-hugging.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
|
||||
<title>Simponic's Friends</title>
|
||||
<title>Lizzy's Friends</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="root"></div><script type="module" src="/src/main.tsx">
|
||||
</script>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
20
client/package-lock.json
generated
20
client/package-lock.json
generated
@ -19,6 +19,8 @@
|
||||
"devDependencies": {
|
||||
"@types/react": "^18.0.28",
|
||||
"@types/react-dom": "^18.0.11",
|
||||
"@types/react-mentions": "^4.1.8",
|
||||
"@types/react-modal": "^3.13.1",
|
||||
"@vitejs/plugin-react": "^3.1.0",
|
||||
"typescript": "^4.9.3",
|
||||
"vite": "^4.2.0"
|
||||
@ -826,6 +828,24 @@
|
||||
"@types/react": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/react-mentions": {
|
||||
"version": "4.1.8",
|
||||
"resolved": "https://registry.npmjs.org/@types/react-mentions/-/react-mentions-4.1.8.tgz",
|
||||
"integrity": "sha512-Go86ozdnh0FTNbiGiDPAcNqYqtab9iGzLOgZPYUKrnhI4539jGzfJtP6rFHcXgi9Koe58yhkeyKYib6Ucul/sQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@types/react": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/react-modal": {
|
||||
"version": "3.13.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/react-modal/-/react-modal-3.13.1.tgz",
|
||||
"integrity": "sha512-iY/gPvTDIy6Z+37l+ibmrY+GTV4KQTHcCyR5FIytm182RQS69G5ps4PH2FxtC7bAQ2QRHXMevsBgck7IQruHNg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@types/react": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/scheduler": {
|
||||
"version": "0.16.3",
|
||||
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
|
||||
|
||||
@ -20,6 +20,8 @@
|
||||
"devDependencies": {
|
||||
"@types/react": "^18.0.28",
|
||||
"@types/react-dom": "^18.0.11",
|
||||
"@types/react-mentions": "^4.1.8",
|
||||
"@types/react-modal": "^3.13.1",
|
||||
"@vitejs/plugin-react": "^3.1.0",
|
||||
"typescript": "^4.9.3",
|
||||
"vite": "^4.2.0"
|
||||
|
||||
1
client/public/people-hugging.svg
Normal file
1
client/public/people-hugging.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 36 36"><ellipse cx="23" cy="8" fill="#55ACEE" rx="8" ry="6.75" transform="rotate(-78 23.001 8)"/><path fill="#269" d="M9.724 14.687v1.579c-2.414.525-5.381 1.851-5.829 3.741C2.493 25.919 2.87 35.081 2.87 35.212v.134c0 .654.663.654 1.316.654h16.097c.653 0 1.315 0 1.315-.654V20.007c0-1.719-1.413-3.438-4.632-3.834v-1.486H9.724z"/><path fill="#55ACEE" d="M26.276 13.303v2.963c2.414.525 5.381 1.851 5.829 3.741c1.401 5.913 1.025 15.075 1.025 15.205v.134c0 .654-.663.654-1.316.654H15.717c-.653 0-1.315 0-1.315-.654V20.007c0-1.719 1.413-3.438 4.632-3.834v-1.486l7.242-1.384z"/><ellipse cx="12.992" cy="8" fill="#269" rx="6.75" ry="8" transform="rotate(-12 12.992 8)"/><path fill="#55ACEE" d="M19.092 16.088c-1.31.381-3.441.546-5.898-.382c-2.593-.98-4.978-1.944-5.908-2.268c-.846-.295-3.005-.033-3.486.848c-.481.881-.753 2.485.437 3.659s7.458 3.491 9.23 4.533c.928.546.874 3.823.928 6.499c.083 4.043 7.383-13.67 4.697-12.889z"/><path fill="#269" d="M12.233 25.283c1.331.298 3.604.811 5.999-.269c2.527-1.14 4.712-2.732 5.619-3.113c.826-.347 2.571-.683 3.532.629c.594.81.907 2.434-.207 3.679c-1.115 1.246-5.497 3.919-8.739 4.702c-2.749.664-6.967.6-8.313-.793c-2.101-2.175.281-5.245 2.109-4.835zm12.758-8.048c0-1.952 1.724-3.016 3.739-3.797c.835-.324 3.005-.033 3.486.848c.481.881.753 2.485-.437 3.659s-6.788 2.294-6.788-.71z"/></svg>
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 1.5 KiB |
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 4.0 KiB |
@ -1,28 +1,42 @@
|
||||
import { ago } from "../utils/ago";
|
||||
import { useEffect, useState } from "react";
|
||||
import { ago } from "../utils/ago";
|
||||
import { TimerResponse, Friend, TimersFilter } from "../utils/types";
|
||||
|
||||
const replaceReferencedFriendsInName = (name, referencedFriends, onSelect) => {
|
||||
const friendIdToFriend = referencedFriends.reduce((friendMap, friend) => {
|
||||
friendMap[friend.id] = friend;
|
||||
const replaceReferencedFriendsInName = (
|
||||
name: string,
|
||||
referencedFriends: Friend[],
|
||||
onSelect: (select?: TimersFilter) => void
|
||||
) => {
|
||||
const friendIdToFriend = referencedFriends.reduce(
|
||||
(friendMap: Record<string, Friend>, friend) => {
|
||||
friendMap[friend.id.toString()] = friend;
|
||||
return friendMap;
|
||||
}, {});
|
||||
return name.split(/(@\<\d+\>)/g).map((s) => {
|
||||
},
|
||||
{}
|
||||
);
|
||||
|
||||
return name.split(/(@\<\d+\>)/g).map((s: string) => {
|
||||
const matches = /@\<(\d+)\>/g.exec(s);
|
||||
if (matches) {
|
||||
const [_match, id] = matches;
|
||||
const name = friendIdToFriend[id].name;
|
||||
|
||||
return <a onClick={() => onSelect({ friendId: id })}>{name}</a>;
|
||||
return <a onClick={() => onSelect({ friendId: Number(id) })}>{name}</a>;
|
||||
}
|
||||
return s;
|
||||
});
|
||||
};
|
||||
|
||||
export default function TimerCard({ timer, onSelect }) {
|
||||
const [since, setSince] = useState(ago(timer.start));
|
||||
export type TimerCardProps = {
|
||||
timer: TimerResponse;
|
||||
onSelect: (select?: TimersFilter) => void;
|
||||
};
|
||||
|
||||
export default function TimerCard({ timer, onSelect }: TimerCardProps) {
|
||||
const [since, setSince] = useState<string>(ago(timer.start));
|
||||
|
||||
useEffect(() => {
|
||||
let updateTimersInterval;
|
||||
let updateTimersInterval: ReturnType<typeof setInterval>;
|
||||
const msTillNextSecond = 1000 - (timer.start.getTime() % 1000);
|
||||
|
||||
setTimeout(() => {
|
||||
@ -42,8 +56,8 @@ export default function TimerCard({ timer, onSelect }) {
|
||||
timer.name,
|
||||
timer.referenced_friends,
|
||||
onSelect
|
||||
).map((s, i) => (
|
||||
<span key={i}>{s}</span>
|
||||
).map((element: JSX.Element | string, i: number) => (
|
||||
<span key={i}>{element}</span>
|
||||
))}
|
||||
</h1>
|
||||
);
|
||||
|
||||
@ -4,20 +4,31 @@ import { Mention, MentionsInput } from "react-mentions";
|
||||
import { useAuthContext } from "../context/authContext";
|
||||
import mentionStyles from "../styles/mention";
|
||||
import modalStyles from "../styles/modal";
|
||||
import { Friend, TimersFilter, TimerResponse } from "../utils/types";
|
||||
|
||||
Modal.setAppElement("#root");
|
||||
|
||||
export default function TimerHeader({ friends, selected, onSelect }) {
|
||||
const [modalOpen, setModalOpen] = useState(false);
|
||||
const [newTimerName, setNewTimerName] = useState("");
|
||||
const [errors, setErrors] = useState([]);
|
||||
export type TimerHeaderProps = {
|
||||
friends: Friend[];
|
||||
selected?: TimersFilter;
|
||||
onSelect: (selected?: TimersFilter) => void;
|
||||
};
|
||||
|
||||
export default function TimerHeader({
|
||||
friends,
|
||||
selected,
|
||||
onSelect,
|
||||
}: TimerHeaderProps) {
|
||||
const [modalOpen, setModalOpen] = useState<boolean>(false);
|
||||
const [newTimerName, setNewTimerName] = useState<string>("");
|
||||
const [errors, setErrors] = useState<string[]>([]);
|
||||
const { friendName, setSignedIn } = useAuthContext();
|
||||
|
||||
const logout = () => {
|
||||
fetch("/api/auth/logout").then(() => setSignedIn(false));
|
||||
};
|
||||
|
||||
const createTimer = (e) => {
|
||||
const createTimer = (e: any) => {
|
||||
e.preventDefault();
|
||||
|
||||
fetch("/api/timers", {
|
||||
@ -33,7 +44,7 @@ export default function TimerHeader({ friends, selected, onSelect }) {
|
||||
},
|
||||
})
|
||||
.then((r) => r.json())
|
||||
.then((r) => {
|
||||
.then((r: TimerResponse) => {
|
||||
if (r.message) {
|
||||
setErrors([r.message]);
|
||||
return;
|
||||
@ -72,10 +83,11 @@ export default function TimerHeader({ friends, selected, onSelect }) {
|
||||
<MentionsInput
|
||||
style={mentionStyles}
|
||||
value={newTimerName}
|
||||
onChange={(e) => setNewTimerName(e.target.value)}
|
||||
onChange={(e: any) => setNewTimerName(e.target.value)}
|
||||
>
|
||||
<Mention
|
||||
data={friends.map(({ id, name }) => ({
|
||||
trigger="@"
|
||||
data={friends.map(({ id, name }: Friend) => ({
|
||||
id: `@<${id}>`,
|
||||
display: `@${name}`,
|
||||
}))}
|
||||
@ -108,7 +120,7 @@ export default function TimerHeader({ friends, selected, onSelect }) {
|
||||
>
|
||||
all
|
||||
</a>
|
||||
{friends.map((friend) => (
|
||||
{friends.map((friend: Friend) => (
|
||||
<a
|
||||
key={friend.id}
|
||||
onClick={() => {
|
||||
|
||||
@ -38,7 +38,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
|
||||
|
||||
useEffect(() => {
|
||||
if (friendId) {
|
||||
localStorage.setItem("friendId", friendId);
|
||||
localStorage.setItem("friendId", friendId.toString());
|
||||
}
|
||||
}, [friendId]);
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { io } from "socket.io-client";
|
||||
import { io, Socket } from "socket.io-client";
|
||||
import { useState, useEffect } from "react";
|
||||
|
||||
export interface UseInitialDataProps {
|
||||
@ -11,7 +11,7 @@ export const useInitialData = <T>(props: UseInitialDataProps) => {
|
||||
const [data, setData] = useState<T>();
|
||||
const [query, setQuery] = useState(props?.query);
|
||||
const [endpoint, setEndpoint] = useState(props.initialDataEndpoint);
|
||||
const [socket, setSocket] = useState();
|
||||
const [socket, setSocket] = useState<Socket>();
|
||||
|
||||
const refreshData = () =>
|
||||
fetch(endpoint)
|
||||
|
||||
@ -6,7 +6,7 @@ import { AuthProvider } from "./context/authContext";
|
||||
import NotFound from "./routes/notFound";
|
||||
import Login from "./routes/login";
|
||||
import Timers from "./routes/timers";
|
||||
import ProtectedRoute from "./routes/protected.tsx";
|
||||
import ProtectedRoute from "./routes/protected";
|
||||
|
||||
import "chota";
|
||||
import "./styles/index.css";
|
||||
|
||||
@ -1,9 +1,12 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { Navigate } from "react-router-dom";
|
||||
import { useAuthContext } from "../context/authContext";
|
||||
import { SignThisTokenResponse, TokenResponse } from "../utils/types";
|
||||
import "../styles/login.css";
|
||||
|
||||
const requestTokenSubmit = async (name) =>
|
||||
const requestTokenSubmit = async (
|
||||
name: string
|
||||
): Promise<SignThisTokenResponse> =>
|
||||
fetch(
|
||||
"/api/auth?" +
|
||||
new URLSearchParams({
|
||||
@ -11,7 +14,7 @@ const requestTokenSubmit = async (name) =>
|
||||
})
|
||||
).then((r) => r.json());
|
||||
|
||||
const submitSignedToken = async (signature) =>
|
||||
const submitSignedToken = async (signature: string): Promise<TokenResponse> =>
|
||||
fetch("/api/auth", {
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
@ -23,41 +26,43 @@ const submitSignedToken = async (signature) =>
|
||||
}).then((r) => r.json());
|
||||
|
||||
export default function Login() {
|
||||
const [token, setToken] = useState("");
|
||||
const [errors, setErrors] = useState([]);
|
||||
const [token, setToken] = useState<string>("");
|
||||
const [errors, setErrors] = useState<string[]>([]);
|
||||
|
||||
const { signedIn, setSignedIn, setSessionOver, setFriendId, setFriendName } =
|
||||
useAuthContext();
|
||||
|
||||
const getTokenFormSubmission = async (e) => {
|
||||
const getTokenFormSubmission = async (e: any) => {
|
||||
e.preventDefault();
|
||||
const { error, message, token } = await requestTokenSubmit(
|
||||
e.target.name.value
|
||||
);
|
||||
if (error && message) {
|
||||
if (message && error) {
|
||||
setErrors([message]);
|
||||
return;
|
||||
}
|
||||
if (token) {
|
||||
setErrors([]);
|
||||
setToken(token);
|
||||
}
|
||||
};
|
||||
|
||||
const signTokenFormSubmission = async (e) => {
|
||||
const signTokenFormSubmission = async (e: any) => {
|
||||
e.preventDefault();
|
||||
const { error, message, token, expiration, friend } =
|
||||
await submitSignedToken(e.target.signature.value);
|
||||
|
||||
if (token) {
|
||||
if (token && expiration && friend) {
|
||||
setSignedIn(true);
|
||||
setSessionOver(new Date(expiration));
|
||||
setFriendId(friend.id.toString());
|
||||
setFriendId(friend.id);
|
||||
setFriendName(friend.name);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (error & message) {
|
||||
setErrors([message]);
|
||||
if (error && message) {
|
||||
setErrors([message as string]);
|
||||
}
|
||||
};
|
||||
|
||||
@ -97,7 +102,7 @@ export default function Login() {
|
||||
<textarea
|
||||
id="signature"
|
||||
name="signature"
|
||||
rows="6"
|
||||
rows={6}
|
||||
placeholder="-----BEGIN PGP SIGNED MESSAGE-----"
|
||||
/>
|
||||
|
||||
|
||||
@ -1,7 +1,12 @@
|
||||
import { ReactElement } from "react";
|
||||
import { Navigate } from "react-router-dom";
|
||||
import { useAuthContext } from "../context/authContext";
|
||||
|
||||
export default function ProtectedRoute({ children }) {
|
||||
export type ProtectedRouteProps = {
|
||||
children: ReactElement<any, any>;
|
||||
};
|
||||
|
||||
export default function ProtectedRoute({ children }: ProtectedRouteProps) {
|
||||
const { signedIn } = useAuthContext();
|
||||
|
||||
if (!signedIn) return <Navigate to="/login" />;
|
||||
|
||||
@ -4,24 +4,9 @@ import TimerCard from "../components/timerCard";
|
||||
import TimerHeader from "../components/timerHeader";
|
||||
import { useInitialData } from "../hooks/useInitialData";
|
||||
|
||||
export type TimersFilter = {
|
||||
friendId: undefined | number; // when undefined, get all
|
||||
};
|
||||
import { Friend, TimersFilter, TimerResponse } from "../utils/types";
|
||||
|
||||
export type Friend = {
|
||||
id: number;
|
||||
name: number;
|
||||
};
|
||||
|
||||
export type TimerResponse = {
|
||||
id: number;
|
||||
name: string;
|
||||
start: Date;
|
||||
created_by: Friend;
|
||||
referenced_friends: Friend[];
|
||||
};
|
||||
|
||||
const makeEndpoint = (filter: TimersFilter) => {
|
||||
const makeEndpoint = (filter?: TimersFilter) => {
|
||||
let url = "/api/timers";
|
||||
if (filter && typeof filter.friendId !== "undefined")
|
||||
url += `/friend?id=${filter.friendId}`;
|
||||
@ -38,20 +23,19 @@ export default function Timers() {
|
||||
socket,
|
||||
setEndpoint,
|
||||
} = useInitialData<TimerResponse[]>({
|
||||
initialDataEndpoint: makeEndpoint({}),
|
||||
initialDataEndpoint: makeEndpoint(),
|
||||
namespace: "/events/timers",
|
||||
query: {},
|
||||
});
|
||||
const [friends, setFriends] = useState([]);
|
||||
const [selected, setSelected] = useState();
|
||||
const [friends, setFriends] = useState<Friend[]>([]);
|
||||
const [selected, setSelected] = useState<TimersFilter | undefined>();
|
||||
|
||||
useEffect(() => {
|
||||
fetch("/api/auth/friends")
|
||||
.then((r) => r.json())
|
||||
.then((friends) => setFriends(friends));
|
||||
.then((friends: Friend[]) => setFriends(friends));
|
||||
}, []);
|
||||
|
||||
const onSelect = (selected: TimersFilter) => {
|
||||
const onSelect = (selected?: TimersFilter) => {
|
||||
setSelected(selected);
|
||||
setEndpoint(makeEndpoint(selected));
|
||||
setQuery(selected);
|
||||
@ -60,7 +44,7 @@ export default function Timers() {
|
||||
useEffect(() => {
|
||||
socket?.on("refreshed", (newTimer: TimerResponse) => {
|
||||
setTimers((timers) =>
|
||||
timers.map((timer) => {
|
||||
timers?.map((timer) => {
|
||||
if (timer.id === newTimer.id) return newTimer;
|
||||
return timer;
|
||||
})
|
||||
@ -68,7 +52,12 @@ export default function Timers() {
|
||||
});
|
||||
|
||||
socket?.on("created", (newTimer: TimerResponse) => {
|
||||
setTimers((timers) => [...timers, newTimer]);
|
||||
setTimers((timers) => {
|
||||
if (timers) {
|
||||
return [...timers, newTimer];
|
||||
}
|
||||
return [newTimer];
|
||||
});
|
||||
});
|
||||
}, [socket]);
|
||||
|
||||
@ -81,7 +70,12 @@ export default function Timers() {
|
||||
...timer,
|
||||
start: new Date(timer.start),
|
||||
}))
|
||||
.sort(({ start: startA }, { start: startB }) => startB - startA)
|
||||
.sort(
|
||||
(
|
||||
{ start: startA }: { start: Date },
|
||||
{ start: startB }: { start: Date }
|
||||
) => startB.getTime() - startA.getTime()
|
||||
)
|
||||
.map((timer) => (
|
||||
<TimerCard onSelect={onSelect} timer={timer} key={timer.id} />
|
||||
))
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
// thanks, chatgpt
|
||||
export function ago(date) {
|
||||
export function ago(date: Date) {
|
||||
const timeElapsed = Date.now() - date.getTime();
|
||||
const days = Math.floor(timeElapsed / (1000 * 60 * 60 * 24));
|
||||
const hours = Math.floor(
|
||||
|
||||
32
client/src/utils/types.ts
Normal file
32
client/src/utils/types.ts
Normal file
@ -0,0 +1,32 @@
|
||||
export type TimersFilter = {
|
||||
friendId: undefined | number; // when undefined, get all
|
||||
};
|
||||
|
||||
export type Friend = {
|
||||
id: number;
|
||||
name: string;
|
||||
};
|
||||
|
||||
export type TimerResponse = {
|
||||
error?: string;
|
||||
message?: string;
|
||||
id: number;
|
||||
name: string;
|
||||
start: Date;
|
||||
created_by: Friend;
|
||||
referenced_friends: Friend[];
|
||||
};
|
||||
|
||||
export type TokenResponse = {
|
||||
error?: string;
|
||||
message?: string;
|
||||
token?: string;
|
||||
expiration?: string;
|
||||
friend: Friend;
|
||||
};
|
||||
|
||||
export type SignThisTokenResponse = {
|
||||
error?: string;
|
||||
message?: string;
|
||||
token?: string;
|
||||
};
|
||||
@ -44,7 +44,6 @@ services:
|
||||
container_name: friendsclient
|
||||
build:
|
||||
context: ./client
|
||||
target: development
|
||||
dockerfile: Dockerfile.dev
|
||||
networks:
|
||||
- app
|
||||
|
||||
45
docker-compose.prod.yml
Normal file
45
docker-compose.prod.yml
Normal file
@ -0,0 +1,45 @@
|
||||
version: '3'
|
||||
|
||||
services:
|
||||
postgres:
|
||||
container_name: friendsdbprod
|
||||
image: postgres:15
|
||||
restart: always
|
||||
env_file: .env.prod
|
||||
networks:
|
||||
- db
|
||||
volumes:
|
||||
- pgdata:/var/lib/postgresql/data/
|
||||
|
||||
nginx:
|
||||
container_name: friendsproxyprod
|
||||
restart: always
|
||||
ports:
|
||||
- 25822:80
|
||||
networks:
|
||||
- app
|
||||
depends_on:
|
||||
- server
|
||||
build:
|
||||
context: ./
|
||||
dockerfile: ./nginx/Dockerfile.prod
|
||||
|
||||
server:
|
||||
container_name: friendsserver
|
||||
restart: always
|
||||
env_file: .env.prod
|
||||
build:
|
||||
context: ./server
|
||||
dockerfile: Dockerfile.prod
|
||||
networks:
|
||||
- app
|
||||
- db
|
||||
|
||||
networks:
|
||||
app:
|
||||
driver: bridge
|
||||
db:
|
||||
driver: bridge
|
||||
|
||||
volumes:
|
||||
pgdata:
|
||||
17
nginx/Dockerfile.prod
Normal file
17
nginx/Dockerfile.prod
Normal file
@ -0,0 +1,17 @@
|
||||
FROM node:16-alpine as build
|
||||
|
||||
WORKDIR /app
|
||||
COPY ./client/ /app/
|
||||
|
||||
# prepare for build
|
||||
RUN npm install --silent
|
||||
RUN npm run build
|
||||
|
||||
# now, start nginx
|
||||
|
||||
FROM nginx
|
||||
RUN rm /etc/nginx/conf.d/default.conf
|
||||
COPY ./nginx/nginx.prod.conf /etc/nginx/conf.d/nginx.conf
|
||||
COPY --from=build /app/dist /usr/share/nginx/html
|
||||
|
||||
CMD ["nginx", "-g", "daemon off;"]
|
||||
32
nginx/nginx.prod.conf
Normal file
32
nginx/nginx.prod.conf
Normal file
@ -0,0 +1,32 @@
|
||||
server {
|
||||
listen 80;
|
||||
|
||||
location /api {
|
||||
proxy_pass http://friendsserver:4000;
|
||||
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header Host $host;
|
||||
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
}
|
||||
|
||||
location /socket.io {
|
||||
proxy_pass http://friendsserver:4000;
|
||||
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header Host $host;
|
||||
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
|
||||
}
|
||||
|
||||
location / {
|
||||
root /usr/share/nginx/html;
|
||||
index index.html index.htm index.nginx-debian.html;
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
}
|
||||
6
package-lock.json
generated
6
package-lock.json
generated
@ -1,6 +0,0 @@
|
||||
{
|
||||
"name": "friends",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
FROM node:16.20.0-alpine AS development
|
||||
FROM node:16-alpine
|
||||
|
||||
WORKDIR /usr/src/app
|
||||
|
||||
@ -10,5 +10,4 @@ RUN npm install --only=development
|
||||
|
||||
COPY . .
|
||||
|
||||
|
||||
CMD npx -y prisma generate ; npm run start:dev
|
||||
|
||||
34
server/Dockerfile.prod
Normal file
34
server/Dockerfile.prod
Normal file
@ -0,0 +1,34 @@
|
||||
FROM node:16-alpine AS development
|
||||
WORKDIR /usr/src/app
|
||||
COPY --chown=node:node package*.json ./
|
||||
|
||||
RUN apk add --no-cache python3 make gcc g++
|
||||
|
||||
RUN npm ci
|
||||
COPY --chown=node:node . .
|
||||
USER node
|
||||
|
||||
FROM node:16-alpine AS build
|
||||
WORKDIR /usr/src/app
|
||||
COPY --chown=node:node package*.json ./
|
||||
COPY --chown=node:node --from=development /usr/src/app/node_modules ./node_modules
|
||||
COPY --chown=node:node . .
|
||||
|
||||
RUN npx -y prisma generate
|
||||
RUN npm run build
|
||||
|
||||
ENV NODE_ENV production
|
||||
RUN apk add --no-cache python3 make gcc g++
|
||||
RUN npm ci --omit=dev && npm cache clean --force
|
||||
USER node
|
||||
|
||||
FROM node:16-alpine AS production
|
||||
WORKDIR /usr/src/app
|
||||
|
||||
RUN apk add --no-cache python3
|
||||
|
||||
COPY --chown=node:node --from=build /usr/src/app/node_modules ./node_modules
|
||||
COPY --chown=node:node --from=build /usr/src/app/prisma ./prisma
|
||||
COPY --chown=node:node --from=build /usr/src/app/dist ./dist
|
||||
|
||||
CMD npx -y prisma migrate deploy ; node dist/main.js
|
||||
@ -173,7 +173,6 @@ export default [
|
||||
"start",
|
||||
"hand",
|
||||
"might",
|
||||
"American",
|
||||
"show",
|
||||
"part",
|
||||
"about",
|
||||
@ -542,7 +541,6 @@ export default [
|
||||
"court",
|
||||
"produce",
|
||||
"eat",
|
||||
"American",
|
||||
"teach",
|
||||
"oil",
|
||||
"half",
|
||||
@ -1208,7 +1206,6 @@ export default [
|
||||
"beginning",
|
||||
"date",
|
||||
"generally",
|
||||
"African",
|
||||
"very",
|
||||
"sorry",
|
||||
"crisis",
|
||||
@ -1279,7 +1276,6 @@ export default [
|
||||
"Ms",
|
||||
"contract",
|
||||
"crowd",
|
||||
"Christian",
|
||||
"express",
|
||||
"apartment",
|
||||
"willing",
|
||||
@ -1810,7 +1806,6 @@ export default [
|
||||
"influence",
|
||||
"surgery",
|
||||
"correct",
|
||||
"Jewish",
|
||||
"blame",
|
||||
"estimate",
|
||||
"due",
|
||||
@ -2023,7 +2018,6 @@ export default [
|
||||
"expose",
|
||||
"rural",
|
||||
"AIDS",
|
||||
"Jew",
|
||||
"narrow",
|
||||
"cream",
|
||||
"secretary",
|
||||
@ -2616,7 +2610,6 @@ export default [
|
||||
"phrase",
|
||||
"ingredient",
|
||||
"stake",
|
||||
"Muslim",
|
||||
"dream",
|
||||
"fiber",
|
||||
"activist",
|
||||
@ -3191,7 +3184,6 @@ export default [
|
||||
"versus",
|
||||
"manufacturing",
|
||||
"risk",
|
||||
"Christian",
|
||||
"complex",
|
||||
"absolute",
|
||||
"chef",
|
||||
@ -3341,7 +3333,6 @@ export default [
|
||||
"rope",
|
||||
"concrete",
|
||||
"prescription",
|
||||
"African-American",
|
||||
"chase",
|
||||
"document",
|
||||
"brick",
|
||||
@ -3547,8 +3538,6 @@ export default [
|
||||
"administrative",
|
||||
"elbow",
|
||||
"deadly",
|
||||
"Muslim",
|
||||
"Hispanic",
|
||||
"allegation",
|
||||
"tip",
|
||||
"confuse",
|
||||
@ -4337,7 +4326,6 @@ export default [
|
||||
"breeze",
|
||||
"costly",
|
||||
"ambitious",
|
||||
"Christianity",
|
||||
"presumably",
|
||||
"influential",
|
||||
"translation",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user