Changed folder structure

.gitignore

@@ -1,16 +1,16 @@
-build/node_modules/
+src/node_modules/
-build/bower_components/
+src/bower_components/
 
-php/config.php
 data/config.php
 
 uploads/import/*
 uploads/big/*
 uploads/thumb/*
 plugins/*
-etc/*
 
 !uploads/import/index.html
 !uploads/big/index.html
 !uploads/thumb/index.html
-!plugins/check/
+
+!plugins/check/
+!plugins/displaylog/

Dockerfile

@@ -27,4 +27,4 @@ RUN chown www-data:www-data /app -R
 RUN chmod -R 777 uploads/ data/
 
 EXPOSE 80
-CMD scripts/start
+CMD src/commands/start

assets/img/no_images.svg

@@ -1 +0,0 @@
-<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"><title>no_images</title><g sketch:type="MSLayerGroup" fill="none"><rect fill="#222" sketch:type="MSShapeGroup" width="200" height="200"/><g transform="translate(68 52)" sketch:type="MSShapeGroup"><rect stroke="#B4B4B4" stroke-width="4" width="50" height="42" rx="3"/><rect fill="#222" x="11" y="11" width="44" height="36"/><rect stroke="#B4B4B4" stroke-width="4" x="20" y="20" width="50" height="42" rx="3"/></g></g></svg>

assets/img/password.svg

@@ -1 +0,0 @@
-<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"><title>password</title><g sketch:type="MSLayerGroup" fill="none"><rect fill="#222" sketch:type="MSShapeGroup" width="200" height="200"/><path d="M118 73h2.999c4.413 0 8.001 3.579 8.001 7.994v28.013c0 4.412-3.582 7.994-8.001 7.994h-40.999c-4.413 0-8.001-3.579-8.001-7.994v-28.013c0-4.412 3.582-7.994 8.001-7.994h2.999v-9.495c0-9.665 7.835-17.505 17.5-17.505 9.667 0 17.5 7.837 17.5 17.505v9.495zm-17.5-20c-5.799 0-10.5 4.702-10.5 10.498v9.502h21v-9.502c0-5.798-4.7-10.498-10.5-10.498zm0 0" fill="#B4B4B4" sketch:type="MSShapeGroup"/></g></svg>

docs/Build.md

@@ -16,11 +16,11 @@ After [installing Node.js](http://nodejs.org) you can use the included `npm` pac
 ### Build
 
 The Gruntfile is located in `build/` and can be easily executed using the `gulp` command.
-	
+
 ### Watch for changes
 
-While developing, you might want to use the following command to watch for changes in `assets/js/` and `assets/css/`:
+While developing, you might want to use the following command to watch for changes:
 
 	gulp watch
-	
+
 `gulp` will automatically build Lychee everytime you save a file.

index.html

@@ -10,11 +10,11 @@
 		<meta name="description" content="">
 
 		<!-- CSS -->
-		<link type="text/css" rel="stylesheet" href="assets/min/main.css">
+		<link type="text/css" rel="stylesheet" href="dist/main.css">
 
 		<link rel="shortcut icon" href="favicon.ico">
-		<link rel="apple-touch-icon" href="assets/img/apple-touch-icon-iphone.png" sizes="120x120">
+		<link rel="apple-touch-icon" href="src/images/apple-touch-icon-iphone.png" sizes="120x120">
-		<link rel="apple-touch-icon" href="assets/img/apple-touch-icon-ipad.png" sizes="152x152">
+		<link rel="apple-touch-icon" href="src/images/apple-touch-icon-ipad.png" sizes="152x152">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
@@ -79,7 +79,7 @@
 	</div>
 
 	<!-- JS -->
-	<script async type="text/javascript" src="assets/min/main.js"></script>
+	<script async type="text/javascript" src="dist/main.js"></script>
 
 	</body>
 </html>

src/gulpfile.js

@@ -7,19 +7,19 @@ var paths = {
 		'bower_components/js-md5/js/md5.min.js',
 		'bower_components/mousetrap/mousetrap.min.js',
 		'bower_components/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js',
-		'../assets/js/_frameworks.js',
+		'../src/scripts/_frameworks.js',
-		'../assets/js/build.js',
+		'../src/scripts/build.js',
-		'../assets/js/view/main.js'
+		'../src/scripts/view/main.js'
 	],
 	js: [
 		'bower_components/jQuery/dist/jquery.min.js',
 		'bower_components/js-md5/js/md5.min.js',
 		'bower_components/mousetrap/mousetrap.min.js',
 		'bower_components/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js',
-		'../assets/js/*.js'
+		'../src/scripts/*.js'
 	],
 	css: [
-		'../assets/scss/main.scss'
+		'../src/styles/main.scss'
 	]
 }
 
@@ -35,7 +35,7 @@ gulp.task('view', function() {
 	gulp.src(paths.view)
 		.pipe(plugins.concat('view.js', {newLine: "\n"}))
 		.pipe(plugins.uglify())
-		.pipe(gulp.dest('../assets/min/'));
+		.pipe(gulp.dest('../dist/'));
 
 });
 
@@ -45,7 +45,7 @@ gulp.task('js', function() {
 		.pipe(plugins.concat('main.js', {newLine: "\n"}))
 		.pipe(plugins.uglify())
 		.on('error', catchError)
-		.pipe(gulp.dest('../assets/min/'));
+		.pipe(gulp.dest('../dist/'));
 
 });
 
@@ -57,7 +57,7 @@ gulp.task('css', function() {
 		.pipe(plugins.concat('main.css', {newLine: "\n"}))
 		.pipe(plugins.autoprefixer('last 4 versions', '> 5%'))
 		.pipe(plugins.minifyCss())
-		.pipe(gulp.dest('../assets/min/'));
+		.pipe(gulp.dest('../dist/'));
 
 });
 

src/images/no_images.svg

@@ -0,0 +1 @@
+<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"><title>no_images</title><g fill="none"><path fill="#222" d="M0 0h200v200H0z"/><g transform="translate(68 52)"><rect stroke="#B4B4B4" stroke-width="4" width="50" height="42" rx="3"/><path fill="#222" d="M11 11h44v36H11z"/><rect stroke="#B4B4B4" stroke-width="4" x="20" y="20" width="50" height="42" rx="3"/></g></g></svg>

src/images/password.svg

@@ -0,0 +1 @@
+<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"><title>password</title><g fill="none"><path fill="#222" d="M0 0h200v200H0z"/><path d="M118 73h3c4.412 0 8 3.58 8 7.994v28.013c0 4.412-3.582 7.994-8 7.994H80c-4.413 0-8-3.578-8-7.993V80.994C72 76.582 75.58 73 80 73h3v-9.495C83 53.84 90.833 46 100.5 46S118 53.837 118 63.505V73zm-17.5-20C94.7 53 90 57.702 90 63.498V73h21v-9.502C111 57.7 106.3 53 100.5 53zm0 0" fill="#B4B4B4"/></g></svg>

src/scripts/albums.js

@@ -93,13 +93,13 @@ albums = {
 	parse: function(album) {
 
 		if (album.password&&lychee.publicMode) {
-			album.thumb0 = "assets/img/password.svg";
+			album.thumb0 = "src/images/password.svg";
-			album.thumb1 = "assets/img/password.svg";
+			album.thumb1 = "src/images/password.svg";
-			album.thumb2 = "assets/img/password.svg";
+			album.thumb2 = "src/images/password.svg";
 		} else {
-			if (!album.thumb0) album.thumb0 = "assets/img/no_images.svg";
+			if (!album.thumb0) album.thumb0 = "src/images/no_images.svg";
-			if (!album.thumb1) album.thumb1 = "assets/img/no_images.svg";
+			if (!album.thumb1) album.thumb1 = "src/images/no_images.svg";
-			if (!album.thumb2) album.thumb2 = "assets/img/no_images.svg";
+			if (!album.thumb2) album.thumb2 = "src/images/no_images.svg";
 		}
 
 	},

src/styles/font.scss

@@ -23,8 +23,8 @@
     */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../font/fontawesome-webfont.eot');
