diff --git a/app.js b/app.js index 28da4da..bee395d 100644 --- a/app.js +++ b/app.js @@ -52,6 +52,9 @@ app.engine('hbs', hbs({ } }, bgImg: (name) => { + if ((typeof name) === 'object') { + name = name[0] + } name = name.toLowerCase().replace(/\s/g, '-') return `bg-${name}` } diff --git a/public/assets/img/.gitkeep b/public/assets/img/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/public/css/main.css b/public/css/main.css index 13758b5..105373b 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -11,6 +11,15 @@ height: 6rem; } +.amiri { + font-family: 'Amiri', serif; +} + +.bg-color-80{ + background: #6570D1; + opacity: 0.8; +} + /*categories images*/ .bg-construction { diff --git a/routes/serviceInfo.js b/routes/serviceInfo.js index 0e0c8dd..9a35b30 100644 --- a/routes/serviceInfo.js +++ b/routes/serviceInfo.js @@ -11,7 +11,8 @@ module.exports = (req, res) => { else { res.render('serviceInfo', { service: service, - latlng: coordinates + latlng: coordinates, + back: req.headers.referer }) } }) diff --git a/views/layouts/main.hbs b/views/layouts/main.hbs index 2bb4641..ab6e5eb 100644 --- a/views/layouts/main.hbs +++ b/views/layouts/main.hbs @@ -2,16 +2,18 @@ - {{title}} + {{{title}}} + + - + {{>header}} {{{body}}} {{>navbar}} diff --git a/views/serviceInfo.hbs b/views/serviceInfo.hbs index 85cfd90..d7f0250 100644 --- a/views/serviceInfo.hbs +++ b/views/serviceInfo.hbs @@ -1,24 +1,49 @@ -
+
+
+ +
-

{{service.name}}

-

{{text.address}} - {{service.address}}

-

{{text.accessTitle}}

-
    - {{#each service.accessOptions}} - - {{this}} - {{/each}} -
-

{{text.desc}}

{{service.desc}}

-

{{text.opens}}

{{service.open}}

-

{{text.contact}}

-

{{text.phone}}

{{service.phoneNumber}}

-

{{text.email}}

{{service.email}}

-
-
- - -
+
+
+
+

{{service.name}}

+

{{service.address}}

+
+
+

{{text.accessTitle}}

+
    + {{#each service.accessOptions}} +
    + + {{this}} +
    + {{/each}} +
+
+
+
+
+
+

{{text.desc}}

{{service.desc}}

+
+
+

{{text.opens}}

{{service.open}}

+
+

{{text.contact}}

+
+

{{text.phone}}

{{service.phoneNumber}}

+
+
+

{{text.email}}

{{service.email}}

+
+
+ + +
+
+
+ +