Merge pull request #46 from 19pdh/nabor

Nabor

6 files changed, 56 insertions, 7 deletions

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..1d953f4
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/components/JoinUs.vue b/components/JoinUs.vue
index 65431fa..13c7188 100644
--- a/components/JoinUs.vue
+++ b/components/JoinUs.vue
@@ -4,7 +4,7 @@
       <div class="title">
         <div class="text">Rozpocznij swoją harcerską przygodę!</div>
       </div>
-      <plain-button @click="$router.push('/kontakt')" text="Dołącz do nas" />
+      <plain-button @click="$router.push('/nabor')" text="Dołącz do nas" />
     </div>
   </section>
 </template>
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..65e3443
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,9 @@
+let
+  pkgs = import <nixpkgs> { };
+in
+  with pkgs;
+  mkShell {
+    buildInputs = [
+      nodejs
+    ];
+  }
diff --git a/pages/index.vue b/pages/index.vue
index 2f93914..a801653 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <oboz-widget />
+    <join-us />
     <div style="width: 100%; padding-top: 50px">
       <h1>Ostatnie wpisy z kroniki</h1>
       <post-list :posts="posts" :max="4" />
     </div>
-    <join-us />
+    <oboz-widget />
     <facebook-feed />
   </div>
 </template>
diff --git a/pages/nabor.vue b/pages/nabor.vue
new file mode 100644
index 0000000..386c3cc
--- /dev/null
+++ b/pages/nabor.vue
@@ -0,0 +1,39 @@
+<template>
+<div>
+<h2>Nabór 2020</h2>
+<div class="contact">
+<div>
+<b>19 PDH Puszcza</b>
+<p>drużynowy Patryk Niedźwiedziński</p>
+<p>Tel: 695516492</p>
+<a href="mailto:patryk.niedzwiedzinski@zhr.pl">patryk.niedzwiedzinski@zhr.pl</a>
+</div>
+<div>
+<b>19 PDH Pikada</b>
+<p>drużynowa Aleksandra Komasa</p>
+<p>Tel: 882152416</p>
+<a href="mailto:alekandra.komasa@zhr.pl">aleksandra.komasa@zhr.pl</a>
+</div>
+
+</div>
+<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSdBY-WAwsy13LQIoNl9MGYzBFZbTx8ynGf19oMyCMwurj1g8Q/viewform?embedded=true" width="100%" height="1250" frameborder="0" marginheight="0" marginwidth="0">Ładuję…</iframe>
+</div>
+</template>
+
+<style scoped>
+h2 {
+  margin-top: 20px;
+}
+
+.contact {
+  width: 100%;
+  max-width: 640px;
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: space-around;
+}
+
+.contact > div {
+  margin: 10px;
+}
+</style>
diff --git a/tests/unit/__snapshots__/storybook.test.js.snap b/tests/unit/__snapshots__/storybook.test.js.snap
index c770bf8..49e9ed5 100644
--- a/tests/unit/__snapshots__/storybook.test.js.snap
+++ b/tests/unit/__snapshots__/storybook.test.js.snap
@@ -166,7 +166,7 @@ exports[`Storyshots Posts/PostLink default 1`] = `
       <div>
         <div
           class="image"
-          style="background-image: url(/assets/og/default-tree.jpg);"
+          style="background-image: url(/assets/og/default_tree.jpg);"
         />
          
         <div
@@ -247,7 +247,7 @@ exports[`Storyshots Posts/PurePostList default 1`] = `
         <div>
           <div
             class="image"
-            style="background-image: url(/assets/og/default-tree.jpg);"
+            style="background-image: url(/assets/og/default_tree.jpg);"
           />
            
           <div
@@ -278,7 +278,7 @@ exports[`Storyshots Posts/PurePostList default 1`] = `
         <div>
           <div
             class="image"
-            style="background-image: url(/assets/og/default-tree.jpg);"
+            style="background-image: url(/assets/og/default_tree.jpg);"
           />
            
           <div
@@ -309,7 +309,7 @@ exports[`Storyshots Posts/PurePostList default 1`] = `
         <div>
           <div
             class="image"
-            style="background-image: url(/assets/og/default-tree.jpg);"
+            style="background-image: url(/assets/og/default_tree.jpg);"
           />
            
           <div