Compare revisions

Madbeyk · Madbeyk · Madbeyk · Madbeyk · Charlie Root · Madbeyk
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,13 @@
 src-front/node_modules
 src-front/npm-debug.log
 src-front/yarn-error.log
-src-front/yarn.lock
+#src-front/yarn.lock

 #nuxt static builds
 src-front/.nuxt
 src-front/dist
+
+#nuxt generated files to static directory
+src-front/static/sw.js
+src-front/static/sitemap.xml
+src-front/static/sitemap.xml.gz
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+image: node:10-buster
+
+variables:
+  SITE_NAME: piratipracuji.cz
+  ARTIFACTS_PATH: src-front/dist
+  WEBHOOK_URL: https://ha-web.pirati.cz
+  BASE_URL: https://www.piratipracuji.cz
+  API_URL: https://www.piratipracuji.cz/api/
+
+before_script:
+  - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq curl
+
+build:
+  stage: build
+  script:
+    - cd src-front
+    - yarn install
+    - yarn build
+    - yarn generate
+  after_script:
+    - echo "{ \"name\":\"$SITE_NAME\" }" > request.json
+    - "curl -H 'Content-Type: application/json' -X POST -d @request.json $WEBHOOK_URL"
+  artifacts:
+    expire_in: 30 min
+    paths:
+     - $ARTIFACTS_PATH
+
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@

 - **BASE_URL** - Url, na které staticky generovaný web poběží (defaultně https://www.piratipracuji.cz). Počítá se s tím, že web poběží v rootu domény (subdomény).

- **API_URL** - Url API s daty (defaultně https://redmineapi.mfnet.cz/). Je nutný trailing slash.
+- **API_URL** - Url API s daty (defaultně https://www.piratipracuji.cz/api/). Je nutný trailing slash.

 #### Další konfigurace

@@ -16,7 +16,12 @@

 kopie repository
 ```
-git clone https://gitlab.pirati.cz/forster.marek/piratipracuji.cz
+$ git clone https://gitlab.pirati.cz/forster.marek/piratipracuji.cz
+```
+
+skok do adresáře s projektem
+```
+$ cd src-front
 ```

 instalace závislostí

--- a/src-front/app.html
+++ b/src-front/app.html
@@ -2,6 +2,21 @@
 <html {{ HTML_ATTRS }}>
  <head>
    {{ HEAD }}
+    <!-- Matomo -->
+    <script type="text/javascript">
+      var _paq = window._paq || [];
+      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+      _paq.push(['trackPageView']);
+      _paq.push(['enableLinkTracking']);
+      (function() {
+        var u="//matomo.pirati.cz/";
+        _paq.push(['setTrackerUrl', u+'matomo.php']);
+        _paq.push(['setSiteId', '111']);
+        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+      })();
+    </script>
+    <!-- End Matomo Code -->
  </head>
  <body {{ BODY_ATTRS }}>
    {{ APP }}

--- a/src-front/assets/fonts/BebasNeueRegular.woff
+++ b/src-front/assets/fonts/BebasNeueRegular.woff
--- a/src-front/assets/fonts/BebasNeueRegular.woff2
+++ b/src-front/assets/fonts/BebasNeueRegular.woff2
--- a/src-front/assets/fonts/RobotoCondensed-Bold.ttf
+++ b/src-front/assets/fonts/RobotoCondensed-Bold.ttf
--- a/src-front/assets/fonts/RobotoCondensed-Bold.woff
+++ b/src-front/assets/fonts/RobotoCondensed-Bold.woff
--- a/src-front/assets/fonts/RobotoCondensed-Bold.woff2
+++ b/src-front/assets/fonts/RobotoCondensed-Bold.woff2
--- a/src-front/assets/fonts/RobotoCondensed-Italic.ttf
+++ b/src-front/assets/fonts/RobotoCondensed-Italic.ttf
--- a/src-front/assets/fonts/RobotoCondensed-Light.ttf
+++ b/src-front/assets/fonts/RobotoCondensed-Light.ttf
--- a/src-front/assets/fonts/RobotoCondensed-Light.woff
+++ b/src-front/assets/fonts/RobotoCondensed-Light.woff
--- a/src-front/assets/fonts/RobotoCondensed-Light.woff2
+++ b/src-front/assets/fonts/RobotoCondensed-Light.woff2
--- a/src-front/assets/fonts/RobotoCondensed-Regular.ttf
+++ b/src-front/assets/fonts/RobotoCondensed-Regular.ttf
--- a/src-front/assets/fonts/RobotoCondensed-Regular.woff
+++ b/src-front/assets/fonts/RobotoCondensed-Regular.woff
--- a/src-front/assets/fonts/RobotoCondensed-Regular.woff2
+++ b/src-front/assets/fonts/RobotoCondensed-Regular.woff2
--- a/src-front/assets/scss/_base.scss
+++ b/src-front/assets/scss/_base.scss
--- a/src-front/assets/scss/_fonts.scss
+++ b/src-front/assets/scss/_fonts.scss
--- a/src-front/assets/scss/_mixins.scss
+++ b/src-front/assets/scss/_mixins.scss
--- a/src-front/assets/scss/_typography.scss
+++ b/src-front/assets/scss/_typography.scss
@@ -9,44 +9,47 @@ h4, .like-h4 {
 }

 h1, .like-h1 {
-	font-size: 50px;
+  font-size: 50px;

-	@media (max-width: 590px) {
-		font-size: 40px;
-	}
+  @media (max-width: 590px) {
+    font-size: 40px;
+  }

-	@media (max-width: 420px) {
-		font-size: 35px;
-	}
+  @media (max-width: 420px) {
+    font-size: 35px;
+  }
 }

 h2, .like-h2 {
-	font-size: 35px;
+  font-size: 35px;
 }

 h3, .like-h3 {
-	font-size: 30px;
+  font-size: 30px;

-	@media (max-width: 600px) {
-		font-size: 26px;
-	}
+  @media (max-width: 600px) {
+    font-size: 26px;
+  }
 }

 h4, .like-h4 {
-	font-size: 20px;
+  font-size: 20px;
 }

-p {
+p, ul {
  margin: 0;
-  padding: 0;
  font-family: $font-primary;
  font-weight: 300;
  font-size: 20px;
  line-height: 1.5;

  @media (max-width: 590px) {
-		font-size: 17px;
-	}
+    font-size: 17px;
+  }
+}
+
+p {
+  padding: 0;
 }

 a {
No results found