fix: resolve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>

.github/workflows/cypress.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Setup custom host for nextcloud 
-        run: echo "127.0.0.1 nextcloud.local" | sudo tee -a /etc/hosts
+        run: echo "localhost nextcloud.local" | sudo tee -a /etc/hosts
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
@@ -73,13 +73,13 @@ jobs:
           php occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
           php occ config:system:set debug --value=true --type=boolean
           php -f index.php
-          php -S 0.0.0.0:8081 &
+          php -S 0.0.0.0:80 &
           export OC_PASS=1234561
           php occ user:add --password-from-env user1
           php occ user:add --password-from-env user2
           php occ app:enable deck
           php occ app:list
-          curl -v http://localhost:8081/index.php/login
+          curl -v http://localhost/index.php/login
           cat data/nextcloud.log
 
       - name: Cypress run

cypress/integration/boardFeatures.js

@@ -18,10 +18,7 @@ describe('Board', function () {
         // Click "Add board"
         cy.get('.app-navigation button.app-navigation-toggle').click()
         cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
-            .eq(1)
+            .eq(1).find('a').first().click({force: true})
-            .find('a')
-            .first()
-            .click({force: true})
 
         // Type the board title
         cy.get('.board-create form input[type=text]')
@@ -29,12 +26,9 @@ describe('Board', function () {
 
         // Submit
         cy.get('.board-create form input[type=submit]')
-            .first()
+            .first().click({force: true})
-            .click({force: true})
         
         cy.get('.app-navigation__list .app-navigation-entry__children .app-navigation-entry')
-            .first()
+            .first().contains(board).should('be.visible')
-            .contains(board)
-            .should('be.visible')
 	})
 })

cypress/integration/cardFeatures.js

@@ -21,10 +21,8 @@ describe('Card', function () {
 
         cy.get('.app-navigation button.app-navigation-toggle').click()
         cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
-            .eq(1)
+            .eq(1).find('.app-navigation-entry__children .app-navigation-entry a.app-navigation-entry-link')
-            .find('.app-navigation-entry__children .app-navigation-entry a.app-navigation-entry-link')
+            .first().click({force: true})
-            .first()
-            .click({force: true})
 
         cy.get('.board .stack').eq(0).within(() => {
             cy.get('button.action-item.action-item--single.icon-add')

cypress/integration/deckDashboard.js

@@ -14,8 +14,7 @@ describe('Deck dashboard', function() {
 
 	it('Can show the right title on the dashboard', function() {
 		cy.get('.board-title h2')
-        	.should('have.length', 1)
+        	.should('have.length', 1).first()
-        	.first()
         	.should('have.text', 'Upcoming cards')
 	})
 

package.json

@@ -80,7 +80,14 @@
 		"@vue/test-utils": "^1.3.0",
 		"jest": "^28.1.0",
 		"jest-serializer-vue": "^2.0.2",
-		"vue-jest": "^3.0.7"
+		"node-polyfill-webpack-plugin": "^1.1.4",
+		"postcss-html": "^1.4.1",
+		"stylelint": "^14.7.1",
+		"stylelint-config-recommended-scss": "^6.0.0",
+		"stylelint-config-recommended-vue": "^1.4.0",
+		"stylelint-webpack-plugin": "^3.2.0",
+		"vue-jest": "^3.0.7",
+		"webpack": "^5.72.0"
 	},
 	"jest": {
 		"moduleFileExtensions": [

src/components/board/Board.vue

@@ -163,8 +163,8 @@ export default {
 
 <style lang="scss" scoped>
 
-	@import '../../css/animations.scss';
+	@import '../../css/animations';
-	@import '../../css/variables.scss';
+	@import '../../css/variables';
 
 	form {
 		text-align: center;

src/components/board/Stack.vue

@@ -276,7 +276,7 @@ export default {
 	@import './../../css/variables';
 
 	.stack {
-		width: $stack-width + $stack-spacing*3;
+		width: $stack-width + $stack-spacing * 3;
 		margin-left: math.div($stack-spacing, 2);
 		margin-right: math.div($stack-spacing, 2);
 	}

src/components/card/CardSidebar.vue

@@ -216,12 +216,12 @@ export default {
 	.modal__card .app-sidebar {
 		$modal-padding: 14px;
 		border: 0;
-		min-width: calc(100% - #{$modal-padding*2});
+		min-width: calc(100% - #{$modal-padding * 2});
 		position: relative;
 		top: 0;
 		left: 0;
 		right: 0;
-		max-width: calc(100% - #{$modal-padding*2});
+		max-width: calc(100% - #{$modal-padding * 2});
 		padding: 0 14px;
 		max-height: 100%;
 		overflow: initial;

src/components/card/Description.vue

@@ -263,6 +263,7 @@ export default {
 	overflow-x: auto;
 
 	&::v-deep {
+		/* stylelint-disable-next-line no-invalid-position-at-import-rule */
 		@import './../../css/markdown';
 	}
 

src/components/cards/CardItem.vue

@@ -232,6 +232,7 @@ export default {
 			}
 		}
 
+		/* stylelint-disable-next-line no-invalid-position-at-import-rule */
 		@import './../../css/labels';
 
 		.card-controls {

src/components/search/GlobalSearchResults.vue

@@ -173,7 +173,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../css/variables.scss';
+@import '../../css/variables';
 
 .global-search {
 	width: 100%;

src/components/search/Placeholder.vue

@@ -54,7 +54,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../css/variables.scss';
+@import '../../css/variables';
 $clickable-area: 44px;
 
 .card--placeholder {