various fixes for macOS dev environment

BacLuc · Nov 12, 2022 · 82ce59f · 82ce59f
1 parent 505d8d5
commit 82ce59f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/api/config/packages/dev/lexik_jwt_authentication.yaml b/api/config/packages/dev/lexik_jwt_authentication.yaml
@@ -0,0 +1,10 @@
+parameters:
+    env(COOKIE_PREFIX): ""
+
+lexik_jwt_authentication:
+    set_cookies:
+        '%env(COOKIE_PREFIX)%jwt_hp':
+            secure: false
+
+        '%env(COOKIE_PREFIX)%jwt_s':
+            secure: false
diff --git a/create-ecamp3-test-database.sh b/create-ecamp3-test-database.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -154,7 +154,7 @@ services:
     restart: on-failure
 
   browserless:
-    image: browserless/chrome:1.56.0-puppeteer-18.0.5@sha256:83a0f24eb4341c30e0f5106a98f1d1e5a3981805fce2829403cda9ef2e0b965e
+    image: browserless/chrome:1.56.0-puppeteer-18.0.5
     container_name: 'ecamp3-browserless'
     ports:
       - '3010:3000'

diff --git a/frontend/package.json b/frontend/package.json
@@ -20,7 +20,7 @@
     "test:e2e:ci": "vue-cli-service test:e2e --headless",
     "test:unit:debug": "node --inspect-brk=0.0.0.0:9229 ./node_modules/@vue/cli-service/bin/vue-cli-service.js test:unit --no-cache --runInBand",
     "test:unit:watch": "vue-cli-service test:unit --watch",
-    "postinstall": "sed -i 's/Color.extend(contrast);/Color.extend({contrast});/g' node_modules/colorjs.io/dist/color.js"
+    "postinstall": "sed 's/Color.extend(contrast);/Color.extend({contrast});/g' node_modules/colorjs.io/dist/color.js > node_modules/colorjs.io/dist/color.js.tmpfix; cat node_modules/colorjs.io/dist/color.js.tmpfix > node_modules/colorjs.io/dist/color.js; rm node_modules/colorjs.io/dist/color.js.tmpfix"
   },
   "dependencies": {
     "@intlify/core": "9.2.2",

diff --git a/frontend/src/components/dashboard/SelectFilter.vue b/frontend/src/components/dashboard/SelectFilter.vue
@@ -71,7 +71,7 @@ export default {
     labelValue() {
       if (this.multiple) {
         const list = (this.value || []).map((item) => this.processedItems[item].text)
-        const lang = document.querySelector('html').getAttribute('lang')
+        const lang = this.$store.state.lang.language
         const listFormat = new Intl.ListFormat(lang, {
           type: this.andFilter ? 'conjunction' : 'disjunction',
         })