Merge branch 'master' into sample-offers

client/src/app.tsx

@@ -19,7 +19,7 @@ import Info from './routes/info';
 if (window.location.host === 'matescrates.au') LogRocket.init('yh0dy3/mcrates');
 
 const Main = () => {
-    const dispatch = useDispatch()
+    const dispatch = useDispatch();
 
     // i have no idea why this is needed,
     // but it makes sure the user changes actually rerender

client/src/routes/login.tsx

@@ -97,9 +97,8 @@ function LoginPage({ mode }) {
     return (
         <div class="landing">
             <Login mode={mode} />
-            <div></div>
+            <Swirl />
-            <div class='text'>
+            <div class='words'>
-                <Swirl />
                 <p>Mates Crates is a record importing service.</p>
                 <p>We bundle orders together from thousands of online stores to reduce the cost of shipping vinyl.</p>
                 <p>Based in Preston.</p>

client/src/routes/offers.tsx

@@ -16,6 +16,8 @@ function Home() {
         route('/search');
     }
 
+    if (!offers) return <div>loading...</div>;
+
     return (
         <div class={'offers'}>
             {offers.map(OfferGroup)}

client/src/routes/search.tsx

@@ -104,8 +104,7 @@ const User = () => {
                 <hr />
                 <p>Data provided by Discogs.</p>
             </div>
-            <div />
+            <div class='results'>
-            <div>
                 {infoEl}
                 {results.map(Result)}
                 {topEl}

client/src/store.tsx

@@ -11,7 +11,7 @@ export const userState = createSlice({
 
 export const offersState = createSlice({
   name: 'offers',
-  initialState: [],
+  initialState: null,
   reducers: {
     set: (state, action) => action.payload
   },

client/src/style/index.less

@@ -201,7 +201,7 @@ body {
 }
 
 main {
-    padding: 0 5% 0 5%;
+    padding: 0 var(--spacing-double) 0 var(--spacing-double);
 }
 
 button, [type=submit] {
@@ -212,19 +212,27 @@ button, [type=submit] {
 
 .landing {
     display: grid;
-    grid-template-columns: 1fr 0.5fr 2fr;
+
+    grid-template-columns: 1fr 2fr;
+    grid-gap: calc(var(--spacing-double) * 2);
+    grid-template-areas:
+        "login swirl"
+        "login words";
 
     .login {
+        grid-area: login;
         button {
             width: 100%;
         }
     }
 
     .swirl {
+        grid-area: swirl;
         height: 15rem;
     }
 
-    .text {
+    .words {
+        grid-area: words;
         text-align: center;
     }
 }
@@ -274,13 +282,18 @@ article {
 
 .search {
     display: grid;
-    grid-template-columns: 1fr 0.5fr 2fr;
+    grid-template-columns: 1fr 2fr;
 
-    article {
+    .results {
         display: grid;
-        padding: var(--spacing);
+        padding-left: var(--spacing);
-        margin-bottom: var(--spacing);
+        grid-gap: var(--spacing);
-        grid-template-columns: 1fr 4fr 1fr;
+
+        article {
+            display: grid;
+            padding: var(--spacing);
+            grid-template-columns: 1fr 4fr min-content;
+        }
     }
 
     button {
@@ -300,8 +313,7 @@ article {
     grid-template-columns:
         1fr 1fr 1fr;
 
-    grid-row-gap: var(--spacing);
+    grid-gap: var(--spacing);
-    grid-column-gap: var(--spacing);
 
     article {
         display: grid;
@@ -324,6 +336,10 @@ article {
         }
 
         padding: var(--spacing);
+
+        img {
+            justify-self: end;
+        }
     }
 }
 
@@ -412,6 +428,7 @@ header {
 .offers {
     display: grid;
     grid-template-columns: 1fr 1fr;
+    grid-gap: var(--spacing);
 
     .offer {
         display: grid;
@@ -422,7 +439,6 @@ header {
             "lines lines";
 
         padding: var(--spacing);
-        margin: var(--spacing-half);
         background: var(--background-1);
 
         .details {
@@ -483,3 +499,45 @@ header {
 
     margin-bottom: var(--spacing);
 }
+
+@media (max-width:900px)  {
+    .landing {
+        grid-template-columns: 1fr;
+        grid-template-areas:
+            "swirl"
+            "login"
+            "words";
+    }
+
+    .list {
+        grid-template-columns: 1fr;
+    }
+
+    .search {
+        grid-template-columns: 1fr;
+    }
+
+    .offers {
+        grid-template-columns: 1fr;
+    }
+
+    .info {
+        grid-template-columns: 1fr;
+        // is necessary for some reason
+        grid-template-areas:
+            "swirl"
+            "contact"
+            "words";
+    }
+
+    main {
+        padding: 0 var(--spacing) 0 var(--spacing);
+    }
+}
+
+@media (max-width:1200px) {
+    img {
+        width: 5rem;
+    }
+}
+

client/src/template.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>matescrates.au - record import service</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <% preact.headEnd %>
+  </head>
+  <body>
+    <% preact.bodyEnd %>
+  </body>
+</html>