marcorealacci/WASAPhoto
1
0
Fork 0
mirror of https://github.com/notherealmarco/WASAPhoto.git synced 2025-05-05 12:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove useless try/catch (errors already handled by the interceptor)

Browse source
This commit is contained in:
Marco Realacci 2022-12-22 18:19:02 +01:00
parent f434fcbc72
commit 747a5be567
3 changed files with 98 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

1
webui/src/views/HomeView.vue
View file

@ -26,6 +26,7 @@ export default {
let response = await this.$axios.get("/stream?start_index=" + this.start_idx + "&limit=" + this.limit);
// Errors are handled by the interceptor, which shows a modal dialog to the user and returns a null response.
if (response == null) {
this.loading = false
this.loadingError = true

34
webui/src/views/LoginView.vue
View file

@ -13,11 +13,17 @@ export default {
async login() {
this.loading = true;
this.errormsg = null;
try {
let response = await this.$axios.post("/session", {
name: this.field_username,
});
//this.$router.push({ name: "home" });
// Errors are handled by the interceptor, which shows a modal dialog to the user and returns a null response.
if (response == null) {
this.loading = false
return
}
if (response.status == 201 || response.status == 200) {
// Save the token in the local storage if the user wants to be remembered
if (this.rememberLogin) {
@ -40,10 +46,7 @@ export default {
else {
this.errormsg = response.data["error"];
}
}
catch (e) {
this.errormsg = e.toString();
}
this.loading = false;
},
},
@ -63,13 +66,15 @@ export default {
<form>
<!-- Email input -->
<div class="form-floating mb-4">
<input v-model="field_username" type="email" id="formUsername" class="form-control" placeholder="name@example.com"/>
<input v-model="field_username" type="email" id="formUsername" class="form-control"
placeholder="name@example.com" />
<label class="form-label" for="formUsername">Username</label>
</div>
<!-- Password input -->
<div class="form-floating mb-4">
<input style="display: none" disabled type="password" id="formPassword" class="form-control" placeholder="gattina12"/>
<input style="display: none" disabled type="password" id="formPassword"
class="form-control" placeholder="gattina12" />
<label style="display: none" class="form-label" for="formPassword">Password</label>
</div>
@ -78,23 +83,28 @@ export default {
<div class="col d-flex justify-content-center">
<!-- Checkbox -->
<div class="form-check">
<input v-model="rememberLogin" class="form-check-input" type="checkbox" value="" id="form2Example31" />
<input v-model="rememberLogin" class="form-check-input" type="checkbox" value=""
id="form2Example31" />
<label class="form-check-label" for="form2Example31">Remember me</label>
</div>
</div>
</div>
<!-- Submit button -->
<button style="width: 100%" type="button" class="btn btn-primary btn-block mb-4" @click="login">Sign in</button>
<button style="width: 100%" type="button" class="btn btn-primary btn-block mb-4"
@click="login">Sign in</button>
<ErrorMsg v-if="errormsg" :msg="errormsg"></ErrorMsg>
<LoadingSpinner :loading="loading" />
<i class="text-center text-secondary d-flex flex-column">repeat after me: "best password is no password"</i>
<i class="text-center text-secondary d-flex flex-column">repeat after me: "best password is
no password"</i>
</form>
</div>
</div>
</div></div>
</div>
</div>
</div>
</template>
<style>
</style>

26
webui/src/views/SearchView.vue
View file

@ -1,7 +1,7 @@
<script>
// import getCurrentSession from '../services/authentication'; todo: can be removed
export default {
data: function() {
data: function () {
return {
errormsg: null,
loading: false,
@ -28,16 +28,21 @@ export default {
this.loading = false;
return;
}
try {
let response = await this.$axios.get("/users?query=" + this.fieldUsername + "&start_index=" + this.startIdx + "&limit=" + this.limit);
// Errors are handled by the interceptor, which shows a modal dialog to the user and returns a null response.
if (response == null) {
this.loading = false
return
}
if (response.data.length == 0) this.dataEnded = true;
else this.streamData = this.streamData.concat(response.data);
this.loading = false;
} catch (e) {
this.errormsg = e.toString(); // todo: handle better
}
},
scroll () {
scroll() {
window.onscroll = () => {
let bottomOfWindow = Math.max(window.pageYOffset, document.documentElement.scrollTop, document.body.scrollTop) + window.innerHeight >= document.documentElement.offsetHeight - 5
if (bottomOfWindow && !this.dataEnded) {
@ -68,15 +73,13 @@ export default {
<ErrorMsg v-if="errormsg" :msg="errormsg"></ErrorMsg>
<div class="form-floating mb-4">
<input v-model="fieldUsername" @input="refresh" id="formUsername" class="form-control" placeholder="name@example.com"/>
<input v-model="fieldUsername" @input="refresh" id="formUsername" class="form-control"
placeholder="name@example.com" />
<label class="form-label" for="formUsername">Search by username</label>
</div>
<div id="main-content" v-for="item of streamData">
<UserCard
:user_id="item.user_id"
:name="item.name"
:followed="item.followed"
<UserCard :user_id="item.user_id" :name="item.name" :followed="item.followed"
:banned="item.banned" />
</div>
@ -89,4 +92,5 @@ export default {
</template>
<style>
</style>