fix formating

COS301-SE-2024 · Jun 15, 2024 · f2185d0 · f2185d0
1 parent 9ffff65
commit f2185d0
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 119 deletions.
diff --git a/src/client/package.json b/src/client/package.json
@@ -1,68 +1,68 @@
 {
-  "name": "client",
-  "version": "0.0.1",
-  "scripts": {
-    "dev": "vite dev --open",
-    "build": "vite build",
-    "preview": "vite preview",
-    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
-    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-    "lint": "prettier --check . && eslint .",
-    "format": "prettier --write .",
-    "cy:open-ct": "cypress open --component",
-    "cy:run-ct": "cypress run --e2e",
-    "test": "vitest run",
-    "test:ui": "vitest --ui",
-    "test:watch": "vitest"
-  },
-  "devDependencies": {
-    "@cypress/code-coverage": "^3.12.39",
-    "@fontsource/fira-mono": "^4.5.10",
-    "@fontsource/roboto": "^5.0.13",
-    "@neoconfetti/svelte": "^1.0.0",
-    "@sveltejs/adapter-auto": "^3.0.0",
-    "@sveltejs/kit": "^2.0.0",
-    "@sveltejs/vite-plugin-svelte": "^3.1.1",
-    "@tailwindcss/typography": "^0.5.10",
-    "@testing-library/jest-dom": "^6.4.5",
-    "@testing-library/svelte": "^5.1.0",
-    "@types/eslint": "^8.56.0",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^7.0.0",
-    "@vitest/ui": "^1.6.0",
-    "autoprefixer": "^10.4.16",
-    "cypress": "^13.10.0",
-    "cypress-svelte-unit-test": "^3.3.4",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-svelte": "^2.35.1",
-    "flowbite": "^2.3.0",
-    "flowbite-svelte": "^0.46.1",
-    "flowbite-svelte-icons": "^1.6.1",
-    "istanbul-lib-coverage": "^3.2.2",
-    "jsdom": "^24.1.0",
-    "nyc": "^15.1.0",
-    "postcss": "^8.4.33",
-    "prettier": "^3.1.1",
-    "prettier-plugin-svelte": "^3.1.2",
-    "prettier-plugin-tailwindcss": "^0.5.1",
-    "svelte": "^4.2.7",
-    "svelte-check": "^3.6.0",
-    "tailwindcss": "^3.4.1",
-    "tslib": "^2.4.1",
-    "typescript": "^5.0.0",
-    "vite": "^5.0.3",
-    "vitest": "^1.6.0"
-  },
-  "type": "module",
-  "dependencies": {
-    "@stream-io/node-sdk": "^0.2.5",
-    "@stream-io/video-client": "^1.3.0",
-    "@tabler/icons-svelte": "^3.5.0",
-    "@threlte/core": "^7.3.0",
-    "axios": "^1.7.2",
-    "clsx": "^2.1.1",
-    "tailwind-merge": "^2.3.0",
-    "three": "^0.165.0"
-  }
+	"name": "client",
+	"version": "0.0.1",
+	"scripts": {
+		"dev": "vite dev --open",
+		"build": "vite build",
+		"preview": "vite preview",
+		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
+		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
+		"lint": "prettier --check . && eslint .",
+		"format": "prettier --write .",
+		"cy:open-ct": "cypress open --component",
+		"cy:run-ct": "cypress run --e2e",
+		"test": "vitest run",
+		"test:ui": "vitest --ui",
+		"test:watch": "vitest"
+	},
+	"devDependencies": {
+		"@cypress/code-coverage": "^3.12.39",
+		"@fontsource/fira-mono": "^4.5.10",
+		"@fontsource/roboto": "^5.0.13",
+		"@neoconfetti/svelte": "^1.0.0",
+		"@sveltejs/adapter-auto": "^3.0.0",
+		"@sveltejs/kit": "^2.0.0",
+		"@sveltejs/vite-plugin-svelte": "^3.1.1",
+		"@tailwindcss/typography": "^0.5.10",
+		"@testing-library/jest-dom": "^6.4.5",
+		"@testing-library/svelte": "^5.1.0",
+		"@types/eslint": "^8.56.0",
+		"@typescript-eslint/eslint-plugin": "^7.0.0",
+		"@typescript-eslint/parser": "^7.0.0",
+		"@vitest/ui": "^1.6.0",
+		"autoprefixer": "^10.4.16",
+		"cypress": "^13.10.0",
+		"cypress-svelte-unit-test": "^3.3.4",
+		"eslint": "^8.56.0",
+		"eslint-config-prettier": "^9.1.0",
+		"eslint-plugin-svelte": "^2.35.1",
+		"flowbite": "^2.3.0",
+		"flowbite-svelte": "^0.46.1",
+		"flowbite-svelte-icons": "^1.6.1",
+		"istanbul-lib-coverage": "^3.2.2",
+		"jsdom": "^24.1.0",
+		"nyc": "^15.1.0",
+		"postcss": "^8.4.33",
+		"prettier": "^3.1.1",
+		"prettier-plugin-svelte": "^3.1.2",
+		"prettier-plugin-tailwindcss": "^0.5.1",
+		"svelte": "^4.2.7",
+		"svelte-check": "^3.6.0",
+		"tailwindcss": "^3.4.1",
+		"tslib": "^2.4.1",
+		"typescript": "^5.0.0",
+		"vite": "^5.0.3",
+		"vitest": "^1.6.0"
+	},
+	"type": "module",
+	"dependencies": {
+		"@stream-io/node-sdk": "^0.2.5",
+		"@stream-io/video-client": "^1.3.0",
+		"@tabler/icons-svelte": "^3.5.0",
+		"@threlte/core": "^7.3.0",
+		"axios": "^1.7.2",
+		"clsx": "^2.1.1",
+		"tailwind-merge": "^2.3.0",
+		"three": "^0.165.0"
+	}
 }
