Skip to content

Commit

Permalink
#144 Second round of UI improvements (#148)
Browse files Browse the repository at this point in the history
* #144 Add spacing

* #144 Add round #2 improvements

* #144 Prepare for versioned release
  • Loading branch information
docktermj authored Nov 21, 2024
1 parent c35fe17 commit 102e6bf
Show file tree
Hide file tree
Showing 13 changed files with 165 additions and 91 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning].

## [Unreleased]

## [0.4.2] - 2024-11-21

### Changed in 0.4.2

- UI improvements

## [0.4.1] - 2024-11-20

### Changed in 0.4.1
Expand Down
4 changes: 4 additions & 0 deletions httpserver/static/root/component/bottom-nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
<li class="nav-item">
<a class="nav-link" aria-current="page" href="https://senzing.com">Senzing</a>
</li>
<li class="nav-item">
<a class="nav-link" aria-current="page" href="https://github.com/senzing-garage/playground"><i
class="bi bi-github me-2"></i></a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown"
aria-expanded="false">
Expand Down
10 changes: 8 additions & 2 deletions httpserver/static/templates/site/csharp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@
<div id="left-nav" class="d-flex flex-column flex-shrink-0 p-3 text-bg-dark" style="width: 280px;"
w3-include-html="/component/left-nav.html">
</div>
<div class="container">
<div class="container px-5">
<div class="col-xs-12" style="height:15px;"></div>
<h1>Senzing Playground for C-sharp</h1>
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="/site/home.html">Home</a></li>
<li class="breadcrumb-item active" aria-current="page">C#</li>
</ol>
</nav>
<h1>Senzing Playground for C#</h1>
<p>C-Sharp is not ready yet.</p>
<div class="col-xs-12" style="height:350px;"></div>
<div id="bottom-nav" w3-include-html="/component/bottom-nav.html" />
Expand Down
8 changes: 7 additions & 1 deletion httpserver/static/templates/site/go/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@
<div id="left-nav" class="d-flex flex-column flex-shrink-0 p-3 text-bg-dark" style="width: 280px;"
w3-include-html="/component/left-nav.html">
</div>
<div class="container">
<div class="container px-5">
<div class="col-xs-12" style="height:15px;"></div>
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="/site/home.html">Home</a></li>
<li class="breadcrumb-item active" aria-current="page">Go</li>
</ol>
</nav>
<h1>Senzing Playground for Go</h1>
<p>Go is not ready yet.</p>
<div class="col-xs-12" style="height:350px;"></div>
Expand Down
200 changes: 119 additions & 81 deletions httpserver/static/templates/site/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div id="left-nav" class="d-flex flex-column flex-shrink-0 p-3 text-bg-dark" style="width: 280px;"
w3-include-html="/component/left-nav.html">
</div>
<div class="container">
<div id="main-container" class="container px-5">
<div class="col-xs-12" style="height:15px;"></div>
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
Expand All @@ -28,16 +28,14 @@
</nav>
<h1>Playground & Sandbox</h1>
<p>
Explore Senzing from the convenience of your workstation.
Explore Senzing SDK from the convenience of your workstation.
</p>
<p>
Depending on your goal, you may want to use the Playground
or you may want to use the Sandbox.
The <b>Playground</b> has "baked-in" features that
allow you to examine Senzing without installing anything
on your workstation.
The <b>Sandbox</b> helps you set up an environment on your
workstation to use Senzing via a gRPC server.
Depending on your goal, you may want to use the Playground or you may want to use the Sandbox. The
<b>Playground</b> has <a href="#" data-toggle="tooltip"
title="Baked-in features include: Jupyter Lab, terminal, ..." data-content="">baked-in features</a>
that allow you to examine Senzing without installing anything on your computer. The <b>Sandbox</b> helps you set
up an environment on your workstation to use Senzing via a gRPC server.
</p>
<p>
So the question is: &nbsp;<i>What is your goal?</i>
Expand All @@ -59,56 +57,19 @@ <h6>1. <b class="text-primary">I want to try Senzing SDK without installing anyt
</h2>
<div id="tabPlayground" class="accordion-collapse collapse" data-bs-parent="#accordionGoal">
<div class="col-xs-12" style="height:15px;"></div>
<i class="bi bi-arrow-right-circle-fill me-2 text-primary"></i>
Which language are you using?
<ul class="nav nav-pills mb-auto">
<li>
<a href="/site/python/playground.html" class="nav-link">
&nbsp; &nbsp;
<img src="/images/python-svgrepo-com.svg" alt="Python" width="32" height="32">
&nbsp; Python </a>
</li>
<li>
<a id="bob-java" href="/site/java.html" class="nav-link disabled">
&nbsp; &nbsp;
<img src="/images/java-icon.svg" alt="Go" width="24" height="24">
&nbsp; &nbsp; Java
</a>
</li>
<li>
<a href="/site/go.html" class="nav-link disabled">
&nbsp; &nbsp;
<img src="/images/Go-Logo_Black.svg" alt="Go" width="32" height="32">
&nbsp;Go
</a>
</li>
<li>
<a href="/site/csharp.html" class="nav-link disabled">
&nbsp; &nbsp;
<img src="/images/32px-Logo_C_sharp.svg.png" alt="C-sharp" width="24" height="24">
&nbsp; &nbsp; C#
</a>
</li>
</ul>
</div>
</div>


