Skip to content

Commit

Permalink
CLICKHOUSE-2724: website refactoring (#668)
Browse files Browse the repository at this point in the history
* Split website and doc

* Add Host directive to robots.txt

* Make new favicon.ico from svg

* Reformat code

* Add some obscurity to email to limit it's inclusion to email spam databases

* Mention SQL in descriptions

* Put logo near main title

* Add navbar

* Update feedback text on tutorial page

* Reformat code on tutorial page

* Better inline svg

* Move javascript to bottom in reference

* Mark external links on main & tutorial

* Copy footer from main to tutorial

* Move Telegram higher

* Get rid of hidden content

* Update jQuery + add it on index

* Rewrite plain JS with jQuery on index

* Swap Contacts and Download

* Some title tuning

* Move Source link to corner

* Slow scroll

* New first screen

* First screen tuning

* Add github pages script

* Checkout in proper place

* more nofollow

* Basic mobile support

* Add some temporary icon (SIL licensed)

* Fix horizontal scroll on mobile

* Re-order paragraphs

* Sync paragraphs with their index

* Add one more grey block

* Fix scroll to top

* better offset

* Reformat code

* Add social paragraph

* Better word

* Font tuning

* More font/offset tuning

* Increase navbar padding

* Basic minify & livereload via gulp

* Add styles to default in gulp

* Do not minify html in reference

* Add og:image header

* "build" gulp target

* Add readme for website

* Max-width for navbar

* Use different placeholder

* Tune some margins

* Do not center buttons

* Tune navbar padding

* s/an/a/

* Larger font at logo

* Increase padding at hero

* Yet another placeholder + tune padding on buttons

* Basic support for website inside Docker

* Listen for IPv6 inside Docker

* s/available/enabled/g

* nginx tuning

* add gzip_min_length

* not so dark "fork me" badge

* do not commit build results

* move "fork me" to right side

* Tune styles and texts

* tune mobile version

* text fix

* text fix

* text fix

* publish presentations

* fix navbar styling

* fix id name

* Support actual deployment to either prod and test

* tune logo margin

* Mention ClickHouse Docker images

* style tuning

* disable mix-blend-mode on mobile

* copy robots.txt
  • Loading branch information
blinkov authored and alexey-milovidov committed Apr 10, 2017
1 parent ba9590d commit 6a51c66
Show file tree
Hide file tree
Showing 24 changed files with 12,147 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,7 @@ config-preprocessed.xml

# Ignore symlink to private repository
/private

# Gulp dependencies used to minify website
node_modules
public
Binary file removed doc/favicon.ico
Binary file not shown.
2 changes: 0 additions & 2 deletions doc/robots.txt

This file was deleted.

4 changes: 4 additions & 0 deletions website/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM nginx:mainline
COPY public /usr/share/nginx/html
COPY nginx/nginx.conf /etc/nginx/nginx.conf
COPY nginx/default.conf /etc/nginx/conf.d/default.conf
4 changes: 4 additions & 0 deletions website/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ClickHouse website quickstart:
1. If npm is not installed: `apt-get install npm` for Debian/Ubuntu, `brew install npm` for Mac OS or download and install manually https://nodejs.org/en/download/
2. Run setup\_gulp.sh once to install prerequisites via npm
3. Use `gulp build` to minify website to "public" folder or just `gulp` to run local webserver with livereload serving it
2 changes: 1 addition & 1 deletion doc/benchmark.html → website/benchmark.html
Original file line number Diff line number Diff line change
Expand Up @@ -2116,7 +2116,7 @@
<noscript><div><img src="https://mc.yandex.ru/watch/18343495" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
<!-- /Yandex.Metrika counter -->

<script type="text/javascript" src="https://yandex.st/jquery/1.7.2/jquery.min.js"></script>
<script type="text/javascript" src="https://yastatic.net/jquery/3.1.1/jquery.min.js"></script>

<div class='island'>

Expand Down
Binary file added website/favicon.ico
Binary file not shown.
File renamed without changes.
95 changes: 95 additions & 0 deletions website/gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
var gulp = require('gulp');
var concat = require('gulp-concat');
var uglify = require('gulp-uglify');
var cleanCss = require('gulp-clean-css');
var imagemin = require('gulp-imagemin');
var sourcemaps = require('gulp-sourcemaps');
var htmlmin = require('gulp-htmlmin');
var minifyInline = require('gulp-minify-inline');
var del = require('del');
var connect = require('gulp-connect');

var outputDir = 'public';

var paths = {
htmls: ['*.html', '!reference_ru.html', '!reference_en.html'],
reference: ['reference_ru.html', 'reference_en.html'],
scripts: ['*.js', '!gulpfile.js'],
styles: ['*.css'],
images: ['*.png', '*.ico'],
robotstxt: ['robots.txt'],
presentations: ['../doc/presentations/**']
};

gulp.task('clean', function () {
return del([outputDir + '**']);
});

gulp.task('reference', [], function () {
return gulp.src(paths.reference)
.pipe(minifyInline())
.pipe(gulp.dest(outputDir))
.pipe(connect.reload())
});

gulp.task('presentations', [], function () {
return gulp.src(paths.presentations)
.pipe(gulp.dest(outputDir + '/presentations'))
.pipe(connect.reload())
});

gulp.task('robotstxt', [], function () {
return gulp.src(paths.robotstxt)
.pipe(gulp.dest(outputDir))
.pipe(connect.reload())
});

gulp.task('htmls', ['reference', 'robotstxt', 'presentations'], function () {
return gulp.src(paths.htmls)
.pipe(htmlmin({collapseWhitespace: true}))
.pipe(minifyInline())
.pipe(gulp.dest(outputDir))
.pipe(connect.reload())
});

gulp.task('scripts', [], function () {
return gulp.src(paths.scripts)
.pipe(sourcemaps.init())
.pipe(uglify())
.pipe(sourcemaps.write())
.pipe(gulp.dest(outputDir))
.pipe(connect.reload())
});

gulp.task('styles', [], function () {
return gulp.src(paths.styles)
.pipe(cleanCss())
.pipe(gulp.dest(outputDir))
.pipe(connect.reload())
});

gulp.task('images', [], function () {
return gulp.src(paths.images)
.pipe(imagemin({optimizationLevel: 9}))
.pipe(gulp.dest(outputDir))
.pipe(connect.reload())
});

gulp.task('watch', function () {
gulp.watch(paths.htmls, ['htmls']);
gulp.watch(paths.scripts, ['scripts']);
gulp.watch(paths.images, ['images']);
});

gulp.task('connect', function() {
connect.server({
root: outputDir,
port: 8080,
keepalive: true,
livereload: true
})
});

gulp.task('build', ['htmls', 'scripts', 'styles', 'images']);

gulp.task('default', ['build', 'watch', 'connect']);
Loading

0 comments on commit 6a51c66

Please sign in to comment.