Merge pull request #230 from zirreal/master

few layout fixes + changed books links
airalab · Nov 2, 2023 · 893be8e · 893be8e
2 parents 6066aa6 + 20e514d
commit 893be8e
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 40 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "private": true,
   "scripts": {
     "build": "gridsome --max_old_space_size=4096 build",
+    "test:e2e": "vue-cli-service test:e2e",
     "build-m1": "export NODE_OPTIONS=--openssl-legacy-provider && gridsome build",
     "develop": "gridsome develop",
     "develop-m1": "export NODE_OPTIONS=--openssl-legacy-provider && gridsome develop",
@@ -15,24 +16,23 @@
     "@noxify/gridsome-plugin-remark-embed": "^1.3.1",
     "axios": "^0.24.0",
     "gridsome": "^0.7.23",
-    "gridsome-plugin-google-sheets-post": "^2.0.1",
+    "gridsome-plugin-google-sheets-post": "^3.0.4",
     "gridsome-plugin-matomo": "^0.1.0",
     "gridsome-plugin-translateit": "^1.0.10",
     "gridsome-source-github-api": "^0.2.0",
     "i18n-pro": "^2.0.0",
     "parallax-js": "^3.1.0",
     "vue-client-actions-tracker-component": "^1.0.2",
     "vue-in-viewport-directive": "^2.0.2",
-    "vue-recaptcha": "1.3.0",
     "vue-svg-loader": "^0.16.0",
     "vue2-smooth-scroll": "^1.5.1",
     "vueinview": "^1.0.7",
     "vuex": "^3.6.2"
   },
+  "devDependencies": {},
   "overrides": {
     "gridsome": {
       "sharp": "^0.30.7"
     }
-  },
-  "devDependencies": {}
+  }
 }
