Skip to content

Commit

Permalink
Merge branch 'main' into three-pane-okrs
Browse files Browse the repository at this point in the history
  • Loading branch information
simenheg committed Nov 7, 2023
2 parents b9e4c0c + 5987196 commit f007726
Show file tree
Hide file tree
Showing 36 changed files with 4 additions and 1,224 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@
node_modules
dist/
docs/
tests/e2e/videos/*
tests/e2e/screenshots/*

# local env files
.env.*
cypress.env.json

# Log files
*.log
Expand Down
4 changes: 0 additions & 4 deletions cypress.json

This file was deleted.

22 changes: 0 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
"dev:test": "firebase emulators:start --import=./tests & vite",
"build": "vite build --mode production",
"build:test": "vite build --mode staging",
"test:e2e": "firebase emulators:start --import=./tests & vite & env-cmd -f ./.env.local cypress open",
"test:e2e:headless": "firebase emulators:exec --project origo-okr-tracker --import=./tests & vite & (sleep 10 && env-cmd -f ./.env.local cypress run --headless)",
"deploy": ". ./.env.production && sed -i -e \"s|<host>|$VITE_API_GATEWAY_URL|g\" public/openapi.yaml && npm run build && sed -i -e \"s|$VITE_API_GATEWAY_URL|<host>|g\" public/openapi.yaml && firebase deploy --project=production",
"deploy:test": "npm run build:test && firebase deploy --project=development",
"deploy:feature_branch": "npm run build && firebase hosting:channel:deploy --project=production $npm_config_name",
Expand Down Expand Up @@ -77,7 +75,6 @@
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^9.7.0",
Expand Down
6 changes: 3 additions & 3 deletions src/components/RoleMembers.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="role-group__members-list">
<span v-for="member in membersWithRole" :key="member.id" class="role-group__member">
<pkt-button size="small" skin="tertiary" @onClick="openProfileModal(member.id)">
{{ member.displayName || firstPartOfEmail(member.id) }}
{{ displayName(member) }}
</pkt-button>
</span>
</div>
Expand Down Expand Up @@ -33,8 +33,8 @@ export default {
},
methods: {
firstPartOfEmail(email) {
return email.replace(/@.*/, '');
displayName(member) {
return member.displayName || member.id?.replace(/@.*/, '') || '';
},
openProfileModal(profileId) {
Expand Down
2 changes: 1 addition & 1 deletion src/config/firebaseConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const auth = firebase.auth();
const functions = firebase.app().functions(import.meta.env.VITE_REGION);
const { serverTimestamp, arrayRemove, arrayUnion } = firebase.firestore.FieldValue;

if (import.meta.env.MODE === 'development' || window.Cypress) {
if (import.meta.env.MODE === 'development') {
db.settings(firestoreEmulator);
functions.useEmulator('localhost', emulators.functions.port);
auth.useEmulator(`http://localhost:${emulators.auth.port}`);
Expand Down
28 changes: 0 additions & 28 deletions tests/README.md

This file was deleted.

7 changes: 0 additions & 7 deletions tests/e2e/.eslintrc.js

This file was deleted.

50 changes: 0 additions & 50 deletions tests/e2e/config.js

This file was deleted.

44 changes: 0 additions & 44 deletions tests/e2e/plugins/index.js

This file was deleted.

15 changes: 0 additions & 15 deletions tests/e2e/specs/00 Environment/environment_variables.js

This file was deleted.

36 changes: 0 additions & 36 deletions tests/e2e/specs/01 Login/01 login_error_spec.js

This file was deleted.

22 changes: 0 additions & 22 deletions tests/e2e/specs/01 Login/02 login_admin_user_spec.js

This file was deleted.

36 changes: 0 additions & 36 deletions tests/e2e/specs/02 Navigation/page_navigation_spec.js

This file was deleted.

Loading

0 comments on commit f007726

Please sign in to comment.