added logo

foderking · foderking · commit 438e741ce68f · 2023-06-08T23:45:13.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ riderModule.iml
 settings.json
 appsettings.Development.json
 .vs
-.idea
+.idea
+ComicVineAPI.sln.DotSettings.user
diff --git a/ComicVine.API/Pages/Archives/Forums.cshtml.cs b/ComicVine.API/Pages/Archives/Forums.cshtml.cs
@@ -18,14 +18,8 @@ public Forums(ComicvineContext context) {
      * - filter by type
      */
     public void OnGet(int p) {
-        Entities = 
-            _context.Threads
-            .OrderBy(t => t.Id)
-            .Skip(50 * (p - 1))
-            .Take(50)
-            ;
-        
-        NavRecord = new(p, _context.Threads.Count() / 50, p.ToString());
+        Entities = Util.GetArchivedThreads(_context, p);
+        NavRecord = new(p, Util.GetThreadsMaxPage(_context), p.ToString());
     }
 
     public override Func<string, int, string> PageDelegate() {
diff --git a/ComicVine.API/Pages/Shared/_Layout.cshtml b/ComicVine.API/Pages/Shared/_Layout.cshtml
@@ -11,6 +11,9 @@
 <header>
     <nav>
         <div id="nav-root">
+            <a href="/forums" class="nav-item">
+                <img src="/images/logo.png" alt="logo" id="nav-logo"/>
+            </a>
             <span class="@Util.GetHighlightClass(ViewData, MainHighlight.Vine)">
                 <a href="/forums">Vine</a>
             </span>
diff --git a/ComicVine.API/Pages/Shared/_ProfileLayout.cshtml b/ComicVine.API/Pages/Shared/_ProfileLayout.cshtml
@@ -10,7 +10,10 @@
 <body>
 <header>
     <nav class="profile-nav">
-        <div id="nav-root" >
+        <div id="nav-root">
+            <a href="/forums" class="nav-item">
+                <img src="/images/logo.png" alt="logo" id="nav-logo"/>
+            </a>
             <span class="@Util.GetHighlightClass(ViewData, ProfileHighlight.Main)">
                 <a href="@Util.Profile.GetLink(ViewData, "/profile/")">
                     Profile
diff --git a/ComicVine.API/Pages/Util.cs b/ComicVine.API/Pages/Util.cs
@@ -60,6 +60,9 @@ public class ImgData
 
 public static class Util
 {
+    public static int ThreadPerPage = 50;
+    public static int PostsPerPage = 50;
+    
     public static string GetDuration(DateTime current, DateTime date) {
         TimeSpan dur = current - date;
         return dur.Days switch
@@ -92,8 +95,8 @@ public static string GetThreadRow(int index) {
             .Threads
             .Where(thread => thread.Creator.Text == user)
             .OrderByDescending(each => each.TotalPosts)
-            .Skip((page-1)*50)
-            .Take(50)
+            .Skip(ThreadPerPage * (page-1))
+            .Take(ThreadPerPage)
             ;
     }
 
@@ -102,11 +105,24 @@ public static string GetThreadRow(int index) {
             .Posts
             .Where(posts => posts.Creator.Text == user)
             // .OrderByDescending(each => each.Id)
-            .Skip((page-1)*50)
-            .Take(50)
+            .Skip(PostsPerPage * (page-1))
+            .Take(PostsPerPage)
             ;
     }
-    
+
+    public static IEnumerable<Parsers.Thread> GetArchivedThreads(ComicvineContext context, int page) {
+        return context
+            .Threads
+            .OrderByDescending(t => t.Id)
+            .Skip(ThreadPerPage * (page - 1))
+            .Take(ThreadPerPage)
+            ;
+    }
+
+    public static int GetThreadsMaxPage(ComicvineContext context) {
+        return context.Threads.Count() / ThreadPerPage + 1;
+    }
+
     public static string GetHighlightClass(ViewDataDictionary viewData, string expected) {
         if (expected == (string)(viewData[Keys.Highlight] ?? "")) {
             return "nav-item nav-highlight";
diff --git a/ComicVine.API/wwwroot/css/main.css b/ComicVine.API/wwwroot/css/main.css
@@ -36,7 +36,6 @@ nav {
 #nav-root {
     height: inherit;
     display: flex;
-    margin-left: 5em;
 }
 .nav-item > a {
     text-decoration: none ;
@@ -48,6 +47,9 @@ nav {
     padding-left: 1em;
     padding-right: 1em;
 }
+#nav-logo {
+    height: 3em;
+}
 .nav-highlight > a {
     color: rgb(1, 124, 55);
 }
diff --git a/ComicVine.API/wwwroot/favicon.ico b/ComicVine.API/wwwroot/favicon.ico
diff --git a/ComicVine.API/wwwroot/images/logo.png b/ComicVine.API/wwwroot/images/logo.png

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ nav {`
`36`	`36`	`#nav-root {`
`37`	`37`	`height: inherit;`
`38`	`38`	`display: flex;`
`39`		`- margin-left: 5em;`
`40`	`39`	`}`
`41`	`40`	`.nav-item > a {`
`42`	`41`	`text-decoration: none ;`
`@@ -48,6 +47,9 @@ nav {`
`48`	`47`	`padding-left: 1em;`
`49`	`48`	`padding-right: 1em;`
`50`	`49`	`}`
	`50`	`+#nav-logo {`
	`51`	`+ height: 3em;`
	`52`	`+}`
`51`	`53`	`.nav-highlight > a {`
`52`	`54`	`color: rgb(1, 124, 55);`
`53`	`55`	`}`