diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html index 5178819c6bc698726b80be645753cce302029cdc..7177cc29e6122536bdfee9c4d32d499c773eff34 100644 --- a/client/src/app/app.component.html +++ b/client/src/app/app.component.html @@ -1,6 +1,8 @@ <div class="body"> <div class="navbar"> - <span class="logo" (click)="navigate('/')">SellPoint</span> + <span class="logo" (click)="navigate('/')"> + <img src="../assets/img/SellPointLogo1.png" alt="logo"> + </span> <nav> <span (click)="navigate('/annonse')">Annonser</span> <span (click)="navigate('/annonse/ny')">Lag annonse</span> @@ -25,7 +27,7 @@ </div> <div class="footer"> <div class="logo"> - <h1>SELLPOINT LOGO</h1> + <a style="display: block;" href="/"><img src="../assets/img/SellPointLogo2.png" alt="logo"></a> </div> <div class="info"> <div class="bedrift"> diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss index 02e419a33c3cd3dc93e1abb4b03a83a2872a1828..d10fc878237e1be1981f7394dda9075e28385ac1 100644 --- a/client/src/app/app.component.scss +++ b/client/src/app/app.component.scss @@ -1,5 +1,7 @@ div.body{ min-height: calc(100vh - 200px); + margin-bottom: 50px; + overflow-y: hidden; } div.navbar { @@ -18,6 +20,10 @@ div.navbar { font-size: 40px; font-weight: bold; cursor: pointer; + img { + width: 170px; + transform: translateY(3px); + } } nav { span{ diff --git a/client/src/app/home/home.component.scss b/client/src/app/home/home.component.scss index 29c63ab6b635a6ce2d674947aad1dcd2550a4a99..3008ad33cc20585d01918e6cb1da85962bf1bd12 100644 --- a/client/src/app/home/home.component.scss +++ b/client/src/app/home/home.component.scss @@ -74,6 +74,7 @@ div.postContainer{ gap: 30px; margin-bottom: 80px; transform: translateY(-150px); + justify-content: center; h2 { font-family: 'Josefin Sans', sans-serif; position: absolute; diff --git a/client/src/assets/img/SellPointLogo1.png b/client/src/assets/img/SellPointLogo1.png new file mode 100644 index 0000000000000000000000000000000000000000..bc72bfea643bbd7d1bbfb76cecd8afeec5c6cf51 Binary files /dev/null and b/client/src/assets/img/SellPointLogo1.png differ diff --git a/client/src/assets/img/SellPointLogo2.png b/client/src/assets/img/SellPointLogo2.png new file mode 100644 index 0000000000000000000000000000000000000000..18800cd32a651796818efad11274a98032c30a7b Binary files /dev/null and b/client/src/assets/img/SellPointLogo2.png differ diff --git a/server/src/controllers/postController/index.ts b/server/src/controllers/postController/index.ts index 9d1be12d67fe752bc97dd78fe2ad651531c7d9bf..b25f46f15f167909d3eace2b6cbdfdc1fb792601 100644 --- a/server/src/controllers/postController/index.ts +++ b/server/src/controllers/postController/index.ts @@ -116,7 +116,7 @@ router.route("/").get(async (request: Request, response: Response) => { if (categoryid == "undefined" || categoryid == "0") { categoryid = ""; } - if (location) { + if (location && location != "undefined") { input += ` INNER JOIN user as u ON p.owner = u.userId`; locationFilter = JSON.parse(location); }