Theenoro
/
wochenbericht-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2.1.1

environments/production/deployments/6
Luca Jäntsch 2019-01-16 17:27:55 +01:00
parent e1299d799b
commit bb27f6df51
9 changed files with 111 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.html
View File

@ -20,7 +20,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>WBM</title>
</head>
<body>
<noscript>

52
public/main.css
View File

@ -14,20 +14,21 @@ body {
display: flex;
}
#nav {
height: 100vh;
min-height: 100vh;
width: 200px;
line-height: 50px;
box-shadow: 0 0 5px #454545;
background-color: #3C6F9B;
color: #fff;
background-color: #FFF;
color: #000000;
}
#nav .header {
background-color: #004F5B;
background-color: #34495e;
height: 98px;
line-height: 98px;
font-size: 41px;
text-align: center;
text-shadow: 1px 1px 3px #000000;
color: #ffffff;
}
#nav button {
display: block;
@ -36,7 +37,7 @@ body {
width: calc(100% - 10px);
background: none;
border: none;
color: #ffffff;
color: #000000;
font-size: 18px;
font-weight: 700;
text-align: left;
@ -45,7 +46,7 @@ body {
cursor: pointer;
}
#nav button:hover {
border-color: white;
border-color: #000000;
}
#content {
width: calc(100% - 200px);
@ -62,12 +63,12 @@ body {
#editor-frame #mask .header {
display: block;
min-height: 98px;
background-color: #004F5B;
background-color: #34495e;
}
#editor-frame #mask .lower-header {
height: 49px;
display: block;
background-color: #004F5B;
background-color: #34495e;
}
#editor-frame #mask .inputGroup {
font: 16px 'Helvetica Neue', Helvetica, Arial, sans-serif;
@ -101,8 +102,8 @@ button.btn,
button {
margin: 5px;
padding: 10px;
background: #FFF;
border: 3px solid #004F5B;
background: #ffffff;
border: 3px solid #34495e;
cursor: pointer;
font-size: 15px;
font-weight: 700;
@ -121,8 +122,8 @@ button.success:hover {
}
#generator-frame .header {
height: 98px;
background-color: #004F5B;
color: #FFF;
background-color: #34495e;
color: #ffffff;
line-height: 98px;
padding: 0 25px;
font-size: 30px;
@ -202,7 +203,7 @@ button.success:hover {
z-index: 2;
}
.Cal__Day__root.Cal__Day__today > span {
color: #3d3d3d;
color: #34495e;
}
.Cal__Day__root.Cal__Day__today:before {
content: '';
@ -542,6 +543,8 @@ button.success:hover {
}
.Cal__Weekdays__day {
padding: 15px 0;
color: #444;
text-decoration: underline;
flex-basis: 14.28571%;
flex-grow: 1;
font-weight: 500;
@ -831,7 +834,7 @@ button.success:hover {
}
.rc-tabs .rc-tabs-nav {
display: flex;
background-color: #3C6F9B;
background-color: #FFF;
color: #FFF;
font-size: 15px;
height: 49px;
@ -844,7 +847,7 @@ button.success:hover {
cursor: pointer;
}
.rc-tabs .rc-tabs-nav .rc-tabs-tab:hover {
background-color: #003942;
background-color: #2b3c4e;
}
.rc-tabs .rc-tabs-content {
white-space: nowrap;
@ -877,7 +880,7 @@ button.success:hover {
}
#print-frame .header {
height: 98px;
background-color: #004F5B;
background-color: #34495e;
color: #FFF;
display: flex;
}
@ -893,3 +896,20 @@ button.success:hover {
height: calc(100vh - 102px);
border: none;
}
#settings-frame {
padding: 10px;
}
#settings-frame .form-group {
display: flex;
padding-bottom: 5px;
padding-top: 5px;
}
#settings-frame .form-group label.control-label {
width: 20%;
text-align: right;
padding-right: 10px;
line-height: 2em;
}
#settings-frame .form-group input {
width: 100%;
}

46
src/jsx/ui/calender.jsx
View File

