Skip to content

Commit 93dd0a5

Browse files
color changes, adding a flashcard set, ui fixes
1 parent f903f5b commit 93dd0a5

File tree

6 files changed

+21
-3
lines changed

6 files changed

+21
-3
lines changed

.idea/misc.xml

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

src/data/FlashcardSets.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ title,description,isPrivate,flashcardSetId,ownerUsername,flashcardIds
22
test set 1,for testing study use case,false,0,testUser,0,1,2,3
33
empty test set,for testing study use case with empty set,true,1,testUser
44
Long Test Set,Insert Generic Description,false,2,Anthony,10,11,12,13,14,15,16,17,18,19,20,21
5+
CSC207 Final Exam Prep,Prepare for the CSC207 final exam with this flashcard set.,false,3,csc207,22,23,24,25,26,27,28,29,30,31,32,33,34,35

src/data/Flashcards.csv

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,17 @@ Term I,Definition I,2022-11-13T15:32:29.666982800,18,2
1515
Term J,Definition J,2022-11-13T15:32:29.666982800,19,2
1616
Same Term,Same Definition,2022-11-13T15:32:29.666982800,20,2
1717
Same Term,Same Definition,2022-11-13T15:32:29.666982800,21,2
18+
Entity,A basic bit of data that we are storing in our program.,2022-12-03T21:52:27.507373800,22,3
19+
Factory,An object that knows how to make a class instance typically by calling a constructor.,2022-12-03T21:52:47.933762600,23,3
20+
Use case,Something a user wants to do with the program.,2022-12-03T21:53:04.556680900,24,3
21+
Input boundary,The public interface for calling the use case.,2022-12-03T21:53:17.541271200,25,3
22+
Interactor,The class that runs the use case (a subclass of the input boundary).,2022-12-03T21:53:34.172732200,26,3
23+
Repository,The persistence mechanism (a subclass of the gateway).,2022-12-03T21:53:49.101677400,27,3
24+
Gateway,The methods the repository needs to implement for the interactor to do its job.,2022-12-03T21:54:03.276713900,28,3
25+
Controller,The object that the UI asks to run a use case.,2022-12-03T21:54:14.308815800,29,3
26+
Presenter,The object that tells the UI what to do when a use case finishes.,2022-12-03T21:54:26.957394100,30,3
27+
Downcasting,Casting the type of a variable into its subclass.,2022-12-03T21:55:06.381100300,31,3
28+
Upcasting,Casting the type of a variable into its superclass.,2022-12-03T21:55:16.940754800,32,3
29+
Private,Can only be accessed by code within the same class.,2022-12-03T21:55:28.372671100,33,3
30+
Protected,Can only be accessed by code within the same class or within a class derived from the original.,2022-12-03T21:55:42.829787700,34,3
31+
Variable shadowing,The same variable name is used in two different scopes.,2022-12-03T21:56:00.916802500,35,3

src/data/Users.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ username,password,isAdmin,flashcardSetIds
22
jempio,ilovejempio,false
33
ducas,badpassword,false
44
Anthony,123456,false,2
5+
csc207,csc207,false,3
56
testUser,password,false,0,1

src/main/java/frameworks_and_drivers/components/QuestionCard.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public abstract class QuestionCard extends JPanel {
1616
protected final ImageIcon no = new ImageIcon("src/images/no.png");
1717

1818
protected final Color DARK_GRAY = new Color(41,41,41);
19-
protected final Color GREEN = new Color(24, 134, 0);
20-
protected final Color RED = new Color(134, 0, 0);
19+
protected final Color GREEN = new Color(25, 59, 16);
20+
protected final Color RED = new Color(89, 34, 34);
2121

2222
/**
2323
* Constructs a question card given the question number.

src/main/java/frameworks_and_drivers/components/TrueFalseQuestionCard.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public TrueFalseQuestionCard(int num, List<String> outputText) {
3535

3636
GridBagLayout grid = new GridBagLayout();
3737
GridBagConstraints c = new GridBagConstraints();
38+
c.insets = new Insets(10,10,10,10);
3839
c.gridx = 0;
3940
c.gridy = 0;
4041
c.gridwidth = 2;
@@ -90,6 +91,7 @@ public TrueFalseQuestionCard(int num, List<String> outputText, String userAnswer
9091

9192
GridBagLayout grid = new GridBagLayout();
9293
GridBagConstraints c = new GridBagConstraints();
94+
c.insets = new Insets(10,10,10,10);
9395
c.gridx = 0;
9496
c.gridy = 0;
9597
c.gridwidth = 2;

0 commit comments

Comments
 (0)