diff --git a/README.md b/README.md index a365dd8..1220917 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Sprint Padawan ![Status](https://status.atri.dad/api/badge/4/status?upColor=%23d10ace&downColor=%23ff0400&pendingColor=%23ff0400&style=for-the-badge) +# Pollo -A scrum poker tool that helps agile teams plan their sprints in real-time. +A dead-simple real-time voting tool. ## Stack @@ -18,8 +18,4 @@ A scrum poker tool that helps agile teams plan their sprints in real-time. ## Contributing -Feel free to propose changes via PR. I'm not awfully picky about formatting right now, so I'll accept/reject on a case-by-case basis. Please make sure to have an issue first though. - -## Stats - -![Alt](https://repobeats.axiom.co/api/embed/852f886f9cf9682a5355b574f59716dca985e7cc.svg "Repobeats analytics image") +Feel free to propose changes via PR. I'm not awfully picky about formatting right now, so I'll accept/reject on a case-by-case basis. Please make sure to have an issue first though. \ No newline at end of file diff --git a/app/components/ErrorPage.tsx b/app/components/ErrorPage.tsx index 936d464..051300d 100644 --- a/app/components/ErrorPage.tsx +++ b/app/components/ErrorPage.tsx @@ -15,7 +15,7 @@ export default function ErrorPage() {

If you believe you reached this page in error, please file an issue{" "} here @@ -41,7 +41,7 @@ export default function ErrorPage() {

If you believe you reached this page in error, please file an issue{" "} here @@ -63,7 +63,7 @@ export default function ErrorPage() {

If you believe you reached this page in error, please file an issue{" "} here diff --git a/app/components/Footer.tsx b/app/components/Footer.tsx index fb16572..727f77c 100644 --- a/app/components/Footer.tsx +++ b/app/components/Footer.tsx @@ -19,7 +19,7 @@ const Footer = () => { -{" "} diff --git a/app/root.tsx b/app/root.tsx index 7e87d20..77c2494 100644 --- a/app/root.tsx +++ b/app/root.tsx @@ -16,8 +16,8 @@ import "./tailwind.css"; export const meta: MetaFunction = () => { return [ - { title: "Sprint Padawan" }, - { name: "description", content: "Plan. Sprint. Repeat." }, + { title: "Pollo" }, + { name: "description", content: "Simple Real-Time Voting" }, ]; }; @@ -35,7 +35,7 @@ function App() { -
+
diff --git a/app/routes/_index.tsx b/app/routes/_index.tsx index 0511fbd..abad60b 100644 --- a/app/routes/_index.tsx +++ b/app/routes/_index.tsx @@ -3,7 +3,7 @@ export default function Index() {

- Sprint Padawan + Pollo

diff --git a/app/routes/api.room.create.tsx b/app/routes/api.room.create.tsx index 05426e8..c609e6d 100644 --- a/app/routes/api.room.create.tsx +++ b/app/routes/api.room.create.tsx @@ -25,7 +25,7 @@ export async function action({ request, params, context }: ActionFunctionArgs) { created_at: Date.now().toString(), userId: userId || "", roomName: data.name, - storyName: "First Story!", + topicName: "First Topic!", scale: "0.5,1,2,3,5,8", visible: false, }) diff --git a/app/routes/api.room.set.$roomId.tsx b/app/routes/api.room.set.$roomId.tsx index 594e2b6..06f131a 100644 --- a/app/routes/api.room.set.$roomId.tsx +++ b/app/routes/api.room.set.$roomId.tsx @@ -44,7 +44,7 @@ export async function action({ request, params, context }: ActionFunctionArgs) { }) ), roomName: oldRoom.roomName, - storyName: oldRoom.storyName, + topicName: oldRoom.topicName, })); } @@ -54,23 +54,23 @@ export async function action({ request, params, context }: ActionFunctionArgs) { const newRoom = data.reset ? await db - .update(rooms) - .set({ - storyName: data.name, - visible: data.visible, - scale: [...new Set(data.scale.split(","))] - .filter((item) => item !== "") - .toString(), - }) - .where(eq(rooms.id, params.roomId || "")) - .returning() + .update(rooms) + .set({ + topicName: data.name, + visible: data.visible, + scale: [...new Set(data.scale.split(","))] + .filter((item) => item !== "") + .toString(), + }) + .where(eq(rooms.id, params.roomId || "")) + .returning() : await db - .update(rooms) - .set({ - visible: data.visible, - }) - .where(eq(rooms.id, params.roomId || "")) - .returning(); + .update(rooms) + .set({ + visible: data.visible, + }) + .where(eq(rooms.id, params.roomId || "")) + .returning(); const success = newRoom.length > 0; diff --git a/app/routes/dashboard.tsx b/app/routes/dashboard.tsx index 354b187..98e1476 100644 --- a/app/routes/dashboard.tsx +++ b/app/routes/dashboard.tsx @@ -20,19 +20,19 @@ export const loader: LoaderFunction = async (args) => { type RoomsResponse = | { - id: string; - createdAt: Date; - roomName: string; - }[] + id: string; + createdAt: Date; + roomName: string; + }[] | { - roomName: string | null; - id: string; - created_at: Date | null; - userId: string; - storyName: string | null; - visible: boolean; - scale: string; - }[] + roomName: string | null; + id: string; + created_at: Date | null; + userId: string; + topicName: string | null; + visible: boolean; + scale: string; + }[] | null | undefined; diff --git a/app/routes/room.$roomId.tsx b/app/routes/room.$roomId.tsx index 65ace8a..0deab29 100644 --- a/app/routes/room.$roomId.tsx +++ b/app/routes/room.$roomId.tsx @@ -113,7 +113,7 @@ function RoomContent() { | PresenceItem[] | undefined; - const [storyNameText, setStoryNameText] = useState(""); + const [topicNameText, setTopicNameText] = useState(""); const [roomScale, setRoomScale] = useState(""); const [copied, setCopied] = useState(false); @@ -142,7 +142,7 @@ function RoomContent() { cache: "no-cache", method: "PUT", body: JSON.stringify({ - name: storyNameText, + name: topicNameText, visible: data.visible, scale: roomScale, reset: data.reset ? data.reset : false, @@ -175,7 +175,7 @@ function RoomContent() { userId: item.userId, roomId: item.roomId, roomName: item.roomName, - storyName: item.storyName, + topicName: item.topicName, scale: item.scale, votes: item.votes, }; @@ -186,7 +186,7 @@ function RoomContent() { userId: roomFromDbParsed.userId, roomId: roomFromDbParsed.id, roomName: roomFromDbParsed.roomName, - storyName: storyNameText, + topicName: topicNameText, scale: roomScale, votes: votesFromDbParsed?.map((vote) => { return { @@ -240,7 +240,7 @@ function RoomContent() { // ================================= useEffect(() => { if (roomFromDb) { - setStoryNameText(roomFromDbParsed?.storyName || ""); + setTopicNameText(roomFromDbParsed?.topicName || ""); setRoomScale(roomFromDbParsed?.scale || "ERROR"); } // eslint-disable-next-line react-hooks/exhaustive-deps @@ -276,7 +276,7 @@ function RoomContent() {

- Story: {roomFromDbParsed?.storyName} + Topic: {roomFromDbParsed?.topicName}

    @@ -324,13 +324,13 @@ function RoomContent() { )}{" "} {presenceItem.userId === roomFromDbParsed?.userId && ( - - - - )} + + + + )} {" : "}

    @@ -351,11 +351,10 @@ function RoomContent() { return (