diff --git a/src/client/src/lib/components/admin/+Lessons.svelte b/src/client/src/lib/components/admin/+Lessons.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import {goto} from '$app/navigation';
+	import { goto } from '$app/navigation';
 	import { lessons } from '$lib/stores/store';
 	import {
 		Table,
@@ -39,13 +39,12 @@
 				</span>
 			</div>
 		</div>
-	<div class="mb-4 flex items-center gap-x-3">
-		<ScheduleLesson />
-	</div>
+		<div class="mb-4 flex items-center gap-x-3">
+			<ScheduleLesson />
+		</div>
 	</div>
 
-
-	<br>
+	<br />
 
 	<p class="text-l font-bold text-gray-800 dark:text-white">In Session</p>
 
@@ -56,26 +55,20 @@
 			{/each}
 		</TableHead>
 		<TableBody tableBodyClass="divide-y">
-				<TableBodyRow>
-					<TableBodyCell class="inline-flex items-center gap-x-3">
-						<p class="text-lg text-gray-800 dark:text-white">
-							Mathematics
-						</p>
-					</TableBodyCell>
-					<TableBodyCell>
-						15 June
-					</TableBodyCell>
-					<TableBodyCell>
-						09:30
-					</TableBodyCell>
-					<TableBodyCell>
-						<Button size="xs" on:click={() => goto('lessons/1234')} >Join</Button>
-					</TableBodyCell>
-				</TableBodyRow>
+			<TableBodyRow>
+				<TableBodyCell class="inline-flex items-center gap-x-3">
+					<p class="text-lg text-gray-800 dark:text-white">Mathematics</p>
+				</TableBodyCell>
+				<TableBodyCell>15 June</TableBodyCell>
+				<TableBodyCell>09:30</TableBodyCell>
+				<TableBodyCell>
+					<Button size="xs" on:click={() => goto('lessons/1234')}>Join</Button>
+				</TableBodyCell>
+			</TableBodyRow>
 		</TableBody>
 	</Table>
 
-	<br>
+	<br />
 
 	<p class="text-l font-bold text-gray-800 dark:text-white">Upcoming</p>
 

diff --git a/src/client/src/lib/components/lesson/Participant.svelte b/src/client/src/lib/components/lesson/Participant.svelte
@@ -7,7 +7,7 @@
 	export let participant: StreamVideoParticipant;
 </script>
 
-<div class="bg-gray-200 m-5">
+<div class="m-5 bg-gray-200">
 	<Video {call} {participant} />
 	<Audio {call} {participant} />
-</div>
+</div>
diff --git a/src/client/src/lib/components/modals/+ScheduleLesson.svelte b/src/client/src/lib/components/modals/+ScheduleLesson.svelte
@@ -6,14 +6,14 @@
 	async function handleSubmit(event: Event) {
 		event.preventDefault();
 
-		const formData = new FormData(event.target as HTMLFormElement);
+		/*const formData = new FormData(event.target as HTMLFormElement);
 
 		const topic = formData.get('topic')?.toString() ?? '';
 		const date = formData.get('date')?.toString() ?? '';
-		const time = formData.get('time')?.toString() ?? '';
+		const time = formData.get('time')?.toString() ?? '';*/
 
 		try {
-            // Make request
+			// Make request
 		} catch (error) {
 			console.error('Schedule Lesson Error:', error);
 		}

diff --git a/src/client/src/lib/stores/store.ts b/src/client/src/lib/stores/store.ts
@@ -16,16 +16,15 @@ export const lecChange = writable('change');
 export const stuChange = writable('change');
 export const admChange = writable('change');
 
-export const username = "e241198014"
+export const username = 'e241198014';
 
 export const userInfo = writable<any>({
-    name: "James",
-    surname: "Guy",
-    username: "e241198014",
-    email: "[email protected]",
-    image: "https://www.pngkey.com/png/full/73-730477_first-name-profile-image-placeholder-png.png",
-    role: "lecturer",
-    organisation: "665c341781a011b727589f4c",
-    workspaces: [], 
-	token: "eyJhbGciOiJIUzI1NZC93D40"
-  });
+	name: 'James',
+	surname: 'Guy',
+	username: 'e241198014',
+	email: '[email protected]',
+	image: 'https://www.pngkey.com/png/full/73-730477_first-name-profile-image-placeholder-png.png',
+	role: 'lecturer',
+	organisation: '665c341781a011b727589f4c',
+	workspaces: []
+});
diff --git a/src/client/src/routes/lessons/[id]/+page.server.ts b/src/client/src/routes/lessons/[id]/+page.server.ts
@@ -4,20 +4,20 @@ import { StreamClient } from '@stream-io/node-sdk';
 import { STREAM_API_KEY, STREAM_SECRET_KEY } from '$env/static/private';
 
 export const load = async () => {
-  if (!username) throw new Error('User is not authenticated');
-  if (!STREAM_API_KEY) throw new Error('Stream API key secret is missing');
-  if (!STREAM_SECRET_KEY) throw new Error('Stream API secret is missing');
+	if (!username) throw new Error('User is not authenticated');
+	if (!STREAM_API_KEY) throw new Error('Stream API key secret is missing');
+	if (!STREAM_SECRET_KEY) throw new Error('Stream API secret is missing');
 
-  const streamClient = new StreamClient(STREAM_API_KEY, STREAM_SECRET_KEY);
+	const streamClient = new StreamClient(STREAM_API_KEY, STREAM_SECRET_KEY);
 
-  const tokenProvider = async () => {
-    const expirationTime = Math.floor(Date.now() / 1000) + 3600;
-    const issuedAt = Math.floor(Date.now() / 1000) - 60;
-    const token = streamClient.createToken(username, expirationTime, issuedAt);
-    return token;
-  };
+	const tokenProvider = async () => {
+		const expirationTime = Math.floor(Date.now() / 1000) + 3600;
+		const issuedAt = Math.floor(Date.now() / 1000) - 60;
+		const token = streamClient.createToken(username, expirationTime, issuedAt);
+		return token;
+	};
 
-  const token = await tokenProvider();
+	const token = await tokenProvider();
 
-  return { apiKey : STREAM_API_KEY, token };
-};
+	return { apiKey: STREAM_API_KEY, token };
+};
diff --git a/src/client/src/routes/lessons/[id]/+page.svelte b/src/client/src/routes/lessons/[id]/+page.svelte
@@ -27,7 +27,7 @@
 		await call.join({ create: true });
 	});
 
-	onDestroy(() : void => {
+	onDestroy((): void => {
 		if (call) call.leave();
 		if (client) client.disconnectUser();
 	});