diff options
-rw-r--r-- | frontend/src/Hub.js | 2 | ||||
-rw-r--r-- | frontend/src/HubList.js | 12 | ||||
-rw-r--r-- | src/main/java/edu/brown/cs/student/term/Main.java | 13 | ||||
-rw-r--r-- | src/main/java/edu/brown/cs/student/term/hub/Holder.java | 2 |
4 files changed, 20 insertions, 9 deletions
diff --git a/frontend/src/Hub.js b/frontend/src/Hub.js index 982ffee..6dbcc57 100644 --- a/frontend/src/Hub.js +++ b/frontend/src/Hub.js @@ -11,7 +11,7 @@ function Hub(props) { const [isToggled, setIsToggled] = useState(false); return ( - <li className='Checkin'> + <li className='Checkin' key={props.name}> <div className="Img-flex"> <span><span className="Clickable-name" onClick= {(e) => console.log(props.name)}>{props.name}</span> has {props.value}</span> <img className="Img-btn" hidden={isToggled} onClick={() => setIsToggled((toggle) => !toggle)} src="/round_expand_more_white_18dp.png" alt="image"/> diff --git a/frontend/src/HubList.js b/frontend/src/HubList.js index 9947d5e..64dd131 100644 --- a/frontend/src/HubList.js +++ b/frontend/src/HubList.js @@ -31,12 +31,12 @@ function HubList(props) { }, [props.data]); return ( - <div className="User-checkin"> - <div className="Checkins"> - <h2>Hubs and Suspicion</h2> - <ul className='Checkin-list'>{hubItems}</ul> - </div> - </div> + <div className="User-checkin"> + <div className="Checkins"> + <h2>Individual Suspicion</h2> + <ul className='Checkin-list'>{hubItems}</ul> + </div> + </div> ); } diff --git a/src/main/java/edu/brown/cs/student/term/Main.java b/src/main/java/edu/brown/cs/student/term/Main.java index 3b0a258..008c411 100644 --- a/src/main/java/edu/brown/cs/student/term/Main.java +++ b/src/main/java/edu/brown/cs/student/term/Main.java @@ -12,6 +12,8 @@ import edu.brown.cs.student.term.repl.commands.SetupCommand; import joptsimple.OptionParser; import joptsimple.OptionSet; +import java.io.OutputStream; +import java.io.PrintStream; import java.time.Instant; import java.sql.Date; import java.util.HashMap; @@ -64,6 +66,7 @@ public final class Main { parser.accepts("gui"); parser.accepts("port").withRequiredArg().ofType(Integer.class) .defaultsTo(DEFAULT_PORT); + parser.accepts("debug"); OptionSet options = parser.parse(args); if (options.has("gui")) { @@ -73,6 +76,14 @@ public final class Main { setConnection.run(new String[]{"data/trades.sqlite3"}); } + if (!options.has("debug")) { + System.setErr(new PrintStream(new OutputStream() { + public void write(int b) { + } + })); + } + + HashMap<String, Command> commandHashMap = new HashMap<>(); commandHashMap.put("setup", new SetupCommand()); commandHashMap.put("load", new LoadCommand()); @@ -180,7 +191,7 @@ public final class Main { return "Error"; } - Map<String, Object> res = new HashMap(); + Map<String, Object> res = new HashMap<>(); res.put("person", person); res.put("moneyIn", profit.getMoneyInput()); res.put("moneyOut", profit.getMoneyInput() + gains); diff --git a/src/main/java/edu/brown/cs/student/term/hub/Holder.java b/src/main/java/edu/brown/cs/student/term/hub/Holder.java index 66def5e..1151e74 100644 --- a/src/main/java/edu/brown/cs/student/term/hub/Holder.java +++ b/src/main/java/edu/brown/cs/student/term/hub/Holder.java @@ -7,7 +7,7 @@ public class Holder { private String name; private double suspicionScore; - public Holder(int id, String name){ + public Holder(int id, String name) { this.id = id; this.name = name; } |