Merge branch 'main' into kate/viewer_tests

This commit is contained in:
KatKatKateryna
2021-09-09 22:30:30 +08:00
5 changed files with 21 additions and 1 deletions
+2 -1
View File
@@ -33,7 +33,7 @@ workflows:
context: main-builds
filters:
branches:
only: cristi/webhookservice_ci_build
only: cristi/ci-new-dep
jobs:
test_server:
@@ -97,6 +97,7 @@ jobs:
./.circleci/deploy.sh
if [[ "$CIRCLE_TAG" =~ ^v.* ]]; then
env K8S_CLUSTER=TOR1 K8S_NAMESPACE=${K8S_NAMESPACE_TOR1_1_RELEASE} ./.circleci/deploy_in_new_setup.sh
env K8S_CLUSTER=LON1 K8S_NAMESPACE=${K8S_NAMESPACE_LON1_1_RELEASE} ./.circleci/deploy_in_new_setup.sh
else
env K8S_CLUSTER=TOR1 K8S_NAMESPACE=${K8S_NAMESPACE_TOR1_1_LATEST} ./.circleci/deploy_in_new_setup.sh
fi
+1
View File
@@ -16,3 +16,4 @@ test-queries
packages/viewer/example/*.js
packages/viewer/example/*.js.map
packages/frontend/schema.graphql
.tool-versions
+8
View File
@@ -4,6 +4,14 @@ import vuetify from './embedVuetify'
import router from './embedRouter'
Vue.config.productionTip = false
import VueMatomo from 'vue-matomo'
Vue.use(VueMatomo, {
host: 'https://speckle.matomo.cloud',
siteId: 4,
router: router
})
new Vue({
router,
vuetify,
@@ -47,6 +47,10 @@
filled
single-line
prepend-icon="mdi-email"
id="email"
name="email"
type="email"
autocomplete="username"
/>
</v-col>
<v-col cols="12" sm="12">
@@ -76,6 +80,8 @@
v-model="form.password"
label="password"
type="password"
autocomplete="new-password"
id="new-password"
:rules="validation.passwordRules"
filled
single-line
@@ -89,6 +95,8 @@
v-model="form.passwordConf"
label="confirm password"
type="password"
autocomplete="new-password"
id="confirm-password"
:rules="validation.passwordRules"
filled
single-line
@@ -22,6 +22,8 @@
v-model="form.password"
label="new password"
type="password"
autocomplete="new-password"
id="new-password"
:rules="validation.passwordRules"
filled
single-line