Skip to content

Commit 00017bb

Browse files
authored
Merge pull request #70 from CSC207-2022F-UofT/main
Updating branch.
2 parents d1a9f91 + 8628af5 commit 00017bb

File tree

181 files changed

+4621
-1591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+4621
-1591
lines changed

.idea/vcs.xml

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

src/data/FlashcardSets.csv

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
title, description, privacy, id, owner, flashcardsIds
2-
test set,for testing study use case,true,0,testUser,0,1,2,3
3-
empty test set,for testing study use case with empty set,true,1,testUser,
4-
csc207,flashcards for csc207,true,2,jempio,1,4,5,6,7
5-
csc207,flashcards for csc207,true,3,jempio,1,4,5,6,7
6-
csc207,flashcards for csc207,true,4,jempio,1,4,5,6,7
7-
csc207,flashcards for csc207,true,5,jempio,1,4,5,6,7
8-
csc207,flashcards for csc207,true,6,jempio,1,4,5,6,7
9-
csc207,flashcards for csc207,false,7,jempio,1,4,5,6,7
10-
csc207,flashcards for csc207,false,8,jempio,1,4,5,6,7
1+
title,description,isPrivate,flashcardSetId,ownerUsername,flashcardIds
2+
test set 1,for testing study use case,false,0,testUser,0,1,2,3
3+
empty test set,for testing study use case with empty set,true,1,testUser
4+
Long Test Set,Insert Generic Description,false,2,testUser,10,11,12,13,14,15,16,17,18,19,20,21

src/data/Flashcards.csv

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,16 @@ term,definition,creationDate,flashcardId,belongsToId
22
test card 1,the first test card,2022-11-13T15:32:26.666982800,0,0
33
test card 2,the second test card,2022-11-13T15:32:27.666982800,1,0
44
test card 3,the third test card,2022-11-13T15:32:28.666982800,2,0
5-
alphabetical order checker,to test if alphabetical order is working,2022-11-13T15:32:29.666982800,3,0
5+
alphabetical order checker,to test if alphabetical order is working,2022-11-13T15:32:29.666982800,3,0
6+
Term A,Definition A,2022-11-13T15:32:26.666982800,10,2
7+
Term B,Definition B,2022-11-13T15:32:27.666982800,11,2
8+
Term C,Definition C,2022-11-13T15:32:28.666982800,12,2
9+
Term D,Definition D,2022-11-13T15:32:29.666982800,13,2
10+
Term E,Definition E,2022-11-13T15:32:29.666982800,14,2
11+
Term F,Definition F,2022-11-13T15:32:29.666982800,15,2
12+
Term G,Definition G,2022-11-13T15:32:29.666982800,16,2
13+
Term H,Definition H,2022-11-13T15:32:29.666982800,17,2
14+
Term I,Definition I,2022-11-13T15:32:29.666982800,18,2
15+
Term J,Definition J,2022-11-13T15:32:29.666982800,19,2
16+
Same Term,Same Definition,2022-11-13T15:32:29.666982800,20,2
17+
Same Term,Same Definition,2022-11-13T15:32:29.666982800,21,2

src/data/Users.csv

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
username,password,isAdmin,flashcardSetsIds
2-
testUser,456r2t17yuihjn@,false,0,1
3-
jempio,ilovejempio,false,3,4,5,6,7,8
1+
username,password,isAdmin,flashcardSetIds
2+
jempio,ilovejempio,false
3+
ducas,badpassword,false
4+
Anthony,123456,false,2
5+
testUser,password,false,0,1

src/images/bbq.png

20.2 KB
Loading

src/images/spungebub.png

-32.8 KB
Binary file not shown.

src/main/java/Editor/Flashcard/FlashcardEditorInputBoundary.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/java/Editor/Flashcard/FlashcardEditorInteractor.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/main/java/Editor/Flashcard/FlashcardEditorRequestModel.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/main/java/Editor/Flashcard/FlashcardEditorResponseModel.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)