Merge branch 'master' into recurring-tasks

TaskRatchet · Sep 27, 2022 · d0f1943 · d0f1943 · github-actions · Sep 27, 2022
2 parents 1609868 + 69c6ca5
commit d0f1943
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/src/lib/api/addTask.ts b/src/lib/api/addTask.ts
@@ -1,4 +1,4 @@
-import apiFetch from './fetch2';
+import fetch2 from './fetch2';
 
 // Requires that user be authenticated.
 export async function addTask(
@@ -7,7 +7,7 @@ export async function addTask(
 	cents: number,
 	recurrence?: Record<string, number>
 ): Promise<Response> {
-	const response = await apiFetch('me/tasks', true, 'POST', {
+	const response = await fetch2('me/tasks', true, 'POST', {
 		task,
 		due,
 		cents,

diff --git a/src/lib/api/editTask.ts b/src/lib/api/editTask.ts
@@ -1,12 +1,12 @@
-import apiFetch from './fetch1';
+import fetch1 from './fetch1';
 
 // Requires that user be authenticated.
 export async function editTask(
 	id: string,
 	due: string,
 	cents: number
 ): Promise<Response> {
-	const response = await apiFetch(`me/tasks/${id}`, true, 'PUT', {
+	const response = await fetch1(`me/tasks/${id}`, true, 'PUT', {
 		due,
 		cents,
 	});

diff --git a/src/lib/api/fetch1.spec.ts b/src/lib/api/fetch1.spec.ts
@@ -1,11 +1,11 @@
-import apiFetch from './fetch1';
+import fetch1 from './fetch1';
 import { expect, it, describe, vi } from 'vitest';
 
 vi.mock('./fetch1', () => {
 	return vi.importActual('./fetch1');
 });
 
-describe('apiFetch', () => {
+describe('fetch1', () => {
 	it('uses localStorage token', async () => {
 		fetchMock.mockResponse(JSON.stringify({}));
 
@@ -14,7 +14,7 @@ describe('apiFetch', () => {
 		global.localStorage.setItem('token', token);
 
 		const url = 'https://example.com';
-		await apiFetch(url);
+		await fetch1(url);
 
 		expect(fetch).toHaveBeenCalledWith(
 			expect.anything(),

diff --git a/src/lib/api/getCheckoutSession.ts b/src/lib/api/getCheckoutSession.ts
@@ -1,7 +1,7 @@
-import apiFetch from './fetch1';
+import fetch1 from './fetch1';
 
 export async function getCheckoutSession(): Promise<CheckoutSession> {
-	const response = await apiFetch('payments/checkout/session');
+	const response = await fetch1('payments/checkout/session');
 
 	return response.json() as Promise<CheckoutSession>;
 }
diff --git a/src/lib/api/getMe.ts b/src/lib/api/getMe.ts
@@ -1,7 +1,7 @@
-import apiFetch from './fetch1';
+import fetch1 from './fetch1';
 
 export async function getMe(): Promise<User> {
-	const response = await apiFetch('me', true);
+	const response = await fetch1('me', true);
 
 	if (!response.ok) {
 		throw new Error('Failed to get me');

diff --git a/src/lib/api/getTasks.ts b/src/lib/api/getTasks.ts
@@ -1,7 +1,7 @@
-import apiFetch from './fetch1';
+import fetch1 from './fetch1';
 
 export async function getTasks(): Promise<unknown> {
-	const response = await apiFetch('me/tasks', true);
+	const response = await fetch1('me/tasks', true);
 
 	return response.json();
 }
diff --git a/src/lib/api/getTimezones.ts b/src/lib/api/getTimezones.ts
@@ -1,7 +1,7 @@
-import apiFetch from './fetch1';
+import fetch1 from './fetch1';
 
 export async function getTimezones(): Promise<string[]> {
-	const response = await apiFetch('timezones');
+	const response = await fetch1('timezones');
 
 	return response.json() as Promise<string[]>;
 }
diff --git a/src/lib/api/register.ts b/src/lib/api/register.ts
@@ -1,4 +1,4 @@
-import apiFetch from './fetch1';
+import fetch1 from './fetch1';
 
 export default function register(
 	name: string,
@@ -7,7 +7,7 @@ export default function register(
 	timezone: string,
 	checkoutSessionId: string | null
 ): Promise<Response> {
-	return apiFetch('account/register', false, 'POST', {
+	return fetch1('account/register', false, 'POST', {
 		name: name,
 		email: email,
 		password: password,

diff --git a/src/lib/api/updatePassword.ts b/src/lib/api/updatePassword.ts
@@ -1,10 +1,10 @@
-import apiFetch from './fetch1';
+import fetch1 from './fetch1';
 
 export function updatePassword(
 	oldPassword: string,
 	newPassword: string
 ): Promise<Response> {
-	return apiFetch('me', true, 'PUT', {
+	return fetch1('me', true, 'PUT', {
 		old_password: oldPassword,
 		new_password: newPassword,
 	});

diff --git a/src/lib/api/updateTask.ts b/src/lib/api/updateTask.ts
@@ -1,4 +1,4 @@
-import apiFetch from './fetch1';
+import fetch1 from './fetch1';
 
 export interface TaskInput {
 	complete?: boolean;
@@ -7,5 +7,5 @@ export interface TaskInput {
 
 // Requires that user be authenticated.
 export function updateTask(taskId: string, data: TaskInput): Promise<Response> {
-	return apiFetch('me/tasks/' + taskId, true, 'PUT', data);
+	return fetch1('me/tasks/' + taskId, true, 'PUT', data);
 }
diff --git a/src/lib/api/useGetApiToken.ts b/src/lib/api/useGetApiToken.ts
@@ -1,5 +1,5 @@
 import { useMutation } from 'react-query';
-import apiFetch from './fetch1';
+import fetch1 from './fetch1';
 import { UseMutationResult } from 'react-query';
 
 export function useGetApiToken(): UseMutationResult<
@@ -9,7 +9,7 @@ export function useGetApiToken(): UseMutationResult<
 	unknown
 > {
 	return useMutation<string>('api-token', async () => {
-		const response = await apiFetch('me/token', true, 'GET');
+		const response = await fetch1('me/token', true, 'GET');
 		return response.text();
 	});
 }