Finish basic page output

LinwoodDev · Jan 26, 2024 · 16df83b · 16df83b
1 parent 8baac09
commit 16df83b
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 14 deletions.
diff --git a/cli/assets/layouts/asset.hbs b/cli/assets/layouts/asset.hbs
@@ -3,8 +3,8 @@
     <div class="container">
         <h1>{{asset.name}}</h1>
         <li>
-            <ul><a href="{{info.root}}/assets/{{asset.name}}/changes">Home</a></ul>
-            <ul><a href="{{info.root}}/assets/{{asset.name}}/changes">Changes</a></ul>
+            <ul><a href="{{info.root}}/{{asset.author}}/{{asset.name}}">Home</a></ul>
+            <ul><a href="{{info.root}}/{{asset.author}}/{{asset.name}}/changes.html">Changes</a></ul>
         </li>
     </div>
     {{> @partial-block }}

diff --git a/cli/assets/layouts/base.hbs b/cli/assets/layouts/base.hbs
@@ -4,10 +4,11 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{> title}}</title>
-    <link rel="stylesheet" href="{{info.root}}/assets/css/style.css">
+    <link rel="stylesheet" href="{{info.root}}/style.css">
+    <link rel="stylesheet" href="{{info.root}}/custom.css">
 </head>
 <body>
-{{> layouts/navbar}}
+{{> layouts/navbar.hbs}}
 {{> @partial-block }}
 </body>
 </html>
diff --git a/cli/assets/layouts/navbar.hbs b/cli/assets/layouts/navbar.hbs
@@ -5,7 +5,7 @@
     </button>
     <ul class="navbar-items">
         <li class="navbar-search">
-            <form action="{{info.root}}/search" method="GET">
+            <form action="{{info.root}}/search.html" method="GET">
                 <input type="text" name="q" placeholder="Search">
             </form>
         </li>

diff --git a/cli/assets/public/style.css b/cli/assets/public/style.css
@@ -30,9 +30,23 @@ html, body {
 .item-list {
     display: flex;
     flex-direction: column;
-    gap: 1rem;
+    gap: 1em;
 }
 
 .item-list-entry {
     list-style-type: none;
 }
+
+.button {
+    background-color: var(--primary-color);
+    color: var(--primary-color-text);
+    border: 0;
+    padding: 1em 0.5em;
+    border-radius: 1em;
+    text-decoration: none;
+}
+
+.header {
+    display: flex;
+    justify-content: space-between;
+}
diff --git a/cli/assets/templates/asset/changes.hbs b/cli/assets/templates/asset/changes.hbs
@@ -5,12 +5,14 @@
   <div class="container">
     <ul class="item-list">
         {{#each asset.versions}}
-            <li clas="item-list-entry">
-                <h2>{{this.name}}</h2>
-                <a href="{{this.download_url}}">Download</a>
+            <li class="item-list-entry">
+                <div class="header">
+                    <h2>{{this.name}}</h2>
+                    <a class="button" href="{{this.download_url}}">Download</a>
+                </div>
                 <p>{{this.changes}}</p>
             </li>
         {{/each}}
     </ul>
   </div>
-{{/layouts/base.hbs}}
+{{/layouts/asset.hbs}}
diff --git a/cli/assets/templates/asset/index.hbs b/cli/assets/templates/asset/index.hbs
@@ -4,4 +4,4 @@
         <p>{{asset.description}}</p>
         <p>{{asset.current_version.changes}}</p>
     </div>
-{{/layouts/base.hbs}}
+{{/layouts/asset.hbs}}
diff --git a/cli/src/docs.rs b/cli/src/docs.rs
@@ -24,6 +24,8 @@ struct Templates;
 #[folder = "assets/public"]
 struct Public;
 
+const ASSET_PAGES: [&str; 2] = ["index", "changes"];
+
 pub fn generate_docs(data: &RepositoryData, output : String) -> Result<(), DocsError> {
     let mut hb = Handlebars::new();
     hb.register_embed_templates::<Templates>()?;
@@ -40,7 +42,10 @@ pub fn generate_docs(data: &RepositoryData, output : String) -> Result<(), DocsE
             "asset": asset,
             "info": data.info
         });
-        render_dynamic("asset", &format!("{}/{}", asset.author, asset.name), &hb, &output, context)?;
+        fs::create_dir_all(format!("{}/{}/{}", output, &asset.author, &asset.name))?;
+        for page in ASSET_PAGES {
+            render_dynamic(&format!("asset/{}", &page), &format!("{}/{}/{}", &asset.author, &asset.name, &page), &hb, &output, context)?;
+        }
     }
 
     for file in Public::iter() {

diff --git a/example/content/codedoctor/assets/testasset/config.toml b/example/content/codedoctor/assets/testasset/config.toml
@@ -1,4 +1,13 @@
 name = "testasset"
-author = "obiwan"
+author = "codedoctor"
 id = "LEL"
-tags = ["test", "asset"]
+tags = ["test", "asset"]
+
+previous_versions = []
+
+[current_version]
+name = "1.0"
+changes = "Nothing"
+download_url = "https://example.com"
+sha256 = "test"
+