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

update all js #501

Merged
merged 1 commit into from
Mar 11, 2022
Merged
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
30,514 changes: 11,679 additions & 18,835 deletions quetz_frontend/package-lock.json

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions quetz_frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@carbon/themes": "^10.13.0",
"@carbon/vue": "^2.27.0",
"core-js": "^3.6.5",
"vue": "^2.6.11",
"vue-router": "^3.3.2"
"@carbon/themes": "^10.53.0",
"@carbon/vue": "^2.40.0",
"core-js": "^3.21.1",
"vue": "^2.6.14",
"vue-router": "^3.5.3"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.4.0",
"@vue/cli-plugin-eslint": "~4.4.0",
"@vue/cli-service": "~4.4.0",
"babel-eslint": "^10.1.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2",
"node-sass": "^7.0.0",
"sass-loader": "^8.0.2",
"vue-template-compiler": "^2.6.11"
"@babel/eslint-parser": "^7",
"@vue/cli-plugin-babel": "^5",
"@vue/cli-plugin-eslint": "^5",
"@vue/cli-service": "^5",
"eslint": "^8",
"eslint-plugin-vue": "^8",
"sass": "^1",
"sass-loader": "^12",
"vue-template-compiler": "^2"
},
"eslintConfig": {
"root": true,
Expand All @@ -36,7 +36,7 @@
"eslint:recommended"
],
"parserOptions": {
"parser": "babel-eslint"
"parser": "@babel/eslint-parser"
},
"rules": {}
},
Expand Down
6 changes: 3 additions & 3 deletions quetz_frontend/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<template>
<div id="app">
<Header />
<HeaderComponent />
<cv-content id="main-content" class="container">
<router-view />
</cv-content>
</div>
</template>

<script>
import Header from './components/Header';
import HeaderComponent from './components/HeaderComponent';
export default {
name: 'App',
components: {
Header
HeaderComponent
}
};
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
components: {
UserAvatar20
},
name: 'Header',
name: 'HeaderComponent',
data() {
return {
yourName: '',
Expand Down
2 changes: 1 addition & 1 deletion quetz_frontend/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Vue.config.productionTip = false;
new Vue({
router,
render: h => h(App)
}).$mount('#app');
}).$mount('#app');
43 changes: 21 additions & 22 deletions quetz_frontend/src/router.js
Original file line number Diff line number Diff line change
@@ -1,68 +1,67 @@
import Vue from 'vue';
import Router from 'vue-router';
import CarbonComponentsVue from '@carbon/vue';

import Channels from './views/Channels.vue';
import Users from './views/Users.vue';
import ApiKeys from './views/ApiKeys';
import Packages from './views/Packages';
import Package from './views/Package';
import Jobs from './views/Jobs';
import Tasks from './views/Tasks';
import ChannelsView from './views/ChannelsView';
import UsersView from './views/UsersView';
import ApiKeysView from './views/ApiKeysView';
import PackagesView from './views/PackagesView';
import PackageView from './views/PackageView';
import JobsView from './views/JobsView';
import TasksView from './views/TasksView';

import Header from './components/Header';
import HeaderComponent from './components/HeaderComponent';

import CarbonComponentsVue from '@carbon/vue';
Vue.use(CarbonComponentsVue);

Vue.use(CarbonComponentsVue);
Vue.use(Router);

export default new Router({
routes: [
{
path: '/channels',
name: 'channels',
component: Channels
component: ChannelsView
},
{
path: '/',
name: 'root_channels',
component: Channels
component: ChannelsView
},
{
path: '/users',
name: 'users',
component: Users
component: UsersView
},
{
path: '/api-keys',
name: 'api-keys',
component: ApiKeys
component: ApiKeysView
},
{
path: '/channel/:channel_id/packages',
name: 'packages',
component: Packages
component: PackagesView
},
{
path: '/jobs/',
name: 'jobs',
component: Jobs
component: JobsView
},
{
path: '/jobs/:job_id',
name: 'tasks',
component: Tasks
component: TasksView
},
{
path: '/channel/:channel_id/packages/:package',
name: 'package',
component: Package
component: PackageView
},
{
path: '/header',
name: 'header',
component: Header
}
],
mode: 'history'
component: HeaderComponent
}],
mode: 'history'
});