Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Backend Login via UI #1013

Merged
merged 32 commits into from
Apr 30, 2021

Conversation

fabianfnc
Copy link
Contributor

grafik

@fabianfnc fabianfnc closed this Mar 25, 2020
@fabianfnc fabianfnc deleted the feature/backend_login_mockup branch March 25, 2020 16:31
@fabianfnc fabianfnc restored the feature/backend_login_mockup branch March 25, 2020 16:40
@fabianfnc fabianfnc reopened this Mar 25, 2020
@sfeilmeier sfeilmeier changed the title Backend Login Mockup [WIP] Backend Login Mockup Mar 26, 2020
@sfeilmeier sfeilmeier changed the title [WIP] Backend Login Mockup [WIP] Backend Login via UI Mar 26, 2020
# Conflicts:
#	ui/src/app/index/index.component.html
@fabianfnc
Copy link
Contributor Author

new login screen
grafik
grafik

@fabianfnc
Copy link
Contributor Author

grafik

fabianfnc and others added 5 commits November 4, 2020 12:48
adjust side menu button visibility while in user component
adjust back button for user component
created base for user component
add translation
# Conflicts:
#	ui/src/app/app.component.html
#	ui/src/app/index/index.component.html
#	ui/src/app/shared/service/service.ts
…ianfnc/openems into pr/1013

# Conflicts:
#	ui/src/app/app.component.html
#	ui/src/app/index/index.component.html
#	ui/src/app/shared/service/service.ts
finish user area mockup
adjust user component layout
fabianfnc pushed a commit to fabianfnc/openems that referenced this pull request Nov 10, 2020
# Conflicts:
#	io.openems.backend.metadata.api/src/io/openems/backend/metadata/api/BackendUser.java
#	io.openems.backend.uiwebsocket.impl/src/io/openems/backend/uiwebsocket/impl/OnOpen.java
#	io.openems.backend.uiwebsocket/src/io/openems/backend/uiwebsocket/impl/OnRequest.java
#	io.openems.common/src/io/openems/common/jsonrpc/notification/AuthenticateWithSessionIdNotification.java
#	io.openems.common/src/io/openems/common/jsonrpc/request/AuthenticateWithPasswordRequest.java
#	io.openems.common/src/io/openems/common/jsonrpc/response/AuthenticateWithPasswordResponse.java
#	io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnOpen.java
#	io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnRequest.java
#	ui/package-lock.json
#	ui/package.json
#	ui/src/app/about/about.component.html
#	ui/src/app/app-routing.module.ts
#	ui/src/app/app.module.ts
#	ui/src/app/index/index.component.html
#	ui/src/app/shared/jsonrpc/notification/authenticatedWithSessionIdNotification.ts
@sfeilmeier sfeilmeier merged commit 020d3b8 into OpenEMS:develop Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants