Skip to content

Commit

Permalink
Remove python files, add new structure in html files, building interf…
Browse files Browse the repository at this point in the history
…ace.
  • Loading branch information
MarekM25 committed Mar 11, 2016
1 parent f20a2cb commit 158989a
Show file tree
Hide file tree
Showing 17,727 changed files with 1,826,427 additions and 148 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
26 changes: 0 additions & 26 deletions MBI.py

This file was deleted.

5 changes: 0 additions & 5 deletions ReadMe.md

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions app/css/styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
html, body, .container-table {
height: 100%; }

.container-table {
display: table; }

body {
background: green; }
35 changes: 35 additions & 0 deletions app/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE html>
<html lang="pl">
<head>
<meta charset="UTF-8">
<title>Wyszukiwania motywów</title>

<link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="css/styles.css" rel="stylesheet">
</head>
<body ng-app="app" ng-controller="AppCtrl as app">
<div class="container container-table">
{{msg}}
<div class="form-group col-lg-2">
<h3>Ilość sekwencji:</h3>
<input type="number" class="form-control">
<h3>Długośc sekwencji:</h3>
<input type="number" class="form-control">
</div>
<div class="form-group">
<label for="comment">Sekwencje:</label>
<textarea class="form-control" rows="5" id="comment"></textarea>
</div>
<button type="button" class="btn btn-info" ng-click='go()'>Wykonaj algorytm</button>


<h4>Wyszukiwania motywów dla zbioru sekwencji metodą wyszukiwania mediany</h4>
<h3>Autorzy: Filip Piątkowski, Marcin Dudek, Marek Moraczyński</h3>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="bower_components/angular/angular.min.js"></script>
<script src="js/app.js"></script>
<script src="bower_components/bootstrap/bootstrap.min.js"></script>
</div>
</body>
</html>
10 changes: 7 additions & 3 deletions static/js/app.js → app/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ var app = angular.module("app",[]);

app.controller("AppCtrl",function($scope,$http) {
var app = this;


$scope.msg = 'not clicked';

$scope.go = function() {

$http.get("/api/pin").success(function (data) {
app.pins = data.objects;
});
$scope.msg = 'clicked';
}
})
14 changes: 14 additions & 0 deletions app/scss/styles.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@


html, body, .container-table {
height: 100%;
}
.container-table {
display: table;
}

body
{

background: green;
}
68 changes: 68 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
// Include gulp
var gulp = require('gulp');

// Include Our Plugins
var jshint = require('gulp-jshint');
var sass = require('gulp-sass');
var concat = require('gulp-concat');
var uglify = require('gulp-uglify');
var rename = require('gulp-rename');
var browserSync = require('browser-sync').create();

// Lint Task
gulp.task('lint', function() {
return gulp.src('js/*.js')
.pipe(jshint())
.pipe(jshint.reporter('default'));
});

gulp.task('sass', function() {
return gulp.src('app/scss/**/*.scss') // Gets all files ending with .scss in app/scss
.pipe(sass())
.pipe(gulp.dest('app/css'))
.pipe(browserSync.reload({
stream: true
}))
});

// Concatenate & Minify JS
gulp.task('scripts', function() {
return gulp.src('js/*.js')
.pipe(concat('all.js'))
.pipe(gulp.dest('dist'))
.pipe(rename('all.min.js'))
.pipe(uglify())
.pipe(gulp.dest('dist'));
});

gulp.task('browserSync', function() {
browserSync.init({
server: {
baseDir: 'app'
},
})
})


gulp.task('html', function() {
return gulp.src('app/**/*.html') // Gets all files ending with .scss in app/scss
.pipe(browserSync.reload({
stream: true
}))
});


// Watch Files For Changes
gulp.task('watch', ['browserSync', 'sass'], function (){
gulp.watch('app/scss/**/*.scss', ['sass']);
gulp.watch('app/js/**/*.js', ['scripts']);
gulp.watch('app/index.html', ['html']);
// Other watchers
});

gulp.task('hello', function() {
console.log('test');
});

// Default Task
gulp.task('default', ['lint', 'sass', 'scripts', 'watch']);
70 changes: 0 additions & 70 deletions medianSearch.py

This file was deleted.

15 changes: 15 additions & 0 deletions node_modules/.bin/bower

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions node_modules/.bin/bower.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions node_modules/.bin/browser-sync

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions node_modules/.bin/browser-sync.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions node_modules/.bin/gulp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions node_modules/.bin/gulp.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions node_modules/.bin/jshint

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions node_modules/.bin/jshint.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 158989a

Please sign in to comment.