Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65dc2858 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'calender-join-btn' into 'main' 

"Open link" button when location contains a URL

See merge request e/infra/selfhost/nextcloud-apps/calendar!1
parents cf034e95 7be3acee

.gitlab-ci.yml

0 → 100644
+121 −0
Original line number Diff line number Diff line 
stages:

    - prepare

    - test

    - build

    - deploy



default:

    image: node:15.14.0-stretch

    before_script:

        - npm set cache .npm

        - npm install --prefer-offline --no-audit

    cache:

        key: ${CI_COMMIT_REF_SLUG}

        paths:

            - .npm/

            - node_modules/



install-node-deps:

    stage: prepare

    before_script:

        - node --version

        - npm --version

    script:

        - npm set cache .npm

        - npm ci

    only:

        changes:

            - package*.json



lint:

    stage: test

    script:

        - npm run lint



build-frontend:

    stage: build

    script:

        - npm run build

        - mkdir -p dist/$CI_PROJECT_NAME

        - cp -a appinfo css img l10n lib templates js dist/$CI_PROJECT_NAME

    artifacts:

        paths:

            - dist/



.deploy:nextcloud-app:

    image: ubuntu:focal

    stage: deploy

    dependencies:

      - build-frontend

    before_script:

      - mkdir $HOME/.ssh

      - chmod 700 ~/.ssh

      - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519

      - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub

      - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts

      - chmod 600 ~/.ssh/id_ed25519

      - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub

      - apt-get update && apt-get install -y openssh-client rsync

    script:

      - echo "Deploying $CI_PROJECT_NAME of $CI_PROJECT_PATH_SLUG to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"

      - rsync -avzh dist/ $SSH_USER@$DEPLOYMENT_HOST:/tmp/${CI_JOB_ID}

      - ssh $SSH_USER@$DEPLOYMENT_HOST "sudo rsync -avzh --chown www-data:www-data --delete /tmp/${CI_JOB_ID}/$CI_PROJECT_NAME ${DEPLOYMENT_PATH}/html/custom_apps/ && rm -rf /tmp/${CI_JOB_ID} && sudo docker exec -u www-data $CONTAINER_NAME /var/www/html/occ app:enable $CI_PROJECT_NAME"





deploy:dev01:

    extends: .deploy:nextcloud-app

    only:

      - master

      - main

      - production

      - calender-join-btn

    environment:

      name: dev/01

      url: https://dev.eeo.one/

    variables:

      DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH

      CONTAINER_NAME: dev01_nextcloud



deploy:dev02:

  extends: .deploy:nextcloud-app

  when: manual

  only:

    - master

    - main

    - production

    - calender-join-btn

  environment:

    name: dev/02

    url: https://ecloud02.dev.eeo.one

  variables:

    DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH

    CONTAINER_NAME: dev02_nextcloud



deploy:dev03:

  extends: .deploy:nextcloud-app

  when: manual

  only:

    - master

    - main

    - production

    - calender-join-btn

  environment:

    name: dev/03

    url: https://ecloud03.dev.eeo.one

  variables:

    DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH

    CONTAINER_NAME: dev03_nextcloud



deploy:staging:

  extends: .deploy:nextcloud-app

  when: manual

  only:

    - master

    - main

    - production

  environment:

    name: staging/01

    url: https://eeo.one

  variables:

    DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH

    CONTAINER_NAME: nextcloud

css/app-sidebar.scss

