Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use API v2 in web client #1153

Merged
merged 24 commits into from
Nov 5, 2022
Merged

Use API v2 in web client #1153

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0e6d283
start scanner component
RomainMaillot Oct 18, 2022
7ace52b
add json viewer to see result
RomainMaillot Oct 22, 2022
1f6a3be
unique id for each collapser
RomainMaillot Oct 22, 2022
eea9740
add scan local on lookup button
RomainMaillot Oct 23, 2022
89868bc
basic ui
RomainMaillot Oct 23, 2022
0fc85ed
check with dryrun that scanners available
RomainMaillot Oct 23, 2022
3c65bc4
better handling of errors
RomainMaillot Oct 24, 2022
417e969
modify feedbacks
RomainMaillot Oct 28, 2022
141617f
remove package-lock
RomainMaillot Oct 31, 2022
5c78758
remove root node_module
RomainMaillot Oct 31, 2022
7881a4d
change a bit ui
RomainMaillot Oct 31, 2022
9c3764b
ui change
RomainMaillot Oct 31, 2022
9677141
add todo for later, remove filter local
RomainMaillot Oct 31, 2022
8b9d45a
format string
RomainMaillot Oct 31, 2022
87170d7
update yarn
RomainMaillot Nov 1, 2022
be739c2
update yarn version
RomainMaillot Nov 2, 2022
df260fd
yarn lock from v1
RomainMaillot Nov 2, 2022
c8b30ea
add getScanners to utils
RomainMaillot Nov 2, 2022
ccbb3a0
try fix yarn version
RomainMaillot Nov 3, 2022
81f4694
Revert "try fix yarn version"
RomainMaillot Nov 4, 2022
8c00218
Revert "yarn lock from v1"
RomainMaillot Nov 4, 2022
7d34962
Revert "update yarn version"
RomainMaillot Nov 4, 2022
440ede3
Revert "update yarn"
RomainMaillot Nov 4, 2022
62fb70b
absolute route to config for import
RomainMaillot Nov 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add scan local on lookup button
  • Loading branch information
@RomainMaillot
RomainMaillot committed Oct 23, 2022
commit eea97400b038ac2ede8168ecc206fe00ad964cfa
4 changes: 2 additions & 2 deletions web/client/src/components/Scanner.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<b-row align-h="between" align-v="center">
<h3>{{ name }}</h3>
<b-button
v-if="!error && !loading"
v-if="!error && !loading && !data"
@click="runScan"
variant="outline-primary"
size="lg"
Expand Down Expand Up @@ -40,7 +40,7 @@ import config from "@/config";
},
})
export default class Scanner extends Vue {
data = {};
data = null;
loading = false;
error = null;
computed = {
Expand Down
61 changes: 53 additions & 8 deletions web/client/src/views/Scan.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
class="m-1"
>
<b-icon-play-fill></b-icon-play-fill>
Run scan
Lookup
</b-button>

<b-button
Expand All @@ -40,7 +40,17 @@

<hr />

<b-container class="border p-4">
<b-container v-if="isLookup" class="border p-4 mb-3">
<h3 class="text-center">Local</h3>
<b-container>
<b-row v-for="(value, name) in localData" :key="name" align-v="center">
<h5 class="text-capitalize m-0 mr-4">{{ name }}:</h5>
<p class="m-0">{{ value }}</p>
</b-row>
</b-container>
</b-container>

<b-container v-if="isLookup" class="border p-4">
<h3 class="text-center">Scanners</h3>
<Scanner name="GoogleSearch" scanId="googlesearch" />
<Scanner name="Numverify Scan" scanId="numverify" />
Expand All @@ -63,12 +73,22 @@ import Scanner from "../components/Scanner.vue";
// import NumverifyScan from "../components/NumverifyScan.vue";
// import GoogleSearch from "../components/GoogleSearch.vue";
// import OVHScan from "../components/OVHScan.vue";
import { AxiosResponse } from "axios";
import axios, { AxiosResponse } from "axios";
import config from "@/config";

interface Data {
loading: boolean;
isLookup: boolean;
inputNumber: string;
scanEvent: Vue;
localData: {
raw_local: string;
local: string;
e164: string;
international: string;
country_code: string;
country: string;
};
}

export type ScanResponse<T> = AxiosResponse<{
Expand All @@ -86,13 +106,23 @@ export default Vue.extend({
data(): Data {
return {
loading: false,
isLookup: false,
inputNumber: "",
scanEvent: new Vue(),
localData: {
raw_local: "",
local: "",
e164: "",
international: "",
country_code: "",
country: "",
},
};
},
methods: {
clearData() {
this.scanEvent.$emit("clear");
// this.scanEvent.$emit("clear");
sundowndev marked this conversation as resolved.
Show resolved Hide resolved
this.isLookup = false;
this.$store.commit("resetState");
},
async runScans(): Promise<void> {
Expand All @@ -105,11 +135,26 @@ export default Vue.extend({

this.$store.commit("setNumber", formatNumber(this.inputNumber));

this.scanEvent.$emit("scan");
try {
const res = await axios.get(
`${config.apiUrl}/numbers/${this.$store.state.number}/scan/local`,
{
validateStatus: () => true,
}
);

this.localData = res.data.result;
} catch (error) {
this.$store.commit("pushError", { message: error });
}

this.isLookup = true;
this.loading = false;
// this.scanEvent.$emit("scan");

this.scanEvent.$on("finished", () => {
this.loading = false;
});
// this.scanEvent.$on("finished", () => {
// this.loading = false;
// });
},
onSubmit(evt: Event) {
evt.preventDefault();
Expand Down