update proxy & fix space encoding

dan-mba · Sep 7, 2023 · 07aaad3 · 07aaad3
1 parent 2766df4
commit 07aaad3
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 488 deletions.
diff --git a/docs/assets/color.473bc8ca.png b/docs/assets/color.473bc8ca.png
diff --git a/docs/assets/index.05f67a6a.js b/docs/assets/index.05f67a6a.js
diff --git a/docs/assets/index.1b396a02.css b/docs/assets/index.1b396a02.css
diff --git a/docs/assets/primeicons.131bc3bf.ttf b/docs/assets/primeicons.131bc3bf.ttf
diff --git a/docs/assets/primeicons.3824be50.woff2 b/docs/assets/primeicons.3824be50.woff2
diff --git a/docs/assets/primeicons.5e10f102.svg b/docs/assets/primeicons.5e10f102.svg
diff --git a/docs/assets/primeicons.90a58d3a.woff b/docs/assets/primeicons.90a58d3a.woff
diff --git a/docs/assets/primeicons.ce852338.eot b/docs/assets/primeicons.ce852338.eot
diff --git a/docs/favicon.ico b/docs/favicon.ico
diff --git a/docs/index.html b/docs/index.html
diff --git a/src/App.vue b/src/App.vue
@@ -27,7 +27,7 @@
 
 <script setup>
 import {ref, watch} from 'vue';
-import NHTSA from './constants/endpoints';
+import getUrl from './constants/endpoints';
 import YearSelect from './components/YearSelect';
 import MakeSelect from './components/MakeSelect';
 import ModelSelect from './components/ModelSelect';
@@ -64,7 +64,7 @@ function getData() {
     vehicle.value = null;
     return;
   }
-  fetch(`${NHTSA.proxy}?quest=${NHTSA.endpoint}/VehicleId/${vehId.value}`)
+  fetch(getUrl(`/VehicleId/${vehId.value}`))
     .then(res => res.json())
     .then(response => {
       const data = response.Results[0];

diff --git a/src/components/DescSelect.vue b/src/components/DescSelect.vue
@@ -12,7 +12,7 @@
 
 <script setup>
 import {ref, watch} from 'vue';
-import NHTSA from '../constants/endpoints';
+import getUrl from '../constants/endpoints';
 
 const props = defineProps({
   value: {type: String, default: ''},
@@ -51,7 +51,7 @@ watch (selected, () => {
 
 function getData() {
   selected.value = '';
-  fetch(`${NHTSA.proxy}?quest=${NHTSA.endpoint}/modelyear/${props.year}/make/${props.make}/model/${props.model}`)
+  fetch(getUrl(`/modelyear/${props.year}/make/${props.make}/model/${props.model}`))
     .then(res => res.json())
     .then(response => {
       descriptions.value = response.Results.map(result => {

diff --git a/src/components/MakeSelect.vue b/src/components/MakeSelect.vue
@@ -12,7 +12,7 @@
 
 <script setup>
 import {ref, watch} from 'vue';
-import NHTSA from '../constants/endpoints';
+import getUrl from '../constants/endpoints';
 
 const props = defineProps({
   value: {type: String, default: ''},
@@ -29,7 +29,7 @@ watch(() => props.year, () => {
     return;
   }
   selected.value = '';
-  fetch(`${NHTSA.proxy}?quest=${NHTSA.endpoint}/modelyear/${props.year}`)
+  fetch(getUrl(`/modelyear/${props.year}`))
     .then(res => res.json())
     .then(response => {
       makes.value = response.Results.map(result => {

diff --git a/src/components/ModelSelect.vue b/src/components/ModelSelect.vue
@@ -12,7 +12,7 @@
 
 <script setup>
 import {ref, watch} from 'vue';
-import NHTSA from '../constants/endpoints';
+import getUrl from '../constants/endpoints';
 
 const props = defineProps({
     value: {type: String, default: ''},
@@ -47,12 +47,12 @@ watch (selected, () => {
 });
 
 function getData() {
-  fetch(`${NHTSA.proxy}?quest=${NHTSA.endpoint}/modelyear/${props.year}/make/${props.make}`)
+  fetch(getUrl(`/modelyear/${props.year}/make/${props.make}`))
     .then(res => res.json())
     .then(response => {
       models.value = response.Results.map(result => {
         return {
-          value: result.Model.replace(/&/g,'_'),
+          value: result.Model.replace(/&/g,'_').replace(/ /g,'%20'),
           text: result.Model
         }
       })

diff --git a/src/components/YearSelect.vue b/src/components/YearSelect.vue
@@ -12,7 +12,7 @@
 
 <script setup>
 import {ref, watch, onMounted} from 'vue';
-import NHTSA from '../constants/endpoints';
+import getUrl from '../constants/endpoints';
 
 defineProps({
   value: {type: String, default: ''}
@@ -27,7 +27,7 @@ watch(selected, () => {
 });
 
 onMounted(() => {
-  fetch(`${NHTSA.proxy}?quest=${NHTSA.endpoint}`)
+  fetch(getUrl(''))
     .then(res => res.json())
     .then(response => {
       years.value = response.Results.map(result => {

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
@@ -1,5 +1,6 @@
-const NHTSA = {
-  endpoint: 'api.nhtsa.gov/SafetyRatings',
-  proxy: 'https://api.codetabs.com/v1/proxy/'
-};
-export default NHTSA;
+const endpoint = 'https://api.nhtsa.gov/SafetyRatings';
+const proxy = 'https://corsproxy.io/?';
+
+export default function getUrl (URLPart){
+  return proxy + encodeURIComponent(`${endpoint}${URLPart}`);
+}