1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Commit graph

46 commits

Author SHA1 Message Date
Sonja Happ
03e360ff16 minor update for react-router-dom, a few fixes related to routing #368 2022-04-19 16:54:14 +02:00
irismarie
a0be74699d always show API page to admin users 2021-11-10 12:59:06 +01:00
irismarie
68a13f738a show infrastructure page to admin users (while hidden for others) 2021-04-27 11:45:20 +02:00
irismarie
11b6d13653 logo positioning, page routing corrections 2021-04-22 12:07:54 +02:00
Sonja Happ
f2d0006021 Merge branch 'master' into feature-whitelabel
# Conflicts:
#	package-lock.json
#	package.json
#	src/app.js
#	src/common/icon-button.js
#	src/ic/ics.js
#	src/scenario/scenario.js
#	src/scenario/scenarios.js
#	src/user/users.js
2021-04-21 11:47:36 +02:00
irismarie
c5420cc4a5 move IC dialog to new page 2021-04-01 12:54:05 +02:00
Sonja Happ
b39db51275 Merge branch 'master' into react-update
# Conflicts:
#	package-lock.json
#	package.json
#	src/app.js
#	src/dashboard/dashboard.js
2021-03-25 13:23:44 +01:00
irismarie
e0d7fe5538 manual merge of master 2021-03-25 11:47:39 +01:00
irismarie
ac3fa5dced disallow routing 2021-03-19 19:23:38 +01:00
irismarie
d2cd5adc14 error handling, style changes 2021-03-19 09:42:50 +01:00
Sonja Happ
f69e3e230e check if jwt is expired and redirect to logout if so #298 2021-03-18 16:28:27 +01:00
Sonja Happ
84dbb81cb0 Merge branch 'master' into react-update
# Conflicts:
#	src/app.js
#	src/dashboard/dashboard.js
#	src/ic/ic-dialog.js
#	src/user/login.js
2021-03-16 14:40:21 +01:00
irismarie
9733dcbb51 move footer to branding 2021-03-16 11:55:30 +01:00
irismarie
985bac405e changed the singleton implementation of branding, added borderradius 2021-03-16 11:23:11 +01:00
Sonja Happ
b0d96c3de9 move queries of config endpoint to componentDidMount for compatibility with React life cycle management, update a few packages 2021-03-15 16:15:10 +01:00
irismarie
715b7cf69a changed login page 2021-03-12 14:28:28 +01:00
irismarie
79a96490ed changed the logo 2021-03-11 15:42:17 +01:00
irismarie
455c0047fd separate brands 2021-03-11 14:39:12 +01:00
irismarie
5f18a9841a manual merge with master (other layout changes) 2021-03-09 17:17:15 +01:00
irismarie
d82f24dc3f icon & font 2021-03-09 16:23:56 +01:00
irismarie
81916e9275 change style for brands 2021-03-09 14:18:32 +01:00
f1fbea22a7 remove broken responsive layout 2021-03-08 22:22:27 +01:00
Sonja Happ
fc0c535d43 Merge branch 'master' into react-update and more package updates (WIP)
# Conflicts:
#	package-lock.json
#	package.json
#	src/dashboard/dashboard-button-group.js
#	src/dashboard/dashboard.js
2021-03-04 15:22:17 +01:00
irismarie
18966f86e0 Merge branch 'master' into feature-external-auth 2021-02-18 15:11:56 +01:00
irismarie
8d74f92927 redirect after logout for external auth 2021-02-18 15:08:14 +01:00
irismarie
2b7a5fe81f load config from login 2021-02-17 18:19:26 +01:00
irismarie
83674086f4 read config from backend, changed login page 2021-02-17 17:53:26 +01:00
d62ebbdcd9 add new api browser based on swagger-ui-react 2021-02-05 22:33:31 +01:00
Sonja Happ
98f1d5c3a7 WIP: update to React 17, Flux 4.0.0 2021-01-08 17:29:54 +01:00
Sonja Happ
a2c3330185 add xxl format to hidden header menu cases 2020-10-26 15:38:50 +01:00
Sonja Happ
4fa2cb13ec Clean up usage of login store, only use it for login, use the local storage in all other cases to get the token and current user. 2020-09-30 11:29:37 +02:00
Sonja Happ
fc1db84170 WIP: begin fixing application router, use token from local storage instead of LoginStore; IC websocket connects not yet working when loading dashboard #245 2020-07-20 16:26:22 +02:00
Sonja Happ
58809e3e41 add JSON.parse around current user from local storage in login 2020-03-20 11:46:43 +01:00
Sonja Happ
82874b2222 check for existing current user upon app mount 2020-03-20 11:19:26 +01:00
Sonja Happ
bc089fdc89 rename simulator to infrastructure component (ic) 2020-03-11 15:53:18 +01:00
Sonja Happ
800428b7bf remove obsolete file, mark one file as obsolete 2020-02-19 08:53:50 +01:00
Sonja Happ
6f4604c75e Removes componentWillUpdate and componentWillReceiveProps due conflicts with React's unsafe life cycles #212 2020-01-16 15:11:17 +01:00
Sonja Happ
6a2201a59a Remove logging output and do not load simulator and scenarios upon login since they are loaded in their containers anyway 2019-11-28 16:17:25 +01:00
Sonja Happ
0895ad3c85 Major modifications in login data management:
- only token and currentUser are stored (and error msg if any)
- token and current User are stored in local storage and used by app.js
- placeholders in user edit dialogs are replaced by actual values (except for pw)
- UserStore is renamed to LoginStore to resolve naming confusion
- Error notifications are moved to react components instead of data managers/ dispatchers
- updateCurrentUser method was added in UserDataManager for updating own user #197
- cleanup of edit-own-user dialog #197
2019-11-28 16:01:17 +01:00
Sonja Happ
e50a43a569 Dashboards are now reachable via scenarios, removed example dashboard 2019-11-26 16:33:57 +01:00
Laura Fuentes Grau
ab714e6896 wip: dashboardA and widgets can be accessed but aren't rendered yet 2019-11-24 20:32:12 +01:00
Laura Fuentes Grau
700c64fc1f wip #210 fixed query parameters, added an example dashboard file for testing 2019-11-12 15:17:40 +01:00
Laura Fuentes Grau
5ecb254e13 renamed visualization to dashboard 2019-10-29 14:41:35 +01:00
Sonja Happ
c9d678d8df add user component and menu item for account management, WIP 2019-10-07 16:04:34 +02:00
Sonja Happ
67b7b876fd Merge branch 'new-api-restructuring' into new-api-add-scenario
# Conflicts:
#	src/app.js
2019-08-20 15:06:42 +02:00
Sonja Happ
f468b44557 Refactoring of js code base:
- Grouping js files based on the elements of the data model instead of parent js class
- All js files providing functionality for one element of the data model are now in one folder; this makes is easier to implement changes for one element in all affected files/ classes
- js files which are common to multiple elements are in the common folder
- The new structure is more in alignment with the new Go backend code base structure
- This commit does not contain any changes in functionality of the frontend
2019-08-20 14:46:33 +02:00
Renamed from src/containers/app.js (Browse further)