From 9f3a194bd8289d0ccae20560242d8be96630adb5 Mon Sep 17 00:00:00 2001 From: Vladimir Polyakov Date: Sat, 9 May 2015 23:19:25 +0300 Subject: [PATCH] base functionalit --- .gitignore | 2 + app.js | 2 +- bower.json | 3 +- gulpfile.js | 17 +- package.json | 1 + static/css/index.less | 20 + .../css/sources/common/variables-flatly.less | 861 ++++++++++++++++++ static/css/sources/common/variables.less | 1 + static/css/sources/components/builds.less | 10 + static/css/sources/components/layout.less | 3 + static/css/sources/components/projects.less | 0 static/index.html | 20 - static/js/app/app.js | 26 +- static/js/app/components/app.jade | 17 +- static/js/app/components/builds/item.jade | 23 +- static/js/app/components/builds/item.js | 2 +- static/js/app/components/builds/list.jade | 10 +- static/js/app/components/projects/list.jade | 1 - static/js/app/index.jade | 9 +- static/js/main.js | 1 + views/index.jade | 3 +- 21 files changed, 978 insertions(+), 54 deletions(-) create mode 100644 static/css/index.less create mode 100644 static/css/sources/common/variables-flatly.less create mode 100644 static/css/sources/common/variables.less create mode 100644 static/css/sources/components/builds.less create mode 100644 static/css/sources/components/layout.less create mode 100644 static/css/sources/components/projects.less delete mode 100644 static/index.html diff --git a/.gitignore b/.gitignore index 613ecd0..2462588 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ node_modules test/workspace +static/css/**/*.css +static/fonts static/js/libs static/js/templates projects/**/workspace diff --git a/app.js b/app.js index 628cdac..186d73e 100644 --- a/app.js +++ b/app.js @@ -8,7 +8,7 @@ var staticServer = new nodeStatic.Server('./static'); var server = http.createServer(function(req, res, next) { // serve index for all app pages if (req.url.indexOf('/data.io.js') === -1) { - if (req.url.indexOf('/js') === -1) { + if (!req.url.match(/(js|css|fonts)/)) { // Compile a function var index = jade.compileFile(__dirname + '/views/index.jade'); res.write(index()); diff --git a/bower.json b/bower.json index 1094116..77e51c5 100644 --- a/bower.json +++ b/bower.json @@ -10,7 +10,8 @@ "requirejs": "2.1.17", "jquery": "1.10.2", "reflux": "0.2.7", - "bootstrap": "3.3.4" + "bootstrap": "3.3.4", + "font-awesome": "~4.3.0" }, "moduleType": [ "amd" diff --git a/gulpfile.js b/gulpfile.js index accf3a9..6e3ff05 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,7 +2,9 @@ var gulp = require('gulp'); var nodemon = require('gulp-nodemon'); +var less = require('gulp-less'); var gulpReactJade = require('gulp-react-jade-amd'); +var mainBowerFiles = require('main-bower-files'); gulp.task('react-jade', function() { return gulp.src('static/js/**/*.jade') @@ -10,9 +12,20 @@ gulp.task('react-jade', function() { .pipe(gulp.dest('static/js/templates')); }); +gulp.task('less', function () { + return gulp.src('static/css/index.less') + .pipe(less('index.css')) + .pipe(gulp.dest('./static/css')); +}); + +gulp.task('fonts', function() { + return gulp.src(mainBowerFiles({filter: /.*fonts.*/i})) + .pipe(gulp.dest('static/fonts/')); +}); + gulp.task('develop', function() { gulp.watch('static/js/app/**/*.jade', ['react-jade']); - //gulp.watch('static/css/**/*.less', ['make-styles']); + gulp.watch('static/css/**/*.less', ['less']); return nodemon({ ignore: ['static/**/*.js', 'app/**/*.js', 'node_modules/**'], @@ -23,5 +36,7 @@ gulp.task('develop', function() { gulp.task('default', [ 'react-jade', + 'less', + 'fonts', 'develop' ]); diff --git a/package.json b/package.json index f7536c9..5c94fe4 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "gulp-nodemon": "2.0.3", "gulp-react-jade-amd": "git://github.com/vladimir-polyakov/gulp-react-jade-amd", "memdown": "1.0.0", + "main-bower-files": "2.7.0", "mocha": "1.18.2", "nodemon": "1.3.7" } diff --git a/static/css/index.less b/static/css/index.less new file mode 100644 index 0000000..a887a0d --- /dev/null +++ b/static/css/index.less @@ -0,0 +1,20 @@ +@bowerPath: "../js/libs"; + +// bootstrap +@import "@{bowerPath}/bootstrap/less/bootstrap.less"; + +//flatly +@import "./sources/common/variables-flatly.less"; + +//font-awesome +@import "@{bowerPath}/font-awesome/less/font-awesome.less"; + +//variables +@import "./sources/common/variables.less"; + +//layout +@import "./sources/components/layout.less"; + +//components +@import "./sources/components/builds.less"; +@import "./sources/components/projects.less"; diff --git a/static/css/sources/common/variables-flatly.less b/static/css/sources/common/variables-flatly.less new file mode 100644 index 0000000..a8b0679 --- /dev/null +++ b/static/css/sources/common/variables-flatly.less @@ -0,0 +1,861 @@ +// Flatly 3.3.4 +// Variables +// -------------------------------------------------- + + +//== Colors +// +//## Gray and brand colors for use across Bootstrap. + +@gray-base: #000; +@gray-darker: lighten(@gray-base, 13.5%); // #222 +@gray-dark: #7b8a8b; // #333 +@gray: #95a5a6; // #555 +@gray-light: #b4bcc2; // #999 +@gray-lighter: #ecf0f1; // #eee + +@brand-primary: #2C3E50; +@brand-success: #18BC9C; +@brand-info: #3498DB; +@brand-warning: #F39C12; +@brand-danger: #E74C3C; + + +//== Scaffolding +// +//## Settings for some of the most global styles. + +//** Background color for ``. +@body-bg: #fff; +//** Global text color on ``. +@text-color: @brand-primary; + +//** Global textual link color. +@link-color: @brand-success; +//** Link hover color set via `darken()` function. +@link-hover-color: @link-color; +//** Link hover decoration. +@link-hover-decoration: underline; + + +//== Typography +// +//## Font, line-height, and color for body text, headings, and more. + +@font-family-sans-serif: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif; +@font-family-serif: Georgia, "Times New Roman", Times, serif; +//** Default monospace fonts for ``, ``, and `
`.
+@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base:        @font-family-sans-serif;
+
+@font-size-base:          15px;
+@font-size-large:         ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small:         ceil((@font-size-base * 0.85)); // ~12px
+
+@font-size-h1:            floor((@font-size-base * 2.6)); // ~36px
+@font-size-h2:            floor((@font-size-base * 2.15)); // ~30px
+@font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px
+@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
+@font-size-h5:            @font-size-base;
+@font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+@line-height-base:        1.428571429; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px
+
+//** By default, this inherits from the ``.
+@headings-font-family:    @font-family-base;
+@headings-font-weight:    400;
+@headings-line-height:    1.1;
+@headings-color:          inherit;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+@icon-font-path:          "../fonts/";
+//** File name for all font files.
+@icon-font-name:          "glyphicons-halflings-regular";
+//** Element ID within SVG icon file.
+@icon-font-svg-id:        "glyphicons_halflingsregular";
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+@padding-base-vertical:     10px;
+@padding-base-horizontal:   15px;
+
+@padding-large-vertical:    18px;
+@padding-large-horizontal:  27px;
+
+@padding-small-vertical:    6px;
+@padding-small-horizontal:  9px;
+
+@padding-xs-vertical:       1px;
+@padding-xs-horizontal:     5px;
+
+@line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
+@line-height-small:         1.5;
+
+@border-radius-base:        4px;
+@border-radius-large:       6px;
+@border-radius-small:       3px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color:    #fff;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg:       @brand-primary;
+
+//** Width of the `border` for generating carets that indicator dropdowns.
+@caret-width-base:          4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large:         5px;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for ``s and ``s.
+@table-cell-padding:            8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding:  5px;
+
+//** Default background color used for all tables.
+@table-bg:                      transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent:               #f9f9f9;
+//** Background color used for `.table-hover`.
+@table-bg-hover:                @gray-lighter;
+@table-bg-active:               @table-bg-hover;
+
+//** Border color for table and cell borders.
+@table-border-color:            @gray-lighter;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+@btn-font-weight:                normal;
+
+@btn-default-color:              #fff;
+@btn-default-bg:                 @gray;
+@btn-default-border:             @btn-default-bg;
+
+@btn-primary-color:              @btn-default-color;
+@btn-primary-bg:                 @brand-primary;
+@btn-primary-border:             @btn-primary-bg;
+
+@btn-success-color:              @btn-default-color;
+@btn-success-bg:                 @brand-success;
+@btn-success-border:             @btn-success-bg;
+
+@btn-info-color:                 @btn-default-color;
+@btn-info-bg:                    @brand-info;
+@btn-info-border:                @btn-info-bg;
+
+@btn-warning-color:              @btn-default-color;
+@btn-warning-bg:                 @brand-warning;
+@btn-warning-border:             @btn-warning-bg;
+
+@btn-danger-color:               @btn-default-color;
+@btn-danger-bg:                  @brand-danger;
+@btn-danger-border:              @btn-danger-bg;
+
+@btn-link-disabled-color:        @gray-light;
+
+
+//== Forms
+//
+//##
+
+//** `` background color
+@input-bg:                       #fff;
+//** `` background color
+@input-bg-disabled:              @gray-lighter;
+
+//** Text color for ``s
+@input-color:                    @text-color;
+//** `` border color
+@input-border:                   #dce4ec;
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on ``s in CSS.
+@input-border-radius:            @border-radius-base;
+//** Large `.form-control` border radius
+@input-border-radius-large:      @border-radius-large;
+//** Small `.form-control` border radius
+@input-border-radius-small:      @border-radius-small;
+
+//** Border color for inputs on focus
+@input-border-focus:             @brand-primary;
+
+//** Placeholder text color
+@input-color-placeholder:        #acb6c0;
+
+//** Default `.form-control` height
+@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 4);
+//** Large `.form-control` height
+@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 4);
+//** Small `.form-control` height
+@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 4);
+
+//** `.form-group` margin
+@form-group-margin-bottom:       15px;
+
+@legend-color:                   @text-color;
+@legend-border-color:            transparent;
+
+//** Background color for textual input addons
+@input-group-addon-bg:           @gray-lighter;
+//** Border color for textual input addons
+@input-group-addon-border-color: @input-border;
+
+//** Disabled cursor for form controls and buttons.
+@cursor-disabled:                not-allowed;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+@dropdown-bg:                    #fff;
+//** Dropdown menu `border-color`.
+@dropdown-border:                rgba(0,0,0,.15);
+//** Dropdown menu `border-color` **for IE8**.
+@dropdown-fallback-border:       #ccc;
+//** Divider color for between dropdown items.
+@dropdown-divider-bg:            #e5e5e5;
+
+//** Dropdown link text color.
+@dropdown-link-color:            @gray-dark;
+//** Hover color for dropdown links.
+@dropdown-link-hover-color:      #fff;
+//** Hover background for dropdown links.
+@dropdown-link-hover-bg:         @component-active-bg;
+
+//** Active dropdown menu item text color.
+@dropdown-link-active-color:     #fff;
+//** Active dropdown menu item background color.
+@dropdown-link-active-bg:        @component-active-bg;
+
+//** Disabled dropdown menu item background color.
+@dropdown-link-disabled-color:   @gray-light;
+
+//** Text color for headers within dropdown menus.
+@dropdown-header-color:          @gray-light;
+
+//** Deprecated `@dropdown-caret-color` as of v3.1.0
+@dropdown-caret-color:           #000;
+
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+@zindex-navbar:            1000;
+@zindex-dropdown:          1000;
+@zindex-popover:           1060;
+@zindex-tooltip:           1070;
+@zindex-navbar-fixed:      1030;
+@zindex-modal-background:  1040;
+@zindex-modal:             1050;
+
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `@screen-xs` as of v3.0.1
+@screen-xs:                  480px;
+//** Deprecated `@screen-xs-min` as of v3.2.0
+@screen-xs-min:              @screen-xs;
+//** Deprecated `@screen-phone` as of v3.0.1
+@screen-phone:               @screen-xs-min;
+
+// Small screen / tablet
+//** Deprecated `@screen-sm` as of v3.0.1
+@screen-sm:                  768px;
+@screen-sm-min:              @screen-sm;
+//** Deprecated `@screen-tablet` as of v3.0.1
+@screen-tablet:              @screen-sm-min;
+
+// Medium screen / desktop
+//** Deprecated `@screen-md` as of v3.0.1
+@screen-md:                  992px;
+@screen-md-min:              @screen-md;
+//** Deprecated `@screen-desktop` as of v3.0.1
+@screen-desktop:             @screen-md-min;
+
+// Large screen / wide desktop
+//** Deprecated `@screen-lg` as of v3.0.1
+@screen-lg:                  1200px;
+@screen-lg-min:              @screen-lg;
+//** Deprecated `@screen-lg-desktop` as of v3.0.1
+@screen-lg-desktop:          @screen-lg-min;
+
+// So media queries don't overlap when required, provide a maximum
+@screen-xs-max:              (@screen-sm-min - 1);
+@screen-sm-max:              (@screen-md-min - 1);
+@screen-md-max:              (@screen-lg-min - 1);
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+@grid-columns:              12;
+//** Padding between columns. Gets divided in half for the left and right.
+@grid-gutter-width:         30px;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+@grid-float-breakpoint:     @screen-sm-min;
+//** Point at which the navbar begins collapsing.
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+@container-tablet:             (720px + @grid-gutter-width);
+//** For `@screen-sm-min` and up.
+@container-sm:                 @container-tablet;
+
+// Medium screen / desktop
+@container-desktop:            (940px + @grid-gutter-width);
+//** For `@screen-md-min` and up.
+@container-md:                 @container-desktop;
+
+// Large screen / wide desktop
+@container-large-desktop:      (1140px + @grid-gutter-width);
+//** For `@screen-lg-min` and up.
+@container-lg:                 @container-large-desktop;
+
+
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+@navbar-height:                    60px;
+@navbar-margin-bottom:             @line-height-computed;
+@navbar-border-radius:             @border-radius-base;
+@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
+@navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height:       340px;
+
+@navbar-default-color:             #777;
+@navbar-default-bg:                @brand-primary;
+@navbar-default-border:            transparent;
+
+// Navbar links
+@navbar-default-link-color:                #fff;
+@navbar-default-link-hover-color:          @brand-success;
+@navbar-default-link-hover-bg:             transparent;
+@navbar-default-link-active-color:         #fff;
+@navbar-default-link-active-bg:            darken(@navbar-default-bg, 10%);
+@navbar-default-link-disabled-color:       #ccc;
+@navbar-default-link-disabled-bg:          transparent;
+
+// Navbar brand label
+@navbar-default-brand-color:               @navbar-default-link-color;
+@navbar-default-brand-hover-color:         @navbar-default-link-hover-color;
+@navbar-default-brand-hover-bg:            transparent;
+
+// Navbar toggle
+@navbar-default-toggle-hover-bg:           darken(@navbar-default-bg, 10%);
+@navbar-default-toggle-icon-bar-bg:        #fff;
+@navbar-default-toggle-border-color:       darken(@navbar-default-bg, 10%);
+
+
+// Inverted navbar
+// Reset inverted navbar basics
+@navbar-inverse-color:                      #fff;
+@navbar-inverse-bg:                         @brand-success;
+@navbar-inverse-border:                     transparent;
+
+// Inverted navbar links
+@navbar-inverse-link-color:                 #fff;
+@navbar-inverse-link-hover-color:           @brand-primary;
+@navbar-inverse-link-hover-bg:              transparent;
+@navbar-inverse-link-active-color:          #fff;
+@navbar-inverse-link-active-bg:             darken(@navbar-inverse-bg, 5%);
+@navbar-inverse-link-disabled-color:        #ccc;
+@navbar-inverse-link-disabled-bg:           transparent;
+
+// Inverted navbar brand label
+@navbar-inverse-brand-color:                @navbar-inverse-link-color;
+@navbar-inverse-brand-hover-color:          @navbar-inverse-link-hover-color;
+@navbar-inverse-brand-hover-bg:             transparent;
+
+// Inverted navbar toggle
+@navbar-inverse-toggle-hover-bg:            darken(@navbar-inverse-bg, 10%);
+@navbar-inverse-toggle-icon-bar-bg:         #fff;
+@navbar-inverse-toggle-border-color:        darken(@navbar-inverse-bg, 10%);
+
+
+//== Navs
+//
+//##
+
+//=== Shared nav styles
+@nav-link-padding:                          10px 15px;
+@nav-link-hover-bg:                         @gray-lighter;
+
+@nav-disabled-link-color:                   @gray-light;
+@nav-disabled-link-hover-color:             @gray-light;
+
+//== Tabs
+@nav-tabs-border-color:                     @gray-lighter;
+
+@nav-tabs-link-hover-border-color:          @gray-lighter;
+
+@nav-tabs-active-link-hover-bg:             @body-bg;
+@nav-tabs-active-link-hover-color:          @brand-primary;
+@nav-tabs-active-link-hover-border-color:   @gray-lighter;
+
+@nav-tabs-justified-link-border-color:            @gray-lighter;
+@nav-tabs-justified-active-link-border-color:     @body-bg;
+
+//== Pills
+@nav-pills-border-radius:                   @border-radius-base;
+@nav-pills-active-link-hover-bg:            @component-active-bg;
+@nav-pills-active-link-hover-color:         @component-active-color;
+
+
+//== Pagination
+//
+//##
+
+@pagination-color:                     #fff;
+@pagination-bg:                        @brand-success;
+@pagination-border:                    transparent;
+
+@pagination-hover-color:               #fff;
+@pagination-hover-bg:                  darken(@brand-success, 15%);
+@pagination-hover-border:              transparent;
+
+@pagination-active-color:              #fff;
+@pagination-active-bg:                 darken(@brand-success, 15%);
+@pagination-active-border:             transparent;
+
+@pagination-disabled-color:            @gray-lighter;
+@pagination-disabled-bg:               lighten(@brand-success, 15%);
+@pagination-disabled-border:           transparent;
+
+
+//== Pager
+//
+//##
+
+@pager-bg:                             @pagination-bg;
+@pager-border:                         @pagination-border;
+@pager-border-radius:                  15px;
+
+@pager-hover-bg:                       @pagination-hover-bg;
+
+@pager-active-bg:                      @pagination-active-bg;
+@pager-active-color:                   @pagination-active-color;
+
+@pager-disabled-color:                 #fff;
+
+
+//== Jumbotron
+//
+//##
+
+@jumbotron-padding:              30px;
+@jumbotron-color:                inherit;
+@jumbotron-bg:                   @gray-lighter;
+@jumbotron-heading-color:        inherit;
+@jumbotron-font-size:            ceil((@font-size-base * 1.5));
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+@state-success-text:             #fff;
+@state-success-bg:               @brand-success;
+@state-success-border:           @brand-success;
+
+@state-info-text:                #fff;
+@state-info-bg:                  @brand-info;
+@state-info-border:              @brand-info;
+
+@state-warning-text:             #fff;
+@state-warning-bg:               @brand-warning;
+@state-warning-border:           @brand-warning;
+
+@state-danger-text:              #fff;
+@state-danger-bg:                @brand-danger;
+@state-danger-border:            @brand-danger;
+
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+@tooltip-max-width:           200px;
+//** Tooltip text color
+@tooltip-color:               #fff;
+//** Tooltip background color
+@tooltip-bg:                  #000;
+@tooltip-opacity:             .9;
+
+//** Tooltip arrow width
+@tooltip-arrow-width:         5px;
+//** Tooltip arrow color
+@tooltip-arrow-color:         @tooltip-bg;
+
+
+//== Popovers
+//
+//##
+
+//** Popover body background color
+@popover-bg:                          #fff;
+//** Popover maximum width
+@popover-max-width:                   276px;
+//** Popover border color
+@popover-border-color:                rgba(0,0,0,.2);
+//** Popover fallback border color
+@popover-fallback-border-color:       #ccc;
+
+//** Popover title background color
+@popover-title-bg:                    darken(@popover-bg, 3%);
+
+//** Popover arrow width
+@popover-arrow-width:                 10px;
+//** Popover arrow color
+@popover-arrow-color:                 @popover-bg;
+
+//** Popover outer arrow width
+@popover-arrow-outer-width:           (@popover-arrow-width + 1);
+//** Popover outer arrow color
+@popover-arrow-outer-color:           fadein(@popover-border-color, 5%);
+//** Popover outer arrow fallback color
+@popover-arrow-outer-fallback-color:  darken(@popover-fallback-border-color, 20%);
+
+
+//== Labels
+//
+//##
+
+//** Default label background color
+@label-default-bg:            @btn-default-bg;
+//** Primary label background color
+@label-primary-bg:            @brand-primary;
+//** Success label background color
+@label-success-bg:            @brand-success;
+//** Info label background color
+@label-info-bg:               @brand-info;
+//** Warning label background color
+@label-warning-bg:            @brand-warning;
+//** Danger label background color
+@label-danger-bg:             @brand-danger;
+
+//** Default label text color
+@label-color:                 #fff;
+//** Default text color of a linked label
+@label-link-hover-color:      #fff;
+
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+@modal-inner-padding:         20px;
+
+//** Padding applied to the modal title
+@modal-title-padding:         15px;
+//** Modal title line-height
+@modal-title-line-height:     @line-height-base;
+
+//** Background color of modal content area
+@modal-content-bg:                             #fff;
+//** Modal content border color
+@modal-content-border-color:                   rgba(0,0,0,.2);
+//** Modal content border color **for IE8**
+@modal-content-fallback-border-color:          #999;
+
+//** Modal backdrop background color
+@modal-backdrop-bg:           #000;
+//** Modal backdrop opacity
+@modal-backdrop-opacity:      .5;
+//** Modal header border color
+@modal-header-border-color:   #e5e5e5;
+//** Modal footer border color
+@modal-footer-border-color:   @modal-header-border-color;
+
+@modal-lg:                    900px;
+@modal-md:                    600px;
+@modal-sm:                    300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+@alert-padding:               15px;
+@alert-border-radius:         @border-radius-base;
+@alert-link-font-weight:      bold;
+
+@alert-success-bg:            @state-success-bg;
+@alert-success-text:          @state-success-text;
+@alert-success-border:        @state-success-border;
+
+@alert-info-bg:               @state-info-bg;
+@alert-info-text:             @state-info-text;
+@alert-info-border:           @state-info-border;
+
+@alert-warning-bg:            @state-warning-bg;
+@alert-warning-text:          @state-warning-text;
+@alert-warning-border:        @state-warning-border;
+
+@alert-danger-bg:             @state-danger-bg;
+@alert-danger-text:           @state-danger-text;
+@alert-danger-border:         @state-danger-border;
+
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+@progress-bg:                 @gray-lighter;
+//** Progress bar text color
+@progress-bar-color:          #fff;
+//** Variable for setting rounded corners on progress bar.
+@progress-border-radius:      @border-radius-base;
+
+//** Default progress bar color
+@progress-bar-bg:             @brand-primary;
+//** Success progress bar color
+@progress-bar-success-bg:     @brand-success;
+//** Warning progress bar color
+@progress-bar-warning-bg:     @brand-warning;
+//** Danger progress bar color
+@progress-bar-danger-bg:      @brand-danger;
+//** Info progress bar color
+@progress-bar-info-bg:        @brand-info;
+
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+@list-group-bg:                 #fff;
+//** `.list-group-item` border color
+@list-group-border:             @gray-lighter;
+//** List group border radius
+@list-group-border-radius:      @border-radius-base;
+
+//** Background color of single list items on hover
+@list-group-hover-bg:           @gray-lighter;
+//** Text color of active list items
+@list-group-active-color:       @component-active-color;
+//** Background color of active list items
+@list-group-active-bg:          @component-active-bg;
+//** Border color of active list elements
+@list-group-active-border:      @list-group-active-bg;
+//** Text color for content within active list items
+@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
+
+//** Text color of disabled list items
+@list-group-disabled-color:      @gray-light;
+//** Background color of disabled list items
+@list-group-disabled-bg:         @gray-lighter;
+//** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
+@list-group-link-color:         #555;
+@list-group-link-hover-color:   @list-group-link-color;
+@list-group-link-heading-color: #333;
+
+
+//== Panels
+//
+//##
+
+@panel-bg:                    #fff;
+@panel-body-padding:          15px;
+@panel-heading-padding:       10px 15px;
+@panel-footer-padding:        @panel-heading-padding;
+@panel-border-radius:         @border-radius-base;
+
+//** Border color for elements within panels
+@panel-inner-border:          @gray-lighter;
+@panel-footer-bg:             @gray-lighter;
+
+@panel-default-text:          @text-color;
+@panel-default-border:        @gray-lighter;
+@panel-default-heading-bg:    @gray-lighter;
+
+@panel-primary-text:          #fff;
+@panel-primary-border:        @brand-primary;
+@panel-primary-heading-bg:    @brand-primary;
+
+@panel-success-text:          @state-success-text;
+@panel-success-border:        @state-success-border;
+@panel-success-heading-bg:    @state-success-bg;
+
+@panel-info-text:             @state-info-text;
+@panel-info-border:           @state-info-border;
+@panel-info-heading-bg:       @state-info-bg;
+
+@panel-warning-text:          @state-warning-text;
+@panel-warning-border:        @state-warning-border;
+@panel-warning-heading-bg:    @state-warning-bg;
+
+@panel-danger-text:           @state-danger-text;
+@panel-danger-border:         @state-danger-border;
+@panel-danger-heading-bg:     @state-danger-bg;
+
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+@thumbnail-padding:           4px;
+//** Thumbnail background color
+@thumbnail-bg:                @body-bg;
+//** Thumbnail border color
+@thumbnail-border:            @gray-lighter;
+//** Thumbnail border radius
+@thumbnail-border-radius:     @border-radius-base;
+
+//** Custom text color for thumbnail captions
+@thumbnail-caption-color:     @text-color;
+//** Padding around the thumbnail caption
+@thumbnail-caption-padding:   9px;
+
+
+//== Wells
+//
+//##
+
+@well-bg:                     @gray-lighter;
+@well-border:                 transparent;
+
+
+//== Badges
+//
+//##
+
+@badge-color:                 #fff;
+//** Linked badge text color on hover
+@badge-link-hover-color:      #fff;
+@badge-bg:                    @brand-primary;
+
+//** Badge text color in active nav link
+@badge-active-color:          @brand-primary;
+//** Badge background color in active nav link
+@badge-active-bg:             #fff;
+
+@badge-font-weight:           bold;
+@badge-line-height:           1;
+@badge-border-radius:         10px;
+
+
+//== Breadcrumbs
+//
+//##
+
+@breadcrumb-padding-vertical:   8px;
+@breadcrumb-padding-horizontal: 15px;
+//** Breadcrumb background color
+@breadcrumb-bg:                 @gray-lighter;
+//** Breadcrumb text color
+@breadcrumb-color:              #ccc;
+//** Text color of current page in the breadcrumb
+@breadcrumb-active-color:       @gray;
+//** Textual separator for between breadcrumb elements
+@breadcrumb-separator:          "/";
+
+
+//== Carousel
+//
+//##
+
+@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
+
+@carousel-control-color:                      #fff;
+@carousel-control-width:                      15%;
+@carousel-control-opacity:                    .5;
+@carousel-control-font-size:                  20px;
+
+@carousel-indicator-active-bg:                #fff;
+@carousel-indicator-border-color:             #fff;
+
+@carousel-caption-color:                      #fff;
+
+
+//== Close
+//
+//##
+
+@close-font-weight:           bold;
+@close-color:                 #000;
+@close-text-shadow:           none;
+
+
+//== Code
+//
+//##
+
+@code-color:                  #c7254e;
+@code-bg:                     #f9f2f4;
+
+@kbd-color:                   #fff;
+@kbd-bg:                      #333;
+
+@pre-bg:                      @gray-lighter;
+@pre-color:                   @gray-dark;
+@pre-border-color:            #ccc;
+@pre-scrollable-max-height:   340px;
+
+
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+@component-offset-horizontal: 180px;
+//** Text muted color
+@text-muted:                  @gray-light;
+//** Abbreviations and acronyms border color
+@abbr-border-color:           @gray-light;
+//** Headings small color
+@headings-small-color:        @gray-light;
+//** Blockquote small color
+@blockquote-small-color:      @gray-light;
+//** Blockquote font size
+@blockquote-font-size:        (@font-size-base * 1.25);
+//** Blockquote border color
+@blockquote-border-color:     @gray-lighter;
+//** Page header border color
+@page-header-border-color:    transparent;
+//** Width of horizontal description list titles
+@dl-horizontal-offset:        @component-offset-horizontal;
+//** Horizontal line color.
+@hr-border:                   @gray-lighter;
diff --git a/static/css/sources/common/variables.less b/static/css/sources/common/variables.less
new file mode 100644
index 0000000..4714151
--- /dev/null
+++ b/static/css/sources/common/variables.less
@@ -0,0 +1 @@
+@font-size-base:          13px;
diff --git a/static/css/sources/components/builds.less b/static/css/sources/components/builds.less
new file mode 100644
index 0000000..02f3917
--- /dev/null
+++ b/static/css/sources/components/builds.less
@@ -0,0 +1,10 @@
+.build {
+	padding: 25px;
+
+	&__in-progress {
+		background: lighten(@brand-info, 40%);
+	}
+	&__done {
+		background: lighten(@brand-success, 50%);
+	}
+}
diff --git a/static/css/sources/components/layout.less b/static/css/sources/components/layout.less
new file mode 100644
index 0000000..55bd0d9
--- /dev/null
+++ b/static/css/sources/components/layout.less
@@ -0,0 +1,3 @@
+.main-row {
+	margin-top: @navbar-height + 15px;
+}
diff --git a/static/css/sources/components/projects.less b/static/css/sources/components/projects.less
new file mode 100644
index 0000000..e69de29
diff --git a/static/index.html b/static/index.html
deleted file mode 100644
index 36c1e4c..0000000
--- a/static/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-
-	

Hello world

-
- -
- - - - - diff --git a/static/js/app/app.js b/static/js/app/app.js index cd05d14..d9485a2 100644 --- a/static/js/app/app.js +++ b/static/js/app/app.js @@ -1,15 +1,31 @@ 'use strict'; define([ - 'react', 'templates/app/index', 'app/components/index', + 'react', + 'react-router', + 'templates/app/index', 'app/components/index', 'app/actions/project', 'app/actions/build' ], function( - React, template, Components, + React, + Router, + template, Components, ProjectActions, BuildActions ) { - React.render(template({ - App: Components.App - }), document.getElementById('content')); + var Route = React.createFactory(Router.Route), + DefaultRoute = React.createFactory(Router.DefaultRoute); + + var routes = ( + Route({name: 'dashboard', path: '/', handler: Components.App}, + Route({name: 'projects', path: '/projects', handler: Components.ProjectsComponents.List}) + ) + ); + + Router.run(routes, Router.HistoryLocation, function(Handler) { + console.log(Handler); + React.render(template({ + Component: Handler + }), document.getElementById('content')); + }); ProjectActions.readAll(); BuildActions.readAll(); diff --git a/static/js/app/components/app.jade b/static/js/app/components/app.jade index 2f5f553..efcd1d9 100644 --- a/static/js/app/components/app.jade +++ b/static/js/app/components/app.jade @@ -1,11 +1,8 @@ -h1 nci +.main-row + .row + .col-md-4.col-md-push-8 + h2 Projects + ProjectsList() -.row - .col-md-4 - ProjectsList() - - .col-md-4 - BuildsList() - - .col-md-4 - Console() + .col-md-8.col-md-pull-4 + BuildsList() diff --git a/static/js/app/components/builds/item.jade b/static/js/app/components/builds/item.jade index 945f87f..48a8ce2 100644 --- a/static/js/app/components/builds/item.jade +++ b/static/js/app/components/builds/item.jade @@ -1,7 +1,20 @@ -li.list-group-item(title= item.status === 'in-progress' ? 'Current step is: ' + item.currentStep : 'Build is done') - span.badge= item.status - a.pull-right(href="javascript:void(0);", onClick=onBuildSelect(item.id), style={marginRight: '5px'}) show console output +mixin statusText(build) span # - span= item.id + span= build.id span - span= item.project.name + if build.status === 'in-progress' + span current step is: + span= build.currentStep + + if build.status === 'queued' + span build queued + + if build.status === 'done' + span build done + +.build(class="build__#{build.status}") + .pull-right + span= build.project.name + .build_header + + statusText(build) + a.pull-right(href="javascript:void(0);", onClick=onBuildSelect(build.id), style={marginRight: '5px'}) show console output diff --git a/static/js/app/components/builds/item.js b/static/js/app/components/builds/item.js index 30f2b3e..8a1261c 100644 --- a/static/js/app/components/builds/item.js +++ b/static/js/app/components/builds/item.js @@ -10,7 +10,7 @@ define([ }, render: function() { return template({ - item: this.props.item, + build: this.props.build, onBuildSelect: this.onBuildSelect }); } diff --git a/static/js/app/components/builds/list.jade b/static/js/app/components/builds/list.jade index eb5ff4b..f7e74ec 100644 --- a/static/js/app/components/builds/list.jade +++ b/static/js/app/components/builds/list.jade @@ -1,6 +1,4 @@ -div - h2 builds list - - console.log(items) - ul.list-group - each build, index in items - Item(item=build, key=build.id) +- console.log('builds', items) +.builds + each build, index in items + Item(build=build, key=build.id) diff --git a/static/js/app/components/projects/list.jade b/static/js/app/components/projects/list.jade index da10117..5e07d46 100644 --- a/static/js/app/components/projects/list.jade +++ b/static/js/app/components/projects/list.jade @@ -1,4 +1,3 @@ -h2 projects list ul.list-group each project, index in items Item(item=project, key=project.name) diff --git a/static/js/app/index.jade b/static/js/app/index.jade index a021249..339b720 100644 --- a/static/js/app/index.jade +++ b/static/js/app/index.jade @@ -1,2 +1,9 @@ +.navbar.navbar-default.navbar-fixed-top + .container-fluid + .navbar-header + a.navbar-brand(href="javascript:void(0);") Company Brand Name CI + form.navbar-left.navbar-form + .form-group + input.form-control(placeholder="Start typing project name...", style={width: '220px'}) .container-fluid - App() + Component() diff --git a/static/js/main.js b/static/js/main.js index c63d257..a4b4950 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -5,6 +5,7 @@ require.config({ paths: { underscore: 'libs/underscore/underscore', react: 'libs/react/react-with-addons', + 'react-router': 'libs/react-router/build/umd/ReactRouter', reflux: 'libs/reflux/dist/reflux', _dataio: '/data.io', socketio: '/socket.io/socket.io.js', diff --git a/views/index.jade b/views/index.jade index 208540e..f326ea3 100644 --- a/views/index.jade +++ b/views/index.jade @@ -3,8 +3,7 @@ html head title nci - // do it temporary - link(href="/js/libs/bootstrap/dist/css/bootstrap.css", rel="stylesheet", type="text/css") + link(href="/css/index.css", rel="stylesheet", type="text/css") script(data-main="/js/main" src="/js/libs/requirejs/require.js") script(type="text/javascript").