From 52434cea98535f8cd0e70fdbeaa821b24a996792 Mon Sep 17 00:00:00 2001
From: aradjafari <arad.jafari@gmail.com>
Date: Fri, 29 Oct 2021 23:40:18 +0200
Subject: [PATCH] SCrolling box fix

---
 client/src/App.css         | 10 +++-------
 server/src/server.ts       |  8 ++++----
 server/src/server_local.ts |  9 ++++-----
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/client/src/App.css b/client/src/App.css
index a46648f..cce19c6 100644
--- a/client/src/App.css
+++ b/client/src/App.css
@@ -14,8 +14,7 @@
 }
 
 .header {
-  position: fixed;
-  width: 100%;
+
   background-color: rgb(1, 0, 34);
   min-height: 5vh;
   display: flex;
@@ -26,7 +25,7 @@
   color: white;
   font-size: large;
   margin: auto;
-  z-index: 10;
+ 
 }
 
 #textfield1, #textfield2, #checkbox1  {
@@ -57,10 +56,7 @@
   }
 }
 
-#tableContainer{
-  position: absolute;
-  margin-top: 5vh;
-}
+
 
 table {
   table-layout:fixed;
diff --git a/server/src/server.ts b/server/src/server.ts
index e0c7836..0dedc9b 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -129,7 +129,7 @@ const Mutation = new GraphQLObjectType({
                 cover_image: { type: GraphQLString }
             },
             async resolve(parent: any, args: any) { 
-                const response = await sendQuery('INSERT INTO movie VALUES ({$args.id}, {$args.title}, {$args.genre}, {$args.rating_dice_throw}, {$args.year}, {$args.director_first_name}, {$args.director_last_name}, {$args.description}, {$args.cover_image})');
+                const response = await sendQuery('INSERT INTO movie VALUES (${args.id}, ${args.title}, ${args.genre}, ${args.rating_dice_throw}, ${args.year}, ${args.director_first_name}, ${args.director_last_name}, ${args.description}, ${args.cover_image})');
                 return response[0];
             }
         },
@@ -139,7 +139,7 @@ const Mutation = new GraphQLObjectType({
                 id: {type: GraphQLInt}
             },
             async resolve(parent: any, args: any) { 
-                const response = await sendQuery('DELETE FROM movie WHERE id = {$args.id}');
+                const response = await sendQuery('DELETE FROM movie WHERE id = ${args.id}');
                 return response[0];
             }
         },
@@ -157,7 +157,7 @@ const Mutation = new GraphQLObjectType({
                 cover_image: { type: GraphQLString }
             },
             async resolve(parent: any, args: any) { 
-                const response = await sendQuery('UPDATE movie SET title = {$args.title}, genre = {$args.genre}, rating_dice_throw = {$args.rating_dice_throw}, year = {$args.year}, director_first_name = {$args.director_first_name}, director_last_name = {$args.director_last_name} , description = {$args.description}, cover_image = {$args.cover_image} WHERE id = {$args.id}');
+                const response = await sendQuery('UPDATE movie SET title = ${args.title}, genre = ${args.genre}, rating_dice_throw = ${args.rating_dice_throw}, year = ${args.year}, director_first_name = ${args.director_first_name}, director_last_name = ${args.director_last_name} , description = ${args.description}, cover_image = ${args.cover_image} WHERE id = ${args.id}');
                 return response[0];
             }
         },
@@ -168,7 +168,7 @@ const Mutation = new GraphQLObjectType({
                 rating_dice_throw: { type: GraphQLInt }
             },
             async resolve(parent: any, args: any) { 
-                const response = await sendQuery('UPDATE movie SET rating_dice_throw =  {$args.rating_dice_throw} WHERE id = {$args.id}');
+                const response = await sendQuery('UPDATE movie SET rating_dice_throw =  ${args.rating_dice_throw} WHERE id = ${args.id}');
                 return response[0];
             }
         }
diff --git a/server/src/server_local.ts b/server/src/server_local.ts
index e005c64..70cd2d5 100644
--- a/server/src/server_local.ts
+++ b/server/src/server_local.ts
@@ -76,7 +76,9 @@ const RootQuery = new GraphQLObjectType({
                 let query = '';
                 if(typeof args.title!='undefined'  && typeof args.genre!='undefined'){
                     console.log("resolve")
-                    query = getSearchQuery(args.title, args.genre, args.order)}
+                    query = getSearchQuery(args.title, args.genre)}
+                
+                if(args.order) {query += ' ORDER BY year DESC;';}
                 const response = await sendQuery(query);
                 return response[0];
             }
@@ -88,7 +90,7 @@ function getQuery(key: string, value: string){
     return 'SELECT * FROM movie WHERE ' + key + ' = "'  + value + '"'
 }
 
-function getSearchQuery(title: string, genre: string, order: boolean): string {
+function getSearchQuery(title: string, genre: string): string {
     let query = 'SELECT * FROM movie'
     if (title != '') {
         query = query + ' WHERE title LIKE "%' + title + '%"'
@@ -102,9 +104,6 @@ function getSearchQuery(title: string, genre: string, order: boolean): string {
     if (genre != '') {
         query = query +  ' genre LIKE "%' + genre + '%"'
     }
-    if (order) {
-        query = query + ' ORDER BY year DESC'
-    }
     console.log(query)
     return query
 }
-- 
GitLab