Compare commits

...

6 Commits

Author SHA1 Message Date
renovate 8e2b5d3bdd Update dependency vue-easymde to v1.3.2 (#335)
Update dependency vue-easymde to v1.3.2

Reviewed-on: vikunja/frontend#335
Co-Authored-By: renovate <renovatebot@kolaente.de>
Co-Committed-By: renovate <renovatebot@kolaente.de>
2020-12-16 20:49:21 +00:00
kolaente 3346fe00eb
Add downloading assets when building docker images 2020-12-16 20:23:38 +01:00
konrad 66d4738ec5 Make sure task title and task id are properly shown on mobile (#334)
Make sure task title and task id are properly shown on mobile

Co-authored-by: kolaente <k@knt.li>
Reviewed-on: vikunja/frontend#334
Co-Authored-By: konrad <konrad@kola-entertainments.de>
Co-Committed-By: konrad <konrad@kola-entertainments.de>
2020-12-16 11:54:01 +00:00
kolaente 4fc73626b7
Properly cache html files 2020-12-16 12:28:54 +01:00
renovate f04ee6f130 Update dependency dompurify to v2.2.4 (#330)
Update dependency dompurify to v2.2.4

Reviewed-on: vikunja/frontend#330
Co-Authored-By: renovate <renovatebot@kolaente.de>
Co-Committed-By: renovate <renovatebot@kolaente.de>
2020-12-16 10:51:58 +00:00
renovate 30704dea8c Update dependency eslint-plugin-vue to v7.3.0 (#333)
Update dependency eslint-plugin-vue to v7.3.0

Reviewed-on: vikunja/frontend#333
Co-Authored-By: renovate <renovatebot@kolaente.de>
Co-Committed-By: renovate <renovatebot@kolaente.de>
2020-12-16 10:45:13 +00:00
6 changed files with 99 additions and 58 deletions

View File

@ -294,6 +294,10 @@ kind: pipeline
type: docker
name: docker-arm-release
depends_on:
- release-latest
- release-version
platform:
os: linux
arch: arm
@ -304,12 +308,7 @@ trigger:
- "refs/tags/**"
steps:
- name: fetch-tags
image: docker:git
commands:
- git fetch --tags
- name: docker
- name: docker-latest
image: plugins/docker:linux-arm
pull: true
settings:
@ -320,8 +319,30 @@ steps:
repo: vikunja/frontend
auto_tag: true
auto_tag_suffix: linux-arm
depends_on:
- fetch-tags
build_args:
- USE_RELEASE=true
- RELEASE_VERSION=master
when:
ref:
- refs/heads/master
- name: docker-version
image: plugins/docker:linux-arm
pull: true
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: vikunja/frontend
auto_tag: true
auto_tag_suffix: linux-arm
build_args:
- USE_RELEASE=true
- RELEASE_VERSION=${DRONE_TAG##v}
when:
ref:
- "refs/tags/**"
---
kind: pipeline
@ -332,36 +353,17 @@ platform:
os: linux
arch: amd64
depends_on:
- release-latest
- release-version
trigger:
ref:
- refs/heads/master
- "refs/tags/**"
steps:
- name: fetch-tags
image: docker:git
commands:
- git fetch --tags
- name: restore-cache
image: meltwater/drone-cache:dev
pull: true
environment:
AWS_ACCESS_KEY_ID:
from_secret: cache_aws_access_key_id
AWS_SECRET_ACCESS_KEY:
from_secret: cache_aws_secret_access_key
settings:
restore: true
bucket: kolaente.dev-drone-dependency-cache
endpoint: https://s3.fr-par.scw.cloud
region: fr-par
path_style: true
cache_key: '{{ .Repo.Name }}_{{ checksum "yarn.lock" }}_{{ arch }}_{{ os }}'
mount:
- '.cache'
- name: docker
- name: docker-latest
image: plugins/docker:linux-amd64
pull: true
settings:
@ -372,9 +374,30 @@ steps:
repo: vikunja/frontend
auto_tag: true
auto_tag_suffix: linux-amd64
depends_on:
- fetch-tags
- restore-cache
build_args:
- USE_RELEASE=true
- RELEASE_VERSION=master
when:
ref:
- refs/heads/master
- name: docker-version
image: plugins/docker:linux-amd64
pull: true
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: vikunja/frontend
auto_tag: true
auto_tag_suffix: linux-amd64
build_args:
- USE_RELEASE=true
- RELEASE_VERSION=${DRONE_TAG##v}
when:
ref:
- "refs/tags/**"
---
kind: pipeline

View File

@ -3,10 +3,19 @@ FROM node:13.14.0 AS compile-image
WORKDIR /build
ARG USE_RELEASE=false
ARG RELEASE_VERSION=master
ENV YARN_CACHE_FOLDER .cache/yarn/
COPY . ./
RUN \
if [ $USE_RELEASE ]; then \
rm -rf dist/ && \
wget https://dl.vikunja.io/frontend/vikunja-frontend-$RELEASE_VERSION.zip -O frontend-release.zip && \
unzip frontend-release.zip -d dist/ && \
exit 0; \
fi && \
# Build the frontend
yarn install --frozen-lockfile --network-timeout 100000 && \
echo '{"VERSION": "'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'"}' > src/version.json && \

View File

@ -39,7 +39,7 @@ http {
# Expires map
map $sent_http_content_type $expires {
default off;
text/html epoch; # We don't cache the html for the browser to get the content
text/html max;
text/css max;
application/javascript max;
~image/ max;

View File

@ -16,7 +16,7 @@
"camel-case": "4.1.2",
"copy-to-clipboard": "3.3.1",
"date-fns": "2.16.1",
"dompurify": "2.2.3",
"dompurify": "2.2.4",
"lodash": "4.17.20",
"marked": "1.2.7",
"register-service-worker": "1.7.2",
@ -25,7 +25,7 @@
"vue": "2.6.12",
"vue-advanced-cropper": "0.19.2",
"vue-drag-resize": "1.4.2",
"vue-easymde": "1.3.1",
"vue-easymde": "1.3.2",
"vue-shortkey": "3.1.7",
"vue-smooth-dnd": "0.8.1",
"vuex": "3.6.0"
@ -45,7 +45,7 @@
"cypress": "6.1.0",
"cypress-file-upload": "4.1.1",
"eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0",
"eslint-plugin-vue": "7.3.0",
"faker": "5.1.0",
"jest": "26.6.3",
"node-sass": "5.0.0",

View File

@ -44,6 +44,15 @@
color: lighten($grey, 25%);
white-space: nowrap;
}
@media screen and (max-width: $tablet) {
flex-direction: column;
align-items: start;
.title.input {
margin: 0 -.3em .5rem -.3em; // the title has 0.3em padding - this make the text inside of it align with the rest
}
}
}
.date-input {

View File

@ -6428,10 +6428,10 @@ domhandler@^2.3.0:
dependencies:
domelementtype "1"
dompurify@2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.3.tgz#ec653ba521b39f397c2ca045769438d593ea8a9f"
integrity sha512-8Hv7Q0FuwD9rWoB6qI2eZsfKbGXfoUVuGHHrE15vgk4ReOKwOkSgbqb2OMFtc0d5besOEkoLkcyuV10zQ2X5gw==
dompurify@2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz#a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410"
integrity sha512-jE21SelIgWrGKoXGfGPA524Zt1IJFBnktwfFMHDlEYRx5FZOdc+4eEH9mkA6PuhExrq3HVpJnY8hMYUzAMl0OA==
domutils@1.5.1:
version "1.5.1"
@ -6769,15 +6769,15 @@ eslint-loader@^2.2.1:
object-hash "^1.1.4"
rimraf "^2.6.1"
eslint-plugin-vue@7.2.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.2.0.tgz#dd8323fe7ca28fe9377ce3f5f6cf17afe2686f2a"
integrity sha512-4mt0yIv6rBDNtvis/g22a0ozJ12GfcdEzX77u0ICYjKlxOVtGrKGEvo0cbOObHaKDg9a9kJcoaNodqE4TPfS2A==
eslint-plugin-vue@7.3.0:
version "7.3.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.3.0.tgz#0faf0fcf0e1b1052bf800d4dee42d64f50679cb0"
integrity sha512-4rc9xrZgwT4aLz3XE6lrHu+FZtDLWennYvtzVvvS81kW9c65U4DUzQQWAFjDCgCFvN6HYWxi7ueEtxZVSB+f0g==
dependencies:
eslint-utils "^2.1.0"
natural-compare "^1.4.0"
semver "^7.3.2"
vue-eslint-parser "^7.2.0"
vue-eslint-parser "^7.3.0"
eslint-scope@^4.0.3:
version "4.0.3"
@ -10478,7 +10478,7 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"
marked@1.2.7:
marked@1.2.7, marked@^1.2.7:
version "1.2.7"
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.7.tgz#6e14b595581d2319cdcf033a24caaf41455a01fb"
integrity sha512-No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==
@ -15125,18 +15125,18 @@ vue-drag-resize@1.4.2:
resolved "https://registry.yarnpkg.com/vue-drag-resize/-/vue-drag-resize-1.4.2.tgz#656408b52c77c383a6aafb08c32bd220f0f25b73"
integrity sha512-rPd8JkkueBegCX8niJg3aWwQBfys9upaxLDyH6+1Gkz6pUzldhVqpF0hragppo68q6NWqE9fbvypWVI43AFyqw==
vue-easymde@1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/vue-easymde/-/vue-easymde-1.3.1.tgz#886aa7fecfe799136795fe8b19c9d40f904e806e"
integrity sha512-fTgc5TSj+YJgfTwwazE3cUloBRvpB1tTuX2npvQQrKr9jdQY9eNA4PT6WxnTCfvNZdw2dYfC4eMv+Ss+s9aNXA==
vue-easymde@1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/vue-easymde/-/vue-easymde-1.3.2.tgz#6df7db2510f638b2a5722a001156df886d384b10"
integrity sha512-gBi57CKi/d/2QqeIa7Cp0iukdmvFkM4c03UtzXMnu+56FWVuuAnkn6lQ9djzg0+EsY3jQeA86B9c5S9i9XEiwg==
dependencies:
easymde "^2.13.0"
marked "^1.2.3"
marked "^1.2.7"
vue-eslint-parser@^7.2.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.2.0.tgz#1e17ae94ca71e617025e05143c8ac5593aacb6ef"
integrity sha512-uVcQqe8sUNzdHGcRHMd2Z/hl6qEaWrAmglTKP92Fnq9TYU9un8xsyFgEdFJaXh/1rd7h8Aic1GaiQow5nVneow==
vue-eslint-parser@^7.3.0:
version "7.3.0"
resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz#894085839d99d81296fa081d19643733f23d7559"
integrity sha512-n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw==
dependencies:
debug "^4.1.1"
eslint-scope "^5.0.0"