Skip to content

Commit 7c3feb8

Browse files
LSKprLSKpr
committed
merge 2 - still trying
1 parent 485be96 commit 7c3feb8

10 files changed

Lines changed: 0 additions & 128 deletions

File tree

‎my-app/firebase.js‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,6 @@ export async function addCourse(course){
4242
await set(myRef, course);
4343
}
4444

45-
<<<<<<< HEAD
46-
export async function fetchCourses() {
47-
const myRef = ref(db, `courses`);
48-
const snapshot = await get(myRef);
49-
if (!snapshot.exists()) return [];
50-
const value = snapshot.val();
51-
let courses = [];
52-
for (const id of Object.keys(courses)) {
53-
courses = [...courses, courses[id]];
54-
}
55-
return courses;
56-
=======
5745
export async function fetchAllCourses() {
5846
const myRef = ref(db, `courses`);
5947
const snapshot = await get(myRef);
@@ -68,7 +56,6 @@ export async function fetchAllCourses() {
6856
}
6957

7058
return courses;
71-
>>>>>>> 27a5b77bd1478c3b8493b19385b77340472d7591
7259
}
7360

7461
// Before: [ {courseCode: "CS101", name: "Intro to CS"}, {...} ]

‎my-app/index.html‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
<!doctype html>
22
<html lang="en">
3-
<<<<<<< HEAD
4-
<head>
5-
<meta charset="UTF-8" />
6-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
7-
<link href="/src/styles.css" rel="stylesheet">
8-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
9-
<title>Find my course</title>
10-
</head>
11-
<body>
12-
<div id="root"></div>
13-
<div id="modal-root"></div>
14-
<script type="module" src="/src/index.jsx"></script>
15-
</body>
16-
=======
173
<head>
184
<meta charset="UTF-8" />
195
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
@@ -23,5 +9,4 @@
239
</head>
2410
<div id="root"></div>
2511
<script type="module" src="/src/index.jsx"></script>
26-
>>>>>>> 27a5b77bd1478c3b8493b19385b77340472d7591
2712
</html>

‎my-app/package-lock.json‎

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎my-app/package.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,10 @@
1212
"dependencies": {
1313
"@tailwindcss/vite": "^4.0.17",
1414
"firebase": "^11.5.0",
15-
<<<<<<< HEAD
16-
"mobx": "^6.13.7",
17-
"mobx-react-lite": "^4.1.0",
18-
=======
1915
"ldrs": "^1.1.6",
2016
"mobx": "^6.13.7",
2117
"mobx-react-lite": "^4.1.0",
2218
"pdfjs-dist": "^5.1.91",
23-
>>>>>>> 27a5b77bd1478c3b8493b19385b77340472d7591
2419
"react": "^19.0.0",
2520
"react-dom": "^19.0.0",
2621
"react-router-dom": "^7.4.0",

‎my-app/src/index.jsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ import { connectToFirebase } from "../firebase";
55
import { model } from "./model"
66
import App from "./pages/App.jsx";
77
import "./styles.css";
8-
<<<<<<< HEAD
9-
=======
108
import { JsonToDatabase } from "./presenters/Tests/JsonToDatabase"
119
import { AllCoursesPresenter } from "./presenters/Tests/AllCoursesPresenter.jsx";
12-
>>>>>>> 27a5b77bd1478c3b8493b19385b77340472d7591
1310

1411
configure({ enforceActions: "never" });
1512
const reactiveModel = makeAutoObservable(model);

‎my-app/src/model.js‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,11 @@
44
import { addCourse } from "../firebase";
55

66
export const model = {
7-
<<<<<<< HEAD
8-
user: undefined,
9-
currentCourse: undefined,
10-
currentSearch: {},
11-
courses: [], // Initialize as an array
12-
=======
137
user: undefined,
148
currentCourse: undefined,
159
currentSearch: {},
1610
courses: [],
1711
isReady: false,
18-
>>>>>>> 27a5b77bd1478c3b8493b19385b77340472d7591
1912

2013
// sets the current user
2114
setUser(user) {

‎my-app/src/views/Components/SideBarComponents/ButtonGroupField.jsx‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,3 @@
1-
<<<<<<< HEAD
2-
import React from 'react';
3-
4-
export default function ButtonGroupField(props) {
5-
return (
6-
<div className='m-2'>
7-
<div className='mb-2 text-white justify-center'>
8-
<div className='float-left mr-1'>
9-
<h3>Other filter</h3>
10-
</div>
11-
<div>
12-
<p className='text-sm opacity-50'> - filter description</p>
13-
</div>
14-
</div>
15-
<div class="flex flex-col sm:inline-flex sm:flex-row rounded-lg shadow-2xs w-full items-center font-medium text-white bg-[#aba8e0] border border-gray-200">
16-
<button type="button" class="flex-auto py-3 px-4 inline-flex items-center gap-x-2 -mt-px -ms-px first:rounded-t-md last:rounded-b-md sm:first:rounded-s-md sm:mt-0 sm:first:ms-0 sm:first:rounded-se-none sm:last:rounded-es-none sm:last:rounded-e-md text-sm font-medium focus:z-10 border border-gray-200 shadow-2xs hover:bg-[#8785ac] focus:outline-hidden focus:bg-violet-500 disabled:opacity-50 disabled:pointer-events-none dark:bg-neutral-900 dark:border-neutral-700 dark:text-white dark:hover:bg-neutral-800 dark:focus:bg-neutral-800">
17-
Item 1
18-
</button>
19-
<button type="button" class="flex-auto py-3 px-4 inline-flex items-center gap-x-2 -mt-px -ms-px first:rounded-t-md last:rounded-b-md sm:first:rounded-s-md sm:mt-0 sm:first:ms-0 sm:first:rounded-se-none sm:last:rounded-es-none sm:last:rounded-e-md text-sm font-medium focus:z-10 border border-gray-200 shadow-2xs hover:bg-[#8785ac] focus:outline-hidden focus:bg-violet-500 disabled:opacity-50 disabled:pointer-events-none dark:bg-neutral-900 dark:border-neutral-700 dark:text-white dark:hover:bg-neutral-800 dark:focus:bg-neutral-800">
20-
Item 2
21-
</button>
22-
<button type="button" class="flex-auto py-3 px-4 inline-flex items-center gap-x-2 -mt-px -ms-px first:rounded-t-md last:rounded-b-md sm:first:rounded-s-md sm:mt-0 sm:first:ms-0 sm:first:rounded-se-none sm:last:rounded-es-none sm:last:rounded-e-md text-sm font-medium focus:z-10 border border-gray-200 shadow-2xs hover:bg-[#8785ac] focus:outline-hidden focus:bg-violet-500 disabled:opacity-50 disabled:pointer-events-none dark:bg-neutral-900 dark:border-neutral-700 dark:text-white dark:hover:bg-neutral-800 dark:focus:bg-neutral-800">
23-
Item 3
24-
</button>
25-
</div>
26-
</div>
27-
);
28-
=======
291
import { useState } from "react";
302

313
export default function ButtonGroupField() {
@@ -64,5 +36,4 @@ export default function ButtonGroupField() {
6436
</div>
6537
</div>
6638
);
67-
>>>>>>> 27a5b77bd1478c3b8493b19385b77340472d7591
6839
}

‎my-app/src/views/Components/SideBarComponents/ToggleField.jsx‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,6 @@ export default function ToggleField(props) {
1212
<p className='text-sm opacity-50'> - filter description</p>
1313
</div>
1414
</div>
15-
<<<<<<< HEAD
16-
<div className='bg-[#aba8e0] px-5 py-3 border-b border-gray-200 left-0 border-r rounded-lg flex items-center'>
17-
<label class="inline-flex items-center cursor-pointer">
18-
<input type="checkbox" value="" class="sr-only peer" />
19-
<div class="relative w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-violet-500 rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-violet-500 dark:peer-checked:bg-blue-600"></div>
20-
<span class="ms-3 text-sm text-white border-l px-3">Apple</span>
21-
</label>
22-
</div>
23-
<div class="flex flex-col sm:inline-flex sm:flex-row rounded-lg shadow-2xs w-full items-center font-medium text-white bg-[#aba8e0] border border-gray-200">
24-
<button type="button" class="flex-auto py-3 px-4 inline-flex items-center gap-x-2 -mt-px -ms-px first:rounded-t-md last:rounded-b-md sm:first:rounded-s-md sm:mt-0 sm:first:ms-0 sm:first:rounded-se-none sm:last:rounded-es-none sm:last:rounded-e-md text-sm font-medium focus:z-10 border border-gray-200 shadow-2xs hover:bg-[#8785ac] focus:outline-hidden focus:bg-violet-500 disabled:opacity-50 disabled:pointer-events-none dark:bg-neutral-900 dark:border-neutral-700 dark:text-white dark:hover:bg-neutral-800 dark:focus:bg-neutral-800">
25-
Item 1
26-
</button>
27-
<label class="inline-flex items-center cursor-pointer">
28-
<input type="checkbox" value="" class="sr-only peer" />
29-
<div class="relative w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-violet-500 rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-violet-500 dark:peer-checked:bg-blue-600"></div>
30-
</label>
31-
<span class="flex-auto ms-3 text-sm text-white border-l px-3">Apple</span>
32-
</div>
33-
=======
3415
<div class="flex flex-col sm:flex-row md:flex-row rounded-lg shadow-2xs w-full items-center font-medium text-white bg-[#aba8e0] border border-gray-200">
3516
<label class="flex-auto py-3 px-4 inline-flex gap-x-2 -mt-px -ms-px
3617
first:rounded-t-md last:rounded-b-md sm:first:rounded-s-md sm:mt-0 sm:first:ms-0 s
@@ -55,7 +36,6 @@ export default function ToggleField(props) {
5536
<span>Swedish</span>
5637
</label>
5738
</div>
58-
>>>>>>> 27a5b77bd1478c3b8493b19385b77340472d7591
5939
</div>
6040
);
6141
}

‎my-app/src/views/Components/SideBarComponents/UploadField.jsx‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,4 @@
11
import React from 'react';
2-
<<<<<<< HEAD
3-
4-
export default function UploadField(props) {
5-
return (
6-
<div className='w-full pb-5 px-8'>
7-
<div className="flex items-center justify-center ">
8-
<label for="dropzone-file" className="flex flex-col items-center justify-center w-full h-50 border-2 border-gray-300 border-dashed rounded-lg cursor-pointer bg-[#aba8e0] dark:hover:bg-gray-800 dark:bg-gray-700 hover:bg-gray-400 dark:border-gray-600 dark:hover:border-gray-500 dark:hover:bg-gray-600">
9-
<div className="flex flex-col items-center justify-center pt-5 pb-6">
10-
<svg className="w-8 h-8 mb-4 text-white dark:text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 16">
11-
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 13h3a3 3 0 0 0 0-6h-.025A5.56 5.56 0 0 0 16 6.5 5.5 5.5 0 0 0 5.207 5.021C5.137 5.017 5.071 5 5 5a4 4 0 0 0 0 8h2.167M10 15V6m0 0L8 8m2-2 2 2" />
12-
</svg>
13-
<p className="mb-2 text-sm "><span className="font-semibold">Click to upload</span> or drag and drop</p>
14-
<p className="text-xs">KTH trnascript of records in PDF format</p>
15-
</div>
16-
<input id="dropzone-file" type="file" className="hidden" />
17-
</label>
18-
</div>
19-
<p className='text-sm opacity-50 pt-3'> Describe how the Transcript upload works</p>
20-
</div>
21-
);
22-
}
23-
=======
242
import CourseTranscriptList from './CourseTranscriptList';
253
//import * as scraper from '../../../../src/scripts/transcript-scraper/transcript-scraper.js';
264
import * as pdfjsLib from "pdfjs-dist";
@@ -218,4 +196,3 @@ export default function UploadField(props) {
218196
);
219197
}
220198

221-
>>>>>>> 27a5b77bd1478c3b8493b19385b77340472d7591

‎my-app/src/views/CourseView.jsx‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22

33
export default function CourseView(props) {
4-
<<<<<<< HEAD
54
return (
65
<div style={{ margin: '20px' }}>
76
{/* Course Title Section */}
@@ -60,10 +59,3 @@ The focus of the course is on the protocols and algorithms used, and we will fol
6059
</div>
6160
);
6261
}
63-
=======
64-
65-
return
66-
(<div>
67-
</div>);
68-
}
69-
>>>>>>> 27a5b77bd1478c3b8493b19385b77340472d7591

0 commit comments

Comments
 (0)