Commit ff4b11ee authored by Richard Blechinger's avatar Richard Blechinger
Browse files

Fix hot-reloading finally, add first version of daily overview for calendar

parent fcd7875b
......@@ -3,7 +3,6 @@
@tailwind components;
@tailwind utilities;
:root {
--primary: theme('colors.gray.800');
--info: theme('colors.aura.purple');
......@@ -79,3 +78,22 @@ footer a:hover {
opacity: 0.5;
font-weight: bold;
}
.fc-day-header.fc-day-header {
padding: .5rem 0;
}
.fc-day-header:hover {
background: theme('colors.gray.200');
cursor: pointer;
}
.fc-day-selected {
background: theme('colors.red.500');
color: white;
}
.fc-day-selected:hover {
background: theme('colors.red.700');
color: white;
}
This diff is collapsed.
{
"name": "dboard",
"version": "0.1.0",
"version": "0.99.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"serve": "TAILWIND_MODE=watch NODE_ENV=development vue-cli-service serve --open",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
......@@ -29,15 +29,16 @@
"@vue/cli-plugin-eslint": "^3.12.1",
"@vue/cli-service": "^4.5.7",
"@vue/devtools": "^5.3.3",
"autoprefixer": "^9.8.6",
"babel-eslint": "^10.1.0",
"copy-webpack-plugin": "^6.0.3",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.2.3",
"minimist": "^1.2.5",
"postcss": "^7.0.36",
"sass": "^1.30.0",
"sass-loader": "^10.1.0",
"tailwindcss": "^1.7.6",
"vue-cli-plugin-tailwind": "~1.4.2",
"tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.4",
"vue-template-compiler": "^2.6.12"
},
"eslintConfig": {
......@@ -66,13 +67,6 @@
"parser": "babel-eslint"
}
},
"postcss": {
"plugins": {
"tailwindcss": {},
"vue-cli-plugin-tailwind/purgecss": false,
"autoprefixer": {}
}
},
"browserslist": [
"> 1%",
"last 2 versions",
......
const tailwindcss = require('tailwindcss')
const autoprefixer = require('autoprefixer')
module.exports = {
plugins: [
tailwindcss,
autoprefixer
]
}
......@@ -142,3 +142,4 @@
color: #2e3436;
}
</style>
<style src="../assets/styles/tailwind.css" />
This diff is collapsed.
......@@ -253,7 +253,7 @@
is_repetition: false,
add_days_no: 0,
add_business_days_only: false,
default_id: 0,
default_playlist_id: 0,
automation_id: 0,
}
}
......
......@@ -286,7 +286,7 @@
createRepetitionSchedule() {
const {onlyBusinessDays, addNoOfDays} = this.getRepetitionParameters();
const {dstart, tstart, tend, rrule, until, default_id, automation_id, byweekday} = this.schedule;
const {dstart, tstart, tend, rrule, until, default_playlist_id, automation_id, byweekday} = this.schedule;
const newSchedule = {
schedule: {
......@@ -295,7 +295,7 @@
tend,
rrule,
until,
default_id,
default_playlist_id,
automation_id,
byweekday,
is_repetition: true,
......
......@@ -7,11 +7,11 @@
>
<p v-if="loaded">
{{ $t('playlistSelector.currentPlaylistLabel') }}:
<span v-if="selectedShow.default_id === null">
<span v-if="selectedShow.default_playlist_id === null">
<i><small>{{ $t('noneSetFeminine') }}</small></i>
</span>
<span v-else>
{{ selectedShow.default_id }},
{{ selectedShow.default_playlist_id }},
<br>
<span v-if="currentPlaylistDescription">
{{ $t('showMeta.description') }}: <b>{{ currentPlaylistDescription }}</b>
......@@ -52,7 +52,7 @@
<template v-slot:cell(actions)="data">
<b-button-group size="sm">
<b-button
v-if="data.item.id !== selectedShow.default_id"
v-if="data.item.id !== selectedShow.default_playlist_id"
variant="info"
@click="choose(data.item.id)"
>
......@@ -114,8 +114,8 @@
currentPlaylistDescription() {
let description = false
if (this.selectedShow.default_id !== null) {
let choosenList = this.playlists.find(list => list.id === this.selectedShow.default_id)
if (this.selectedShow.default_playlist_id !== null) {
let choosenList = this.playlists.find(list => list.id === this.selectedShow.default_playlist_id)
if (choosenList && choosenList.description.length > 0) {
description = choosenList.description
}
......
......@@ -121,7 +121,7 @@
<b-badge variant="light">
{{ $t('showMeta.defaultPlaylistId') }}:
</b-badge>
<span v-if="!selectedShow.default_id"><small><i>{{ $t('noneSetFeminine') }}</i></small></span>
<span v-if="!selectedShow.default_playlist_id"><small><i>{{ $t('noneSetFeminine') }}</i></small></span>
<span v-else>{{ fallbackInfo }}</span>
<img
src="/assets/edit.svg"
......@@ -369,9 +369,9 @@
},
fallbackInfo() {
const list = this.playlists.find(p => p.id === this.selectedShow.default_id)
const list = this.playlists.find(p => p.id === this.selectedShow.default_playlist_id)
if (!list) {
return this.selectedShow.default_id
return this.selectedShow.default_playlist_id
} else {
return list.description + ' (ID: ' + list.id + ')'
}
......@@ -486,7 +486,7 @@
},
saveFallback(id) {
this.saveProperty('default_id', id, this.$refs.modalFallback)
this.saveProperty('default_playlist_id', id, this.$refs.modalFallback)
this.$log.debug(this.playlists)
},
......
......@@ -3,7 +3,6 @@ import App from './App.vue'
import router from './router'
import store from './store'
import '../assets/tailwind.css'
import 'vue-toast-notification/dist/theme-default.css'
import Translation from '@/plugins/translation'
......
// Note that any adjustments to this file must be reflected in custom.scss and tailwind.css
module.exports = {
mode: 'jit',
prefix: 'tw-',
future: {
removeDeprecatedGapUtilities: true,
purgeLayersByDefault: true,
},
purge: [
'./src/**/*.{js,vue}'
],
important: true,
theme: {
screens: {
'sm': '576px',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment