about summary refs log tree commit diff
path: root/pages
diff options
context:
space:
mode:
authorPatryk Niedźwiedziński <pniedzwiedzinski19@gmail.com>2019-12-06 17:42:16 -0500
committerGitHub <noreply@github.com>2019-12-06 17:42:16 -0500
commitc1bb2e70e0a85227df899eccc6ac8cf661afe350 (patch)
treea12f43e34e0d32e68f0a14c9512b2b08af54829b /pages
parentfaaf63ad895bd51541a9984273d52c71645a0b28 (diff)
parentc7306cfdbaa50c89639fe38bb1b4005ed3555422 (diff)
downloadpuszcza-c1bb2e70e0a85227df899eccc6ac8cf661afe350.tar.gz
puszcza-c1bb2e70e0a85227df899eccc6ac8cf661afe350.zip
Merge pull request #14 from 19pdh/develop
Storybook and license
Diffstat (limited to 'pages')
-rw-r--r--pages/do-pobrania.vue29
-rw-r--r--pages/index.vue23
-rw-r--r--pages/kronika/_year/_month/_day/_title/index.vue16
-rw-r--r--pages/kronika/index.vue44
4 files changed, 59 insertions, 53 deletions
diff --git a/pages/do-pobrania.vue b/pages/do-pobrania.vue
index dd6b507..453b8d4 100644
--- a/pages/do-pobrania.vue
+++ b/pages/do-pobrania.vue
@@ -1,11 +1,34 @@
 <template>
   <div class="container">
     <h1>Do pobrania</h1>
-    <a class="link" href="/files/Karta_próby_na_sprawność.pdf">Karta próby na sprawność</a>
-    <a class="link" href="/files/Próba_Harcerza.pdf">Próba Harcerza</a>
+    <a
+      v-for="{ file, title } in files"
+      :key="file"
+      class="link"
+      :href="`/files/${file}`"
+    >
+      {{ title }}
+    </a>
   </div>
 </template>
 
+<script>
+export default {
+  data() {
+    return {
+      files: [
+        {
+          file: 'Karta_próby_na_sprawność.pdf',
+          title: 'Karta próby na sprawność'
+        },
+        { file: 'Próba_Harcerza.pdf', title: 'Próba Harcerza' },
+        { file: 'Książeczka_sprawności.pdf', title: 'Książeczka sprawności' }
+      ]
+    }
+  }
+}
+</script>
+
 <style scoped>
 .container {
   display: flex;
@@ -15,4 +38,4 @@
 .link {
   margin: 5px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/index.vue b/pages/index.vue
index 736e7f4..045025d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,16 +1,23 @@
 <template>
   <div>
-    <JoinUs />
-    <FacebookFeed />
+    <join-us />
+    <div style="width: 100%; padding-top: 50px">
+      <h1>Ostatnie wpisy z kroniki</h1>
+      <post-list :posts="posts" :max="4" />
+    </div>
+    <facebook-feed />
   </div>
 </template>
 
 <script>
-import JoinUs from "../components/JoinUs.vue";
-import FacebookFeed from "../components/FacebookFeed.vue";
+import JoinUs from '~/components/JoinUs.vue'
+import FacebookFeed from '~/components/Facebook/FacebookFeed.vue'
+import PostList from '~/components/Posts/PostList'
+import postListParentMixin from '~/components/Posts/PostList/parentMixin'
 
 export default {
-  name: "HomeView",
-  components: { JoinUs, FacebookFeed }
-};
-</script>
\ No newline at end of file
+  name: 'HomeView',
+  components: { JoinUs, FacebookFeed, PostList },
+  mixins: [postListParentMixin]
+}
+</script>
diff --git a/pages/kronika/_year/_month/_day/_title/index.vue b/pages/kronika/_year/_month/_day/_title/index.vue
index fa9a9ab..9fab1d0 100644
--- a/pages/kronika/_year/_month/_day/_title/index.vue
+++ b/pages/kronika/_year/_month/_day/_title/index.vue
@@ -4,9 +4,9 @@
       <h1>404</h1>
       <p>Nie znaleziono wpisu</p>
     </div>
-    <div v-else class="article">
+    <section v-else class="article">
       <article class="content" v-html="content"></article>
-    </div>
+    </section>
   </div>
 </template>
 
@@ -71,6 +71,12 @@ export default {
   width: 100%;
   border-radius: 5px;
 }
+
+.article h1 {
+  font-size: 1.5em;
+  letter-spacing: 0;
+}
+
 @media (max-width: 720px) {
   .article {
     padding: 60px 20px;
@@ -78,5 +84,9 @@ export default {
   .article p {
     text-align: justify;
   }
+  .article h1 {
+    font-size: 1.7em;
+    font-weight: 700;
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/kronika/index.vue b/pages/kronika/index.vue
index 4a89a48..8142a6c 100644
--- a/pages/kronika/index.vue
+++ b/pages/kronika/index.vue
@@ -1,52 +1,18 @@
 <template>
   <div style="padding-top: 20px">
     <h2>Ostatnie wpisy</h2>
-    <div class="post-list">
-      <chronicle-post
-        v-for="(post, index) in posts"
-        :key="index"
-        :route="post.route"
-        :title="post.content.meta.title"
-        :description="post.content.description"
-      />
-    </div>
+    <post-list :posts="posts" />
   </div>
 </template>
 
 <script>
-import ChroniclePost from '~/components/ChroniclePost'
-import k from '~/api'
+import PostList from '~/components/Posts/PostList'
+import postListParentMixin from '~/components/Posts/PostList/parentMixin'
 
 export default {
   components: {
-    ChroniclePost
+    PostList
   },
-  async asyncData() {
-    return {
-      posts: k.getPosts()
-    }
-  },
-  mounted() {
-    this.getPosts()
-  },
-  methods: {
-    getPosts() {
-      if (this.posts.length < 1) {
-        this.$axios
-          .get(`${window.location.origin}/api/posts.json`)
-          .then(r => (this.posts = r.data))
-      }
-      console.log(this.posts)
-    }
-  }
+  mixins: [postListParentMixin]
 }
 </script>
-
-<style scoped>
-.post-list {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-  max-width: 900px;
-}
-</style>
\ No newline at end of file