From af06d79ac92460ae1a924a7e1d72f5c376c61663 Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Wed, 28 Aug 2019 22:34:06 +0200 Subject: Add footer --- public/assets/krajka-logo.svg | 39 ++++++--------------- src/App.vue | 28 ++++++++++++--- src/components/Footer.vue | 81 +++++++++++++++++++++++++++++++++++++++++++ src/components/NavBar.vue | 8 +++-- src/router/index.js | 26 +++++++------- src/views/AboutView.vue | 3 ++ src/views/GalleryView.vue | 3 -- 7 files changed, 135 insertions(+), 53 deletions(-) create mode 100644 src/components/Footer.vue create mode 100644 src/views/AboutView.vue delete mode 100644 src/views/GalleryView.vue diff --git a/public/assets/krajka-logo.svg b/public/assets/krajka-logo.svg index 6014783..ac952c1 100644 --- a/public/assets/krajka-logo.svg +++ b/public/assets/krajka-logo.svg @@ -1,40 +1,21 @@ - - - - + + + - - + + - - - - - - - - - - - + + + - - + - - - - - - - - - - + diff --git a/src/App.vue b/src/App.vue index 0497a35..1016a3f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,22 +1,35 @@
- - - + + +
+ + \ No newline at end of file diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 11503c7..28a48c3 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -87,10 +87,12 @@ export default { display: flex; align-items: center; + justify-content: center; } .space { flex: 1; + max-width: 500px; } .title { @@ -107,7 +109,7 @@ export default { } .title-name.margin { - margin-left: 120px; + margin-left: 100px; } .links { @@ -186,7 +188,7 @@ export default { } .logo { - width: 85px; + width: 65px; } .title-name { @@ -194,7 +196,7 @@ export default { } .title-name.margin { - margin-left: 80px; + margin-left: 70px; } .links.show { diff --git a/src/router/index.js b/src/router/index.js index 532747a..e70642d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,25 +1,25 @@ -import VueRouter from "vue-router"; +import VueRouter from 'vue-router'; -import HomeView from "../views/HomeView"; -import GalleryView from "../views/GalleryView"; -import DownloadView from "../views/DownloadView"; -import PageNotFoundView from "../views/PageNotFoundView"; +import HomeView from '../views/HomeView'; +import AboutView from '../views/AboutView'; +import DownloadView from '../views/DownloadView'; +import PageNotFoundView from '../views/PageNotFoundView'; export const routes = [ - { path: "/", name: "Home", component: HomeView }, - { path: "/o-nas", name: "O nas" }, - { path: "/download", name: "Do pobrania", component: DownloadView } + { path: '/', name: 'Home', component: HomeView }, + { path: '/o-nas', name: 'O nas', component: AboutView }, + { path: '/download', name: 'Do pobrania', component: DownloadView } ]; export const externalRoutes = [ { - path: "https://kronika-puszcza.netlify.com", - name: "Kronika" + path: 'https://kronika-puszcza.netlify.com', + name: 'Kronika' }, - { path: "https://kronika-puszcza.netlify.com/galeria", name: "Galeria" } + { path: 'https://kronika-puszcza.netlify.com/galeria', name: 'Galeria' } ]; export const router = new VueRouter({ - mode: "history", - routes: [...routes, { path: "*", component: PageNotFoundView }] + mode: 'history', + routes: [...routes, { path: '*', component: PageNotFoundView }] }); diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue new file mode 100644 index 0000000..2455cec --- /dev/null +++ b/src/views/AboutView.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/GalleryView.vue b/src/views/GalleryView.vue deleted file mode 100644 index 3c296fe..0000000 --- a/src/views/GalleryView.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file -- cgit 1.4.1 From 6dfaa8790c86ef1d03bbfc648dce99ab33bc2942 Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Wed, 28 Aug 2019 23:01:41 +0200 Subject: Add social to footer --- public/assets/social/facebook.png | Bin 0 -> 1847 bytes public/assets/social/github.png | Bin 0 -> 2330 bytes src/components/Footer.vue | 35 ++++++++++++++++++++++++++++++++--- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 public/assets/social/facebook.png create mode 100644 public/assets/social/github.png diff --git a/public/assets/social/facebook.png b/public/assets/social/facebook.png new file mode 100644 index 0000000..d21a493 Binary files /dev/null and b/public/assets/social/facebook.png differ diff --git a/public/assets/social/github.png b/public/assets/social/github.png new file mode 100644 index 0000000..73db1f6 Binary files /dev/null and b/public/assets/social/github.png differ diff --git a/src/components/Footer.vue b/src/components/Footer.vue index 3cf81a5..693f8c2 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -13,7 +13,17 @@
-
19 Poznańska Drużyna Harcerzy Puszcza
+
+

19 Poznańska Drużyna Harcerzy Puszcza

+ +
@@ -30,7 +40,7 @@ export default { .footer { background-color: #507b34; color: #ffffff; - height: 175px; + min-height: 175px; display: flex; flex-direction: row; @@ -38,7 +48,7 @@ export default { align-items: center; justify-content: center; - padding: 0 15vw 0 15vw; + padding: 0 15vw; } .map { @@ -61,6 +71,13 @@ export default { flex-direction: column; } +.icon { + width: 30px; + height: 30px; + + margin: 0 5px; +} + .space { flex: 1; max-width: 500px; @@ -76,6 +93,18 @@ export default { .map { text-align: center; + margin-bottom: 10px; + } + + .space { + height: 1px; + width: 100%; + flex: none; + background-color: #ffffff; + } + + .author { + margin-top: 10px; } } \ No newline at end of file -- cgit 1.4.1 From d4c4f780577efe28819667c8564126917360cafb Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Wed, 28 Aug 2019 23:50:58 +0200 Subject: Add JoinUs --- src/App.vue | 5 +++++ src/components/Footer.vue | 1 + src/components/JoinUs.vue | 39 +++++++++++++++++++++++++++++++++++++++ src/components/NavBar.vue | 2 ++ 4 files changed, 47 insertions(+) create mode 100644 src/components/JoinUs.vue diff --git a/src/App.vue b/src/App.vue index 1016a3f..4742bfe 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,12 +44,17 @@ body { margin: 0; } +* { + box-sizing: border-box; +} + #app { font-family: "Roboto Slab", serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; color: #181818; text-align: center; + align-items: center; display: flex; flex-direction: column; diff --git a/src/components/Footer.vue b/src/components/Footer.vue index 693f8c2..63f8e9a 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -41,6 +41,7 @@ export default { background-color: #507b34; color: #ffffff; min-height: 175px; + width: 100vw; display: flex; flex-direction: row; diff --git a/src/components/JoinUs.vue b/src/components/JoinUs.vue new file mode 100644 index 0000000..55d8171 --- /dev/null +++ b/src/components/JoinUs.vue @@ -0,0 +1,39 @@ + + + \ No newline at end of file diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 28a48c3..fb9a8d7 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -163,6 +163,8 @@ export default { justify-content: center; align-items: center; + margin-bottom: 0; + width: 100%; left: 0; top: 0; -- cgit 1.4.1 From cbc2a0152e006aa9d2b4e3461b88cf4822acf003 Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Thu, 29 Aug 2019 10:37:37 +0200 Subject: Add background to joinus --- src/App.vue | 5 +++++ src/components/JoinUs.vue | 45 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/App.vue b/src/App.vue index 4742bfe..6c8c5aa 100644 --- a/src/App.vue +++ b/src/App.vue @@ -63,5 +63,10 @@ body { #content { flex: 1; + width: 100%; + + display: flex; + flex-direction: column; + align-items: center; } diff --git a/src/components/JoinUs.vue b/src/components/JoinUs.vue index 55d8171..ab2d853 100644 --- a/src/components/JoinUs.vue +++ b/src/components/JoinUs.vue @@ -1,28 +1,46 @@ \ No newline at end of file -- cgit 1.4.1 From 50fb2b5b7be05e9b3716c7d1f190219fb5155bc7 Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Thu, 29 Aug 2019 10:37:46 +0200 Subject: Add facebookfeed --- src/components/FacebookFeed.vue | 15 +++++++++++++++ src/views/HomeView.vue | 11 +++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/components/FacebookFeed.vue diff --git a/src/components/FacebookFeed.vue b/src/components/FacebookFeed.vue new file mode 100644 index 0000000..7abf93f --- /dev/null +++ b/src/components/FacebookFeed.vue @@ -0,0 +1,15 @@ + + + \ No newline at end of file diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 1b73240..736e7f4 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -1,13 +1,16 @@ \ No newline at end of file -- cgit 1.4.1 From 6695e07be17768dd8569a60e09a6ac2823eb2273 Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Thu, 29 Aug 2019 10:43:22 +0200 Subject: Fix navbar spacing --- src/components/NavBar.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index fb9a8d7..67df7e3 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -164,6 +164,7 @@ export default { align-items: center; margin-bottom: 0; + padding: 50px 0; width: 100%; left: 0; @@ -178,12 +179,6 @@ export default { } } -@media (max-width: 720px) { - .navbar { - margin-bottom: 40px; - } -} - @media (max-width: 500px) { .navbar { padding: 0 10px 0 10px; -- cgit 1.4.1 From 69512e87650730fe7668da80093aafb9eaf87468 Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Thu, 29 Aug 2019 15:36:31 +0200 Subject: Add ContactView --- src/components/Footer.vue | 14 +++++++++++--- src/components/JoinUs.vue | 2 +- src/router/index.js | 4 +++- src/views/ContactView.vue | 13 +++++++++++++ 4 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 src/views/ContactView.vue diff --git a/src/components/Footer.vue b/src/components/Footer.vue index 63f8e9a..8288667 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -1,5 +1,5 @@