+45 −17
Original line number Diff line number Diff line
@@ -27,6 +27,28 @@ 
		height: unset !important;

	}



	.property-text-location {

		align-items: stretch !important;

		position:relative;

		textarea {

			border-right: 0px;

			padding-right:27px;

		}

		.icon-externallink {

			background-image: var(--icon-calendar-openlink-0075E0);

			opacity: 1;

			position: absolute;

			top: 0;

			right: 0;

			z-index: 2;

			display: block;

			width: 34px;

			height: 100%;

			line-height: 34px;

			text-align: center;

		}

	}



	.app-sidebar-header__action {

		margin-top: 0 !important;

		max-height: none !important;
@@ -56,7 +78,7 @@ 
			height: 50px;

			width: 50px;

			margin: 0 auto;

			opacity: .5;

			opacity: 0.5;

		}



		&__caption {
@@ -135,7 +157,7 @@ 
	.repeat-option-set {

		.repeat-option-set-section {

			&:not(:first-of-type) {

				margin-top: 20px

				margin-top: 20px;

			}



			&--on-the-select {
@@ -188,7 +210,7 @@ 
			align-items: center;



			.multiselect,

			input[type=number] {

			input[type="number"] {

				min-width: 100px;

				width: 25%;

			}
@@ -209,7 +231,7 @@ 


				&__until {

					min-width: 75px;

					width: 50%

					width: 50%;

				}



				&__count {
@@ -263,10 +285,10 @@ 
						margin-left: 8px;

						height: 16px;

						width: 16px;

						opacity: .3;

						opacity: 0.3;



						&--highlighted {

							opacity: .7;

							opacity: 0.7;

						}



						&:focus,
@@ -298,14 +320,14 @@ 


		.datetime-picker-inline-icon {

			margin-top: 17px;

			opacity: .3;

			opacity: 0.3;

			border: none;

			background-color: transparent;

			border-radius: 0;

			padding: 6px !important;



			&--highlighted {

				opacity: .7;

				opacity: 0.7;

			}



			&:focus,
@@ -363,7 +385,7 @@ 
			min-width: 0;

			padding-right: 8px;



			input[type=number] {

			input[type="number"] {

				width: 3em;

			}
@@ -475,7 +497,7 @@ 
				}



				div:nth-child(1) {

					color: var(--color-main-text)

					color: var(--color-main-text);

				}



				div:nth-child(2) {
@@ -550,8 +572,8 @@ 
			background-color: grey;

		}

	}



	.property-text,

	.property-text-location,

	.property-select,

	.property-color,

	.property-select-multiple,
@@ -578,7 +600,7 @@ 
		&__info {

			display: flex;

			justify-content: center;

			opacity: .5;

			opacity: 0.5;

		}



		&__info:hover {
@@ -623,13 +645,12 @@ 
					text-decoration: underline;



					&::after {

						content: ' ↗';

						content: " ↗";

					}

				}

			}



			&--readonly-calendar-picker {



				div.calendar-picker-option {

					margin: 3px 3px 3px 0;

					padding: 8px 7px;
@@ -639,7 +660,6 @@ 
	}



	.property-color {



		&__input {

			display: flex;

		}
@@ -730,6 +750,14 @@ 
		width: 450px;

		padding: 5px 8px;



		.property-text-location {

			align-items: stretch !important;

			position: relative;

			textarea {

				border-right: 0px;

			}

		}



		.empty-content {

			margin-top: 0 !important;

			padding: 50px 0;
@@ -770,7 +798,7 @@ 
			top: 0 !important;

			right: 0 !important;

			z-index: 100 !important;

			opacity: .7 !important;

			opacity: 0.7 !important;

			border-radius: 22px !important;



			.action-item.action-item--single {
@@ -796,7 +824,7 @@ 
	}

}



.event-popover[x-placement^='bottom'] {

.event-popover[x-placement^="bottom"] {

	.popover__arrow {

		border-bottom-color: var(--color-background-dark);

	}

css/icons.scss

+1 −0
Original line number Diff line number Diff line
@@ -45,3 +45,4 @@ 
@include icon-black-white('view-week', 'calendar', 1);

@include icon-color('reminder', 'calendar', '#fffffe', 1);

@include icon-color('reminder', 'calendar', '#000001', 1);

@include icon-color('openlink', 'calendar', '#0075E0', 1);
 
 No newline at end of file

img/openlink.svg

0 → 100644
+1 −0
Original line number Diff line number Diff line 
<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M8.66663 1.11053C8.66663 0.558347 9.1135 0.110535 9.66663 0.110535H13.6385C13.801 0.110535 13.9323 0.13741 14.0479 0.186472C14.1385 0.23491 14.276 0.306472 14.3729 0.40116C14.3729 0.402722 14.3729 0.404285 14.376 0.405535C14.5698 0.59991 14.6385 0.85366 14.6666 1.10741C14.6666 1.10866 14.6666 1.1096 14.6666 1.11053V5.11053C14.6666 5.66366 14.2198 6.11053 13.6666 6.11053C13.1135 6.11053 12.6666 5.66366 12.6666 5.11053V3.52616L7.37288 8.81678C6.98225 9.20741 6.351 9.20741 5.96038 8.81678C5.56975 8.42616 5.56975 7.79491 5.96038 7.40428L11.251 2.11053H9.66663C9.1135 2.11053 8.66663 1.66272 8.66663 1.11053ZM0.666626 3.11053C0.666626 2.00585 1.56194 1.11053 2.66663 1.11053H5.66663C6.21975 1.11053 6.66663 1.55835 6.66663 2.11053C6.66663 2.66366 6.21975 3.11053 5.66663 3.11053H2.66663V12.1105H11.6666V9.11053C11.6666 8.55741 12.1135 8.11053 12.6666 8.11053C13.2198 8.11053 13.6666 8.55741 13.6666 9.11053V12.1105C13.6666 13.2137 12.7698 14.1105 11.6666 14.1105H2.66663C1.56194 14.1105 0.666626 13.2137 0.666626 12.1105V3.11053Z" fill="#0075E0"/></svg>

l10n/de.js

+2 −1
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ OC.L10N.register( 
    "Dinner" : "Abendessen",

    "Lunch" : "Mittagessen",

    "Appointment not found" : "Termin nicht gefunden",

    "User not found" : "Benutzer nicht gefunden"

    "User not found" : "Benutzer nicht gefunden",

    "Open Link" : "Link öffnen"

},

"nplurals=2; plural=(n != 1);");