.gitlab-ci.yml

@@ -14,18 +14,17 @@
   dependencies:
     - install
   script:
-    # test
-    - echo ${DEVELOP}
-    - echo ${VUE_APP_BASE_URL_API}
-    - echo $API_MAIN
-    - echo $VUE_APP_BASE_URL_VIEWER
     # overwrite vars when build from main branch. to omit a second 
-    # job (see dependency in pages stage).
-    - if [[ $CI_COMMIT_REF_SLUG == "main" ]]; then
+    # job (see dependency in pages stage) when building for GitLab page.
+    - if [[ $CI_COMMIT_REF_SLUG == "main" && ${CI_JOB_NAME} != "build_page-main-backend" ]]; then
     - VUE_APP_BASE_URL_API=${API_MAIN}
     - VUE_APP_BASE_URL_VIEWER=${MAIN}
     - VUE_APP_PUBLIC_PATH="/ahiqar/website/"
     - fi
+    # test
+    - echo VUE_APP_BASE_URL_API=${VUE_APP_BASE_URL_API}
+    - echo VUE_APP_BASE_URL_VIEWER=${VUE_APP_BASE_URL_VIEWER}
+    - echo VUE_APP_PUBLIC_PATH=${VUE_APP_PUBLIC_PATH}
     - npm run build
     - mkdir --parents public/${CI_COMMIT_REF_SLUG}
     - cp --recursive src/.vuepress/dist/* public/${CI_COMMIT_REF_SLUG}/
@@ -33,6 +32,12 @@
     paths:
       - public/
 
+.ssh-config: &ssh
+- which ssh-agent
+- eval $(ssh-agent -s)
+- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+- mkdir -p ~/.ssh
+- chmod 700 ~/.ssh
 
 cache:
   paths:
@@ -48,13 +53,14 @@ variables:
   MAIN: 'https://ahikar.sub.uni-goettingen.de'
   DEVELOP: 'https://ahikar-dev.sub.uni-goettingen.de'
   API_DEV: 'https://ahikar-dev.sub.uni-goettingen.de/api'
-  API_MAIN: "${MAIN}/api"
-  BASE_BACKEND: '/website'
+  API_MAIN: 'https://ahikar.sub.uni-goettingen.de/api'
+  BASE_BACKEND: '/website/'
 
 
 stages:
   - pre-build
   - build
+  - deploy_to_server
   - pages
   - preserve-pages
   - remove_unused_envs
@@ -96,6 +102,34 @@ build_page-main-backend:
     VUE_APP_PUBLIC_PATH: "${BASE_BACKEND}"
   <<: *build-defaults
 
+deploy-dev:
+  stage: deploy_to_server
+  image: rsamban/scp-resource:latest
+  only:
+    - develop
+  dependencies:
+    - build_page-develop-backend
+  script:
+    - *ssh
+    # remove the old version from dev and test
+    - ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/$CI_COMMIT_REF_NAME/frontend/website/*"
+    - ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/test/frontend/website/*"
+    # install new version to dev and test
+    - scp -o 'StrictHostKeyChecking no' -r public/$CI_COMMIT_REF_NAME/* $SSH_USER@$SSH_IP:~/$CI_COMMIT_REF_NAME/frontend/website/
+    - ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "cp -r ~/$CI_COMMIT_REF_NAME/frontend/website/* ~/test/frontend/website/"
+
+deploy-main:
+  stage: deploy_to_server
+  image: rsamban/scp-resource:latest
+  only:
+    - main
+  dependencies:
+    - build_page-main-backend
+  script:
+    - *ssh
+    - ssh -o 'StrictHostKeyChecking no' $SSH_USER@$SSH_IP "rm -rf ~/$CI_COMMIT_REF_NAME/frontend/website/*"
+    - scp -o 'StrictHostKeyChecking no' -r public/$CI_COMMIT_REF_NAME/* $SSH_USER@$SSH_IP:~/$CI_COMMIT_REF_NAME/frontend/website/
+
 
 # this stage creates a new environment for the current branch.
 pages:

CHANGELOG.md

@@ -2,7 +2,45 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [1.0.1](https://gitlab.gwdg.de/subugoe/ahiqar/website/compare/v0.1.0...v1.0.1) (2021-07-23)
+## [1.1.0](https://gitlab.gwdg.de/subugoe/ahiqar/website/compare/v1.0.1...v1.1.0) (2021-07-26)
+
+
+### Features
+
+* reuse edition links with base URL ([9e03407](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/9e03407a902d18c8770d8df52039321f13bc87d2)), closes [#84](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/issues/84)
+
+
+### Chore
+
+* changelog and version num ([711f70f](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/711f70fdff2e33f5d68187990d19ccf53af65fe1))
+* **release:** 1.0.2 ([6390448](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/6390448f127272abb10c80c3b3135ef16737579b))
+
+
+### Continuos Integration
+
+* add verbosity ([84abac0](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/84abac02e3136001183864656c302b5076ebf9f3))
+* deployment to main ([80f875b](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/80f875b0dc69b393bb686a7a277a1c33d953f69f))
+* extend condition for main build targeting backend ([c336e2b](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/c336e2b4879e426ff51825a89cb63345f543ac50))
+* fix slash-ending var ([35bd816](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/35bd8169f2ea711d448e06772f7945f01192ddae))
+* fix syntax ([d2358d5](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/d2358d5afbbcdb6657d1a1f6338058460d257cde))
+* fix var resolution in global vars ([98f3534](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/98f3534981dbee696f22420e980c9a8aa817ce7f))
+* move deployment strategy ([0f8dfb0](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/0f8dfb0ecc5835afbff9cfd19d111424a9791df7))
+* refine target paths ([6e4dd35](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/6e4dd35a36f1ccab403a28369fe038d21809987f))
+* remove alias with vars ([966bf64](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/966bf6475671e206ef8d2bbf7100b6561bb2e6ba))
+* remove alias, as they do not work for unknown reasons ([e70a9cd](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/e70a9cd1e6ba7e8f177affb4578adb391e5e4d51))
+
+
+### Refactoring
+
+* move apiService to utilities ([f03aa2f](https://gitlab.gwdg.de/subugoe/ahiqar/website/-/commit/f03aa2f4c89387ee506d924d336b08adbcf9f6b6))
+
+## [1.0.2](https://gitlab.gwdg.de/subugoe/ahiqar/website/compare/v0.1.0...v1.0.2) (2021-07-23)
+
+### CI
+
+* minor change in the pipeline to get working path on back end site
+
+## [1.0.1](https://gitlab.gwdg.de/subugoe/ahiqar/website/compare/v0.1.0...v1.0.1) (2021-07-23)
 
 ## [0.1.0](https://gitlab.gwdg.de/subugoe/ahiqar/website/compare/v0.0.6...v0.1.0) (2021-07-23)
 

package-lock.json

 {
   "name": "ahiqar-website",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

 {
   "name": "ahiqar-website",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "",
   "main": "",
   "authors": {

src/.vuepress/components/Bar.vue

@@ -86,20 +86,19 @@
 </template>
 
 <script>
-  export default {
-    data: () => ({
-      editions: [
-        { title: 'Syriac Texts', to: 'https://ahikar-dev.sub.uni-goettingen.de/syriac' },
-        { title: 'Arabic and Kashuni Texts', to: 'https://ahikar-dev.sub.uni-goettingen.de/arabic-karshuni' },
-      ],
-      metaEdition: [
-        { title: 'Manuscripts', to: '/manuscripts.html' },
-        { title: 'Motifs', to: '/motifs.html' },
-        { title: 'Stemmata', to: '/stemmata.html' },
-        { title: 'Collation', to: '/collation.html' },
-        { title: 'Edition guidelines', to: '/editionguidelines.html' },
-        { title: 'Related Literature', to: '/relatedliterature.html' },
-      ],
-    }),
-  }
+import editions from "../utilities/editionLinks";
+
+export default {
+  data: () => ({
+    editions,
+    metaEdition: [
+      { title: 'Manuscripts', to: '/manuscripts.html' },
+      { title: 'Motifs', to: '/motifs.html' },
+      { title: 'Stemmata', to: '/stemmata.html' },
+      { title: 'Collation', to: '/collation.html' },
+      { title: 'Edition guidelines', to: '/editionguidelines.html' },
+      { title: 'Related Literature', to: '/relatedliterature.html' },
+    ],
+  }),
+}
 </script>

src/.vuepress/components/Cta.vue

@@ -9,7 +9,8 @@
       >
         <a
           class="white--text text-overline text-decoration-none text-uppercase"
-          href="https://ahikar-dev.sub.uni-goettingen.de/syriac"
+          :href="editionSyriac.to"
+          :title="editionSyriac.title"
           role="link"
           tabindex="0"
         >
@@ -25,7 +26,8 @@
       >
         <a
           class="white--text text-overline text-decoration-none text-uppercase"
-          href="https://ahikar-dev.sub.uni-goettingen.de/arabic-karshuni"
+          :href="editionArabic.to"
+          :title="editionArabic.title"
           role="link"
           tabindex="0"
         >
@@ -36,3 +38,13 @@
     </v-layout>
   </v-container>
 </template>
+<script>
+import editionLinks from "../utilities/editionLinks";
+
+export default {
+  data: () => ({
+    editionSyriac: editionLinks[0],
+    editionArabic: editionLinks[1]
+  })
+}
+</script>

src/.vuepress/components/SearchPage.vue

@@ -14,7 +14,7 @@
 <script>
 import SearchResultList from "./SearchResultList";
 import SearchResultEmpty from "./SearchResultEmpty";
-import apiService from '../api/api';
+import apiService from '../utilities/api';
 
 export default {
   components: {

src/.vuepress/utilities/constants.js

+export const baseUrlViewer = process.env.VUE_APP_BASE_URL_VIEWER;

src/.vuepress/utilities/editionLinks.js

+import {baseUrlViewer} from "./constants";
+
+export default [
+  { title: 'Syriac Texts', to: baseUrlViewer + '/syriac' },
+  { title: 'Arabic and Kashuni Texts', to: baseUrlViewer + '/arabic-karshuni' },
+];