summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-04-03 10:04:21 +0200
committerGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-04-03 10:04:21 +0200
commit780c08ab8b8a33ec8d08821f839f0d5dc034931b (patch)
treea875aa01d67fab85d696623790e2ae326efeb86e
parent80c33f5303e2c083841933de4338f7e5d15de972 (diff)
Rename user.ts to user-authentication.ts
-rw-r--r--README.md4
-rw-r--r--src/scripts/main.entry.ts2
-rw-r--r--src/scripts/profile.entry.ts2
-rw-r--r--src/scripts/projects.entry.ts2
-rw-r--r--src/scripts/user-authentication.ts (renamed from src/scripts/user.ts)0
-rw-r--r--tsconfig.json2
6 files changed, 7 insertions, 5 deletions
diff --git a/README.md b/README.md
index 1717fb12..1531b46e 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,13 @@ Let's first take a look at how the user interacts with the frontend.
The user starts at the splashpage (`index.html`) where he/she gets a first impression of OpenDC, including screenshots and features. After signing in with Google Authentication, the user is redirected to the page listing all projects (`projects.html`) shared or owned by that user. Here the user also has the possibility to open a particular project, redirecting to the main application page (`app.html`).
#### Main Application
-The main application allows the user to construct and simulate a datacenter. To understand how the user can do this, have a look at the state diagram below. It visualizes the main interactions a user can make with the application, as well as under which conditions.
+The main application allows the user to construct and simulate a datacenter. To understand how the user can do this, have a look at the state diagram below. It visualizes the main interactions a user can make with the application, as well as under which conditions those can happen.
![OpenDC Frontend Interaction State Diagram](https://raw.githubusercontent.com/atlarge-research/opendc-frontend/master/images/opendc-frontend-interaction-state-diagram.png)
### Components
+Under the hood, this looks as follows:
+
[TODO]
## Setup for Local Development
diff --git a/src/scripts/main.entry.ts b/src/scripts/main.entry.ts
index 48ab7f37..84726ed4 100644
--- a/src/scripts/main.entry.ts
+++ b/src/scripts/main.entry.ts
@@ -7,7 +7,7 @@ window["$"] = $;
require("jquery-mousewheel");
window["jQuery"] = $;
-require("./user");
+require("./user-authentication");
$(document).ready(function () {
diff --git a/src/scripts/profile.entry.ts b/src/scripts/profile.entry.ts
index b194e3a9..0cb77f50 100644
--- a/src/scripts/profile.entry.ts
+++ b/src/scripts/profile.entry.ts
@@ -1,7 +1,7 @@
///<reference path="../../typings/index.d.ts" />
import * as $ from "jquery";
import {APIController} from "./controllers/connection/api";
-import {removeUserInfo} from "./user";
+import {removeUserInfo} from "./user-authentication";
window["jQuery"] = $;
diff --git a/src/scripts/projects.entry.ts b/src/scripts/projects.entry.ts
index 9ae78586..d0ddb8b9 100644
--- a/src/scripts/projects.entry.ts
+++ b/src/scripts/projects.entry.ts
@@ -4,7 +4,7 @@ import {APIController} from "./controllers/connection/api";
import {Util} from "./util";
window["jQuery"] = $;
-require("./user");
+require("./user-authentication");
$(document).ready(() => {
diff --git a/src/scripts/user.ts b/src/scripts/user-authentication.ts
index e9d13091..e9d13091 100644
--- a/src/scripts/user.ts
+++ b/src/scripts/user-authentication.ts
diff --git a/tsconfig.json b/tsconfig.json
index b6966990..436c6181 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,7 +10,7 @@
"src/scripts/colors.ts",
"src/scripts/definitions.ts",
"src/scripts/serverconnection.ts",
- "src/scripts/user.ts",
+ "src/scripts/user-authentication.ts",
"src/scripts/util.ts",
"src/scripts/controllers/mapcontroller.ts",
"src/scripts/controllers/simulationcontroller.ts",