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

Added login route #357

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/en-US/user_guide_pypi.md
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ The following argument options are currently available:
-h, --help show this help message and exit
--conf CONF Path of config file. default:-
"~/.securetea/securetea.conf"
--debug Degug true or false
--debug Debug true or false
--twitter Setup twitter credentials
--twilio_sms Setup twilio SMS credentials
--whatsapp Setup whatsapp credentials
Expand Down
36 changes: 19 additions & 17 deletions gui/src/app/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,24 @@
<link href="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css" rel="stylesheet" />

<nav class="navbar top-navbar navbar-expand-md navbar-light">
<div class="navbar-header">
<a class="navbar-brand" href="/dashboard">
<b><img src="../assets/images/logo.png" alt="homepage" class="dark-logo" /></b>
<span><img src="../assets/images/logo-text.png" alt="homepage" class="dark-logo" /></span>
</a>
</div>
<div class="navbar-collapse">
<ul class="navbar-nav mr-auto mt-md-0">
</ul>
<ul class="navbar-nav my-lg-0">
<li class="nav-item dropdown ">
<div class="username">{{ username | titlecase}}</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle text-muted" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img src="../../assets/images/users/5.jpg" alt="user" class="profile-pic" /></a>
</li>
</ul>
<div style="display: flex;">
<div class="navbar-header">
<a class="navbar-brand" href="/dashboard">
<b><img src="../assets/images/logo.png" alt="homepage" class="dark-logo" /></b>
<span><img src="../assets/images/logo-text.png" alt="homepage" class="dark-logo" /></span>
</a>
</div>
<div class="navbar-collapse" style="margin-left:auto!important; margin-right:0!important;">
<ul class="navbar-nav my-lg-0">
<li class="nav-item dropdown ">
<div class="username">{{ username | titlecase}}</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle text-muted" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false"><img src="../../assets/images/users/5.png" alt="user"
class="profile-pic" /></a>
</li>
</ul>
</div>
</div>
</nav>
1 change: 1 addition & 0 deletions gui/src/app/register/register.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ <h1 class="ml-4">Register</h1>
<input formControlName="endpoint" class="form-control" placeholder="http://192.168.1.123:5000" required>
</div>
<h5 class="text-danger">{{error}}</h5>
<h4>Already registered? <a href="/config">Login here</a> </h4>
<button type="submit" class="btn btn-primary btn-flat m-b-30">Register</button>
</form>
</div>
Expand Down
Binary file added gui/src/assets/images/users/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion securetea/entry_points/iot_ep.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def get_args():
'--debug',
default=False,
action="store_true",
help='Degug true or false'
help='Debug true or false'
)

return parser.parse_args()
Expand Down
2 changes: 1 addition & 1 deletion securetea/entry_points/server_ep.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def get_args():
'--debug',
default=False,
action="store_true",
help='Degug true or false'
help='Debug true or false'
)

return parser.parse_args()
Expand Down
2 changes: 1 addition & 1 deletion securetea/entry_points/system_ep.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def get_args():
'--debug',
default=False,
action="store_true",
help='Degug true or false'
help='Debug true or false'
)

args = parser.parse_args()
Expand Down