<div class="accordion" id="accordionGoal">
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#tabJupyter" aria-expanded="true" aria-controls="tabJupyter">
<h6>2. <b class="text-primary">I want to use my Jupyter Lab.</b> (Sandbox)</h6>
</button>
</h2>
<div id="tabJupyter" class="accordion-collapse collapse" data-bs-parent="#accordionGoal">
<div class="col-xs-12" style="height:15px;"></div>
<div class="container px-5">
<p>
In this exercise, you'll be using the built-in
<a href="https://jupyter.org/">Jupyter Lab</a>
and termimal to work with code examples that access the Senzing SDK.
Everything is included within the Docker container;
there's nothing else to install on your computer.
</p>
<i class="bi bi-arrow-right-circle-fill me-2 text-primary"></i>
Which language are you using?
<ul class="nav nav-pills mb-auto">
<li>
<a href="/site/python/jupyter-lab.html" class="nav-link">
<a href="/site/python/playground.html" class="nav-link">
&nbsp; &nbsp;
<img src="/images/python-svgrepo-com.svg" alt="Python" width="32" height="32">
&nbsp; Python </a>
Expand Down Expand Up @@ -137,24 +98,31 @@ <h6>2. <b class="text-primary">I want to use my Jupyter Lab.</b> (Sandbox)</h6>
</ul>
</div>
</div>
</div>


<div class="accordion" id="accordionGoal">
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#tabSDK" aria-expanded="true" aria-controls="tabSDK">
<h6>3. <b class="text-primary">I want to try Senzing SDK in my development environment.</b>
(Sandbox)</h6>
</button>
</h2>
<div id="tabSDK" class="accordion-collapse collapse" data-bs-parent="#accordionGoal">
<div class="col-xs-12" style="height:15px;"></div>
<div class="accordion" id="accordionGoal">
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#tabJupyter" aria-expanded="true" aria-controls="tabJupyter">
<h6>2. <b class="text-primary">I want to use my Jupyter Lab.</b> (Sandbox)</h6>
</button>
</h2>
<div id="tabJupyter" class="accordion-collapse collapse" data-bs-parent="#accordionGoal">
<div class="col-xs-12" style="height:15px;"></div>
<div class="container px-5">
<p>
Using the
<a href="https://jupyter.org/">Jupyter Lab</a>
that you already have installed on your computer,
this exercise gives you some starter Jupyter notebooks to try.
</p>
<i class="bi bi-arrow-right-circle-fill me-2 text-primary"></i>
Which language are you using?
<ul class="nav nav-pills mb-auto">
<li>
<a href="/site/python/local-development.html" class="nav-link">
<a href="/site/python/jupyter-lab.html" class="nav-link">
&nbsp; &nbsp;
<img src="/images/python-svgrepo-com.svg" alt="Python" width="32" height="32">
&nbsp; Python </a>
Expand Down Expand Up @@ -183,25 +151,37 @@ <h6>3. <b class="text-primary">I want to try Senzing SDK in my development envir
</ul>
</div>
</div>
</div>


<div class="accordion" id="accordionGoal">
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#tabMIgrate" aria-expanded="true" aria-controls="tabMIgrate">
<h6>4. <b class="text-primary">I want to migrate from using Senzing gRPC SDK to using the Senzing
native
SDK.</b></h6>
</button>
</h2>
<div id="tabMIgrate" class="accordion-collapse collapse" data-bs-parent="#accordionGoal">
<div class="col-xs-12" style="height:15px;"></div>
<div class="accordion" id="accordionGoal">
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#tabSDK" aria-expanded="true" aria-controls="tabSDK">
<h6>3. <b class="text-primary">I want to try Senzing SDK in my development environment.</b>
(Sandbox)</h6>
</button>
</h2>
<div id="tabSDK" class="accordion-collapse collapse" data-bs-parent="#accordionGoal">
<div class="col-xs-12" style="height:15px;"></div>
<div class="container px-5">
<p>
Using a development environment that you already have on your computer
(e.g.
<a href="https://code.visualstudio.com/">VSCode</a>,
<a href="https://www.eclipse.org/">Eclipse</a>,
<a href="https://developer.apple.com/xcode/">Xcode</a>,
<a href="https://www.jetbrains.com/">JetBrains</a>,
simple editor, etc.
),
this exercise gives you some starter code to try.
</p>
<i class="bi bi-arrow-right-circle-fill me-2 text-primary"></i>
Which language are you using?
<ul class="nav nav-pills mb-auto">
<li>
<a href="/site/python/migrate.html" class="nav-link">
<a href="/site/python/local-development.html" class="nav-link">
&nbsp; &nbsp;
<img src="/images/python-svgrepo-com.svg" alt="Python" width="32" height="32">
&nbsp; Python </a>
Expand Down Expand Up @@ -231,15 +211,73 @@ <h6>4. <b class="text-primary">I want to migrate from using Senzing gRPC SDK to
</div>
</div>
</div>
</div>


