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

Dependency upgrades #143

Merged
merged 3 commits into from
Jul 26, 2019
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
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
}
}
],
"vue/html-self-closing": "off"
"vue/html-self-closing": "off",
"vue/singleline-html-element-content-newline": "off"
}
}
4 changes: 1 addition & 3 deletions back-end/domain/module/LedStrip.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ class LedStrip extends AbstractModule {

if (typeof this.config.colors !== 'undefined') {
for (let overWriteColor in this.config.colors) {
if (this.config.colors.hasOwnProperty(overWriteColor)) {
this.colors[overWriteColor] = this.config.colors[overWriteColor];
}
this.colors[overWriteColor] = this.config.colors[overWriteColor];
}
}

Expand Down
4 changes: 3 additions & 1 deletion front-end/components/NoConnection/no-connection.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<template>
<div class="no-connection">no connection with the server</div>
<div class="no-connection">
no connection with the server
</div>
</template>

<script>
Expand Down
4 changes: 3 additions & 1 deletion front-end/components/SettingsPanel/panels/About/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
<div class="name">
{{ contributor.name }} <span class="username">@{{ contributor.username }}</span>
</div>
<div v-if="contributor.location" class="location">{{ contributor.location }}</div>
<div v-if="contributor.location" class="location">
{{ contributor.location }}
</div>
<div class="contributions">
<a :href="getContributionsLink(contributor)" target="_blank">
{{ getContributionsText(contributor) }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</button>
<ul id="statusSelector" v-if="pushNotifications">
<li v-for="(enabled, status) in notificationStatuses" :key="status">
<button class="sub-option" @click="toggleNotificationStatus(status);" :class="{ current: enabled }">
<button class="sub-option" @click="toggleNotificationStatus(status)" :class="{ current: enabled }">
Show {{ status }}
</button>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
-`.
</p>
<p><strong>Hide cursor:</strong></p>
<button class="option" @click="disableCursorHide" :class="{ current: !cursorHidden }">Don't hide cursor</button>
<button class="option" @click="enableCursorHide" :class="{ current: cursorHidden }">Hide cursor</button>
<button class="option" @click="disableCursorHide" :class="{ current: !cursorHidden }">
Don't hide cursor
</button>
<button class="option" @click="enableCursorHide" :class="{ current: cursorHidden }">
Hide cursor
</button>
<div id="cursorHiddenTimeout" v-if="cursorHidden">
Hide after <input v-model.number="cursorHiddenTimeout" type="number" class="text" /> miliseconds
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
<div class="panel-status" :class="status.state">
<div class="title">
{{ status.title }}
<div v-if="status.subTitle" class="sub-title">{{ status.subTitle }}</div>
<div v-if="status.subTitle" class="sub-title">
{{ status.subTitle }}
</div>
</div>
<div class="actions">
<button class="remove" @click="remove(status.key);"><i class="fas fa-ban" /> remove</button>
<button class="remove" @click="remove(status.key)"><i class="fas fa-ban" /> remove</button>
</div>
</div>
</div>
Expand Down
19 changes: 13 additions & 6 deletions front-end/components/SettingsPanel/settings-panel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,32 @@
<div v-if="open" class="overlay" @click="closeOnOutsideClick">
<div class="settings-panel">
<div class="title-bar">
Settings <button @click="closePanel" class="close"><i class="fas fa-times"></i></button>
Settings
<button @click="closePanel" class="close">
<i class="fas fa-times"></i>
</button>
</div>
<div class="body">
<div class="menu">
<button
v-for="tab in tabs"
@click="openSettingsTab(tab);"
@click="openSettingsTab(tab)"
:key="tab.name"
:class="{ active: tab === openTab }"
>
<i :class="tab.icon"></i> <span class="title">{{ tab.name }}</span>
</button>
</div>
<div class="setting-space-wrapper">
<note v-if="openTab.localChangesOnly">Changes you make here will only affect you.</note>
<note v-if="openTab.localChangesOnly">
Changes you make here will only affect you.
</note>
<note v-if="!openTab.localChangesOnly && openTab.localChangesOnly !== null" type="warning">
Changes you make here will affect all connected clients.
</note>
<div class="setting-space"><component :is="openTab.component" /></div>
<div class="setting-space">
<component :is="openTab.component" />
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -186,7 +193,7 @@ $seperator-color: $color-gray-lighter
.setting-space
padding: 20px

/deep/ h1,
/deep/ p
::v-deep h1,
::v-deep p
margin-bottom: 15px
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:class="getStageClasses(stage)"
v-for="stage in stages"
:key="stage"
@mouseenter="selectStage(stage);"
@mouseenter="selectStage(stage)"
>
{{ stage }}
</div>
Expand Down
24 changes: 16 additions & 8 deletions front-end/components/Status/status.vue
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
<template>
<div class="status" :class="status.state">
<div class="image-resolver"><img v-if="status.image" :src="status.image" @error="hideImage" /></div>
<div class="image-resolver">
<img v-if="status.image" :src="status.image" @error="hideImage" />
</div>
<div class="image-container" :class="{ 'image-container--no-image': !showImage || !status.image }">
<div class="image" :style="imageStyle" />
</div>
<div class="build-details">
<div class="detail-title">{{ status.title }}</div>
<div class="detail-sub-title" v-if="status.subTitle">{{ status.subTitle }}</div>
<div class="detail-title">
{{ status.title }}
</div>
<div class="detail-sub-title" v-if="status.subTitle">
{{ status.subTitle }}
</div>
<jobs-and-stages :jobs="status.jobs" :stages="status.stages" />
</div>
<div class="submit-details">
<div class="user-image-container" :class="{ 'user-image--no-image': !status.userImage }">
<div class="user-image" :style="userImageStyle" />
</div>
<div class="time-ago" v-if="now">{{ timeAgo }}</div>
<div class="time-ago" v-if="now">
{{ timeAgo }}
</div>
</div>
</div>
</template>
Expand Down Expand Up @@ -96,25 +104,25 @@ export default {
&.info
background: $color-info

/deep/ .detail-stage.pending
::v-deep .detail-stage.pending
background: rgba($color-info-darker, .5)

&.success
background: $color-success

/deep/ .detail-stage.pending
::v-deep .detail-stage.pending
background: rgba($color-success-darker, .5)

&.warning
background: $color-warning

/deep/ .detail-stage.pending
::v-deep .detail-stage.pending
background: rgba($color-warning-darker, .5)

&.error
background: $color-error

/deep/ .detail-stage.pending
::v-deep .detail-stage.pending
background: rgba($color-error-darker, .5)

.image-container
Expand Down
12 changes: 9 additions & 3 deletions front-end/components/ToolBar/tool-bar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
<div>
<div class="light" :class="state" />
<div class="toolbar">
<button @click="openGitHub();"><i class="fab fa-github" /></button>
<div class="logo"><img :src="trafficLightImage" alt="logo" /></div>
<button @click="openSettings();"><i class="fas fa-cog" /></button>
<button @click="openGitHub()">
<i class="fab fa-github" />
</button>
<div class="logo">
<img :src="trafficLightImage" alt="logo" />
</div>
<button @click="openSettings()">
<i class="fas fa-cog" />
</button>
</div>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion front-end/components/VideoOverlay/video-overlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default {
padding-bottom: 56.25%
height: 0

/deep/ iframe
::v-deep iframe
position: absolute
left: 0
top: 0
Expand Down
58 changes: 31 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,23 @@
]
},
"devDependencies": {
"browser-sync": "^2.26.3",
"browser-sync-webpack-plugin": "2.0.1",
"cypress": "^3.2.0",
"eslint": "^5.16.0",
"eslint-config-prettier": "^3.3.0",
"eslint-plugin-cypress": "^2.1.2",
"eslint-plugin-jest": "^22.5.1",
"eslint-plugin-json": "^1.2.1",
"eslint-plugin-prettier": "^3.0.0",
"eslint-plugin-vue": "^4.7.1",
"husky": "^3.0.0",
"jest": "^24.7.1",
"lint-staged": ">=8"
"browser-sync": "^2.26.7",
"browser-sync-webpack-plugin": "^2.2.2",
"cypress": "^3.4.0",
"eslint": "^6.1.0",
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-cypress": "^2.6.0",
"eslint-plugin-jest": "^22.14.0",
"eslint-plugin-json": "^1.4.0",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-vue": "^5.2.3",
"husky": "^3.0.1",
"jest": "^24.8.0",
"lint-staged": "^9.2.1",
"resolve-url-loader": "^3.1.0",
"sass": "^1.22.7",
"sass-loader": "^7.1.0",
"vue-template-compiler": "^2.6.10"
},
"scripts": {
"dev": "NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
Expand All @@ -44,23 +48,23 @@
},
"dependencies": {
"babel-cli": "^6.26.0",
"body-parser": "^1.18.3",
"body-parser": "^1.19.0",
"dotenv": "^8.0.0",
"express": "^4.16.3",
"firebase-admin": "^7.1.1",
"gravatar": "^1.6.0",
"laravel-mix": "^2.1.11",
"moment": "^2.22.2",
"express": "^4.17.1",
"firebase-admin": "^8.3.0",
"gravatar": "^1.8.0",
"laravel-mix": "^4.1.2",
"moment": "^2.24.0",
"pi-blaster.js": "^0.1.3",
"request": "^2.88.0",
"request-promise": "^4.2.2",
"sass-resources-loader": "^1.3.3",
"semver": "^5.6.0",
"socket.io": "^2.1.1",
"validate.js": "^0.12.0",
"vue": "^2.5.16",
"vue-socket.io-extended": "^3.1.0",
"vuex": "^3.0.1",
"request-promise": "^4.2.4",
"sass-resources-loader": "^2.0.1",
"semver": "^6.3.0",
"socket.io": "^2.2.0",
"validate.js": "^0.13.1",
"vue": "^2.6.10",
"vue-socket.io-extended": "^3.2.2",
"vuex": "^3.1.1",
"vuex-persistedstate": "^2.5.4"
},
"husky": {
Expand Down
Loading