From 0e3460ab49a30f184b609c64f938ac54ebe64623 Mon Sep 17 00:00:00 2001 From: f0x Date: Sun, 9 Jun 2019 21:59:36 +0200 Subject: [PATCH] refactor source code layout --- gulpfile.js | 12 ++++++------ app.js => src/app.js | 2 -- {public => src/assets}/OpenSans-Bold.ttf | Bin {public => src/assets}/OpenSans-Regular.ttf | Bin {public => src/assets}/font-license.txt | 0 {public => src/assets}/icons/file.svg | 0 {public => src/assets}/index.html | 0 {public => src/assets}/neo.png | Bin {components => src/components}/Login.js | 0 {components => src/components}/chat.js | 0 {components => src/components}/events/Event.js | 0 {components => src/components}/events/image.js | 0 {components => src/components}/events/state.js | 0 {components => src/components}/events/text.js | 0 {components => src/components}/events/user.js | 0 {components => src/components}/events/video.js | 0 {components => src/components}/fileUpload.js | 0 {components => src/components}/filterList.js | 0 {components => src/components}/info.js | 0 {components => src/components}/input.js | 0 {components => src/components}/loading.js | 0 {components => src/components}/sidebar.js | 0 {lib => src/lib}/media.js | 0 {lib => src/lib}/riot-utils.js | 0 {public => src}/scss/style.scss | 0 25 files changed, 6 insertions(+), 8 deletions(-) rename app.js => src/app.js (99%) rename {public => src/assets}/OpenSans-Bold.ttf (100%) rename {public => src/assets}/OpenSans-Regular.ttf (100%) rename {public => src/assets}/font-license.txt (100%) rename {public => src/assets}/icons/file.svg (100%) rename {public => src/assets}/index.html (100%) rename {public => src/assets}/neo.png (100%) rename {components => src/components}/Login.js (100%) rename {components => src/components}/chat.js (100%) rename {components => src/components}/events/Event.js (100%) rename {components => src/components}/events/image.js (100%) rename {components => src/components}/events/state.js (100%) rename {components => src/components}/events/text.js (100%) rename {components => src/components}/events/user.js (100%) rename {components => src/components}/events/video.js (100%) rename {components => src/components}/fileUpload.js (100%) rename {components => src/components}/filterList.js (100%) rename {components => src/components}/info.js (100%) rename {components => src/components}/input.js (100%) rename {components => src/components}/loading.js (100%) rename {components => src/components}/sidebar.js (100%) rename {lib => src/lib}/media.js (100%) rename {lib => src/lib}/riot-utils.js (100%) rename {public => src}/scss/style.scss (100%) diff --git a/gulpfile.js b/gulpfile.js index 2edc842..1cde1fc 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -15,7 +15,7 @@ const sourcemaps = require('gulp-sourcemaps') const budo = require('budo') const babelify = require('babelify') -const cssFiles = 'public/scss/**/*.?(s)css' +const cssFiles = 'src/scss/**/*.?(s)css' let css = gulp.src(cssFiles) .pipe(sass()) @@ -23,7 +23,7 @@ let css = gulp.src(cssFiles) .pipe(gulp.dest('build')) gulp.task('watch', function(cb) { - budo("app.js", { + budo("src/app.js", { live: true, dir: "build", port: 3000, @@ -47,7 +47,7 @@ gulp.task("sass", function() { }) gulp.task("assets", function() { - return gulp.src(["public/**/*", "!public/scss", "!public/scss/**/*"]) + return gulp.src(["src/assets/**/*"]) .pipe(gulpIf('*.+(png|jpg|jpeg|gif|svg)', cache(imagemin({ interlaced: true @@ -57,7 +57,7 @@ gulp.task("assets", function() { }) gulp.task('js', function() { - return gulp.src(['app.js', "components/**/*"]) + return gulp.src(['src/app.js', "src/components/**/*"]) .pipe(babel({ presets: [ ['@babel/env', { @@ -70,14 +70,14 @@ gulp.task('js', function() { gulp.task('js', function() { let b = browserify({ - entries: 'app.js', + entries: 'src/app.js', debug: false, transform: [babelify.configure({ presets: ['@babel/preset-env', '@babel/preset-react'] })] }) return b.bundle() - .pipe(source('app.js')) + .pipe(source('src/app.js')) .pipe(buffer()) .pipe(sourcemaps.init({ loadMaps: true })) .pipe(gulp.dest('build')) diff --git a/app.js b/src/app.js similarity index 99% rename from app.js rename to src/app.js index 0d791c7..e4750f4 100644 --- a/app.js +++ b/src/app.js @@ -15,8 +15,6 @@ const Chat = require('./components/chat.js') // avatar tilt // incoming/outgoing message alignment (split) - - let App = create({ displayName: "App", diff --git a/public/OpenSans-Bold.ttf b/src/assets/OpenSans-Bold.ttf similarity index 100% rename from public/OpenSans-Bold.ttf rename to src/assets/OpenSans-Bold.ttf diff --git a/public/OpenSans-Regular.ttf b/src/assets/OpenSans-Regular.ttf similarity index 100% rename from public/OpenSans-Regular.ttf rename to src/assets/OpenSans-Regular.ttf diff --git a/public/font-license.txt b/src/assets/font-license.txt similarity index 100% rename from public/font-license.txt rename to src/assets/font-license.txt diff --git a/public/icons/file.svg b/src/assets/icons/file.svg similarity index 100% rename from public/icons/file.svg rename to src/assets/icons/file.svg diff --git a/public/index.html b/src/assets/index.html similarity index 100% rename from public/index.html rename to src/assets/index.html diff --git a/public/neo.png b/src/assets/neo.png similarity index 100% rename from public/neo.png rename to src/assets/neo.png diff --git a/components/Login.js b/src/components/Login.js similarity index 100% rename from components/Login.js rename to src/components/Login.js diff --git a/components/chat.js b/src/components/chat.js similarity index 100% rename from components/chat.js rename to src/components/chat.js diff --git a/components/events/Event.js b/src/components/events/Event.js similarity index 100% rename from components/events/Event.js rename to src/components/events/Event.js diff --git a/components/events/image.js b/src/components/events/image.js similarity index 100% rename from components/events/image.js rename to src/components/events/image.js diff --git a/components/events/state.js b/src/components/events/state.js similarity index 100% rename from components/events/state.js rename to src/components/events/state.js diff --git a/components/events/text.js b/src/components/events/text.js similarity index 100% rename from components/events/text.js rename to src/components/events/text.js diff --git a/components/events/user.js b/src/components/events/user.js similarity index 100% rename from components/events/user.js rename to src/components/events/user.js diff --git a/components/events/video.js b/src/components/events/video.js similarity index 100% rename from components/events/video.js rename to src/components/events/video.js diff --git a/components/fileUpload.js b/src/components/fileUpload.js similarity index 100% rename from components/fileUpload.js rename to src/components/fileUpload.js diff --git a/components/filterList.js b/src/components/filterList.js similarity index 100% rename from components/filterList.js rename to src/components/filterList.js diff --git a/components/info.js b/src/components/info.js similarity index 100% rename from components/info.js rename to src/components/info.js diff --git a/components/input.js b/src/components/input.js similarity index 100% rename from components/input.js rename to src/components/input.js diff --git a/components/loading.js b/src/components/loading.js similarity index 100% rename from components/loading.js rename to src/components/loading.js diff --git a/components/sidebar.js b/src/components/sidebar.js similarity index 100% rename from components/sidebar.js rename to src/components/sidebar.js diff --git a/lib/media.js b/src/lib/media.js similarity index 100% rename from lib/media.js rename to src/lib/media.js diff --git a/lib/riot-utils.js b/src/lib/riot-utils.js similarity index 100% rename from lib/riot-utils.js rename to src/lib/riot-utils.js diff --git a/public/scss/style.scss b/src/scss/style.scss similarity index 100% rename from public/scss/style.scss rename to src/scss/style.scss