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 Dependencies #12

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
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
38 changes: 38 additions & 0 deletions .github/workflows/ionos-space.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: IONOS.space

on: [push]

jobs:
ionos-space:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2
with:
submodules: 'recursive'
- name: Get Ionos Project data
uses: buildwith-ionos/[email protected]
id: project
with:
api-key: ${{ secrets.IONOS_API_KEY }}
project: 35346700-6a3c-43f8-a074-a5b21d21b737
service-host: api-eu.ionos.space
- name: Setup Node.js 12.16.x
uses: actions/setup-node@v1
with:
node-version: 12.16.x
- name: Prepare Project build environment
run: npm ci
- name: Build Node project
run: npm run build
env:
SITE_URL: ${{ steps.project.outputs.site-url }}
CI: true
- name: Deploy to IONOS
uses: buildwith-ionos/[email protected]
with:
api-key: ${{ secrets.IONOS_API_KEY }}
dist-folder: dist
service-host: api-eu.ionos.space
project: 35346700-6a3c-43f8-a074-a5b21d21b737
remote-host: ${{ steps.project.outputs.remote-host }}
14,775 changes: 7,842 additions & 6,933 deletions package-lock.json

Large diffs are not rendered by default.

39 changes: 24 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,35 @@
"scripts": {
"dev": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
"lint": "vue-cli-service lint",
"validate_prod": "npm run build; http-server dist"
},
"dependencies": {
"animate.css": "^3.7.0",
"chart.js": "2.5.0",
"eagle.js": "^0.4.1",
"highlight.js": "^9.12.0",
"vue": "^2.1.10",
"vue-router": "^2.2.0"
"animate.css": "^4.1.1",
"chart.js": "2.9.4",
"eagle.js": "^0.6.1",
"highlight.js": "^10.2.1",
"vue": "^2.6.12",
"vue-router": "^3.4.7"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.0.4",
"@vue/cli-plugin-eslint": "^3.0.4",
"@vue/cli-service": "^3.0.4",
"@vue/eslint-config-standard": "^3.0.4",
"node-sass": "^4.9.3",
"pug": "^2.0.3",
"@vue/cli-plugin-babel": "^4.5.8",
"@vue/cli-plugin-eslint": "^4.5.8",
"@vue/cli-service": "^4.5.8",
"@vue/eslint-config-standard": "^5.1.2",
"babel-eslint": "^10.1.0",
"eslint": "^7.11.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^7.1.0",
"http-server": "^0.12.3",
"node-sass": "^4.14.1",
"pug": "^3.0.0",
"pug-plain-loader": "^1.0.0",
"sass-loader": "^7.1.0",
"vue-template-compiler": "^2.5.17"
"sass-loader": "^10.0.3",
"vue-template-compiler": "^2.6.12"
},
"engines": {
"node": ">= 4.0.0",
Expand Down
1 change: 0 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<head>
<meta charset="utf-8">
<link rel="shortcut icon" type="image/png" href="./static/favicon.png">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css">
<title>Eagle.js</title>
</head>
<body>
Expand Down
7 changes: 5 additions & 2 deletions src/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
.embedded-slideshow-container
component(:is="slideshow", :embedded='true',
:keyboardNavigation='false',
:mouseNavigation='false')
:mouseNavigation='false',
)
.caption
h3 {{slideshow.infos.title}}
p.thumbnail-description {{slideshow.infos.description}}
Expand All @@ -36,7 +37,9 @@ import slideshows from './slideshows/slideshows.js'
export default {
data: function () {
return {
slideshows: slideshows.list
slideshows: slideshows.list,
childWindow: null,
parentWindow: null
}
},
mounted: function () {
Expand Down
17 changes: 13 additions & 4 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import Router from 'vue-router'
import App from './App'
import Home from './Home'

import Eagle, { Options } from 'eagle.js'
import 'eagle.js/dist/eagle.css'
import Eagle, { Options, Presenter, CodeBlock, CodeComment, Toggle, RadioButton, Timer, TriggeredMessage, Modal, ImageSlide } from 'eagle.js'
import hljs from 'highlight.js'
import 'animate.css/animate.compat.css'

import slideshows from './slideshows/slideshows.js'
/* eslint-disable no-new */
Expand All @@ -14,8 +14,17 @@ Vue.use(Eagle)
Vue.use(Router)
Vue.config.productionTip = false
Options.hljs = hljs
Eagle.use(Presenter)
Eagle.use(CodeBlock)
Eagle.use(CodeComment)
Eagle.use(Toggle)
Eagle.use(RadioButton)
Eagle.use(Timer)
Eagle.use(TriggeredMessage)
Eagle.use(Modal)
Eagle.use(ImageSlide)

let routes = []
const routes = []
slideshows.list.forEach(function (slideshow) {
routes.push({
path: '/' + slideshow.infos.path,
Expand All @@ -24,7 +33,7 @@ slideshows.list.forEach(function (slideshow) {
})
routes.push({ path: '*', component: Home })

let router = new Router({
const router = new Router({
routes
})

Expand Down
4 changes: 2 additions & 2 deletions src/slideshows/eagle-recipes/DemoSlideshow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@
</template>

<script>
import eagle from 'eagle.js'
import { Slideshow } from 'eagle.js'

export default {
mixins: [eagle.slideshow],
mixins: [Slideshow],
infos: {
title: 'Demo recipes',
description: 'Demos for Eagle recipes',
Expand Down
10 changes: 5 additions & 5 deletions src/slideshows/eagle-recipes/EagleRecipes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
The &lt;script&gt; tag loads Eagle and specifies options:
eg-code-block(lang='html').
&lt;script&gt;
import eagle from 'eagle.js'
import { Slideshow } from 'eagle.js'
export default {
mixins: [ eagle.slideshow ],
mixins: [Slideshow],
infos: {
title: 'Your First Slideshow',
description: 'A boilerplate to get you started',
Expand Down Expand Up @@ -198,19 +198,19 @@
</template>

<script>
import eagle from 'eagle.js'
import { Slideshow, Slide } from 'eagle.js'
import DemoSlideshow from './DemoSlideshow'

var TransitionedSlide = {
mixins: [eagle.slide],
mixins: [Slide],
props: {
enter: { default: 'slideInRight' },
leave: { default: 'slideOutLeft' }
}
}

export default {
mixins: [eagle.slideshow],
mixins: [Slideshow],
data: function () {
return {
fullPageWidth: null,
Expand Down
4 changes: 2 additions & 2 deletions src/slideshows/first-slideshow/FirstSlideshow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</template>

<script>
import eagle from 'eagle.js'
import { Slideshow } from 'eagle.js'
export default {
mixins: [ eagle.slideshow ],
mixins: [Slideshow],
infos: {
// These infos appear on the home page, below the slideshow's thumbnail
title: 'Your First Slideshow',
Expand Down
6 changes: 4 additions & 2 deletions src/slideshows/introducing-eagle/AwesomeEmbeddedSlideshow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,14 @@
</template>

<script>
import eagle from 'eagle.js'
import { Slideshow } from 'eagle.js'
import ExampleImageSlideshow from './ExampleImageSlideshow'

export default {
mixins: [eagle.slideshow],
mixins: [Slideshow],
props: {
childWindow: null,
parentWindow: null,
preference: { default: 'baby bunnies' },
username: { default: 'Tracy' }
},
Expand Down
4 changes: 2 additions & 2 deletions src/slideshows/introducing-eagle/AwesomeInsertedSlide.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ eg-transition(:enter='enter', :leave='leave')

<script>
import AwesomeEmbeddedSlideshow from './AwesomeEmbeddedSlideshow'
import eagle from 'eagle.js'
import { Slide } from 'eagle.js'
export default {
props: {
steps: { default: 14 },
Expand All @@ -60,7 +60,7 @@ export default {
components: {
'awesome-embedded-slideshow': AwesomeEmbeddedSlideshow
},
mixins: [eagle.slide]
mixins: [Slide]
}
</script>
<style lang='scss' scoped>
Expand Down
4 changes: 2 additions & 2 deletions src/slideshows/introducing-eagle/ExampleImageSlideshow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
</template>

<script>
import eagle from 'eagle.js'
import { Slideshow } from 'eagle.js'

export default {
mixins: [eagle.slideshow],
mixins: [Slideshow],
props: {
preference: { default: 'funny kitties' }
},
Expand Down
4 changes: 2 additions & 2 deletions src/slideshows/introducing-eagle/FiguresSlide.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ eg-transition(:enter='enter', :leave='leave')
:height='250')
</template>
<script>
import eagle from 'eagle.js'
import { Slide } from 'eagle.js'
import chart from './Chart'
export default {
components: { chart },
Expand Down Expand Up @@ -104,7 +104,7 @@ export default {
}
}
},
mixins: [eagle.slide]
mixins: [Slide]
}
</script>
<style lang='scss' scoped>
Expand Down
10 changes: 6 additions & 4 deletions src/slideshows/introducing-eagle/IntroducingEagle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,10 @@
</template>

<script>
import eagle from 'eagle.js'
import { Slideshow } from 'eagle.js'

export default {
mixins: [eagle.slideshow],
mixins: [Slideshow],
infos: {
title: 'Introducing Eagle.js',
description: 'Watch this first if you are new to Eagle.js',
Expand All @@ -234,6 +234,8 @@ export default {
},
data: function () {
return {
childWindow: null,
parentWindow: null,
username: 'Tracy',
preference: 'baby bunnies',
preferences: [
Expand Down Expand Up @@ -282,9 +284,9 @@ export default {
'baby bunnies': 'Yeeeeah my favorite too !',
'fluffy puppies': 'Wow so original.',
'funny kitties': 'Good for you ' + this.username + '.',
'Theming': 'Ok ' + this.username + ', whatever.',
Theming: 'Ok ' + this.username + ', whatever.',
'Slide reuse': 'Seriously ' + this.username + ' you <em>want</em> to see this.',
'Interactivity': 'Well that\'s this slide, ' + this.username +
Interactivity: 'Well that\'s this slide, ' + this.username +
'. <br /> A bit too late to unsee it, heh ?'
}[name]
}
Expand Down
6 changes: 3 additions & 3 deletions src/slideshows/introducing-eagle/components/EndCredits.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default {
data: function () {
return {
categories: {
'Crew': [
Crew: [
{
name: this.username,
role: 'Internet Person'
Expand All @@ -39,7 +39,7 @@ export default {
role: 'Author'
}
],
'Software': [
Software: [
{
name: 'Vue.js',
role: 'Front-end engine'
Expand All @@ -65,7 +65,7 @@ export default {
role: '(Bad) highlighting'
}
],
'Assets': [
Assets: [
{
name: 'Irfan iLias',
role: 'Background Pattern'
Expand Down
4 changes: 2 additions & 2 deletions src/slideshows/themes-slideshow/ThemesSlideshow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
h3 Your bad taste is the limit
</template>
<script>
import eagle from 'eagle.js'
import { Slideshow } from 'eagle.js'
export default {
mixins: [eagle.slideshow],
mixins: [Slideshow],
infos: {
title: 'Themes Slideshows',
description: 'You can change everything !',
Expand Down
4 changes: 4 additions & 0 deletions test
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
twesed
dfsdf
sdfsdf
sdfsdf
8 changes: 8 additions & 0 deletions vue.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
module.exports = {
lintOnSave: 'error',
// runtimeCompiler: process.env.NODE_ENV !== 'production'
chainWebpack: config => {
config.module
.rule('vue')
.use('vue-loader')
.tap(args => {
args.compilerOptions.whitespace = 'preserve'
})
}
}