Inject SEO verification

ciukstar · Jan 29, 2024 · f4f7f03 · f4f7f03
1 parent a82ac24
commit f4f7f03
Show file tree

Hide file tree

Showing 17 changed files with 85 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,8 +10,10 @@ ARG YESOD_DEMO_LANG=EN
 ARG YESOD_MAPBOX_PK
 ARG YESOD_STRIPE_PK
 ARG YESOD_STRIPE_SK
+ARG YESOD_GOOGLE_SITE_VERIFICATION
 ARG YESOD_GOOGLE_CLIENT_ID
 ARG YESOD_GOOGLE_CLIENT_SECRET
+ARG YESOD_YANDEX_VERIFICATION
 
 WORKDIR /opt/salon
 COPY salon /opt/salon
@@ -23,8 +25,10 @@ ENV YESOD_DEMO_LANG=${YESOD_DEMO_LANG}
 ENV YESOD_MAPBOX_PK=${YESOD_MAPBOX_PK}
 ENV YESOD_STRIPE_PK=${YESOD_STRIPE_PK}
 ENV YESOD_STRIPE_SK=${YESOD_STRIPE_SK}
+ENV YESOD_GOOGLE_SITE_VERIFICATION=${YESOD_GOOGLE_SITE_VERIFICATION}
 ENV YESOD_GOOGLE_CLIENT_ID=${YESOD_GOOGLE_CLIENT_ID}
 ENV YESOD_GOOGLE_CLIENT_SECRET=${YESOD_GOOGLE_CLIENT_SECRET}
+ENV YESOD_YANDEX_VERIFICATION=${YESOD_YANDEX_VERIFICATION}
 
 EXPOSE 8080
 CMD ["./salon"]
diff --git a/README.fr.md b/README.fr.md
@@ -88,6 +88,16 @@ De plus, la facture peut être téléchargée au format PDF ou HTML et envoyée
   ENV: YESOD_GOOGLE_CLIENT_ID, YESOD_GOOGLE_CLIENT_SECRET
   ```
 
+## Optimisation du moteur de recherche
+
+* [Google SEO](https://search.google.com/search-console)
+
+  ```$YESOD_GOOGLE_SITE_VERIFICATION```
+
+* [Yandex SEO](https://webmaster.yandex.com/welcome)
+
+  ```$YESOD_YANDEX_VERIFICATION```
+
 
 ## Diagramme ERD
 

diff --git a/README.md b/README.md
@@ -86,6 +86,16 @@ Additionally, the invoice can be downloaded in PDF or HTML format and sent to th
   ENV: YESOD_GOOGLE_CLIENT_ID, YESOD_GOOGLE_CLIENT_SECRET
   ```
 
+## Search Engine Optimization
+
+* [Google SEO](https://search.google.com/search-console)
+
+  ```$YESOD_GOOGLE_SITE_VERIFICATION```
+
+* [Yandex SEO](https://webmaster.yandex.com/welcome)
+
+  ```$YESOD_YANDEX_VERIFICATION```
+
 ## ERD Diagram
 
 ![Entity Relationship Diagram](static/img/Salon-ERD.svg)

diff --git a/README.ro.md b/README.ro.md
@@ -86,6 +86,16 @@ După crearea unei noi facturi și adăugarea elementelor acesteia, factura poat
   ENV: YESOD_GOOGLE_CLIENT_ID, YESOD_GOOGLE_CLIENT_SECRET
   ```
 
+## Optimizare motor de căutare
+
+* [Google SEO](https://search.google.com/search-console)
+
+  ```$YESOD_GOOGLE_SITE_VERIFICATION```
+
+* [Yandex SEO](https://webmaster.yandex.com/welcome)
+
+  ```$YESOD_YANDEX_VERIFICATION```
+
 
 ## Diagrama ERD
 

diff --git a/README.ru.md b/README.ru.md
@@ -86,6 +86,16 @@
   ENV: YESOD_GOOGLE_CLIENT_ID, YESOD_GOOGLE_CLIENT_SECRET
   ```
 
+## Поисковая оптимизация
+
+* [Яндекс Вебмастер](https://webmaster.yandex.ru/welcome)
+
+  ```$YESOD_YANDEX_VERIFICATION```
+
+* [Google SEO](https://search.google.com/search-console)
+
+  ```$YESOD_GOOGLE_SITE_VERIFICATION```
+
 ## ER-диаграмма
 
 ![Диаграмма отношений сущностей](static/img/Salon-ERD.svg)

diff --git a/config/settings.yml b/config/settings.yml
@@ -40,8 +40,10 @@ idle-timeout: "_env:YESOD_SQLITE_IDLETIMEOUT:1200"
 mapbox-pk: "_env:YESOD_MAPBOX_PK:pk.xxx"
 stripe-pk: "_env:YESOD_STRIPE_PK:pk.yyy"
 stripe-sk: "_env:YESOD_STRIPE_SK:sk.zzz"
+google-site-verification: "_env:YESOD_GOOGLE_SITE_VERIFICATION"
 google-client-id: "_env:YESOD_GOOGLE_CLIENT_ID:xxx"
 google-client-secret: "_env:YESOD_GOOGLE_CLIENT_SECRET:xxx"
+yandex-verification: "_env:YESOD_YANDEX_VERIFICATION"
 
 copyright: Insert copyright statement here
 #analytics: UA-YOURCODE
diff --git a/messages/en.msg b/messages/en.msg
@@ -1,3 +1,4 @@
+SearchEngineOptimization: Search Engine Optimization
 SignInWithGoogle: Sign in with Google
 Cleared: Cleared
 InvalidStoreType: Invalid store type

diff --git a/messages/fr.msg b/messages/fr.msg
@@ -1,3 +1,4 @@
+SearchEngineOptimization: Optimisation du moteur de recherche
 SignInWithGoogle: Connectez-vous avec Google
 Cleared: Effacé
 InvalidStoreType: Type de stockage invalide

diff --git a/messages/ro.msg b/messages/ro.msg
@@ -1,3 +1,4 @@
+SearchEngineOptimization: Optimizare motor de căutare
 SignInWithGoogle: Conectați-vă cu Google
 Cleared: S-a șters
 InvalidStoreType: Tip de stocare nevalid

diff --git a/messages/ru.msg b/messages/ru.msg
@@ -1,3 +1,4 @@
+SearchEngineOptimization: Поисковая оптимизация
 SignInWithGoogle: Войти через Google
 Cleared: Очищено
 InvalidStoreType: Неверный тип хранилища

diff --git a/src/Handler/Common.hs b/src/Handler/Common.hs
@@ -23,7 +23,7 @@ import Foundation
     ( Handler
     , Route
       ( HomeR, ServicesR, BookOffersR, BookingsCalendarR, AboutUsR
-      , ContactR, ResourcesR, StaticR
+      , ContactR, ResourcesR, StaticR, FaviconR
       )
     , ResourcesR (DocsR), AppMessage (MsgAppName, MsgMetaDescription)
     )
@@ -67,6 +67,7 @@ getWebAppManifestR = do
 
 getSitemapR :: Handler TypedContent
 getSitemapR = sitemap $ do
+    yield $ SitemapUrl FaviconR Nothing (Just Monthly) (Just 0.5)
     yield $ SitemapUrl (ResourcesR DocsR) Nothing (Just Monthly) (Just 1.0)
     yield $ SitemapUrl HomeR Nothing (Just Monthly) (Just 1.0)
     yield $ SitemapUrl ServicesR Nothing (Just Monthly) (Just 0.9)

diff --git a/src/Handler/Resources.hs b/src/Handler/Resources.hs
@@ -30,7 +30,7 @@ import Foundation
       , MsgErdDiagram, MsgBookingStateDiagram, MsgAppointmentStateDiagram
       , MsgBasicEntities, MsgBusiness, MsgUser, MsgPaymentGateway, MsgOnlineMaps
       , MsgAppName, MsgOverview, MsgStaff, MsgService, MsgOffer, MsgInvoice
-      , MsgEmail
+      , MsgEmail, MsgSearchEngineOptimization
       , MsgDoc001, MsgDoc002, MsgDoc003, MsgDoc004, MsgDoc005, MsgDoc0061
       , MsgDoc0062, MsgDoc0063, MsgDoc0064, MsgDoc0065, MsgDoc0066, MsgDoc0067
       , MsgDoc0068, MsgDoc007, MsgDoc008, MsgDoc009, MsgDoc010, MsgDoc011

diff --git a/src/Settings.hs b/src/Settings.hs
@@ -63,11 +63,13 @@ data AppSettings = AppSettings
 
     , appAuthDummyLogin         :: Bool
     -- ^ Indicate if auth dummy login should be enabled.
-    , appMapboxPk           :: Text
-    , appStripePk           :: Text
-    , appStripeSk           :: Text
-    , appGoogleClientId     :: Text
-    , appGoogleClientSecret :: Text
+    , appMapboxPk               :: Text
+    , appStripePk               :: Text
+    , appStripeSk               :: Text
+    , appGoogleSiteVerification :: Maybe Text
+    , appGoogleClientId         :: Text
+    , appGoogleClientSecret     :: Text
+    , appYandexVerification     :: Maybe Text
     }
 
 instance FromJSON AppSettings where
@@ -97,13 +99,15 @@ instance FromJSON AppSettings where
         appCopyright              <- o .:  "copyright"
         appAnalytics              <- o .:? "analytics"
 
-        appAuthDummyLogin         <- o .:? "auth-dummy-login"      .!= dev
+        appAuthDummyLogin         <- o .:? "auth-dummy-login" .!= dev
 
         appMapboxPk               <- o .:  "mapbox-pk"
         appStripePk               <- o .:  "stripe-pk"
         appStripeSk               <- o .:  "stripe-sk"
+        appGoogleSiteVerification <- o .:  "google-site-verification"
         appGoogleClientId         <- o .:  "google-client-id"
         appGoogleClientSecret     <- o .:  "google-client-secret"
+        appYandexVerification     <- o .:  "yandex-verification"
 
 
         return AppSettings {..}

diff --git a/stack.yaml b/stack.yaml
@@ -18,7 +18,7 @@
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
 resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/6.yaml
+  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/7.yaml
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.

diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -27,8 +27,8 @@ packages:
     hackage: stripe-haskell-2.6.2@sha256:4ad015702e65b3219b9f2db10b8ae35873254a149f7b735c5d3e6250d7b641a1,1130
 snapshots:
 - completed:
-    sha256: 1b4c2669e26fa828451830ed4725e4d406acc25a1fa24fcc039465dd13d7a575
-    size: 714100
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/6.yaml
+    sha256: 7b975b104cb3dbf0c297dfd01f936a4d2ee523241dd0b1ae960522b833fe3027
+    size: 714096
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/7.yaml
   original:
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/6.yaml
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/7.yaml
diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet
@@ -11,8 +11,10 @@ $doctype 5
     <meta name="author" content="Sergiu Starciuc, [email protected]">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="theme-color" content="#FEDBD0">
-    <meta name="google-site-verification" content="a5AUtJixuZ1_hbHg7AbmclYAYk5AkZylPeIFRsesEXI">
-    <meta name="yandex-verification" content="92c10516dea08e0b" />
+    $maybe gsv <- appGoogleSiteVerification $ appSettings master
+      <meta name="google-site-verification" content=#{gsv}>
+    $maybe yv <- appYandexVerification $ appSettings master
+      <meta name="yandex-verification" content=#{yv}>
 
     <link rel="manifest" href=@{WebAppManifestR}>
 

diff --git a/templates/resources/docs.hamlet b/templates/resources/docs.hamlet
@@ -113,6 +113,19 @@
           <small>
             <code>ENV: YESOD_GOOGLE_CLIENT_ID, YESOD_GOOGLE_CLIENT_SECRET
 
+    <div.mdc-typography--headline4>_{MsgSearchEngineOptimization}
+    <ul>
+      <li>
+        <a href="https://search.google.com/search-console" target=_blank>Google SEO
+        <p>
+          <small>
+            <code>&dollar;YESOD_GOOGLE_SITE_VERIFICATION
+      <li>
+        <a href="https://webmaster.yandex.com/welcome" target=_blank>Yandex SEO
+        <p>
+          <small>
+            <code>&dollar;YESOD_YANDEX_VERIFICATION
+
     <div.mdc-typography--headline4>
       _{MsgErdDiagram}
     <img #imgErdDiagram src=@{StaticR img_Salon_ERD_svg} alt=_{MsgErdDiagram} loading=lazy>