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.

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

[WIP] try to upgrade to vue3 #285

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions node_modules/.yarn-integrity

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

7 changes: 5 additions & 2 deletions web/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ module.exports = {
},
extends: [
'plugin:vue/recommended',
'@vue/airbnb',
// see https://github.com/vuejs/vue-cli/issues/1650
// Unable to resolve path to module '@/components/hero/Illustration.vue' import/no-unresolved
//'@vue/airbnb',
'plugin:@intlify/vue-i18n/recommended',
],
globals: {
bus: false,
},
parserOptions: {
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
Expand All @@ -23,6 +25,7 @@ module.exports = {
extensions: ['.js', '.vue'],
}],
'no-multiple-empty-lines': 'off',
'vue/multi-word-component-names': 'off',
},
settings: {
'vue-i18n': {
Expand Down
3 changes: 3 additions & 0 deletions web/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ yarn-error.log*

# Local Netlify folder
.netlify

# Compiled Lambda functions
/lambda/
19 changes: 19 additions & 0 deletions web/jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"compilerOptions": {
"target": "es5",
"module": "esnext",
"baseUrl": "./",
"moduleResolution": "node",
"paths": {
"@/*": [
"src/*"
]
},
"lib": [
"esnext",
"dom",
"dom.iterable",
"scripthost"
]
}
}
2 changes: 1 addition & 1 deletion web/netlify.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[build]
command = "yarn build"
functions = "dist-lambda"
functions = "lambda"
publish = "dist"
77 changes: 45 additions & 32 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,62 @@
"scripts": {
"serve": "vue-cli-service serve",
"build": "yarn build:front && yarn build:lambda",
"build:front": "vue-cli-service build",
"build:lambda": "yarn run patch-package && yarn netlify-lambda build src/lambda --config ./webpack.functions.js",
"test:unit": "vue-cli-service test:unit",
"lint": "vue-cli-service lint",
"build:front": "vue-cli-service build",
"build:lambda": "yarn run patch-package && yarn netlify-lambda build src/lambda --config ./webpack.functions.js",
"i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'"
},
"dependencies": {
"@mdi/font": "^6.5.95",
"airtable": "0.11.2",
"@mdi/font": "5.9.55",
"@vue/compat": "^3.2.41",
"@vuelidate/core": "^2.0.0",
"@vuelidate/validators": "^2.0.0",
"airtable": "0.11.5",
"axios": "^0.26.0",
"core-js": "^3.6.4",
"encoding": "^0.1.13",
"core-js": "^3.8.3",
"material-design-icons-iconfont": "^6.4.1",
"mitt": "^3.0.0",
"netlify-lambda": "2.0.15",
"vue": "^2.6.14",
"vue-i18n": "^8.27.0",
"vue-router": "^3.5.3",
"vuelidate": "^0.7.7",
"vuetify": "^2.6.10"
"roboto-fontface": "*",
"vue": "^3.2.13",
"vue-i18n": "9",
"vue-router": "4",
"vuetify": "^3.0.0-beta.0",
"webfontloader": "^1.0.0"
},
"devDependencies": {
"@intlify/eslint-plugin-vue-i18n": "^0.5.0",
"@intlify/vue-i18n-loader": "^1.0.0",
"@vue/cli-plugin-babel": "^4.3.0",
"@vue/cli-plugin-eslint": "^4.3.0",
"@vue/cli-plugin-unit-mocha": "^4.3.0",
"@vue/cli-service": "^4.3.0",
"@vue/eslint-config-airbnb": "^5.0.2",
"@vue/test-utils": "1.0.0-beta.31",
"babel-eslint": "^10.1.0",
"chai": "^4.1.2",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-vue": "^6.2.2",
"sass": "^1.26.3",
"sass-loader": "^8.0.2",
"terser-webpack-plugin": "1.4.5",
"vue-cli-plugin-i18n": "~1.0.1",
"@babel/core": "^7.19.3",
"@babel/eslint-parser": "^7.19.1",
"@intlify/eslint-plugin-vue-i18n": "^2.0.0",
"@rushstack/eslint-patch": "^1.2.0",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-eslint": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"@vue/eslint-config-airbnb": "^7.0.0",
"eslint": "^8.25.0",
"eslint-plugin-vue": "^8.0.3",
"patch-package": "^6.4.7",
"sass": "^1.55.0",
"sass-loader": "^13.1.0",
"vue-cli-plugin-netlify-lambda": "~0.1.1",
"vue-cli-plugin-vuetify": "^2.0.5",
"vue-template-compiler": "^2.6.14",
"vuetify-loader": "^1.7.3",
"vue-cli-plugin-vuetify": "~2.5.8",
"vue-eslint-parser": "^9.1.0",
"webpack-node-externals": "^3.0.0",
"patch-package": "^6.4.7"
"webpack-plugin-vuetify": "^2.0.0-alpha.0"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/vue3-essential",
"eslint:recommended"
],
"parserOptions": {
"parser": "@babel/eslint-parser"
},
"rules": {}
}
}
1 change: 0 additions & 1 deletion web/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
@click-menu="clickMenu"
/>
<sidebar
v-if="$vuetify.breakpoint.smAndDown"
:show="showSidebar"
:items="navigation"
@close-drawer="showSidebar = false"
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/AppFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
md="4"
xs="12"
>
<v-row :justify="$vuetify.breakpoint.mdAndUp ? 'left' : 'center'">
<v-row justify="center">
<h3>
{{ $t('footer.title') }}
</h3>
Expand All @@ -43,7 +43,7 @@
xs="12"
>
<v-row justify="center">
<v-spacer v-if="$vuetify.breakpoint.mdAndUp" />
<v-spacer />
<social-button
dark
x-large
Expand Down
3 changes: 1 addition & 2 deletions web/src/components/LocaleSwitcher.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<template>
<v-btn
text
@click="changeLocale"
>
<!--eslint-disable-next-line @intlify/vue-i18n/no-raw-text -->
<v-icon left>
language
mdi-web
</v-icon>
{{ switchLabel }}
</v-btn>
Expand Down
11 changes: 7 additions & 4 deletions web/src/components/Search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<v-autocomplete
:label="$t('findSpeaker.topics')"
:placeholder="$t('findSpeaker.searchPlaceholder')"
prepend-icon="search"
prepend-icon="mdi-search"
clearable
:items="topicItems"
@change="selectItem('topic', $event)"
@select="selectItem('topic', value)"
/>
</v-col>
<v-col
Expand All @@ -21,7 +21,7 @@
<v-autocomplete
:label="$t('findSpeaker.places')"
:placeholder="$t('findSpeaker.searchPlaceholder')"
prepend-icon="search"
prepend-icon="mdi-search"
clearable
:items="locationItems"
@change="selectItem('location', $event)"
Expand All @@ -45,11 +45,14 @@ export default {
},
methods: {
selectItem(fieldName, value) {
debugger;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RageZBla debugger

this[fieldName] = value || '';
this.emitValues();
console.log(value);
},
emitValues() {
bus.$emit('search-by-params', {
console.log(this.topic);
this.emitter.emit('search-by-params', {
topic: this.topic,
location: this.location,
});
Expand Down
19 changes: 6 additions & 13 deletions web/src/components/Sidebar.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<template>
<v-navigation-drawer
v-model="drawer"
app
right
dark
:model-value="drawer"
location="right"
temporary
color="primary"
>
<v-list>
Expand All @@ -13,16 +12,10 @@
>
<v-list-item
:href="item.path"
:title="item.title"
:prepend-icon="item.icon"
link
>
<v-list-item-icon>
<v-icon>{{ item.icon }}</v-icon>
</v-list-item-icon>

<v-list-item-content>
<v-list-item-title>{{ item.title }}</v-list-item-title>
</v-list-item-content>
</v-list-item>
/>
</div>
<v-list-item>
<locale-switcher />
Expand Down
28 changes: 11 additions & 17 deletions web/src/components/Toolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,36 @@
<v-app-bar
app
color="primary"
dark
src="../assets/background.svg"
flat
absolute
flat
>
<template #image>
<v-img src="@/assets/background.svg" />
</template>
<v-btn
href="/"
text
:text="$t('hero.title')"
size="x-large"
variant="text"
>
<v-toolbar-title>
<v-app-bar-title>
{{ $t('hero.title') }}
</v-toolbar-title>
</v-app-bar-title>
</v-btn>

<v-spacer />

<v-toolbar-items
v-if="$vuetify.breakpoint.mdAndUp"
class="d-flex align-center"
>
<div
v-for="item in filteredItems"
:key="item.title"
>
<v-btn
text
:text="item.title"
:href="item.path"
variant="text"
>
{{ item.title }}
</v-btn>
Expand All @@ -40,15 +43,6 @@
/>
<locale-switcher />
</v-toolbar-items>
<v-toolbar-items v-else>
<v-btn
text
@click="$emit('click-menu')"
>
<!--eslint-disable-next-line @intlify/vue-i18n/no-raw-text -->
<v-icon>menu</v-icon>
</v-btn>
</v-toolbar-items>
</v-app-bar>
</template>

Expand Down
6 changes: 3 additions & 3 deletions web/src/components/buttons/SocialButton.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<template>
<v-btn
v-if="show"
variant="text"
:href="link"
target="_blank"
icon
:dark="dark"
:x-large="xLarge"
target="_blank"
size="x-large"
color="primary"
>
<slot />
Expand Down
4 changes: 1 addition & 3 deletions web/src/components/cards/TwoButtonModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
<v-card>
<v-col>
<v-card-title>{{ title }}</v-card-title>
<v-card-text px-8>
<slot />
</v-card-text>
<v-card-text px-8 />
<v-card-actions>
<v-spacer />
<v-btn
Expand Down
7 changes: 4 additions & 3 deletions web/src/components/hero/CallToAction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
justify="center"
>
<v-btn
outlined
variant="outlined"
color="white"
dark
class="ma-2"
@click="$vuetify.goTo('#find-speaker', options)"
Expand All @@ -34,7 +35,8 @@
justify="center"
>
<v-btn
outlined
variant="outlined"
color="white"
dark
class="ma-4"
href="nominate-speaker"
Expand All @@ -43,7 +45,6 @@
</v-btn>
</v-row>
<v-row
v-if="$vuetify.breakpoint.mdAndUp"
class="spacer"
/>
</div>
Expand Down
Loading