diff --git a/i_love_qr.svg b/i_love_qr.svg deleted file mode 100644 index d801ace..0000000 --- a/i_love_qr.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/emoji.png b/public/frown.png similarity index 100% rename from public/emoji.png rename to public/frown.png diff --git a/public/main.css b/public/main.css index bb79e66..93a2ad1 100644 --- a/public/main.css +++ b/public/main.css @@ -4,8 +4,8 @@ background-repeat: no-repeat; background-size: cover; height: 7em; - margin-bottom: 1em; - margin-top: 1em; + margin: 1em 0; + padding: 0 5px; position: relative; width: 100%; } @@ -20,82 +20,112 @@ #appTitle { color: white; - font-size: 3em; - overflow: hidden; - text-align: center; - white-space: nowrap; + font-size: 1.5em; + line-height: 3.2em; } -@media screen and (max-width: 500px) { +@media screen and (min-width: 500px) { #appTitle { - color: white; - font-size: 1.5em; - margin-left: 0; - overflow: hidden; - padding-left: 0; - padding-top: 13px; - text-align: left; - white-space: nowrap; + font-size: 3em; + line-height: 1.5em; + text-align: center; + } + + #miniImg1{ + margin: 0 0 0 2em; + } + + .status{ + width: 35%; + } + + .sticker{ + font-size: 40%; + width: 19%; } } .resultContainer { - margin-top: 1em; - overflow: hidden; + margin-top: 1em; + overflow: hidden; + width: 100%; } -.faded{ - opacity: 0.5; +.breadcrumbs{ + margin-left: 10px; } -.itemImg { - font-size: 11vw; - margin-left: -3vw; - width: 300%; +.card{ + margin: 5px; + padding: 5px; } -@media screen and (min-width: 500px) { - .itemImg { - font-size: 9vw; - margin-left: 0; - width: 100%; - } +.titleCard{ + align-items: center; + display: flex; + justify-content: space-between; +} + +.image { + flex: 1; +} + +.itemImg { + max-height: 150px; + max-width: 100%; } .itemTitle { - text-align: center; + flex: 2; } -.infoBox { - display: flex; - flex-wrap: wrap; - justify-content: space-between; +.center { + font-weight: bold; + padding: 20px; + text-align: center; } -article { - background-color: whitesmoke; - border-radius: 3px; - margin-bottom: 1em; - padding-bottom: 1em; - padding-top: 1em; +.subTitle{ + font-size: 0.75em; + font-style: italic; + font-weight: normal; } -.miniSearchItem{ - padding-bottom: 1em; - padding-top: 1em; +.right { + text-align: right; } + +.status{ + width: 65%; +} + +.faded{ + opacity: 0.5; +} + +.infoTitle{ + font-size: 2em; + margin-top: -7.5px; +} + .miniItemImg{ - width:100%; + width: 32.5%; +} +#miniImg1{ + margin: 0 0 0 0.05em; } -.searchResultList { - list-style: none; - padding: 0; + +#miniImg2{ + float: right; + margin-right: 0; } -.stickers{ +.sticker{ border: 1px dotted black; - font-size: 30%; - padding-bottom: 1em; - padding-top: 1em; + display: inline-block; + font-size: 90%; + margin: 0; + padding: 1em 0; + width: 99%; } diff --git a/public/wrench.png b/public/wrench.png new file mode 100644 index 0000000..21d8a4e Binary files /dev/null and b/public/wrench.png differ diff --git a/views/item.ejs b/views/item.ejs index c8807d2..8761768 100644 --- a/views/item.ejs +++ b/views/item.ejs @@ -1,6 +1,6 @@ <% include ./partials/header %> -
-
<% include ./partials/itemCards %>
-
<% include ./partials/itemImgInfo %>
+
+ <% include ./partials/itemCards %> + <% include ./partials/itemImgInfo %>
<% include ./partials/footer %> diff --git a/views/notFound.ejs b/views/notFound.ejs index 20dc903..f5efa0b 100644 --- a/views/notFound.ejs +++ b/views/notFound.ejs @@ -1,11 +1,9 @@ <% include ./partials/header %> - - -
+
+ frown +
+

Sorry, item not found with the id:

-

- <%= id %> -

