Skip to content

Commit a03c9c6

Browse files
author
Goran Mekić
committed
Not even a week view
1 parent 128843b commit a03c9c6

File tree

10 files changed

+179
-44
lines changed

10 files changed

+179
-44
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
app/static/
22
node_modules/
3+
bower_components/

‎app/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<head>
33
<title> Flarior </title>
4-
<link href="/static/css/bla.css" rel="stylesheet">
4+
<link href="/static/css/style.css" rel="stylesheet">
55
</head>
66
<body>
77
<div id="ReactApp"></div>

‎app/js/components/Calendar.jsx

+74-20
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,81 @@
11
var React = require('react');
22
var Day = require('./Day.jsx')
33

4-
var days = [
5-
'Monday',
6-
'Tuesday',
7-
'Wednesday',
8-
'Thursday',
9-
'Friday',
10-
'Saturday',
11-
'Sunday'
12-
];
13-
144
var Calendar = React.createClass({
15-
render() {
16-
return (
17-
<div className="calendar">
18-
<h1>My first react app</h1>
19-
{days.map((day) => {
20-
return <Day day={day} classes={"day " + day}/>
21-
})}
22-
</div>
23-
);
24-
}
5+
getInitialState: function() {
6+
var current_date = new Date();
7+
var month_names = [
8+
'January',
9+
'February',
10+
'March',
11+
'April',
12+
'May',
13+
'June',
14+
'July',
15+
'August',
16+
'September',
17+
'October',
18+
'November',
19+
'December'
20+
];
21+
var current_month_number = current_date.getMonth();
22+
var current_month_name = month_names[current_month_number];
23+
var days_in_week = [
24+
{
25+
'name': 'Monday',
26+
'number': 1
27+
},
28+
{
29+
'name': 'Tuesday',
30+
'number': 2,
31+
},
32+
{
33+
'name': 'Wednesday',
34+
'number': 3,
35+
},
36+
{
37+
'name': 'Thursday',
38+
'number': 4,
39+
},
40+
{
41+
'name': 'Friday',
42+
'number': 5,
43+
},
44+
{
45+
'name': 'Saturday',
46+
'number': 6,
47+
},
48+
{
49+
'name': 'Sunday',
50+
'number': 0,
51+
}
52+
];
53+
return {
54+
days: days_in_week,
55+
current_month_name: current_month_name,
56+
current_month_number: current_month_number,
57+
};
58+
},
59+
60+
current_day_number: new Date().getDay(),
61+
62+
render: function() {
63+
return (
64+
<div className="calendar">
65+
<h1>{this.state.current_month_name}</h1>
66+
{this.state.days.map((day) => {
67+
var classes = "u-1/7 text--center day day-number-" + day.number + " day-" + day.name;
68+
if (this.current_day_number === day.number) {
69+
classes += " current";
70+
}
71+
if (day.number === 6 || day.number === 0) {
72+
classes += " weekend"
73+
}
74+
return <Day day={day.name} classes={classes}/>
75+
})}
76+
</div>
77+
);
78+
}
2579
});
2680

2781
module.exports = Calendar;

‎app/js/components/Day.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ var React = require('react');
22

