Skip to content

Commit

Permalink
Merge branch 'master' of github.com:OpenShock/WebUI into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
redmushie committed Oct 1, 2023
2 parents a942bce + e3f6967 commit 203800d
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
42 changes: 21 additions & 21 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@popperjs/core": "^2.11.8",
"@sentry/vue": "^7.72.0",
"animate.css": "^4.1.1",
"axios": "^1.4.0",
"bootstrap-vue-next": "^0.14.5",
"axios": "^1.5.1",
"bootstrap-vue-next": "^0.14.6",
"copy-webpack-plugin": "^11.0.0",
"core-js": "^3.32.2",
"esp-web-tools": "^9.4.0",
Expand Down Expand Up @@ -50,7 +50,7 @@
"file-loader": "^6.2.0",
"html-webpack-plugin": "^5.5.3",
"mini-css-extract-plugin": "^2.7.6",
"postcss": "^8.4.30",
"postcss": "^8.4.31",
"postcss-loader": "^7.3.3",
"sass": "^1.68.0",
"sass-loader": "^13.3.2",
Expand Down
4 changes: 2 additions & 2 deletions src/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
v-html="apiVersion"></span> <a target="_blank"
:href="'https://github.com/Shock-Link/API/commit/' + apiCommitHash">{{ apiCommitHash }}</a> | <span>{{ targetEnv }}</span>
</p>
<p class="cred"><a href="https://github.com/Shock-Link">Made by ShockLink Team</a></p>
<p class="cred"><a href="https://github.com/OpenShock">Made by OpenShock Team</a></p>
<p class="status" :style="'color: #' + connectionColor + ';'" v-html="$store.state.userHubState"></p>
</template>
<script>
Expand Down Expand Up @@ -98,4 +98,4 @@ footer {
.status {
text-align: end;
}
}</style>
}</style>
2 changes: 1 addition & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Sentry.init({
integrations: [
new Sentry.BrowserTracing({
// Set 'tracePropagationTargets' to control for which URLs distributed tracing should be enabled
tracePropagationTargets: ["localhost", /^https:\/\/yourserver\.io\/api/],
tracePropagationTargets: ["localhost", "api.shocklink.net", "dev-api.shocklink.net", "shocklink.net"],
routingInstrumentation: Sentry.vueRouterInstrumentation(router),
}),
new Sentry.Replay(),
Expand Down

0 comments on commit 203800d

Please sign in to comment.