<div class="accordion" id="accordionGoal">
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#tabMIgrate" aria-expanded="true" aria-controls="tabMIgrate">
<h6>4. <b class="text-primary">I want to migrate from using Senzing gRPC SDK to using the Senzing
native
SDK.</b></h6>
</button>
</h2>
<div id="tabMIgrate" class="accordion-collapse collapse" data-bs-parent="#accordionGoal">
<div class="col-xs-12" style="height:15px;"></div>
<div class="container px-5">
<p>
In the preceding excerises, you accessed Senzing SDK over gRPC.
The Senzing SDK also has libraries for accessing Senzing directly.
In this exercise, you'll see how to modify your code to access
Senzing directly.
</p>
<i class="bi bi-arrow-right-circle-fill me-2 text-primary"></i>
Which language are you using?
<ul class="nav nav-pills mb-auto">
<li>
<a href="/site/python/migrate.html" class="nav-link">
&nbsp; &nbsp;
<img src="/images/python-svgrepo-com.svg" alt="Python" width="32" height="32">
&nbsp; Python </a>
</li>
<li>
<a id="bob-java" href="/site/java.html" class="nav-link disabled">
&nbsp; &nbsp;
<img src="/images/java-icon.svg" alt="Go" width="24" height="24">
&nbsp; &nbsp; Java
</a>
</li>
<li>
<a href="/site/go.html" class="nav-link disabled">
&nbsp; &nbsp;
<img src="/images/Go-Logo_Black.svg" alt="Go" width="32" height="32">
&nbsp;Go
</a>
</li>
<li>
<a href="/site/csharp.html" class="nav-link disabled">
&nbsp; &nbsp;
<img src="/images/32px-Logo_C_sharp.svg.png" alt="C-sharp" width="24" height="24">
&nbsp; &nbsp; C#
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="col-xs-12" style="height:15px;"></div>
<div id="bottom-nav" w3-include-html="/component/bottom-nav.html" />
</div>
</main>

<script type="text/javascript">
includeHTML();
$(document).ready(function () {
$('[data-toggle="tooltip"]').tooltip();
});
</script>
</body>

Expand Down
8 changes: 7 additions & 1 deletion httpserver/static/templates/site/java/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@
<div id="left-nav" class="d-flex flex-column flex-shrink-0 p-3 text-bg-dark" style="width: 280px;"
w3-include-html="/component/left-nav.html">
</div>
<div class="container">
<div class="container px-5">
<div class="col-xs-12" style="height:15px;"></div>
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="/site/home.html">Home</a></li>
<li class="breadcrumb-item active" aria-current="page">Java</li>
</ol>
</nav>
<h1>Senzing Playground for Java</h1>
<p>Java is not ready yet.</p>
<div class="col-xs-12" style="height:350px;"></div>
Expand Down
1 change: 1 addition & 0 deletions httpserver/static/templates/site/python.html
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ <h6>Migrate from gRPC SDK to core Senzing SDK</h6>
</code></pre>
</div>
with a customized version of this:
<div class="col-xs-12" style="height:15px;"></div>
<div class="mb-6 bg-light">
<pre><code>
from senzing import SzAbstractFactory, SzAbstractFactoryParameters
Expand Down
2 changes: 1 addition & 1 deletion httpserver/static/templates/site/python/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div id="left-nav" class="d-flex flex-column flex-shrink-0 p-3 text-bg-dark" style="width: 280px;"
w3-include-html="/component/left-nav-python.html">
</div>
<div class="container">
<div class="container px-5">
<div class="col-xs-12" style="height:15px;"></div>
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
Expand Down
2 changes: 1 addition & 1 deletion httpserver/static/templates/site/python/jupyter-lab.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div id="left-nav" class="d-flex flex-column flex-shrink-0 p-3 text-bg-dark" style="width: 280px;"
w3-include-html="/component/left-nav-python.html">
</div>
<div class="container">
<div class="container px-5">
<div class="col-xs-12" style="height:15px;"></div>
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div id="left-nav" class="d-flex flex-column flex-shrink-0 p-3 text-bg-dark" style="width: 280px;"
w3-include-html="/component/left-nav-python.html">
</div>
<div class="container">
<div class="container px-5">
<div class="col-xs-12" style="height:15px;"></div>
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
Expand Down
3 changes: 2 additions & 1 deletion httpserver/static/templates/site/python/migrate.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div id="left-nav" class="d-flex flex-column flex-shrink-0 p-3 text-bg-dark" style="width: 280px;"
w3-include-html="/component/left-nav-python.html">
</div>
<div class="container">
<div class="container px-5">
<div class="col-xs-12" style="height:15px;"></div>
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
Expand All @@ -43,6 +43,7 @@ <h1>Migrate from gRPC to native SDK</h1>
</code></pre>
</div>
with a customized version of this:
<div class="col-xs-12" style="height:15px;"></div>
<div class="mb-6 bg-light">
<pre><code>
from senzing import SzAbstractFactory, SzAbstractFactoryParameters
Expand Down
Loading

0 comments on commit 102e6bf

Please sign in to comment.