diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df71cd174..29804622f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,8 +109,7 @@ exunit: variables: MIX_ENV: test before_script: - - mix deps.get - - mix tz_world.update + - mix deps.get && mix tz_world.update - mix ecto.create - mix ecto.migrate script: @@ -210,19 +209,25 @@ package-app: stage: package variables: &release-variables MIX_ENV: "prod" + APP_VERSION: "${CI_COMMIT_TAG}" + APP_ASSET: "${CI_PROJECT_NAME}_${APP_VERSION}_${ARCH}.tar.gz" script: &release-script - mix local.hex --force - mix local.rebar --force - mix deps.get - mix phx.digest - mix release --path release/mobilizon - - cd release/mobilizon && ln -s lib/mobilizon-*/priv priv + - cd release/mobilizon && ln -s lib/mobilizon-*/priv priv && cd ../../ + - du -sh release/ + - 'echo "Artifact: ${APP_ASSET}"' + - tar czf ${APP_ASSET} -C release mobilizon + - du -sh ${APP_ASSET} only: - tags@framasoft/mobilizon artifacts: expire_in: 30 days paths: - - release + - ${APP_ASSET} package-app-dev: stage: package @@ -233,20 +238,16 @@ package-app-dev: artifacts: expire_in: 2 days paths: - - release + - ${APP_ASSET} release-upload: stage: upload image: framasoft/yakforms-assets-deploy:latest rules: *tag-rules + variables: + APP_VERSION: "${CI_COMMIT_TAG}" + APP_ASSET: "${CI_PROJECT_NAME}_${APP_VERSION}_${ARCH}.tar.gz" script: - - APP_VERSION="${CI_COMMIT_TAG}" - - APP_ASSET="${CI_PROJECT_NAME}_${APP_VERSION}_${ARCH}.tar.gz" - - - 'echo "Artifact: ${APP_ASSET}"' - - tar czf ${APP_ASSET} -C release mobilizon - - ls -al ${APP_ASSET} - - eval `ssh-agent -s` - ssh-add <(echo "${DEPLOYEMENT_KEY}" | base64 --decode -i) - echo "put -r ${APP_ASSET}" | sftp -o "VerifyHostKeyDNS yes" ${DEPLOYEMENT_USER}@${DEPLOYEMENT_HOST}:public/ diff --git a/config/prod.exs b/config/prod.exs index 382d36559..6ff6bad15 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -38,6 +38,10 @@ config :mobilizon, :cldr, "sv" ] +config :tzdata, :data_dir, "/var/lib/mobilizon/tzdata" + +config :tz_world, data_dir: "/var/lib/mobilizon/tz_world" + cond do System.get_env("INSTANCE_CONFIG") && File.exists?("./config/#{System.get_env("INSTANCE_CONFIG")}") -> diff --git a/js/package.json b/js/package.json index 881d11db0..011a25477 100644 --- a/js/package.json +++ b/js/package.json @@ -5,7 +5,7 @@ "scripts": { "serve": "vue-cli-service serve", "build": "yarn run build:assets && yarn run build:pictures", - "test:unit": "LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 vue-cli-service test:unit", + "test:unit": "LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TZ=UTC vue-cli-service test:unit", "test:e2e": "vue-cli-service test:e2e", "lint": "vue-cli-service lint", "build:assets": "vue-cli-service build", diff --git a/js/src/App.vue b/js/src/App.vue index bcda04912..237ab57d9 100644 --- a/js/src/App.vue +++ b/js/src/App.vue @@ -216,16 +216,18 @@ export default class App extends Vue { // Set the focus to the router view // https://marcus.io/blog/accessible-routing-vuejs setTimeout(() => { - const focusTarget = this.routerView.$el as HTMLElement; - // Make focustarget programmatically focussable - focusTarget.setAttribute("tabindex", "-1"); + const focusTarget = this.routerView?.$el as HTMLElement; + if (focusTarget) { + // Make focustarget programmatically focussable + focusTarget.setAttribute("tabindex", "-1"); - // Focus element - focusTarget.focus(); + // Focus element + focusTarget.focus(); - // Remove tabindex from focustarget. - // Reason: https://axesslab.com/skip-links/#update-3-a-comment-from-gov-uk - focusTarget.removeAttribute("tabindex"); + // Remove tabindex from focustarget. + // Reason: https://axesslab.com/skip-links/#update-3-a-comment-from-gov-uk + focusTarget.removeAttribute("tabindex"); + } }, 0); } diff --git a/js/src/common.scss b/js/src/common.scss index 66979923b..30160e383 100644 --- a/js/src/common.scss +++ b/js/src/common.scss @@ -3,6 +3,8 @@ @import "~bulma"; @import "~bulma-divider"; @import "~buefy/src/scss/buefy"; +@import "styles/vue-announcer.scss"; +@import "styles/vue-skip-to.scss"; // a { // color: $violet-2; diff --git a/js/src/components/Event/EventMetadataSidebar.vue b/js/src/components/Event/EventMetadataSidebar.vue index 1f94d5d05..19be9ab3a 100644 --- a/js/src/components/Event/EventMetadataSidebar.vue +++ b/js/src/components/Event/EventMetadataSidebar.vue @@ -1,6 +1,7 @@