33
var Day = React.createClass({
44
render() {
5-
var class_list = "day " + "{this.props.day}";
65
return (
76
<div className={this.props.classes}>
87
{this.props.day}

‎app/sass/bla.scss

-8
This file was deleted.

‎app/sass/settings/_defaults.scss

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
$inuit-widths-columns: (
2+
1,
3+
2,
4+
3,
5+
4,
6+
5,
7+
6,
8+
7,
9+
8,
10+
9,
11+
10
12+
);

‎app/sass/style.scss

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// SETTINGS
2+
@import "bower_components/inuit-defaults/settings.defaults";
3+
@import "bower_components/inuit-responsive-settings/settings.responsive";
4+
@import "settings/defaults";
5+
6+
7+
// TOOLS
8+
@import "bower_components/inuit-functions/tools.functions";
9+
@import "bower_components/inuit-mixins/tools.mixins";
10+
@import "bower_components/inuit-tools-widths/tools.widths";
11+
@import "bower_components/inuit-responsive-tools/tools.responsive";
12+
13+
14+
// GENERIC
15+
@import "bower_components/inuit-normalize/generic.normalize";
16+
@import "bower_components/inuit-box-sizing/generic.box-sizing";
17+
18+
19+
// BASE
20+
@import "bower_components/inuit-page/base.page";
21+
22+
23+
// OBJECTS
24+
@import "bower_components/inuit-layout/objects.layout";
25+
@import "bower_components/inuit-buttons/objects.buttons";
26+
27+
28+
// COMPONENTS (Custom stuff)
29+
30+
31+
// TRUMPS
32+
@import "bower_components/inuit-widths/trumps.widths";
33+
@import "bower_components/inuit-spacing/trumps.spacing";
34+
@import "bower_components/inuit-widths-responsive/trumps.widths-responsive";
35+
@import "bower_components/inuit-spacing-responsive/trumps.spacing-responsive";
36+
@import "trumps/defaults";

‎app/sass/trumps/_defaults.scss

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.text--right {
2+
text-align: right !important;
3+
}
4+
5+
.text--center {
6+
text-align: center !important;
7+
}
8+
9+
.text--justify {
10+
text-align: justify;
11+
}
12+
13+
.day {
14+
display: inline-block;
15+
height: 80%;
16+
}
17+
18+
.current {
19+
color: green;
20+
font-weight: bold;
21+
}
22+
23+
.weekend {
24+
background-color: gray;
25+
}

‎bower.json

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"name": "flarior-frontend",
3+
"version": "0.0.1",
4+
"homepage": "https://github.com/flarior/flarior-frontend",
5+
"authors": [
6+
"Goran Mekić <[email protected]>"
7+
],
8+
"description": "Flarior Frontend",
9+
"license": "GPLv3",
10+
"ignore": [
11+
"**/.*",
12+
"node_modules",
13+
"bower_components",
14+
"test",
15+
"tests"
16+
],
17+
"dependencies": {
18+
"inuit-buttons": "~0.4.2",
19+
"inuit-layout": "~0.3.2",
20+
"inuit-spacing": "~0.7.0",
21+
"inuit-spacing-responsive": "~0.0.8",
22+
"inuit-starter-kit": "~0.2.9",
23+
"inuit-tools-widths": "~0.1.4",
24+
"inuit-widths-responsive": "~0.2.2"
25+
},
26+
"resolutions": {
27+
"inuit-spacing": "~0.6.1"
28+
}
29+
}

‎package.json

+1-14
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,12 @@
1818
"homepage": "https://github.com/flarior/flarior-frontend#readme",
1919
"dependencies": {
2020
"alt": "^0.17.3",
21-
"browserify": "^11.0.1",
22-
"gulp": "^3.9.0",
2321
"gulp-browserify": "^0.5.1",
24-
"gulp-dest": "^0.2.2",
25-
"gulp-react": "^3.0.1",
26-
"gulp-reactify": "^3.0.1",
2722
"gulp-rename": "^1.2.2",
2823
"gulp-sass": "^2.0.4",
29-
"gulp-sourcemaps": "^1.5.2",
3024
"gulp-webserver": "^0.9.1",
31-
"inuit-starter-kit": "^0.2.9",
3225
"react": "^0.13.3",
33-
"react-tools": "^0.13.3",
34-
"reactify": "^1.1.1",
35-
"vinyl-buffer": "^1.0.0",
36-
"vinyl-source-stream": "^1.1.0"
37-
},
38-
"devDependencies": {
39-
"gulp-useref": "^1.3.0"
26+
"reactify": "^1.1.1"
4027
},
4128
"browserify": {
4229
"transform": [

0 commit comments

Comments
 (0)