Added 'yanked' notice in more pages

Hirevo · Dec 16, 2019 · d27954b · d27954b
1 parent 929e2a5
commit d27954b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/src/frontend/last_updated.rs b/src/frontend/last_updated.rs
@@ -86,7 +86,7 @@ pub(crate) async fn get(ctx: Context<State>) -> Result<Response, Error> {
                 "prev": prev_page,
             },
             "results": results.into_iter().map(|(krate, keywords)| {
-                let version = state.index.latest_record(&krate.name)?.vers;
+                let record = state.index.latest_record(&krate.name)?;
                 let created_at =
                     chrono::NaiveDateTime::parse_from_str(krate.created_at.as_str(), DATETIME_FORMAT)
                         .unwrap();
@@ -96,14 +96,15 @@ pub(crate) async fn get(ctx: Context<State>) -> Result<Response, Error> {
                 Ok(json!({
                     "id": krate.id,
                     "name": krate.name,
-                    "version": version,
+                    "version": record.vers,
                     "description": krate.description,
                     "created_at": helpers::humanize_datetime(created_at),
                     "updated_at": helpers::humanize_datetime(updated_at),
                     "downloads": helpers::humanize_number(krate.downloads),
                     "documentation": krate.documentation,
                     "repository": krate.repository,
                     "keywords": keywords,
+                    "yanked": record.yanked,
                 }))
             }).collect::<Result<Vec<_>, Error>>()?,
         });

diff --git a/src/frontend/most_downloaded.rs b/src/frontend/most_downloaded.rs
@@ -86,7 +86,7 @@ pub(crate) async fn get(ctx: Context<State>) -> Result<Response, Error> {
                 "prev": prev_page,
             },
             "results": results.into_iter().map(|(krate, keywords)| {
-                let version = state.index.latest_record(&krate.name)?.vers;
+                let record = state.index.latest_record(&krate.name)?;
                 let created_at =
                     chrono::NaiveDateTime::parse_from_str(krate.created_at.as_str(), DATETIME_FORMAT)
                         .unwrap();
@@ -96,14 +96,15 @@ pub(crate) async fn get(ctx: Context<State>) -> Result<Response, Error> {
                 Ok(json!({
                     "id": krate.id,
                     "name": krate.name,
-                    "version": version,
+                    "version": record.vers,
                     "description": krate.description,
                     "created_at": helpers::humanize_datetime(created_at),
                     "updated_at": helpers::humanize_datetime(updated_at),
                     "downloads": helpers::humanize_number(krate.downloads),
                     "documentation": krate.documentation,
                     "repository": krate.repository,
                     "keywords": keywords,
+                    "yanked": record.yanked,
                 }))
             }).collect::<Result<Vec<_>, Error>>()?,
         });

diff --git a/templates/last-updated.hbs b/templates/last-updated.hbs
@@ -117,6 +117,16 @@
             font-weight: bold;
         }
 
+        .search-result-yank {
+            display: inline;
+            font-size: 11px;
+            vertical-align: 30%;
+            border: 3px solid #F52;
+            padding: 1px 6px;
+            border-radius: 7px;
+            color: #F52;
+        }
+
         .search-result-desc {
             font-size: 18px;
         }
@@ -262,7 +272,12 @@
             {{#each results}}
             <a class="search-result" href="/crates/{{ this.name }}">
                 <div class="search-result-infos">
-                    <div class="search-result-title">{{ this.name }} #{{ this.version }}</div>
+                    <div class="search-result-title">
+                        {{ this.name }} #{{ this.version }}
+                        {{#if this.yanked}}
+                        <div class="search-result-yank">YANKED</div>
+                        {{/if}}
+                    </div>
                     <div class="search-result-desc">{{ this.description }}</div>
                     {{#if this.keywords}}
                     <div class="search-result-keywords">

diff --git a/templates/most-downloaded.hbs b/templates/most-downloaded.hbs
@@ -117,6 +117,16 @@
             font-weight: bold;
         }
 
+        .search-result-yank {
+            display: inline;
+            font-size: 11px;
+            vertical-align: 30%;
+            border: 3px solid #F52;
+            padding: 1px 6px;
+            border-radius: 7px;
+            color: #F52;
+        }
+
         .search-result-desc {
             font-size: 18px;
         }
@@ -262,7 +272,12 @@
             {{#each results}}
             <a class="search-result" href="/crates/{{ this.name }}">
                 <div class="search-result-infos">
-                    <div class="search-result-title">{{ this.name }} #{{ this.version }}</div>
+                    <div class="search-result-title">
+                        {{ this.name }} #{{ this.version }}
+                        {{#if this.yanked}}
+                        <div class="search-result-yank">YANKED</div>
+                        {{/if}}
+                    </div>
                     <div class="search-result-desc">{{ this.description }}</div>
                     {{#if this.keywords}}
                     <div class="search-result-keywords">