Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
6ff8dd5
Added sass preprocessor and splitted style.css into smaller files
fxedel Mar 1, 2017
46fe156
Moved some directories
fxedel Mar 1, 2017
4dafcdf
Renamed 'partials' everywhere to 'includes'
fxedel Mar 1, 2017
8860e16
Fixed stylesheet path
fxedel Mar 1, 2017
35d9e93
Refactored colors and used sass nesting in header.scss
fxedel Mar 1, 2017
d9e9e98
Merge remote-tracking branch 'origin/master' into muilga
fxedel Mar 1, 2017
c71b030
Added Lato font and grey background
fxedel Mar 1, 2017
6c946df
Removed some lato flavors
fxedel Mar 1, 2017
b07ef20
Merge remote-tracking branch 'origin/master' into muilga
fxedel Mar 1, 2017
b150b68
Added card layout in /categories
fxedel Mar 1, 2017
09c05db
fix favicon path
FloEdelmann Mar 2, 2017
b33dc87
some style tweaks
FloEdelmann Mar 2, 2017
45a6c34
Removed eot and ttf fonts (woff and woff2 is enough)
fxedel Mar 2, 2017
96ddeaa
Added card layout for manufacturers
fxedel Mar 2, 2017
2538077
Only show manufacturers mentioned in register
fxedel Mar 2, 2017
998dcaf
add icons for categories
FloEdelmann Mar 3, 2017
e3c8ded
optimize svg
FloEdelmann Mar 4, 2017
305a2cb
display category icons on category page
FloEdelmann Mar 4, 2017
086530d
[JUST FOR TEST DEPLOYMENT] show all categories
FloEdelmann Mar 4, 2017
c613799
clean up
FloEdelmann Mar 4, 2017
39fec90
Show manufacturer fixtures in one card
fxedel Mar 4, 2017
4c62af2
Merge branch 'muilga' of github.com:FloEdelmann/open-fixture-library …
fxedel Mar 4, 2017
f840c6a
SCSS code style
FloEdelmann Mar 4, 2017
9e032f7
Show nice list in manufacturer fixtures
fxedel Mar 4, 2017
a86edda
Merge branch 'muilga' of github.com:FloEdelmann/open-fixture-library …
fxedel Mar 4, 2017
80da62b
Added category icons to manufacturer fixtures
fxedel Mar 4, 2017
3ac1a65
Added category icon tooltips (via <title> tag)
fxedel Mar 4, 2017
7efb09c
- Make category icons smaller on phone
fxedel Mar 4, 2017
8a2fdb5
category fixtures list
FloEdelmann Mar 4, 2017
5804a66
add Inconsolata monospace font
FloEdelmann Mar 5, 2017
31e41cf
style single fixture page
FloEdelmann Mar 5, 2017
5005632
small simplification
FloEdelmann Mar 5, 2017
241062e
add source link
FloEdelmann Mar 7, 2017
c4998ef
more margin between categories
FloEdelmann Mar 7, 2017
4699210
move channel groups into top card
FloEdelmann Mar 7, 2017
b638bc3
display channel key
FloEdelmann Mar 7, 2017
79496e9
fix meta spaces
FloEdelmann Mar 7, 2017
3d09cda
Merge branch 'master' into muilga
fxedel Mar 7, 2017
03bf073
Merge branch 'master' into muilga
FloEdelmann Mar 7, 2017
be01d2f
hide unset properties
FloEdelmann Mar 7, 2017
42ed909
Merge branch 'muilga' of github.com:FloEdelmann/open-fixture-library …
FloEdelmann Mar 7, 2017
dfbfc0c
fix channel group wrapping
FloEdelmann Mar 7, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ npm-debug.log
# Docker
Dockerfile
docker-compose.yml

# Generated stylesheet
static/style.css
14 changes: 11 additions & 3 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,26 @@ const express = require('express');
const app = express();
const fs = require('fs');
const path = require('path');
const sassMiddleware = require('node-sass-middleware');

// setup port
app.set('port', (process.env.PORT || 5000));
app.listen(app.get('port'), () => {
console.log('Node app is running on port', app.get('port'));
});

// compile sass
app.use(sassMiddleware({
src: path.join(__dirname, 'views', 'stylesheets'),
dest: path.join(__dirname, 'static'),
outputStyle: 'compressed'
}));

// static files that shall be accessible
app.use(express.static(__dirname + '/public'));
app.use(express.static(path.join(__dirname, 'static')));

// views is directory for all template files
app.set('views', __dirname + '/views');
app.set('views', path.join(__dirname, 'views'));

// custom renderer
app.engine('js', (filePath, options, callback) => {
Expand Down Expand Up @@ -103,7 +111,7 @@ app.use((request, response, next) => {
}
else if (segments.length == 2 && segments[0] === 'categories' && decodeURIComponent(segments[1]) in register.categories) {
response.render('pages/single_category', {
type: decodeURIComponent(segments[1])
category: decodeURIComponent(segments[1])
});
return;
}
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"start": "node main.js"
},
"dependencies": {
"express": "4.14.1"
"express": "4.14.1",
"node-sass-middleware": "^0.11.0"
},
"devDependencies": {
"colors": "^1.1.2",
Expand Down
1 change: 0 additions & 1 deletion public/magnify.svg

This file was deleted.

296 changes: 0 additions & 296 deletions public/style.css

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.
Binary file added static/fonts/Inconsolata/Inconsolata-Bold.ttf
Binary file not shown.
Binary file added static/fonts/Inconsolata/Inconsolata-Regular.ttf
Binary file not shown.
Loading