Skip to content

Commit

Permalink
Changing initial net worth value to match server and adding Log Out b…
Browse files Browse the repository at this point in the history
…utton
  • Loading branch information
Great-The-Nate committed Nov 13, 2020
1 parent 5ed1913 commit 230b781
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ nav input[type=text] {
right: 0px;
display: none;
background-color: white;
min-width: 100px;
width: 110px;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
border: 1px solid #ddd;
border-radius: 5px;
Expand Down
16 changes: 3 additions & 13 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,7 @@ class App extends React.Component{

const users = [
new User(0, "uid", "Student Name", "Student School", "Student Grade", "https://cdn.discordapp.com/attachments/623245857046790159/730165576185413722/unknown.png", 120000, 140000, 40000, 80000, [{UID:"damian2", quantity:15, initPrice:1000},{UID:"damian3", quantity:15, initPrice:1000}], 100, 80),
//new User("b2", "Arvin Sharma", "Clements High School", "12", "https://cdn.discordapp.com/attachments/623245857046790159/730165576185413722/unknown.png", 20000, 70000, [{UID:"a1", quantity:10, initPrice:1400},{UID:"d4", quantity:20, initPrice:1000}]),
//new User("c3", "Amogg Venkat", "Clements High School", "12", "https://cdn.discordapp.com/attachments/623245857046790159/730165576185413722/unknown.png", 5000, 45000, [{UID:"b2", quantity:10, initPrice:1000}]),
//new User("d4", "Jason Lee", "Elkins High School", "11", "https://cdn.discordapp.com/attachments/623245857046790159/730165576185413722/unknown.png", 1000, 19000, [{UID:"c3", quantity:15, initPrice:1200}])
];
//const selfUID = "a1";
//var selfUser = users[0];
/*for(const user in users)
if(user.UID===selfUID){
selfUser=user;
break;
}
*/
this.state={
selfUID: "",
selfUser: users[0],
Expand All @@ -100,7 +89,7 @@ class App extends React.Component{
const users = [];
for(var i=0; i<response.length; i++){
if(response[i]["initialized"]){
users.push(new User(response[i]["id"], response[i]["username"], response[i]["name"], response[i]["schoolName"], response[i]["grade"], response[i]["imageURL"], 10000, 120000, response[i]["availableFunds"], 0, response[i]["investments"], response[i]["stockPrice"], 80))
users.push(new User(response[i]["id"], response[i]["username"], response[i]["name"], response[i]["schoolName"], response[i]["grade"], response[i]["imageURL"], 10000, 10000, response[i]["availableFunds"], 0, response[i]["investments"], response[i]["stockPrice"], 80))
}
}

Expand All @@ -123,7 +112,7 @@ class App extends React.Component{

this.setState({
selfUID: response["username"],
selfUser: new User(response["id"], response["username"], response["name"], response["schoolName"], response["grade"], response["imageURL"], 10000, 10000, response["availableFunds"], 80, response["investments"], response["stockPrice"], 80)
selfUser: new User(response["id"], response["username"], response["name"], response["schoolName"], response["grade"], response["imageURL"], 10000, 10000, response["availableFunds"], 0, response["investments"], response["stockPrice"], 80)
})
}
})
Expand Down Expand Up @@ -157,6 +146,7 @@ const Navigation = () => (
<button className="nav-dropdown-button"><i className="fa fa-bars" aria-hidden="true"/></button>
<div className="nav-dropdown-content">
<NavLink className="nav-dropdown-content-item" exact activeClassName="current" to='/faq'>FAQ</NavLink>
<div className="nav-dropdown-content-item" onClick={() => {window.location.reload(false);}}>Log Out</div>
</div>
</div>
</ul>
Expand Down
5 changes: 3 additions & 2 deletions src/components/FAQ.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ function FAQ() {
"Who can make an account?", "At the moment, any student in Fort Bend ISD can make a GPA Game account.",
"What data do you store?", "We store basic student information, such as your name, grade, and the school you attend, in addition to the Skyward credentials you initially provide us. We use, but do not store, your assignment grades, which are used to calculate your stock value.",
"What's the point of The GPA Game?", "idk man whats the point of life?",
"Is the GPA Game affiliated with Fort Bend ISD in any way?", "No, this is a completely unofficial student project made for fun. :)",
"How can we contact you if we have any other questions?", "You can email us at *insert gpa stocks email here* or find us in the hallway at school, we’re seniors at Clements High School."
"Is The GPA Game affiliated with Fort Bend ISD in any way?", "No, this is a completely unofficial student project made for fun. :)",
"How can we contact you if we have any other questions?", "You can email us at *insert gpa stocks email here* or find us in the hallway at school, we’re seniors at Clements High School.",
//"What should I do if I find something that isn't working?", "It helps us a lot if you let us know if something isn't working so we can fix it as soon as possible. Things such as: Net Worth, the Net Worth Graph, Portfolio Values, and Schedules have not been implemented yet so we know they don't work, but if you find anything else feel free to let us know."
];


Expand Down
1 change: 1 addition & 0 deletions src/components/Home.css
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ body {
font-size: 32px;
color: #212121;
cursor: pointer;
z-index: -1;
}

.home-stock-profile-home-button {
Expand Down

0 comments on commit 230b781

Please sign in to comment.