From 0934fea892d4702f905a129144068a827fa798ec Mon Sep 17 00:00:00 2001 From: Robbie Antenesse Date: Sun, 8 Sep 2019 13:44:01 -0600 Subject: [PATCH] Reorganize the folder structure entirely --- .gitignore | 2 + {images => app/images}/book-pile.svg | 0 {src => app}/index.html | 2 +- {src => app}/index.js | 0 app/styles/index.scss | 42 +++++++++++++++++++ .../picnic-customizations/_custom.scss | 0 .../picnic-customizations/theme/_colors.scss | 0 .../picnic-customizations/theme/_theme.scss | 0 {src => app}/views/controller.js | 0 {src => app}/views/home/controller.js | 0 {src => app}/views/home/index.js | 0 {src => app}/views/home/styles.scss | 0 {src => app}/views/manager.js | 8 ++-- {src => app}/views/search/controller.js | 0 {src => app}/views/search/index.js | 0 index.scss | 42 ------------------- package.json | 6 +-- .../config.example.json | 0 {controllers => server/controllers}/search.js | 0 server.js => server/index.js | 2 +- {routes => server/routes}/account.js | 0 {routes => server/routes}/home.js | 0 {routes => server/routes}/resources.js | 0 {routes => server/routes}/search.js | 0 {views => server/views}/home.hbs | 0 {views => server/views}/layout.hbs | 0 {views => server/views}/login.hbs | 0 {views => server/views}/partials/footer.hbs | 0 {views => server/views}/partials/header.hbs | 0 .../views}/partials/home-logged-in.hbs | 0 .../views}/partials/home-logged-out.hbs | 0 {views => server/views}/search.hbs | 0 {views => server/views}/viewSetup.js | 0 33 files changed, 53 insertions(+), 51 deletions(-) rename {images => app/images}/book-pile.svg (100%) rename {src => app}/index.html (90%) rename {src => app}/index.js (100%) create mode 100644 app/styles/index.scss rename {styles => app/styles}/picnic-customizations/_custom.scss (100%) rename {styles => app/styles}/picnic-customizations/theme/_colors.scss (100%) rename {styles => app/styles}/picnic-customizations/theme/_theme.scss (100%) rename {src => app}/views/controller.js (100%) rename {src => app}/views/home/controller.js (100%) rename {src => app}/views/home/index.js (100%) rename {src => app}/views/home/styles.scss (100%) rename {src => app}/views/manager.js (84%) rename {src => app}/views/search/controller.js (100%) rename {src => app}/views/search/index.js (100%) delete mode 100644 index.scss rename config.example.json => server/config.example.json (100%) rename {controllers => server/controllers}/search.js (100%) rename server.js => server/index.js (97%) rename {routes => server/routes}/account.js (100%) rename {routes => server/routes}/home.js (100%) rename {routes => server/routes}/resources.js (100%) rename {routes => server/routes}/search.js (100%) rename {views => server/views}/home.hbs (100%) rename {views => server/views}/layout.hbs (100%) rename {views => server/views}/login.hbs (100%) rename {views => server/views}/partials/footer.hbs (100%) rename {views => server/views}/partials/header.hbs (100%) rename {views => server/views}/partials/home-logged-in.hbs (100%) rename {views => server/views}/partials/home-logged-out.hbs (100%) rename {views => server/views}/search.hbs (100%) rename {views => server/views}/viewSetup.js (100%) diff --git a/.gitignore b/.gitignore index 14b1f3d..799cdca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ node_modules/ public/ +.cache/ +dist/ **/*.log config.json \ No newline at end of file diff --git a/images/book-pile.svg b/app/images/book-pile.svg similarity index 100% rename from images/book-pile.svg rename to app/images/book-pile.svg diff --git a/src/index.html b/app/index.html similarity index 90% rename from src/index.html rename to app/index.html index 123cc21..611c622 100644 --- a/src/index.html +++ b/app/index.html @@ -9,7 +9,7 @@ - + diff --git a/src/index.js b/app/index.js similarity index 100% rename from src/index.js rename to app/index.js diff --git a/app/styles/index.scss b/app/styles/index.scss new file mode 100644 index 0000000..e3c8181 --- /dev/null +++ b/app/styles/index.scss @@ -0,0 +1,42 @@ +//! Picnic CSS http://www.picnicss.com/ + +// Imports the base variable styles +@import './picnic-customizations/theme/theme'; + +@import '../../node_modules/picnic/src/vendor/compass-breakpoint/stylesheets/breakpoint'; + +// Normalize.css (external library) +@import '../../node_modules/picnic/src/plugins/normalize/plugin'; + +// Generic styles for things like , and others +// It also overwrites normalize.css a bit +@import '../../node_modules/picnic/src/plugins/generic/plugin'; +@import '../../node_modules/picnic/src/plugins/fontello/plugin'; + +// Simple elements +@import '../../node_modules/picnic/src/plugins/label/plugin'; +@import '../../node_modules/picnic/src/plugins/button/plugin'; + +// Forms +@import '../../node_modules/picnic/src/plugins/input/plugin'; +@import '../../node_modules/picnic/src/plugins/select/plugin'; +@import '../../node_modules/picnic/src/plugins/radio/plugin'; +@import '../../node_modules/picnic/src/plugins/checkbox/plugin'; + +// Components +@import '../../node_modules/picnic/src/plugins/table/plugin'; +@import '../../node_modules/picnic/src/plugins/grid/plugin'; + +// Extra +@import '../../node_modules/picnic/src/plugins/nav/plugin'; + +@import '../../node_modules/picnic/src/plugins/stack/plugin'; +@import '../../node_modules/picnic/src/plugins/card/plugin'; +@import '../../node_modules/picnic/src/plugins/modal/plugin'; + +// @import '../../node_modules/picnic/src/plugins/dropimage/plugin'; +// @import '../../node_modules/picnic/src/plugins/tabs/plugin'; +// @import '../../node_modules/picnic/src/plugins/tooltip/plugin'; + +// Custom global styling +@import './picnic-customizations/custom'; diff --git a/styles/picnic-customizations/_custom.scss b/app/styles/picnic-customizations/_custom.scss similarity index 100% rename from styles/picnic-customizations/_custom.scss rename to app/styles/picnic-customizations/_custom.scss diff --git a/styles/picnic-customizations/theme/_colors.scss b/app/styles/picnic-customizations/theme/_colors.scss similarity index 100% rename from styles/picnic-customizations/theme/_colors.scss rename to app/styles/picnic-customizations/theme/_colors.scss diff --git a/styles/picnic-customizations/theme/_theme.scss b/app/styles/picnic-customizations/theme/_theme.scss similarity index 100% rename from styles/picnic-customizations/theme/_theme.scss rename to app/styles/picnic-customizations/theme/_theme.scss diff --git a/src/views/controller.js b/app/views/controller.js similarity index 100% rename from src/views/controller.js rename to app/views/controller.js diff --git a/src/views/home/controller.js b/app/views/home/controller.js similarity index 100% rename from src/views/home/controller.js rename to app/views/home/controller.js diff --git a/src/views/home/index.js b/app/views/home/index.js similarity index 100% rename from src/views/home/index.js rename to app/views/home/index.js diff --git a/src/views/home/styles.scss b/app/views/home/styles.scss similarity index 100% rename from src/views/home/styles.scss rename to app/views/home/styles.scss diff --git a/src/views/manager.js b/app/views/manager.js similarity index 84% rename from src/views/manager.js rename to app/views/manager.js index 63c88ec..dc3ebc6 100644 --- a/src/views/manager.js +++ b/app/views/manager.js @@ -24,8 +24,8 @@ export const viewManager = (state, emit) => {
diff --git a/src/views/search/controller.js b/app/views/search/controller.js similarity index 100% rename from src/views/search/controller.js rename to app/views/search/controller.js diff --git a/src/views/search/index.js b/app/views/search/index.js similarity index 100% rename from src/views/search/index.js rename to app/views/search/index.js diff --git a/index.scss b/index.scss deleted file mode 100644 index b6f4439..0000000 --- a/index.scss +++ /dev/null @@ -1,42 +0,0 @@ -//! Picnic CSS http://www.picnicss.com/ - -// Imports the base variable styles -@import './styles/picnic-customizations/theme/theme'; - -@import './node_modules/picnic/src/vendor/compass-breakpoint/stylesheets/breakpoint'; - -// Normalize.css (external library) -@import './node_modules/picnic/src/plugins/normalize/plugin'; - -// Generic styles for things like , and others -// It also overwrites normalize.css a bit -@import './node_modules/picnic/src/plugins/generic/plugin'; -@import './node_modules/picnic/src/plugins/fontello/plugin'; - -// Simple elements -@import './node_modules/picnic/src/plugins/label/plugin'; -@import './node_modules/picnic/src/plugins/button/plugin'; - -// Forms -@import './node_modules/picnic/src/plugins/input/plugin'; -@import './node_modules/picnic/src/plugins/select/plugin'; -@import './node_modules/picnic/src/plugins/radio/plugin'; -@import './node_modules/picnic/src/plugins/checkbox/plugin'; - -// Components -@import './node_modules/picnic/src/plugins/table/plugin'; -@import './node_modules/picnic/src/plugins/grid/plugin'; - -// Extra -@import './node_modules/picnic/src/plugins/nav/plugin'; - -@import './node_modules/picnic/src/plugins/stack/plugin'; -@import './node_modules/picnic/src/plugins/card/plugin'; -@import './node_modules/picnic/src/plugins/modal/plugin'; - -// @import './node_modules/picnic/src/plugins/dropimage/plugin'; -// @import './node_modules/picnic/src/plugins/tabs/plugin'; -// @import './node_modules/picnic/src/plugins/tooltip/plugin'; - -// Custom global styling -@import './styles/picnic-customizations/custom'; diff --git a/package.json b/package.json index b94f8df..b180dec 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,9 @@ "scripts": { "dev": "npm run watch-js", "start": "npm run build && npm run serve", - "watch-js": "parcel watch src/index.html --no-hmr", - "serve": "node server.js", - "build": "parcel build src/index.html --no-source-maps", + "watch-js": "parcel watch app/index.html --out-dir public --no-hmr --no-cache", + "serve": "node server/index.js", + "build": "parcel build app/index.html --out-dir public --no-source-maps", "clear": "npm run clear-dist && npm run clear-cache", "clear-dist": "rimraf dist/{*,.*}", "clear-cache": "rimraf .cache/{*,.*}" diff --git a/config.example.json b/server/config.example.json similarity index 100% rename from config.example.json rename to server/config.example.json diff --git a/controllers/search.js b/server/controllers/search.js similarity index 100% rename from controllers/search.js rename to server/controllers/search.js diff --git a/server.js b/server/index.js similarity index 97% rename from server.js rename to server/index.js index e5c95ff..3d54bf6 100644 --- a/server.js +++ b/server/index.js @@ -5,7 +5,7 @@ require('make-promises-safe'); // installs an 'unhandledRejection' handler const path = require('path'); let siteConfig; try { - siteConfig = require('./config.json'); + siteConfig = require('./config.json.js'); } catch (ex) { console.error('Please copy `config.example.json` to `config.json` and fill it with your server\'s data.'); process.exit(1); diff --git a/routes/account.js b/server/routes/account.js similarity index 100% rename from routes/account.js rename to server/routes/account.js diff --git a/routes/home.js b/server/routes/home.js similarity index 100% rename from routes/home.js rename to server/routes/home.js diff --git a/routes/resources.js b/server/routes/resources.js similarity index 100% rename from routes/resources.js rename to server/routes/resources.js diff --git a/routes/search.js b/server/routes/search.js similarity index 100% rename from routes/search.js rename to server/routes/search.js diff --git a/views/home.hbs b/server/views/home.hbs similarity index 100% rename from views/home.hbs rename to server/views/home.hbs diff --git a/views/layout.hbs b/server/views/layout.hbs similarity index 100% rename from views/layout.hbs rename to server/views/layout.hbs diff --git a/views/login.hbs b/server/views/login.hbs similarity index 100% rename from views/login.hbs rename to server/views/login.hbs diff --git a/views/partials/footer.hbs b/server/views/partials/footer.hbs similarity index 100% rename from views/partials/footer.hbs rename to server/views/partials/footer.hbs diff --git a/views/partials/header.hbs b/server/views/partials/header.hbs similarity index 100% rename from views/partials/header.hbs rename to server/views/partials/header.hbs diff --git a/views/partials/home-logged-in.hbs b/server/views/partials/home-logged-in.hbs similarity index 100% rename from views/partials/home-logged-in.hbs rename to server/views/partials/home-logged-in.hbs diff --git a/views/partials/home-logged-out.hbs b/server/views/partials/home-logged-out.hbs similarity index 100% rename from views/partials/home-logged-out.hbs rename to server/views/partials/home-logged-out.hbs diff --git a/views/search.hbs b/server/views/search.hbs similarity index 100% rename from views/search.hbs rename to server/views/search.hbs diff --git a/views/viewSetup.js b/server/views/viewSetup.js similarity index 100% rename from views/viewSetup.js rename to server/views/viewSetup.js