+  src: url('../src/fonts/fontawesome-webfont.eot');
-  src: url('../font/fontawesome-webfont.eot?#iefix') format('eot'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
+  src: url('../src/fonts/fontawesome-webfont.eot?#iefix') format('eot'), url('../src/fonts/fontawesome-webfont.woff') format('woff'), url('../src/fonts/fontawesome-webfont.ttf') format('truetype'), url('../src/fonts/fontawesome-webfont.svg#FontAwesome') format('svg');
   font-weight: normal;
   font-style: normal;
 }

view.php

@@ -10,11 +10,11 @@
 		<meta name="description" content="">
 
 		<!-- CSS -->
-		<link type="text/css" rel="stylesheet" href="assets/min/main.css">
+		<link type="text/css" rel="stylesheet" href="dist/main.css">
 
 		<link rel="shortcut icon" href="favicon.ico">
-		<link rel="apple-touch-icon" href="assets/img/apple-touch-icon-iphone.png" sizes="120x120">
+		<link rel="apple-touch-icon" href="src/images/apple-touch-icon-iphone.png" sizes="120x120">
-		<link rel="apple-touch-icon" href="assets/img/apple-touch-icon-ipad.png" sizes="152x152">
+		<link rel="apple-touch-icon" href="src/images/apple-touch-icon-ipad.png" sizes="152x152">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
@@ -63,7 +63,7 @@
 	<div id="infobox"></div>
 
 	<!-- JS -->
-	<script type="text/javascript" src="assets/min/view.js"></script>
+	<script type="text/javascript" src="dist/view.js"></script>
 
 	</body>
 </html>