diff --git a/.gitignore b/.gitignore index 93ee60d..b6c4ce1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ public/ .zanata-cache/etag-cache.xml npm-debug.log /zanata.xml +pnpm-lock.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 390e732..a362558 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,21 @@ image: framasoft/vuefs:latest stages: + - test - deploy +test: + stage: test + script: + - npm install -g yaml-lint + - for f in $(find ./app/ -name "*.yml" -type f);do yamllint $f;done; + pages: stage: deploy script: - npm install - npm run preview - mv -f public/$CI_PROJECT_NAME/* public + - find public -type f -iregex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -execdir gzip -f --keep {} \; artifacts: paths: - public @@ -38,14 +46,17 @@ production: - $DEPLOYEMENT_HOST # Push new translations strings to https://trad.framasoft.org -#trads: -# stage: deploy -# image: framasoft/push-trad:latest -# script: -# - sed -e "s@.*@$CI_COMMIT_REF_SLUG@" -i zanata/zanata.xml -# - sed -e "s@.*@join-peertube@" -i zanata/zanata.xml -# - cp zanata/zanata.xml zanata.xml -# - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then mkdir -p ${HOME}/.config; echo -e "${ZANATA_CONFIG_FRAMABOT}" > ${HOME}/.config/zanata.ini; fi -# - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then make push-locales; fi -# only: -# - master +trads: + stage: deploy + image: framasoft/push-trad:latest + script: + - sed -e "s@.*@$CI_COMMIT_REF_SLUG@" -i zanata/zanata.xml + - sed -e "s@.*@join-peertube@" -i zanata/zanata.xml + - cp -n zanata/zanata.xml zanata.xml + - mkdir -p ${HOME}/.config; echo -e "${ZANATA_CONFIG_FRAMABOT}" > ${HOME}/.config/zanata.ini; + - make push-locales; + only: + refs: + - master + variables: + - $ZANATA_CONFIG_FRAMABOT diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..61a0002 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +puppeteer_skip_chromium_download=true \ No newline at end of file diff --git a/Makefile b/Makefile index 028af20..3cded1c 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,8 @@ prepare-locales: rm -f zanata/yml/*.yml zanata/po/*.po zanata/po/*.pot zanata/po/*.err clean-locales: backup-locales prepare-locales - zanata/scripts/yml2po.sh - zanata/scripts/po2yml.sh + zanata/scripts/selfyml2po.sh + zanata/scripts/selfpo2yml.sh po: zanata/scripts/yml2po.sh @@ -21,7 +21,7 @@ push-locales: po zanata-cli -q -B push --push-type both pull-locales: prepare-locales - cp -n zanata/zanata.xml zanata.xml + cp zanata/zanata.xml zanata.xml sed -e 's@@join-peertube@' -i zanata.xml zanata-cli -q -B pull --pull-type both --min-doc-percent 75 make yml diff --git a/app/App.vue b/app/App.vue index 23f45b3..faddd6f 100644 --- a/app/App.vue +++ b/app/App.vue @@ -2,8 +2,22 @@
@@ -16,6 +30,6 @@ export default { name: 'app', components: { HeaderComponent, - }, + } } diff --git a/app/assets/fonts/ptsans_caption.scss b/app/assets/fonts/ptsans_caption.scss new file mode 100644 index 0000000..42277c2 --- /dev/null +++ b/app/assets/fonts/ptsans_caption.scss @@ -0,0 +1,10 @@ +@font-face { + font-family: 'PTSansCaption'; + src: url('../fonts/ptsans_caption/PTC55F-webfont.eot'); + src: url('../fonts/ptsans_caption/PTC55F-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/ptsans_caption/PTC55F-webfont.woff') format('woff'), + url('../fonts/ptsans_caption/PTC55F-webfont.ttf') format('truetype'), + url('../fonts/ptsans_caption/PTC55F-webfont.svg#RobotoRegular') format('svg'); + font-weight: normal; + font-style: normal; +} diff --git a/app/assets/img/account-creation-en.png b/app/assets/img/account-creation-en.png deleted file mode 100644 index 8a01311..0000000 Binary files a/app/assets/img/account-creation-en.png and /dev/null differ diff --git a/app/assets/img/account-creation.png b/app/assets/img/account-creation.png deleted file mode 100644 index 8997e01..0000000 Binary files a/app/assets/img/account-creation.png and /dev/null differ diff --git a/app/assets/img/channel-en.png b/app/assets/img/channel-en.png deleted file mode 100644 index 16e5fb8..0000000 Binary files a/app/assets/img/channel-en.png and /dev/null differ diff --git a/app/assets/img/channel.png b/app/assets/img/channel.png deleted file mode 100644 index 4d3dfcd..0000000 Binary files a/app/assets/img/channel.png and /dev/null differ diff --git a/app/assets/img/en/account-creation.png b/app/assets/img/en/account-creation.png new file mode 100644 index 0000000..8b03efd Binary files /dev/null and b/app/assets/img/en/account-creation.png differ diff --git a/app/assets/img/en/channel.png b/app/assets/img/en/channel.png new file mode 100644 index 0000000..7035a9d Binary files /dev/null and b/app/assets/img/en/channel.png differ diff --git a/app/assets/img/en/share-popup.png b/app/assets/img/en/share-popup.png new file mode 100644 index 0000000..13ef621 Binary files /dev/null and b/app/assets/img/en/share-popup.png differ diff --git a/app/assets/img/fr/account-creation.png b/app/assets/img/fr/account-creation.png new file mode 100644 index 0000000..fc8dc45 Binary files /dev/null and b/app/assets/img/fr/account-creation.png differ diff --git a/app/assets/img/fr/channel.png b/app/assets/img/fr/channel.png new file mode 100644 index 0000000..47096a0 Binary files /dev/null and b/app/assets/img/fr/channel.png differ diff --git a/app/assets/img/fr/share-popup.png b/app/assets/img/fr/share-popup.png new file mode 100644 index 0000000..2166282 Binary files /dev/null and b/app/assets/img/fr/share-popup.png differ diff --git a/app/assets/img/share-popup-en.png b/app/assets/img/share-popup-en.png deleted file mode 100644 index 5b62e35..0000000 Binary files a/app/assets/img/share-popup-en.png and /dev/null differ diff --git a/app/assets/img/share-popup.png b/app/assets/img/share-popup.png deleted file mode 100644 index fcc5839..0000000 Binary files a/app/assets/img/share-popup.png and /dev/null differ diff --git a/app/assets/scss/bootstrap.scss b/app/assets/scss/bootstrap.scss index efd7d69..4eef494 100644 --- a/app/assets/scss/bootstrap.scss +++ b/app/assets/scss/bootstrap.scss @@ -33,7 +33,7 @@ // @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/pagination"; // @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/pager"; // @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/labels"; -// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/badges"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/badges"; // @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/jumbotron"; // @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/thumbnails"; @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/alerts"; diff --git a/app/assets/scss/main.scss b/app/assets/scss/main.scss index 66c5a22..45aa88c 100644 --- a/app/assets/scss/main.scss +++ b/app/assets/scss/main.scss @@ -63,6 +63,18 @@ main .intro .col-md-6 { margin: 0; } +figure { + border: 10px solid rgb(255, 243, 234); +} + +figcaption { + display: block; + background: rgb(255, 243, 234); + text-align: center; + font-size: 12px; + padding-top: 10px; +} + /* Sections background */ body { background: #211F20 url('../img/network.png') bottom center repeat-y; diff --git a/app/components/pages/News.vue b/app/components/pages/News.vue index f9a4a1a..5521a2e 100644 --- a/app/components/pages/News.vue +++ b/app/components/pages/News.vue @@ -1,40 +1,57 @@ + \ No newline at end of file diff --git a/app/components/partials/Header.vue b/app/components/partials/Header.vue index c5d48cb..9485068 100644 --- a/app/components/partials/Header.vue +++ b/app/components/partials/Header.vue @@ -19,8 +19,9 @@