Skip to content
This repository has been archived by the owner on Oct 28, 2024. It is now read-only.

Channel centric UI #133

Merged
merged 14 commits into from
Jul 13, 2021
Merged

Channel centric UI #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
eaaa2dc
updated package-lock
flynnduism Jul 3, 2021
5278d3e
remove HomeController
flynnduism Jul 3, 2021
561b960
uopdate account and app views
flynnduism Jul 6, 2021
f7943f4
add custom js for interactive ui elements
flynnduism Jul 9, 2021
74d1a58
reroute the logout to the app index
flynnduism Jul 9, 2021
f018301
css for channel layouts
flynnduism Jul 9, 2021
9117424
rework the ui views to use channels as a means of managing apps
flynnduism Jul 9, 2021
bfaa0f6
pr cleanup
flynnduism Jul 13, 2021
d1ab206
post-rebase fixes
flynnduism Jul 13, 2021
41068ba
ensure app directory is CamelCase Hippo
flynnduism Jul 13, 2021
aa1c939
remove .vscode dir from version control
flynnduism Jul 13, 2021
f70e0bd
add ui style to the App/Edit form
flynnduism Jul 13, 2021
31f55bc
make the channel domain text link to the url
flynnduism Jul 13, 2021
93f1c9e
cleanup old code
flynnduism Jul 13, 2021
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 Hippo/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public async Task<IActionResult> Logout()
TraceMethodEntry();

await _signInManager.SignOutAsync();
return RedirectToAction("Index", "Home");
return RedirectToAction("Index", "App");
}

[HttpPost]
Expand Down
2 changes: 1 addition & 1 deletion Hippo/Controllers/AppController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ public async Task<IActionResult> NewChannel(Guid id, AppNewChannelForm form)
return RedirectToAction(nameof(Index));
}

return View(form);
return RedirectToAction(nameof(Index));
}

private static IEnumerable<EnvironmentVariable> ParseEnvironmentVariables(string text)
Expand Down
12 changes: 0 additions & 12 deletions Hippo/Controllers/HomeController.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Hippo/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public void Configure(IApplicationBuilder app, IServiceProvider serviceProvider)
endpoints.MapReverseProxy();
endpoints.MapControllerRoute(
name: "default",
pattern: "{controller=Home}/{action=Index}/{id?}");
pattern: "{controller=App}/{action=Index}/{id?}");
});

if (HostingEnvironment.IsDevelopment() && Configuration["InMemoryDB"] != "true")
Expand Down
3 changes: 3 additions & 0 deletions Hippo/Views/Account/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@{
ViewData["Title"] = "Account";
}
70 changes: 48 additions & 22 deletions Hippo/Views/Account/Login.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,55 @@
ViewData["Title"] = "Log In";
}

<div class="row">
<div class="col-md-4">
<form asp-action="Login">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-group">
<label asp-for="UserName" class="control-label"></label>
<input asp-for="UserName" class="form-control" />
<span asp-validation-for="UserName" class="text-warning"></span>
<div class="columns is-centered">
<div class="column is-two-thirds-tablet is-two-thirds-desktop is-two-thirds-widescreen is-half-fullhd">
<h2 class="has-text-centered">Log in to <span class="has-text-primary">Hippo</span></h2>

<div class="box box-login">
<div class="card-content">
<form asp-action="Login">
<div class="field">
<label asp-for="UserName" class="label">Username</label>
<div class="control has-icons-left">
<input asp-for="UserName" type="text" class="input is-rounded is-medium is-primary" placeholder="e.g. rhymenoceros" />
<span class="icon is-left">
<i class="fa fa-user"></i>
</span>
<p asp-validation-for="UserName" class="help is-warning"></p>
</div>
</div>
<div class="field">
<label asp-for="Password" class="label">Password</label>
<div class="control has-icons-left">
<input asp-for="Password" type="password" class="input is-rounded is-medium is-primary" placeholder="make it strong!" />
<span class="icon is-left">
<i class="fa fa-lock"></i>
</span>
<p asp-validation-for="Password" class="help is-warning"></p>
</div>
</div>
<div class="field is-grouped">
<div class="control">
<button type="submit" value="Login" class="button is-rounded is-primary is-large">Login</button>
<label asp-for="RememberMe" class="checkbox">
<input asp-for="RememberMe" type="checkbox" class="checkbox is-medium" placeholder="topsecret" />
Remember me?
</label>
<span asp-validation-for="RememberMe" class="help is-warning"></span>
</div>
</div>
<div class="field">
<div class="control">
<div asp-validation-summary="ModelOnly" class="help is-alert"></div>
</div>
</div>
</form>
</div>
<div class="form-group">
<label asp-for="Password" class="control-label"></label>
<input asp-for="Password" type="password" class="form-control" />
<span asp-validation-for="Password" class="text-warning"></span>
</div>
<div class="form-group">
<label asp-for="RememberMe" class="control-label">Remember me?</label>
<input asp-for="RememberMe" type="checkbox" class="checkbox-inline" />
<span asp-validation-for="RememberMe" class="text-warning"></span>
</div>
<div class="form-group">
<input type="submit" value="Login" class="btn btn-primary" />
</div>
</form>
</div>

