Skip to content

Commit 82ce59f

Browse files
committed
various fixes for macOS dev environment
1 parent 505d8d5 commit 82ce59f

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
parameters:
2+
env(COOKIE_PREFIX): ""
3+
4+
lexik_jwt_authentication:
5+
set_cookies:
6+
'%env(COOKIE_PREFIX)%jwt_hp':
7+
secure: false
8+
9+
'%env(COOKIE_PREFIX)%jwt_s':
10+
secure: false

create-ecamp3-test-database.sh

100644100755
File mode changed.

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ services:
154154
restart: on-failure
155155

156156
browserless:
157-
image: browserless/chrome:1.56.0-puppeteer-18.0.5@sha256:83a0f24eb4341c30e0f5106a98f1d1e5a3981805fce2829403cda9ef2e0b965e
157+
image: browserless/chrome:1.56.0-puppeteer-18.0.5
158158
container_name: 'ecamp3-browserless'
159159
ports:
160160
- '3010:3000'

frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"test:e2e:ci": "vue-cli-service test:e2e --headless",
2121
"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",
2222
"test:unit:watch": "vue-cli-service test:unit --watch",
23-
"postinstall": "sed -i 's/Color.extend(contrast);/Color.extend({contrast});/g' node_modules/colorjs.io/dist/color.js"
23+
"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"
2424
},
2525
"dependencies": {
2626
"@intlify/core": "9.2.2",

frontend/src/components/dashboard/SelectFilter.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export default {
7171
labelValue() {
7272
if (this.multiple) {
7373
const list = (this.value || []).map((item) => this.processedItems[item].text)
74-
const lang = document.querySelector('html').getAttribute('lang')
74+
const lang = this.$store.state.lang.language
7575
const listFormat = new Intl.ListFormat(lang, {
7676
type: this.andFilter ? 'conjunction' : 'disjunction',
7777
})

0 commit comments

Comments
 (0)