Skip to content
This repository has been archived by the owner on Feb 4, 2024. It is now read-only.

Commit

Permalink
Merge pull request #178 from sanjaygswmi/version_change
Browse files Browse the repository at this point in the history
Upgradation of vue & nuxt version
  • Loading branch information
curtisdelicata authored Jan 29, 2022
2 parents 18e090d + 3d80956 commit cfc26e6
Show file tree
Hide file tree
Showing 5 changed files with 568 additions and 597 deletions.
2 changes: 1 addition & 1 deletion assets/js/fan-chart/fan-chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -2790,7 +2790,7 @@
let compare1 = f;
let compare2 = f;

if (f.length !== 2) {
if (f.length === 1) {
delta = (d, x) => f(d) - x;
compare1 = ascending;
compare2 = (d, x) => ascending(f(d), x);
Expand Down
2 changes: 1 addition & 1 deletion assets/js/fan-chart/fan-chart.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions components/how-to/bulma/pages/howTo/components/HowToVideo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ import { VTooltip } from 'v-tooltip';
import { library } from '@fortawesome/fontawesome-svg-core';
import { faInfo, faTags, faInfoCircle } from '@fortawesome/free-solid-svg-icons';
import { faTrashAlt, faEdit, faImage } from '@fortawesome/free-regular-svg-icons';
import { videoPlayer } from 'vue-video-player';
import 'vue-video-player/src/custom-theme.css';
// import { videoPlayer } from 'vue-video-player';
// import 'vue-video-player/src/custom-theme.css';
import {
Card, CardHeader, CardCollapse, CardControl, CardContent,
CardFooter, CardFooterItem,
Expand Down
13 changes: 9 additions & 4 deletions nuxt.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import getSiteMeta from './utils/getSiteMeta'
import { cloneDeep } from 'lodash'
import { defineNuxtConfig } from '@nuxt/bridge'

const meta = getSiteMeta()

export default {
export default defineNuxtConfig({
ssr: false,

alias: {
tslib: "tslib/tslib.es6.js",
},

// server: {
// host: process.env.HOST || 'localhost' // default: localhost
// },
Expand Down Expand Up @@ -160,8 +165,8 @@ export default {
credentials: true,
},
proxy: {
'/api/': process.env.BASE_URL || 'http://localhost:8000',
'/broadcasting/': process.env.BASE_URL || 'http://localhost:8000',
'/api/': process.env.BASE_URL || 'http://localhost:3000',
'/broadcasting/': process.env.BASE_URL || 'http://localhost:3000',
},

// Build Configuration: https://go.nuxtjs.dev/config-build
Expand Down Expand Up @@ -249,4 +254,4 @@ export default {
// scssRules.store.set('normal', normalRule);
},
},
}
})
Loading

0 comments on commit cfc26e6

Please sign in to comment.