From d0bffca00a51c9542b70f7972c34288fa38a9069 Mon Sep 17 00:00:00 2001 From: Ambrose Chua Date: Thu, 1 Dec 2016 11:35:25 +0800 Subject: [PATCH] Various additions --- assets/bid.js | 4 +- assets/item.css | 4 +- assets/items.css | 26 +++++++++++-- assets/main.css | 43 +++++++++++++++++++- routes.js | 5 +++ views/index.hbs | 14 +++---- views/item.hbs | 82 +++++++++++++++++++-------------------- views/items.hbs | 24 ++++++------ views/layouts/default.hbs | 17 +++++++- 9 files changed, 146 insertions(+), 73 deletions(-) diff --git a/assets/bid.js b/assets/bid.js index 0c02d75..1fa2b6f 100644 --- a/assets/bid.js +++ b/assets/bid.js @@ -40,7 +40,9 @@ $('#placeBid').click(function () { var update = function update() { var success = function success(data) { - $('#highest').text('$' + (data.bid.highest || data.bid.starting)); + if (data.bid) { + $('#highest').text('$' + (data.bid.highest || data.bid.starting)); + } }; var error = function error(xhr) { diff --git a/assets/item.css b/assets/item.css index 1d2d818..ad43976 100644 --- a/assets/item.css +++ b/assets/item.css @@ -6,10 +6,10 @@ } .images { - margin: -1em; + margin: -1rem; } .image { - margin: 1em; + margin: 1rem; } @media (min-width: 768px) { diff --git a/assets/items.css b/assets/items.css index 69f499b..a6857c7 100644 --- a/assets/items.css +++ b/assets/items.css @@ -1,10 +1,26 @@ .items { - margin: -1em; + margin: -1rem; } .item { - margin: 1em; + margin: 1rem; } +.item { + position: relative; +} +.item:after { + content: ''; + display: block; + width: 100%; + padding-top: calc(10 / 16 * 100%); +} +.item a { + display: block; + position: absolute; + top: 0; +} + + @media (min-width: 768px) { .items { display: flex; @@ -12,6 +28,10 @@ } .item { flex: 1 0 auto; - width: calc(50% - 4em); + width: calc(50% - 4rem); + } + + .item:after { + padding-top: calc(4 / 3 * 100%); } } diff --git a/assets/main.css b/assets/main.css index e88fde5..c971ce1 100644 --- a/assets/main.css +++ b/assets/main.css @@ -1,3 +1,42 @@ -main { - padding-top: 6vw; +body { + font-family: "Fira Sans", + -apple-system, + BlinkMacSystemFont, + "Segoe UI", + "Roboto", + "Helvetica Neue", Arial, sans-serif; + -webkit-font-smoothing: antialiased; +} + +.navbar-brand { + /* font-weight: 600; */ + +} + + + +main, +main.container-fluid { + padding: 1rem; +} + +.navbar { + margin-bottom: 1rem; +} + +@media (min-width: 768px) { + main, + main.container-fluid { + padding: 2rem; + } + + .navbar { + margin-bottom: 2rem; + } +} + +@media (max-width: 480px) { + .navbar-brand { + width: 100%; + } } diff --git a/routes.js b/routes.js index f0d234a..377cf95 100644 --- a/routes.js +++ b/routes.js @@ -32,6 +32,11 @@ routes.use(bodyparser.urlencoded({ const logic = new Logic(); const config = logic.getConfig(); +routes.get('/*', (req, res, next) => { + res.set('Cache-Control', 'no-cache, no-store'); + next(); +}); + routes.get('/', (req, res, next) => { logic.getIndex().then((content) => { res.render('index', { diff --git a/views/index.hbs b/views/index.hbs index ec2a45b..588402a 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -1,11 +1,9 @@ -
-
-
- {{{content}}} +
+
+ {{{content}}} - +
-
+ diff --git a/views/item.hbs b/views/item.hbs index fede355..7449318 100644 --- a/views/item.hbs +++ b/views/item.hbs @@ -1,55 +1,51 @@ {{#if item}} {{#with item}} -
-
-
- - -
+
+
+ +
-
-
-
- {{#each images}} -
- - - - -
- {{/each}} +
+
+
+
+ {{#each images}} +
+ + + +
-
-
-
Description
-

{{description}}

-
{{#if bid.highest}}Highest{{else}}Starting{{/if}} bid
-

${{#if bid.highest}}{{bid.highest}}{{else}}{{bid.starting}}{{/if}}

-
-
-
- $ - - - - -
-
-
+ {{/each}}
-
+
+
Description
+

{{description}}

+
{{#if bid.highest}}Highest{{else}}Starting{{/if}} bid
+ ${{#if bid.highest}}{{bid.highest}}{{else}}{{bid.starting}}{{/if}} +
+
+
+ $ + + + + +
+
+
+
+ {{/with}} {{else}} -
-
-
-
- Error! Item not found. -
+
+
+
+ Error! Item not found.
-
+ {{/if}} @@ -60,7 +56,7 @@ -

Place bid

+
Place bid
diff --git a/views/items.hbs b/views/items.hbs index 47fc955..fb18e2c 100644 --- a/views/items.hbs +++ b/views/items.hbs @@ -1,16 +1,14 @@ -
-
-
-
- {{#each items}} -
- - - - -
- {{/each}} +
+
+
+ {{#each items}} +
+ + + +
+ {{/each}}
-
+
diff --git a/views/layouts/default.hbs b/views/layouts/default.hbs index d8ef569..8f89e9a 100644 --- a/views/layouts/default.hbs +++ b/views/layouts/default.hbs @@ -4,13 +4,28 @@ {{#if title}}{{title}}{{else}}{{@root.config.title}}{{/if}} + - {{{body}}} +
+
+
+ +
+
+ + {{{body}}} +