@ -15,20 +15,20 @@ var me = null;
*/
const cal_theme = {
accentColor: '#3C6F9B',
accentColor: '#34495e',
floatingNav: {
background: '#2C3A47',
background: '#34495e',
chevron: '#ffb142',
color: '#FFF',
},
headerColor: '#004F5B',
selectionColor: '#3C6F9B',
headerColor: '#34495e',
selectionColor: '#34495e',
textColor: {
active: '#FFF',
default: '#333',
},
todayColor: '#ffb142',
weekdayColor: '#3C6F9B',
weekdayColor: '#FFF',
}
export class Calender extends React.Component {
@ -75,28 +75,31 @@ export class Calender extends React.Component {
*/
}
componentWillUnmount(){
//ipcRenderer.removeAllListeners('loadDate-reply');
Log.debug("unload Calender")
}
getDate(date){
////console.log(me)
// set selected date
me.cal_date = date;
////console.log(new Date(date));
//
//ipcRenderer.send('loadDate', {date:date})
var res = DB.loadDate(date)
//console.log(res) // prints "pong"
Log.debug('LOAD RES')
console.log(res)
if(res.date === null){
res.date=this.cal_date;
}
if(res.startTime === null){
res.startTime=moment(this.cal_date).unix()*1000;
}
if(res.endTime === null){
res.endTime=moment(this.cal_date).unix()*1000;
}
this.setState(
res
)
if(res.date === null){
this.setState({date:this.cal_date});
}
if(res.startTime === null){
this.setState({startTime:this.cal_date});
}
if(res.endTime === null){
this.setState({endTime:this.cal_date});
}
}
startTimeChange(e){
@ -159,8 +162,7 @@ export class Calender extends React.Component {
<InfiniteCalendar selected = { this.today } theme={cal_theme} locale = { loc } onSelect={this.getDate}/>
</div >
<div id="mask">
<div className="header">Editor</div>
<div className="lower-header"></div>
<div className="header"></div>
<div className="inputGroup">
<div className="input">
<label>Arbeitszeit :</label><input type="text" disable="true" value={wk}/>

12
src/jsx/ui/components/notify.jsx 100644
View File

@ -0,0 +1,12 @@
import React from 'react';
export const Notify = ({type,header,txt})=>{
return(
<div>
TEST
</div>
)
}

6
src/jsx/ui/generator.jsx
View File

@ -19,13 +19,13 @@ const shuffle = function(array) {
const cal_theme = {
accentColor: '#706fd3',
accentColor: '#34495e',
floatingNav: {
background: '#004F5B',
background: '#34495e',
chevron: '#ffb142',
color: '#FFF',
},
headerColor: '#004F5B',
headerColor: '#34495e',
selectionColor: '#706fd3',
textColor: {
active: '#FFF',

5
src/jsx/ui/print_modi/week.jsx
View File

@ -34,6 +34,11 @@ export class Modi_Week{
md[1] = moment(md[1]).format('dddd');
md[2] = moment(md[2]).format('HH:mm');
md[4] = moment(md[4]).format('HH:mm');
if( md[2] === "00:00" && md[4] === "00:00"){
md[2] = "";
md[4] = "";
}
var wnum = 0;
switch(md[1]){

4
src_less/calender.less
View File

@ -1,4 +1,4 @@
@color_1: #3d3d3d;
@color_1: #34495e;
@color_2: #AAA;
@color_3: inherit;
@color_4: rgba(255, 255, 255, 0.5);
@ -454,6 +454,8 @@
}
.Cal__Weekdays__day {
padding: 15px 0;
color: @color_8;
text-decoration: underline;
flex-basis: 14.28571%;
flex-grow: 1;
font-weight: 500;

16
src_less/main.less
View File

@ -1,6 +1,6 @@
@background:#004F5B;
@background-2:#3C6F9B;
@color:#FFF;
@background:#34495e;
@background-2:#FFF;
@color:#ffffff;
@font-face {
@ -22,12 +22,12 @@ html,body{
display: flex;
}
#nav{
height: 100vh;
min-height: 100vh;
width: 200px;
line-height: 50px;
box-shadow: 0 0 5px #454545;
background-color:@background-2;
color: #fff;
color: contrast(@background-2, lighten(@background-2, 100%), darken(@background-2, 100%));
.header{
background-color: @background;
height:98px;
@ -35,6 +35,7 @@ html,body{
font-size: 41px;
text-align: center;
text-shadow: 1px 1px 3px #000000;
color: contrast(@background, lighten(@background, 100%), darken(@background, 100%));
}
button{
display: block;
@ -43,7 +44,7 @@ html,body{
width: calc(100% - 10px);
background: none;
border: none;
color: #ffffff;
color: contrast(@background-2, lighten(@background-2, 100%), darken(@background-2, 100%));
font-size: 18px;
font-weight: 700;
text-align: left;
@ -51,7 +52,7 @@ html,body{
border-color: transparent;
cursor: pointer;
&:hover{
border-color: white;
border-color: contrast(@background-2, lighten(@background-2, 100%), darken(@background-2, 100%));
}
}
}
@ -148,3 +149,4 @@ button.btn, button {
@import './tabs.less';
@import './fileloader.less';
@import './print.less';
@import './settings.less';

18
src_less/settings.less 100644
View File

@ -0,0 +1,18 @@
#settings-frame{
padding: 10px;
.form-group {
display: flex;
padding-bottom: 5px;
padding-top: 5px;
label.control-label {
width: 20%;
text-align: right;
padding-right: 10px;
line-height: 2em;
}
input{
width: 100%;
}
}
}