From e8e676d58474cc0c07de3e382a6e72c40311de27 Mon Sep 17 00:00:00 2001 From: revvie Date: Sun, 4 Mar 2018 18:43:18 +0200 Subject: [PATCH 01/10] search form --- public/main.css | 144 ++++++++++++++++++++++++++++++++++++ server/server.js | 3 +- server/templates/footer.ejs | 2 + server/templates/header.ejs | 5 +- server/templates/index.ejs | 20 ++++- server/templates/result.ejs | 3 + server/templates/search.ejs | 16 ++++ 7 files changed, 189 insertions(+), 4 deletions(-) create mode 100644 public/main.css create mode 100644 server/templates/footer.ejs create mode 100644 server/templates/result.ejs create mode 100644 server/templates/search.ejs diff --git a/public/main.css b/public/main.css new file mode 100644 index 0000000..732a23d --- /dev/null +++ b/public/main.css @@ -0,0 +1,144 @@ +@import url(https://fonts.googleapis.com/css?family=Cabin:400); + +.searchform { + background: #151515; + height: 100%; + position: absolute; + text-align: center; + width: 100%; +} + +.searchform:before, +.searchform:after { + content: ''; + display: block; + height: 1px; + left: 50%; + margin: 0 0 0 -400px; + position: absolute; + width: 800px; +} + +.searchform:before { + background: #444; + background: linear-gradient(left, #151515, #444, #151515); + top: 192px; +} + +.searchform:after { + background: #000; + background: linear-gradient(left, #151515, #000, #151515); + top: 191px; +} + +.searchform form { + background: #111; + background: linear-gradient(#1b1b1b, #111); + border: 1px solid #000; + border-radius: 5px; + box-shadow: inset 0 0 0 1px #272727; + display: inline-block; + font-size: 0px; + margin: 150px auto 0; + padding: 20px; + position: relative; + z-index: 1; +} + +.searchform input { + background: #222; + background: linear-gradient(#333, #222); + border: 1px solid #444; + border-radius: 5px 0 0 5px; + box-shadow: 0 2px 0 #000; + color: #888; + display: block; + float: left; + font-family: 'Cabin', helvetica, arial, sans-serif; + font-size: 13px; + font-weight: 400; + height: 40px; + margin: 0; + padding: 0 10px; + text-shadow: 0 -1px 0 #000; + width: 200px; +} + +.ie .searchform input { + line-height: 40px; +} + +.searchform input::-webkit-input-placeholder { + color: #888; +} + +.searchform input:-moz-placeholder { + color: #888; +} + +.searchform input:focus { + animation: glow 800ms ease-out infinite alternate; + background: #222922; + background: linear-gradient(#333933, #222922); + border-color: #393; + box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; + color: #efe; + outline: none; +} + +.searchform input:focus::-webkit-input-placeholder { + color: #efe; +} + +.searchform input:focus:-moz-placeholder { + color: #efe; +} + +.searchform button { + background: #222; + background: linear-gradient(#333, #222); + box-sizing: border-box; + border: 1px solid #444; + border-left-color: #000; + border-radius: 0 5px 5px 0; + box-shadow: 0 2px 0 #000; + color: #fff; + display: block; + float: left; + font-family: 'Cabin', helvetica, arial, sans-serif; + font-size: 13px; + font-weight: 400; + height: 40px; + line-height: 40px; + margin: 0; + padding: 0; + position: relative; + text-shadow: 0 -1px 0 #000; + width: 80px; +} + +.searchform button:hover, +.searchform button:focus { + background: #292929; + background: linear-gradient(#393939, #292929); + color: #5f5; + outline: none; +} + +.searchform button:active { + background: #292929; + background: linear-gradient(#393939, #292929); + box-shadow: 0 1px 0 #000, inset 1px 0 1px #222; + top: 1px; +} + +@keyframes glow { + 0% { + border-color: #393; + box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; + } + 100% { + border-color: #6f6; + box-shadow: 0 0 20px rgba(0,255,0,.6), inset 0 0 10px rgba(0,255,0,.4), 0 2px 0 #000; + } +} diff --git a/server/server.js b/server/server.js index ac267ea..85e28d4 100644 --- a/server/server.js +++ b/server/server.js @@ -16,6 +16,7 @@ const server = express() // set template engine server.set('view engine', 'ejs') server.set('views', path.join(__dirname, 'templates')) +server.use('/public', express.static('public')) // set up console logs in dev mode if (process.env.NODE_ENV !== 'production') { @@ -29,7 +30,7 @@ server.use(bodyParser.urlencoded({ extended: true })) server.use('/', (req, res, next) => { console.log('hello') - res.render('index') + res.render('search') }) server.use('/search', (req, res, next) => { diff --git a/server/templates/footer.ejs b/server/templates/footer.ejs new file mode 100644 index 0000000..308b1d0 --- /dev/null +++ b/server/templates/footer.ejs @@ -0,0 +1,2 @@ + + diff --git a/server/templates/header.ejs b/server/templates/header.ejs index 5960e31..1271c1e 100644 --- a/server/templates/header.ejs +++ b/server/templates/header.ejs @@ -1 +1,4 @@ -

Penis

+ + + + diff --git a/server/templates/index.ejs b/server/templates/index.ejs index 9a71e42..d889006 100644 --- a/server/templates/index.ejs +++ b/server/templates/index.ejs @@ -1,3 +1,19 @@ <% include header %> -

An awesome template

-{{>header }} + + + +Goodreads API + + + + + + +
+
+ + +
+
+ +<% include footer %> \ No newline at end of file diff --git a/server/templates/result.ejs b/server/templates/result.ejs new file mode 100644 index 0000000..4ecdd29 --- /dev/null +++ b/server/templates/result.ejs @@ -0,0 +1,3 @@ +<% include header %> + +<% include footer %> \ No newline at end of file diff --git a/server/templates/search.ejs b/server/templates/search.ejs new file mode 100644 index 0000000..309f1f4 --- /dev/null +++ b/server/templates/search.ejs @@ -0,0 +1,16 @@ +<% include header %> + + +Goodreads API + + + + + +
+
+ + +
+
+<% include footer %> \ No newline at end of file From c6ec160b6142d4724cf54f99a78523e80dc72e9f Mon Sep 17 00:00:00 2001 From: revvie Date: Sun, 4 Mar 2018 18:53:47 +0200 Subject: [PATCH 02/10] Minor correction --- server/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server.js b/server/server.js index 85e28d4..6277564 100644 --- a/server/server.js +++ b/server/server.js @@ -30,7 +30,7 @@ server.use(bodyParser.urlencoded({ extended: true })) server.use('/', (req, res, next) => { console.log('hello') - res.render('search') + res.render('index') }) server.use('/search', (req, res, next) => { From 0eca99221963efdf9b93de71fcc948cadfbf0b50 Mon Sep 17 00:00:00 2001 From: revvie Date: Sun, 4 Mar 2018 19:21:13 +0200 Subject: [PATCH 03/10] new fixes --- public/main.css | 4 ++-- server/templates/header.ejs | 6 ++++++ server/templates/index.ejs | 19 ++++++------------- server/templates/search.ejs | 14 +++++--------- 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/public/main.css b/public/main.css index 732a23d..deba120 100644 --- a/public/main.css +++ b/public/main.css @@ -69,11 +69,11 @@ } .searchform input::-webkit-input-placeholder { - color: #888; + color: #888; } .searchform input:-moz-placeholder { - color: #888; + color: #888; } .searchform input:focus { diff --git a/server/templates/header.ejs b/server/templates/header.ejs index 1271c1e..e425b08 100644 --- a/server/templates/header.ejs +++ b/server/templates/header.ejs @@ -1,4 +1,10 @@ + + + Goodreads API + + + diff --git a/server/templates/index.ejs b/server/templates/index.ejs index d889006..b5c7ad6 100644 --- a/server/templates/index.ejs +++ b/server/templates/index.ejs @@ -1,19 +1,12 @@ <% include header %> - - -Goodreads API - - - - - -
-
- - + +
+ + + -
+
<% include footer %> \ No newline at end of file diff --git a/server/templates/search.ejs b/server/templates/search.ejs index 309f1f4..d153579 100644 --- a/server/templates/search.ejs +++ b/server/templates/search.ejs @@ -1,16 +1,12 @@ <% include header %> - - -Goodreads API - - - + - -
+ +
-
+
+ <% include footer %> \ No newline at end of file From fa78f36d72693e9bbdcd69b270f82f81208a0ca2 Mon Sep 17 00:00:00 2001 From: revvie Date: Sun, 4 Mar 2018 19:37:34 +0200 Subject: [PATCH 04/10] new changes --- public/main.css | 178 ++++++++++++++++++++++++------------------------ 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/public/main.css b/public/main.css index deba120..66d40b9 100644 --- a/public/main.css +++ b/public/main.css @@ -1,143 +1,143 @@ @import url(https://fonts.googleapis.com/css?family=Cabin:400); .searchform { - background: #151515; - height: 100%; - position: absolute; - text-align: center; - width: 100%; + background: #151515; + height: 100%; + position: absolute; + text-align: center; + width: 100%; } .searchform:before, .searchform:after { - content: ''; - display: block; - height: 1px; - left: 50%; - margin: 0 0 0 -400px; - position: absolute; - width: 800px; + content: ''; + display: block; + height: 1px; + left: 50%; + margin: 0 0 0 -400px; + position: absolute; + width: 800px; } .searchform:before { - background: #444; - background: linear-gradient(left, #151515, #444, #151515); - top: 192px; + background: #444; + background: linear-gradient(left, #151515, #444, #151515); + top: 192px; } .searchform:after { - background: #000; - background: linear-gradient(left, #151515, #000, #151515); - top: 191px; + background: #000; + background: linear-gradient(left, #151515, #000, #151515); + top: 191px; } .searchform form { - background: #111; - background: linear-gradient(#1b1b1b, #111); - border: 1px solid #000; - border-radius: 5px; - box-shadow: inset 0 0 0 1px #272727; - display: inline-block; - font-size: 0px; - margin: 150px auto 0; - padding: 20px; - position: relative; - z-index: 1; + background: #111; + background: linear-gradient(#1b1b1b, #111); + border: 1px solid #000; + border-radius: 5px; + box-shadow: inset 0 0 0 1px #272727; + display: inline-block; + font-size: 0px; + margin: 150px auto 0; + padding: 20px; + position: relative; + z-index: 1; } .searchform input { - background: #222; - background: linear-gradient(#333, #222); - border: 1px solid #444; - border-radius: 5px 0 0 5px; - box-shadow: 0 2px 0 #000; - color: #888; - display: block; - float: left; - font-family: 'Cabin', helvetica, arial, sans-serif; - font-size: 13px; - font-weight: 400; - height: 40px; - margin: 0; - padding: 0 10px; - text-shadow: 0 -1px 0 #000; - width: 200px; + background: #222; + background: linear-gradient(#333, #222); + border: 1px solid #444; + border-radius: 5px 0 0 5px; + box-shadow: 0 2px 0 #000; + color: #888; + display: block; + float: left; + font-family: 'Cabin', helvetica, arial, sans-serif; + font-size: 13px; + font-weight: 400; + height: 40px; + margin: 0; + padding: 0 10px; + text-shadow: 0 -1px 0 #000; + width: 200px; } .ie .searchform input { - line-height: 40px; + line-height: 40px; } .searchform input::-webkit-input-placeholder { - color: #888; + color: #888; } .searchform input:-moz-placeholder { - color: #888; + color: #888; } .searchform input:focus { - animation: glow 800ms ease-out infinite alternate; - background: #222922; - background: linear-gradient(#333933, #222922); - border-color: #393; - box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; - color: #efe; - outline: none; + animation: glow 800ms ease-out infinite alternate; + background: #222922; + background: linear-gradient(#333933, #222922); + border-color: #393; + box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; + color: #efe; + outline: none; } .searchform input:focus::-webkit-input-placeholder { - color: #efe; + color: #efe; } .searchform input:focus:-moz-placeholder { - color: #efe; + color: #efe; } .searchform button { - background: #222; - background: linear-gradient(#333, #222); - box-sizing: border-box; - border: 1px solid #444; - border-left-color: #000; - border-radius: 0 5px 5px 0; - box-shadow: 0 2px 0 #000; - color: #fff; - display: block; - float: left; - font-family: 'Cabin', helvetica, arial, sans-serif; - font-size: 13px; - font-weight: 400; - height: 40px; - line-height: 40px; - margin: 0; - padding: 0; - position: relative; - text-shadow: 0 -1px 0 #000; - width: 80px; + background: #222; + background: linear-gradient(#333, #222); + box-sizing: border-box; + border: 1px solid #444; + border-left-color: #000; + border-radius: 0 5px 5px 0; + box-shadow: 0 2px 0 #000; + color: #fff; + display: block; + float: left; + font-family: 'Cabin', helvetica, arial, sans-serif; + font-size: 13px; + font-weight: 400; + height: 40px; + line-height: 40px; + margin: 0; + padding: 0; + position: relative; + text-shadow: 0 -1px 0 #000; + width: 80px; } .searchform button:hover, .searchform button:focus { - background: #292929; - background: linear-gradient(#393939, #292929); - color: #5f5; - outline: none; + background: #292929; + background: linear-gradient(#393939, #292929); + color: #5f5; + outline: none; } .searchform button:active { - background: #292929; - background: linear-gradient(#393939, #292929); - box-shadow: 0 1px 0 #000, inset 1px 0 1px #222; - top: 1px; + background: #292929; + background: linear-gradient(#393939, #292929); + box-shadow: 0 1px 0 #000, inset 1px 0 1px #222; + top: 1px; } @keyframes glow { - 0% { - border-color: #393; - box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; + 0% { + border-color: #393; + box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; } - 100% { + 100% { border-color: #6f6; box-shadow: 0 0 20px rgba(0,255,0,.6), inset 0 0 10px rgba(0,255,0,.4), 0 2px 0 #000; } From ff36b29ba922e76b7017c2a1a790ff5d1e95f511 Mon Sep 17 00:00:00 2001 From: revvie Date: Sun, 4 Mar 2018 19:52:52 +0200 Subject: [PATCH 05/10] new fixes --- server/templates/header.ejs | 12 ++++++------ server/templates/index.ejs | 4 ++-- server/templates/search.ejs | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/templates/header.ejs b/server/templates/header.ejs index e425b08..72cdc13 100644 --- a/server/templates/header.ejs +++ b/server/templates/header.ejs @@ -1,10 +1,10 @@ - - - Goodreads API - - - + + + Goodreads API + + + diff --git a/server/templates/index.ejs b/server/templates/index.ejs index b5c7ad6..02fd5c2 100644 --- a/server/templates/index.ejs +++ b/server/templates/index.ejs @@ -4,9 +4,9 @@
- + -
+
<% include footer %> \ No newline at end of file diff --git a/server/templates/search.ejs b/server/templates/search.ejs index d153579..a147e97 100644 --- a/server/templates/search.ejs +++ b/server/templates/search.ejs @@ -1,6 +1,6 @@ <% include header %> - +
From 62ef080b92d0928dce2fa5a9ded327fdf43f2343 Mon Sep 17 00:00:00 2001 From: revvie Date: Sun, 4 Mar 2018 20:02:28 +0200 Subject: [PATCH 06/10] more fixes --- server/templates/footer.ejs | 3 ++- server/templates/header.ejs | 15 ++++++++------- server/templates/index.ejs | 19 ++++++++++--------- server/templates/result.ejs | 2 +- server/templates/search.ejs | 15 ++++++++------- 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/server/templates/footer.ejs b/server/templates/footer.ejs index 308b1d0..9870926 100644 --- a/server/templates/footer.ejs +++ b/server/templates/footer.ejs @@ -1,2 +1,3 @@ - + + \ No newline at end of file diff --git a/server/templates/header.ejs b/server/templates/header.ejs index 72cdc13..7e9b9f8 100644 --- a/server/templates/header.ejs +++ b/server/templates/header.ejs @@ -1,10 +1,11 @@ - - - - Goodreads API - - - + + + + Goodreads API + + + \ No newline at end of file diff --git a/server/templates/index.ejs b/server/templates/index.ejs index 02fd5c2..589a4c7 100644 --- a/server/templates/index.ejs +++ b/server/templates/index.ejs @@ -1,12 +1,13 @@ <% include header %> - - -
- - - - -
+ -<% include footer %> \ No newline at end of file + +
+
+ + +
+
+ + <% include footer %> \ No newline at end of file diff --git a/server/templates/result.ejs b/server/templates/result.ejs index 4ecdd29..be8f96b 100644 --- a/server/templates/result.ejs +++ b/server/templates/result.ejs @@ -1,3 +1,3 @@ <% include header %> -<% include footer %> \ No newline at end of file + <% include footer %> \ No newline at end of file diff --git a/server/templates/search.ejs b/server/templates/search.ejs index a147e97..6798e88 100644 --- a/server/templates/search.ejs +++ b/server/templates/search.ejs @@ -1,12 +1,13 @@ <% include header %> - - -
-
- + + + +
+ + -
+
-<% include footer %> \ No newline at end of file + <% include footer %> \ No newline at end of file From dd0709fbf566483fa197d1e5b112508e766ae0e5 Mon Sep 17 00:00:00 2001 From: revvie Date: Sun, 4 Mar 2018 20:03:59 +0200 Subject: [PATCH 07/10] new fixes --- public/main.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/main.css b/public/main.css index 66d40b9..3516788 100644 --- a/public/main.css +++ b/public/main.css @@ -134,11 +134,11 @@ @keyframes glow { 0% { - border-color: #393; - box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; + border-color: #393; + box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; } 100% { - border-color: #6f6; - box-shadow: 0 0 20px rgba(0,255,0,.6), inset 0 0 10px rgba(0,255,0,.4), 0 2px 0 #000; + border-color: #6f6; + box-shadow: 0 0 20px rgba(0,255,0,.6), inset 0 0 10px rgba(0,255,0,.4), 0 2px 0 #000; } } From 8028bec8b6688beaffd07bd5eb6962e5b68881ec Mon Sep 17 00:00:00 2001 From: revvie Date: Sun, 4 Mar 2018 20:06:48 +0200 Subject: [PATCH 08/10] fix css --- public/main.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/main.css b/public/main.css index 3516788..e188a87 100644 --- a/public/main.css +++ b/public/main.css @@ -134,11 +134,11 @@ @keyframes glow { 0% { - border-color: #393; - box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; + border-color: #393; + box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; } 100% { - border-color: #6f6; - box-shadow: 0 0 20px rgba(0,255,0,.6), inset 0 0 10px rgba(0,255,0,.4), 0 2px 0 #000; + border-color: #6f6; + box-shadow: 0 0 20px rgba(0,255,0,.6), inset 0 0 10px rgba(0,255,0,.4), 0 2px 0 #000; } } From 8be52b8388b1d141cceabf50d5cd1776270289fb Mon Sep 17 00:00:00 2001 From: revvie Date: Sun, 4 Mar 2018 20:11:29 +0200 Subject: [PATCH 09/10] formmated with the script --- public/main.css | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/public/main.css b/public/main.css index e188a87..c6ae7be 100644 --- a/public/main.css +++ b/public/main.css @@ -1,5 +1,4 @@ @import url(https://fonts.googleapis.com/css?family=Cabin:400); - .searchform { background: #151515; height: 100%; @@ -11,7 +10,7 @@ .searchform:before, .searchform:after { content: ''; - display: block; + display: block; height: 1px; left: 50%; margin: 0 0 0 -400px; @@ -27,7 +26,7 @@ .searchform:after { background: #000; - background: linear-gradient(left, #151515, #000, #151515); + background: linear-gradient(left, #151515, #000, #151515); top: 191px; } @@ -46,8 +45,8 @@ } .searchform input { - background: #222; - background: linear-gradient(#333, #222); + background: #222; + background: linear-gradient(#333, #222); border: 1px solid #444; border-radius: 5px 0 0 5px; box-shadow: 0 2px 0 #000; @@ -81,12 +80,12 @@ background: #222922; background: linear-gradient(#333933, #222922); border-color: #393; - box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; + box-shadow: 0 0 5px rgba(0, 255, 0, .2), inset 0 0 5px rgba(0, 255, 0, .1), 0 2px 0 #000; color: #efe; outline: none; } -.searchform input:focus::-webkit-input-placeholder { +.searchform input:focus::-webkit-input-placeholder { color: #efe; } @@ -115,7 +114,7 @@ position: relative; text-shadow: 0 -1px 0 #000; width: 80px; -} +} .searchform button:hover, .searchform button:focus { @@ -135,10 +134,10 @@ @keyframes glow { 0% { border-color: #393; - box-shadow: 0 0 5px rgba(0,255,0,.2), inset 0 0 5px rgba(0,255,0,.1), 0 2px 0 #000; - } + box-shadow: 0 0 5px rgba(0, 255, 0, .2), inset 0 0 5px rgba(0, 255, 0, .1), 0 2px 0 #000; + } 100% { border-color: #6f6; - box-shadow: 0 0 20px rgba(0,255,0,.6), inset 0 0 10px rgba(0,255,0,.4), 0 2px 0 #000; - } -} + box-shadow: 0 0 20px rgba(0, 255, 0, .6), inset 0 0 10px rgba(0, 255, 0, .4), 0 2px 0 #000; + } +} \ No newline at end of file From 084ed8ed758b3259b8328f42a701a61b0c2ac177 Mon Sep 17 00:00:00 2001 From: Linus Miller Date: Sun, 4 Mar 2018 19:25:18 +0100 Subject: [PATCH 10/10] Fix indentation, move body and head tags into header and rename form class --- public/main.css | 36 ++++++++++++++++++------------------ server/templates/footer.ejs | 2 +- server/templates/header.ejs | 17 ++++++++++------- server/templates/index.ejs | 12 +++--------- server/templates/result.ejs | 2 +- server/templates/search.ejs | 17 +++++++---------- 6 files changed, 40 insertions(+), 46 deletions(-) diff --git a/public/main.css b/public/main.css index c6ae7be..f147ce8 100644 --- a/public/main.css +++ b/public/main.css @@ -1,5 +1,5 @@ @import url(https://fonts.googleapis.com/css?family=Cabin:400); -.searchform { +.search-form { background: #151515; height: 100%; position: absolute; @@ -7,8 +7,8 @@ width: 100%; } -.searchform:before, -.searchform:after { +.search-form:before, +.search-form:after { content: ''; display: block; height: 1px; @@ -18,19 +18,19 @@ width: 800px; } -.searchform:before { +.search-form:before { background: #444; background: linear-gradient(left, #151515, #444, #151515); top: 192px; } -.searchform:after { +.search-form:after { background: #000; background: linear-gradient(left, #151515, #000, #151515); top: 191px; } -.searchform form { +.search-form form { background: #111; background: linear-gradient(#1b1b1b, #111); border: 1px solid #000; @@ -44,7 +44,7 @@ z-index: 1; } -.searchform input { +.search-form input { background: #222; background: linear-gradient(#333, #222); border: 1px solid #444; @@ -63,19 +63,19 @@ width: 200px; } -.ie .searchform input { +.ie .search-form input { line-height: 40px; } -.searchform input::-webkit-input-placeholder { +.search-form input::-webkit-input-placeholder { color: #888; } -.searchform input:-moz-placeholder { +.search-form input:-moz-placeholder { color: #888; } -.searchform input:focus { +.search-form input:focus { animation: glow 800ms ease-out infinite alternate; background: #222922; background: linear-gradient(#333933, #222922); @@ -85,15 +85,15 @@ outline: none; } -.searchform input:focus::-webkit-input-placeholder { +.search-form input:focus::-webkit-input-placeholder { color: #efe; } -.searchform input:focus:-moz-placeholder { +.search-form input:focus:-moz-placeholder { color: #efe; } -.searchform button { +.search-form button { background: #222; background: linear-gradient(#333, #222); box-sizing: border-box; @@ -116,15 +116,15 @@ width: 80px; } -.searchform button:hover, -.searchform button:focus { +.search-form button:hover, +.search-form button:focus { background: #292929; background: linear-gradient(#393939, #292929); color: #5f5; outline: none; } -.searchform button:active { +.search-form button:active { background: #292929; background: linear-gradient(#393939, #292929); box-shadow: 0 1px 0 #000, inset 1px 0 1px #222; @@ -140,4 +140,4 @@ border-color: #6f6; box-shadow: 0 0 20px rgba(0, 255, 0, .6), inset 0 0 10px rgba(0, 255, 0, .4), 0 2px 0 #000; } -} \ No newline at end of file +} diff --git a/server/templates/footer.ejs b/server/templates/footer.ejs index 9870926..15b9011 100644 --- a/server/templates/footer.ejs +++ b/server/templates/footer.ejs @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/server/templates/header.ejs b/server/templates/header.ejs index 7e9b9f8..3eec78e 100644 --- a/server/templates/header.ejs +++ b/server/templates/header.ejs @@ -2,10 +2,13 @@ - - - Goodreads API - - - \ No newline at end of file + + + Goodreads API + + + + + + diff --git a/server/templates/index.ejs b/server/templates/index.ejs index 589a4c7..fbbfbb7 100644 --- a/server/templates/index.ejs +++ b/server/templates/index.ejs @@ -1,13 +1,7 @@ <% include header %> - +

Welcome

- -
-
- - -
-
+

To the most legit website in the world. Besides rating books you can also buy the best drugs.

- <% include footer %> \ No newline at end of file +<% include footer %> diff --git a/server/templates/result.ejs b/server/templates/result.ejs index be8f96b..795c3ce 100644 --- a/server/templates/result.ejs +++ b/server/templates/result.ejs @@ -1,3 +1,3 @@ <% include header %> - <% include footer %> \ No newline at end of file +<% include footer %> diff --git a/server/templates/search.ejs b/server/templates/search.ejs index 6798e88..fb4ab50 100644 --- a/server/templates/search.ejs +++ b/server/templates/search.ejs @@ -1,13 +1,10 @@ <% include header %> - +
+
+ + +
+
- -
-
- - -
-
- - <% include footer %> \ No newline at end of file +<% include footer %>