+ <%= id %>
- <% include ./partials/footer %> diff --git a/views/partials/header.ejs b/views/partials/header.ejs index d9c57fd..f501e3c 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -11,6 +11,6 @@ - + diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index 2658c29..8b84bb6 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -1,32 +1,43 @@ -
- <%- floor.toLowerCase() %> > - <%- room.toLowerCase() %> > - <%- location.toLowerCase() %> > - <%- fixture.toLowerCase() %> + <% if (uuid) { %> -
+
<% } else { %> -
+
<% } %> -
+
<% if (picture === undefined || picture === '') { %> - + <% if (uuid) { %> + + <% } else { %> + + <% } %> <% }else{ %> - - <%}%> + <% if (uuid) { %> + + <% } else { %> + + <% } %> + <% } %>
-
+
<% if (uuid) { %> -

<%- fixture.toUpperCase().bold() %>

+
+ <%- fixture %> <% } else { %> -

<%- fixture.toUpperCase().bold() %>

+
+ <%- fixture %> <% } %> - <%- model.toLowerCase().italics() %> +
<%- model %>
+
-
+
<% if (status === 'broken') { %> - - <%}%> + <%- status %> + <% } %>
diff --git a/views/partials/itemImgInfo.ejs b/views/partials/itemImgInfo.ejs index 6a28ee2..eaec51e 100644 --- a/views/partials/itemImgInfo.ejs +++ b/views/partials/itemImgInfo.ejs @@ -1,39 +1,39 @@ <% if (HOWTO) { %> -
-

How To

+
+
How To
<%- HOWTO %>
-<%}%> +<% } %> <% if (Troubleshooting) { %> -
-

Need Help

+
+
Need Help
<%- Troubleshooting %>
<% } %> <% if ( similarItems.length > 0 ) { %> -
-

Similar Items

- <% for(var i = 0; i < similarItems.length; i++){ %> -
- <% if (!similarItems[i].picture) { %> - <% if (!similarItems[i].uuid) { %> - - <% }else{ %> - - <%}%> - <% } else{ %> - <% if (!similarItems[i].uuid) { %> - - <% }else{ %> - - <%} %> +
+
Similar Items
+
+ <% for (var i = 0; i < similarItems.length; i++) { %> + <% if (!similarItems[i].picture) { %> + <% if (!similarItems[i].uuid) { %> + + <% }else{ %> + + <%}%> + <% } else{ %> + <% if (!similarItems[i].uuid) { %> + + <% }else{ %> + <% } %> -
+ <% } %> <% } %> -
-<%}%> -
-

Details

+
+
+<% } %> +
+
Details
<%- details %>
  • model: <%- model %>
  • diff --git a/views/qrList.ejs b/views/qrList.ejs index 2b6f3d7..76bdd2e 100644 --- a/views/qrList.ejs +++ b/views/qrList.ejs @@ -1,22 +1,18 @@ <% include ./partials/header %> -
    - <% for ( var i = 0; i < matches.length; i++) {%> -
    -
    - <%- matches[i].floor.toLowerCase() %> > - <%- matches[i].room.toLowerCase() %> > - <%- matches[i].location.toLowerCase() %> > - <%- matches[i].fixture.toLowerCase() %> -
    -
    +
    +
    + <% for ( var i = 0; i < matches.length; i++) {%> +
    + <%- matches[i].qr %> + <%- matches[i].uuid %>
    -
    -
    - <%- matches[i].uuid %> -
    -
    -
    - <% } %> + <% } %> +
    <% include ./partials/footer %> diff --git a/views/recent.ejs b/views/recent.ejs index 372cf57..15aac3c 100644 --- a/views/recent.ejs +++ b/views/recent.ejs @@ -1,7 +1,7 @@ <% include ./partials/header %> -
    -

    Recently scanned QR code

    -
    +
    +

    Recently scanned QR codes

    +
      <% for(var i = 0; i <% if(allScans[i].fixture) { %> diff --git a/views/search.ejs b/views/search.ejs index 0542dd2..743a699 100644 --- a/views/search.ejs +++ b/views/search.ejs @@ -1,5 +1,5 @@ <% include ./partials/header %> -
      +
      <% matches.forEach(function(el) { %> <%- include('./partials/itemCards', el); %> <% }) %>