diff --git a/src/assets/style/forms.css b/src/assets/style/forms.css
@@ -112,4 +112,10 @@ input[type="submit"], button {
 input[type="submit"]:hover, button:hover {
     background-color: var(--color-green);
     border-color: var(--color-green);
+}
+
+/* some captcha styles  */
+.jCaptcha {
+	width: 100%;
+	margin-bottom: 20px;
 }
diff --git a/src/assets/style/typography.css b/src/assets/style/typography.css
@@ -44,6 +44,7 @@ h1, h2, h3, h4, h5 {
   letter-spacing: 0.1rem;
   margin-top: calc(var(--space)*2);
   text-align: center;
+  font-weight: 500;
 }
 
 h1 {

diff --git a/src/assets/style/utils.css b/src/assets/style/utils.css
@@ -141,7 +141,7 @@
   /* min-height: 200px; */
   display: inline-block;
   margin-top: 0;
-  padding-top: 22px;
+  padding-top: 3px;
   max-width: 1040px;
   width: 100%;
   overflow: hidden;
@@ -169,13 +169,16 @@
 .title-with-bg  span,
 .title-with-bg a {
   padding-bottom: 15px;
-  padding-left: calc(var(--space));
-  padding-right: var(--space) !important;;
+  padding-left: calc(var(--space) * 0.5);
+  padding-right: calc(var(--space) * 0.5);
   -webkit-box-decoration-break: clone;
   box-decoration-break: clone;
   color: var(--color-light);
   transition: opacity 0.33s ease-in-out;
   text-transform: uppercase;
+  font-size: calc( var(--base-font-size)* 1.5);
+  font-style: normal;
+  font-weight: 500;
 }
 
 .title-with-bg a:hover {

diff --git a/src/components/BookItem.vue b/src/components/BookItem.vue
@@ -42,6 +42,7 @@ export default {
     display: grid;
     grid-template-columns: 210px 1fr;
     gap: var(--space);
+    margin-bottom: calc(var(--space) * 0.6);
   }
 
   h3 {

diff --git a/src/components/HeaderNav.vue b/src/components/HeaderNav.vue
@@ -49,7 +49,7 @@
         display: none;
         position: fixed;
         z-index: 1012;
-        top: calc(var(--screen-padding-top) - -6px);
+        top: calc(var(--screen-padding-top) - -3px);
         left: 0;
         right: 0;
         bottom: 0;

diff --git a/src/components/blocks/UserForm.vue b/src/components/blocks/UserForm.vue
@@ -7,13 +7,6 @@
             </label>
 
             <label><input type="checkbox" name="agreement" required/> {{$t('I agree to receive emails')}}</label>
-
-            <vue-recaptcha
-            ref="invisibleRecaptcha"
-            @verify="onVerify"
-            size="invisible"
-            :sitekey="recaptchaSitekey">
-            </vue-recaptcha>
             <div>
                 <rbnet-button>{{$t('Send')}}</rbnet-button>
             </div>
@@ -110,9 +103,6 @@
 
 <script>
 export default {
-  components: {
-      VueRecaptcha: () => import("vue-recaptcha")
-  },
 
   metaInfo: {
     script: [
@@ -131,8 +121,6 @@ export default {
     return {
       email: null,
       status: 'none',
-      recaptchaSitekey: process.env.GRIDSOME_RECAPTCHA
-      // recaptchaSitekey: "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI" //test localhost
     }
   },
 

diff --git a/src/components/utils/contactsForm.vue b/src/components/utils/contactsForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <gsp-form class="contacts__form" :gscriptID="gscript" :captchaID="recaptchaSitekey">
+  <gsp-form class="contacts__form" :gscriptID="gscript" :captchaStyle="captchaStyle">
     <input
       required 
       name="email" 
@@ -48,9 +48,16 @@ export default {
     result: this.$response,
     interval: null,
     location: '',
-    recaptchaSitekey: process.env.GRIDSOME_RECAPTCHA,
     gscript: process.env.GRIDSOME_CONTACTS_FORM_SCRIPT,
-    // recaptchaSitekey: "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI" //test localhost
+    captchaStyle: {     
+        width: 100,
+        height: 25,
+        textBaseline: 'top',
+        font: '25px Roboto',
+        textAlign: 'left',
+        fillStyle: '#6E9BEF'
+      }
+
     }
   },
 

diff --git a/src/data/books.yaml b/src/data/books.yaml
@@ -32,13 +32,13 @@
   img: 'docs-book-2.png'
   buttonicon: '↗'
   options:
-    - link: 'https://ipfs.io/ipfs/QmQ3k8p9SQS5wjovPcjUtQceRZZ6nv3Eqirt1vVQ2wP2JL'
+    - link: 'https://crustipfs.info/ipfs/QmQ3k8p9SQS5wjovPcjUtQceRZZ6nv3Eqirt1vVQ2wP2JL'
       text: 'English'
       id: 0
-    - link: 'https://ipfs.io/ipfs/QmUqNnzdZnic61UYTuKT9EzBNzMW6jc5uHSFk4Xzd3iM93'
+    - link: 'https://crustipfs.info/ipfs/QmUqNnzdZnic61UYTuKT9EzBNzMW6jc5uHSFk4Xzd3iM93'
       text: 'Русский'
       id: 2
-    - link: 'https://ipfs.io/ipfs/QmXhWarATZNTy3CweoVAdy4aTMrGMCsipo3gPSWVsUyQW6'
+    - link: 'https://crustipfs.info/ipfs/QmXhWarATZNTy3CweoVAdy4aTMrGMCsipo3gPSWVsUyQW6'
       text: 'Italiano'
       id: 1
 
@@ -49,12 +49,12 @@
   img: 'docs-book-1.png'
   buttonicon: '↗'
   options:
-    - link: 'https://ipfs.io/ipfs/QmWue3YfuZvuRvgcNb4vZuheX9TaZ9E1b8aCdxSoaGTbVN'
+    - link: 'https://crustipfs.info/ipfs/QmWue3YfuZvuRvgcNb4vZuheX9TaZ9E1b8aCdxSoaGTbVN'
       text: 'English'
       id: 0
-    - link: 'https://ipfs.io/ipfs/QmUjBPgDzmHFHiDkQAG93szJQguiZiowm9sedFMhPfQP4y'
+    - link: 'https://crustipfs.info/ipfs/QmUjBPgDzmHFHiDkQAG93szJQguiZiowm9sedFMhPfQP4y'
       text: 'Русский'
       id: 2
-    - link: 'https://ipfs.io/ipfs/QmTp3srjo3r1L2TKpAEGFafjdzSCTKJT9kkBEkCQDEF6tz'
+    - link: 'https://crustipfs.info/ipfs/QmTp3srjo3r1L2TKpAEGFafjdzSCTKJT9kkBEkCQDEF6tz'
       text: 'Deutsch'
       id: 1
diff --git a/src/pages/contact.vue b/src/pages/contact.vue
@@ -27,7 +27,7 @@
             <span class="line-7"></span>
           </div>
         </div>
-        <gsp-form class="contacts__form oldy" :gscriptID="gscript" :captchaID="recaptchaSitekey">
+        <gsp-form class="contacts__form oldy" :gscriptID="gscript" :captchaStyle="captchaStyle">
             <h3>{{ $t('Get latest updates') }}</h3>
             <label class="contacts__label">
               <input
@@ -108,8 +108,15 @@
         result: this.$response,
         location: '',
         interval: null,
-        recaptchaSitekey: process.env.GRIDSOME_RECAPTCHA,
         gscript: process.env.GRIDSOME_CONTACTS_FORM_SCRIPT,
+        captchaStyle: {     
+          width: 100,
+          height: 25,
+          textBaseline: 'top',
+          font: '25px Roboto',
+          textAlign: 'left',
+          fillStyle: '#6E9BEF'
+        }
       }
     },