<div class="has-text-centered">
<p class="has-text-centered">Don't have an account yet? <a href="./register">Register</a> here.</p>
</div>
</div>
</div>

Expand Down
90 changes: 63 additions & 27 deletions Hippo/Views/Account/Register.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,70 @@
ViewData["Title"] = "Register";
}

<div class="row">
<div class="col-md-4">
<form asp-action="Register">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-group">
<label asp-for="UserName" class="control-label"></label>
<input asp-for="UserName" class="form-control" />
<span asp-validation-for="UserName" class="text-danger"></span>
<div class="columns is-centered">
<div class="column is-two-thirds-tablet is-one-third-widescreen">
<h2 class="has-text-centered">Register a <span class="has-text-primary">Hippo</span> Account</h2>

<div class="box box-register">
<div class="card-content">
<form asp-action="Login">
<div class="field">
<label asp-for="UserName" class="label">Username</label>
<div class="control has-icons-left">
<input asp-for="UserName" type="text" class="input is-rounded is-medium is-primary" placeholder="e.g. user123" />
<span class="icon is-left">
<i class="fa fa-user"></i>
</span>
<p asp-validation-for="UserName" class="help is-warning"></p>
</div>
</div>
<div class="field">
<label asp-for="Email" class="label">Email</label>
<div class="control has-icons-left">
<input asp-for="Email" type="email" class="input is-rounded is-medium is-primary" />
<span class="icon is-left">
<i class="fa fa-envelope"></i>
</span>
<p asp-validation-for="Email" class="help is-warning"></p>
</div>
</div>
<div class="field">
<label asp-for="Password" class="label">Password</label>
<div class="control has-icons-left">
<input asp-for="Password" type="password" class="input is-rounded is-medium is-primary" />
<span class="icon is-left">
<i class="fa fa-lock"></i>
</span>
<p asp-validation-for="Password" class="help is-warning"></p>
</div>
</div>
<div class="field">
<label asp-for="PasswordConfirm" class="label">Confirm Password</label>
<div class="control has-icons-left">
<input asp-for="PasswordConfirm" type="password" class="input is-rounded is-medium is-primary" />
<span class="icon is-left">
<i class="fa fa-lock"></i>
</span>
<p asp-validation-for="PasswordConfirm" class="help is-warning"></p>
</div>
</div>
<div class="field is-grouped">
<div class="control">
<button type="submit" value="Register" class="button is-rounded is-primary is-large">Register</button>
</div>
</div>
<div class="field">
<div class="control">
<div asp-validation-summary="ModelOnly" class="help is-alert"></div>
</div>
</div>
</form>
</div>
<div class="form-group">
<label asp-for="Email" class="control-label"></label>
<input asp-for="Email" class="form-control" />
<span asp-validation-for="Email" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Password" class="control-label"></label>
<input asp-for="Password" class="form-control" />
<span asp-validation-for="Password" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="PasswordConfirm" class="control-label"></label>
<input asp-for="PasswordConfirm" class="form-control" />
<span asp-validation-for="PasswordConfirm" class="text-danger"></span>
</div>
<div class="form-group">
<input type="submit" value="Register" class="btn btn-primary" />
</div>
</form>
</div>

<div class="has-text-centered">
<p class="has-text-centered">Already have an account? <a href="./login">Log in here</a>.
</div>
</div>
</div>

Expand Down
48 changes: 36 additions & 12 deletions Hippo/Views/App/Delete.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,42 @@
@model Hippo.Models.Application

<div class="container">
<div class="row">
<div class="col">
<h3>Are you sure?</h3>
</div>
<div class="col">
<form asp-action="Delete">
<input type="hidden" asp-for="Id" />
<div class="form-group btn-group">
<input type="submit" value="Delete" class="btn btn-danger" />
<a asp-action="Index" class="btn btn-secondary">Cancel</a>
@{
ViewData["Title"] = "Delete Application";
Layout = "_Layout";
}

<div class="columns is-centered">
<div class="column is-two-thirds-tablet is-two-thirds-desktop is-two-thirds-widescreen is-half-fullhd">
<div class="card is-danger">
<header class="card-header has-background-danger">
<p class="card-header-title has-text-white">Are you sure?</p>
</header>

<div class="card-content">
<div class="content">
<p>Application <code>@Html.DisplayFor(model => model.Name)</code> will be deleted.</p>
</div>
</form>
</div>

<footer class="card-content">
<form asp-action="Delete">
<input type="hidden" asp-for="Id" />
<button type="submit" value="Delete" class="button button is-danger is-outline is-rounded">Delete Application</button>
<a asp-action="Index" class="button is-link is-outlined is-rounded">Cancel</a>
</form>
</footer>

@* <div class="panel-block">
<form asp-action="Delete">
<div class="field is-grouped">
<div class="control">
<input type="hidden" asp-for="Id" />
<button type="submit" value="Delete" class="button button is-danger is-outline is-rounded">Delete Application</button>
<a asp-action="Index" class="button is-link is-outlined is-rounded">Cancel</a>
</div>
</div>
</form>
</div> *@
</div>
</div>
</div>
Loading