Merge pull request #84 from DSACMS/nat/fe_fixes

Minor UI Fixes for V1
DSACMS · Feb 15, 2024 · ff065e9 · ff065e9
2 parents 584a3e1 + 56fc53c
commit ff065e9
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ app/node_modules
 app/dist
 app/.env
 app/site/img/*
+app/site/_includes
 !app/site/img/.keep
 .vscode/
 scripts/metricsLib/__pycache__

diff --git a/app/site/_includes/banner.liquid b/app/site/_includes/banner.liquid
@@ -1,5 +1,15 @@
-<div class="bg-orange text-white text-center font-sans-lg">
-  <div class="grid-container padding-2">Work in progress. Not an official government site.</div>
+<div class="bg-primary-lighter text-ink text-center">
+  <div class="grid-container padding-1"> 
+    <p class="usa-banner__header-text">Work in progress. We welcome questions and suggestions — 
+      <a
+      class="usa-link usa-link--external"
+      rel="noreferrer"
+      target="_blank"
+      href="https://github.com/DSACMS/metrics/issues/new"
+      >give us feedback.</a
+    >
+    </p>
+  </div>
 </div>
 <section
   class="usa-banner"

diff --git a/app/site/_layouts/org-report.liquid b/app/site/_layouts/org-report.liquid
@@ -23,7 +23,6 @@ layout: base
         <div class="stat-container" id="projects">
           <div class="projects-heading">
             <h4>
-              Repositories
               <span>
                 <svg
                   class="usa-icon"
@@ -33,14 +32,14 @@ layout: base
                   {% lucide "folder-git-2" %}
                 </svg>
               </span>
+              Repositories
             </h4>
           </div>
           <p>{{ organization.repo_count }}</p>
         </div>
         <div class="stat-container" id="followers">
           <div class="followers-heading">
             <h4>
-              Followers
               <span>
                 <svg
                   class="usa-icon"
@@ -50,6 +49,7 @@ layout: base
                   {% lucide "users-2" %}
                 </svg>
               </span>
+              Followers
             </h4>
           </div>
           <p>{{ organization.followers_count }}</p>

diff --git a/app/site/_layouts/repo-report.liquid b/app/site/_layouts/repo-report.liquid
@@ -18,7 +18,6 @@ layout: base
         <div class="stat-container" id="stars">
           <div class="stars-heading">
             <h4>
-              Stars
               <span>
                 <svg
                   class="usa-icon"
@@ -28,14 +27,14 @@ layout: base
                   {% lucide "star" %}
                 </svg>
               </span>
+              Stars
             </h4>
           </div>
           <p>{{ project.stargazers_count }}</p>
         </div>
         <div class="stat-container" id="forks">
           <div class="forks-heading">
             <h4>
-              Forks
               <span>
                 <svg
                   class="usa-icon"
@@ -45,14 +44,14 @@ layout: base
                   {% lucide "git-fork" %}
                 </svg>
               </span>
+              Forks
             </h4>
           </div>
           <p>{{ project.forks_count }}</p>
         </div>
         <div class="stat-container" id="issues">
           <div class="issues-heading">
             <h4>
-              Issues
               <span>
                 <svg
                   class="usa-icon"
@@ -62,14 +61,14 @@ layout: base
                   {% lucide "circle-dot" %}
                 </svg>
               </span>
+              Issues
             </h4>
           </div>
           <p>{{ project.issues_count }}</p>
         </div>
         <div class="stat-container" id="watchers">
           <div class="watchers-heading">
             <h4>
-              Watchers
               <span>
                 <svg
                   class="usa-icon"
@@ -79,14 +78,14 @@ layout: base
                   {% lucide "eye" %}
                 </svg>
               </span>
+              Watchers
             </h4>
           </div>
           <p>{{ project.watchers_count }}</p>
         </div>
         <div class="stat-container" id="pull-requests">
           <div class="pull-requests-heading">
             <h4>
-              Pull Requests
               <span>
                 <svg
                   class="usa-icon"
@@ -96,6 +95,7 @@ layout: base
                   {% lucide "git-pull-request" %}
                 </svg>
               </span>
+              Pull Requests
             </h4>
           </div>
           <p>{{ project.pull_requests_count }}</p>

diff --git a/app/site/index.liquid b/app/site/index.liquid
@@ -20,7 +20,7 @@ layout: base
               >Organizations
               <span class="chevrons-right">
                 <svg class="usa-icon usa-icon--size-2" aria-hidden="true" focusable="false" role="img">
-                  <use xlink:href="/assets/img/sprite.svg#navigate_far_next"></use>
+                  <use xlink:href= {{ "/assets/img/sprite.svg#navigate_far_next" | url }}></use>
                 </svg>
               </span>
             </a>
@@ -43,7 +43,7 @@ layout: base
               >Projects
               <span class="chevrons-right">
                 <svg class="usa-icon usa-icon--size-2" aria-hidden="true" focusable="false" role="img">
-                  <use xlink:href="/assets/img/sprite.svg#navigate_far_next"></use>
+                  <use xlink:href={{ "/assets/img/sprite.svg#navigate_far_next" | url }} ></use>
                 </svg>
               </span>
             </a>

diff --git a/app/site/organizations.liquid b/app/site/organizations.liquid
@@ -36,7 +36,7 @@ layout: base
                 <title id="github-{{org.name}}-title"> Follower Count</title>
                 {% lucide "users-2" %}
               </svg>
-              <span> {{ org.stargazers_count }} </span>
+              <span> {{ org.followers_count }} </span>
             </span>
           </div>
         </div>