Merge branch '58-js-linting' into develop (Closes #58)

pull/59/head
Jef Roosens 2021-05-01 19:12:18 +02:00
commit 5ce3f0bb39
Signed by: Jef Roosens
GPG Key ID: B580B976584B5F30
10 changed files with 67 additions and 42 deletions

15
web/.eslintrc.yml 100644
View File

@ -0,0 +1,15 @@
env:
browser: true
es2021: true
extends:
- 'plugin:vue/essential'
- standard
parserOptions:
ecmaVersion: 12
parser: '@typescript-eslint/parser'
sourceType: module
plugins:
- vue
- '@typescript-eslint'
rules:
indent: ["error", 4]

View File

@ -4,15 +4,25 @@
"scripts": {
"dev": "vite",
"build": "vue-tsc --noEmit && vite build",
"serve": "vite preview"
"serve": "vite preview",
"lint": "eslint \"src/**\"",
"format": "eslint --fix \"src/**\""
},
"dependencies": {
"vue": "^3.0.5",
"vue-router": "^4.0.6"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"@vitejs/plugin-vue": "^1.2.1",
"@vue/compiler-sfc": "^3.0.5",
"eslint": "^7.25.0",
"eslint-config-standard": "^16.0.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.3.1",
"eslint-plugin-vue": "^7.9.0",
"typescript": "^4.1.3",
"vite": "^2.2.1",
"vue-tsc": "^0.0.25"

View File

@ -10,8 +10,8 @@ import Nav from './components/Nav.vue'
export default defineComponent({
name: 'App',
components: {
Nav,
},
Nav
}
})
</script>

View File

@ -4,10 +4,10 @@ export interface Street {
}
export async function search (search_term: string): Promise<Street[]> {
var base_url = import.meta.env.VITE_ENDPOINT as string
const base_url = import.meta.env.VITE_ENDPOINT as string
var r = await fetch(`${base_url}/ivago/search?` + new URLSearchParams({
q: search_term,
const r = await fetch(`${base_url}/ivago/search?` + new URLSearchParams({
q: search_term
}))
if (!r.ok) {

View File

@ -17,16 +17,16 @@ export default defineComponent({
name: 'HelloWorld',
data () {
return {
street: "",
results: [] as Street[],
street: '',
results: [] as Street[]
}
},
methods: {
onSubmit () {
new Ivago(import.meta.env.VITE_ENDPOINT as string).search(this.$data.street)
.then(res => {
this.$data.results = res;
});
this.$data.results = res
})
}
}
})

View File

@ -8,6 +8,6 @@
import { defineComponent } from 'vue'
export default defineComponent({
name: 'Home',
name: 'Home'
})
</script>

View File

@ -3,7 +3,7 @@
<input v-model="query" v-on:keyup.enter="search" type="text" placeholder="Street..." />
<div id="scroll-list">
<ul v-if="msg === ''">
<li v-for="item in items">{{ item.name }}</li>
<li v-for="item in items">{{ item.name }} ({{ item.city }})</li>
</ul>
<p v-else>{{ msg }}</p>
</div>
@ -11,31 +11,31 @@
<script lang="ts">
import { defineComponent } from 'vue'
import { Street, search } from '../api/ivago'
import { Street, search as ivago_search } from '../api/ivago'
export default defineComponent({
name: 'Ivago',
data () {
return {
items: [] as Street[],
msg: "",
query: "",
msg: '',
query: ''
}
},
methods: {
search () {
this.items = []
this.msg = "Loading..."
this.msg = 'Loading...'
if (this.query === "") {
this.msg = ""
if (this.query === '') {
this.msg = ''
return
}
search(this.query)
ivago_search(this.query)
.then((res: Street[]) => {
this.items = res
this.msg = ""
this.msg = ''
})
}
}

View File

@ -11,7 +11,7 @@
import { defineComponent } from 'vue'
export default defineComponent({
name: 'Nav',
name: 'Nav'
})
</script>

View File

@ -1,6 +1,6 @@
import { createApp } from 'vue';
import App from './App.vue';
import router from './router';
import { createApp } from 'vue'
import App from './App.vue'
import router from './router'
const app = createApp(App)
app.use(router)

View File

@ -1,21 +1,21 @@
import { createWebHistory, createRouter } from "vue-router";
import Home from './components/Home.vue';
import Ivago from './components/Ivago.vue';
import { createWebHistory, createRouter } from 'vue-router'
import Home from './components/Home.vue'
import Ivago from './components/Ivago.vue'
const routes = [
{
path: "/",
component: Home,
path: '/',
component: Home
},
{
path: "/ivago",
component: Ivago,
},
];
path: '/ivago',
component: Ivago
}
]
const router = createRouter({
history: createWebHistory(),
routes,
});
routes
})
export default router;
export default router