Restructure twig templates, assets, and other config files

.eslintrc.js

@@ -1,26 +1,20 @@
 module.exports = {
 	"extends": [
-		"airbnb-base",
-		"plugin:vue/recommended"
-	],
+		"airbnb-base"
+    ],
 	"rules": {
 		"max-len": ["error", {
 			"code": 120,
 		}],
         "import/prefer-default-export": ["never"],
 		"indent": ["error", 4],
-		"vue/html-indent": ["error", 4],
-		"vue/html-closing-bracket-newline": ["error", {
-			"singleline": "never",
-			"multiline": "always"
-		}],
-		"vue/max-attributes-per-line": [3, {
-			"singleline": 3,
-			"multiline": {
-				"max": 1,
-				"allowFirstLine": false
-			}
-		}]
+        "no-use-before-define": ["error", { "functions": false, "classes": true }],
+        "no-param-reassign": ["error", { "props": false }],
+        "consistent-return": ["off"],
+        "arrow-body-style": ["off"],
+        "class-methods-use-this": ["off"],
+        "func-names": ["off"],
+        "prefer-arrow-callback": ["off"],
 	},
 	"parserOptions": {
 		"parser": "babel-eslint",

.gitignore

@@ -1,5 +1,6 @@
 /.env
 /.idea
+/.vscode
 /vendor
 .DS_Store
 /node_modules
@@ -9,4 +10,4 @@
 !/web/web.config
 /storage/**
 !/storage/.gitkeep
-/config/license.key
+/config/license.key

assets/js/main.js

@@ -1,24 +0,0 @@
-import Vue from 'vue';
-
-import { components } from './components';
-import { directives } from './directives';
-
-const $app = window.$app || {};
-
-if ($app.devMode === 'true') {
-    Vue.config.devtools = true;
-}
-
-if ($app.devMode === 'false') {
-    Vue.config.devtools = false;
-    Vue.config.productionTip = false;
-}
-
-Vue.prototype.$global = $app;
-
-window.$vue = new Vue({
-    el: '#root',
-    delimiters: ['[[', ']]'],
-    components,
-    directives,
-});

assets/scss/base/_all.scss

@@ -1,6 +1,4 @@
 @import "typography";
 @import "fonts";
 @import "icons";
-@import "containers";
-@import "buttons";
 @import "global";

assets/scss/base/global.scss

@@ -3,13 +3,15 @@ html {
     font-size: 62.5%;
     width: 100%;
     height: 100%;
+    box-sizing: border-box;
 }
 
-body {
-    font-size: 1.6rem;
+*,
+*::before,
+*::after {
+    box-sizing: inherit;
 }
 
-
-[v-cloak] {
-    display: none !important;
+body {
+    font-size: 1.6rem;
 }

assets/scss/main.scss

@@ -4,5 +4,4 @@
 
 @import "utils/all";
 @import "base/all";
-@import "pages/all";
 @import "modules/all";

assets/scss/modules/_all.scss

@@ -1,4 +1,6 @@
 @import "blocks/all";
-@import "components/all";
+@import "buttons";
+@import "blocks";
+@import "containers";
 @import "navigation";
 @import "footer";

assets/scss/modules/blocks/_all.scss

@@ -1 +0,0 @@
-@import "block";

assets/scss/modules/footer.scss

@@ -1,3 +0,0 @@
-.module-footer {
-
-}

assets/scss/modules/navigation.scss

@@ -1,3 +0,0 @@
-.module-navigation {
-
-}

assets/scss/utils/mixins.scss

@@ -88,3 +88,31 @@
         font-size: $max-size;
     }
 }
+
+@mixin responsive-line-height($options) {
+    $min-size: map-get($options, min-size);
+    $max-size: map-get($options, max-size);
+    $lower-bound: map-get($options, lower-bound);
+    $upper-bound: map-get($options, upper-bound);
+
+    $max-minus-min: strip-unit($max-size) - strip-unit($min-size);
+
+    @if(index('rem', unit($min-size)) != null and index('rem', unit($max-size)) != null) {
+        $base-rem: 10;
+        $upper-minus-lower: strip-unit($upper-bound / $base-rem) - strip-unit($lower-bound / $base-rem);
+        $lower-bound-rems: #{strip-unit($lower-bound / $base-rem)}rem;
+
+        line-height: calc(#{$min-size} + #{$max-minus-min} * ((100vw - #{$lower-bound-rems}) / #{$upper-minus-lower}));
+    } @else {
+        $upper-minus-lower: strip-unit($upper-bound) - strip-unit($lower-bound);
+        line-height: calc(#{$min-size} + #{$max-minus-min} * ((100vw - #{$lower-bound}) / #{$upper-minus-lower}));
+    }
+
+    @include mq-below($lower-bound) {
+        line-height: $min-size;
+    }
+
+    @include mq-above($upper-bound) {
+        line-height: $max-size;
+    }
+}

assets/shared-vars.json

@@ -14,14 +14,11 @@
 		"default": 0
 	},
 	"breakpoints": {
-		"x-tiny": 350,
-		"tiny": 400,
-		"x-small": 480,
-		"mid-small": 600,
-		"small": 768,
-		"medium": 960,
-		"large": 1224,
-		"x-large": 1440,
-		"xx-large": 1525
+        "phone-small": 340,
+        "phone-large": 600,
+        "tablet": 870,
+        "tablet-large": 1030,
+        "desktop-small": 1230,
+        "desktop-medium": 1270
 	}
 }

composer.json

@@ -3,7 +3,6 @@
     "description": "Craft CMS",
     "type": "project",
     "require": {
-        "anubarak/craft-relabel": "^1.2",
         "craftcms/aws-s3": "^1.1",
         "craftcms/cms": "^3.0.0",
         "craftcms/redactor": "^2.3",

composer.json.default

@@ -1,6 +1,5 @@
 {
     "require": {
-        "anubarak/craft-relabel": "^1.2",
         "craftcms/aws-s3": "^1.1",
         "craftcms/cms": "^3.0.0",
         "craftcms/redactor": "^2.3",

config/app.php

@@ -20,6 +20,12 @@
 return [
     'modules' => [
         'my-module' => \modules\Module::class,
+        'twighelpers' => [
+            'class' => \modules\twighelpers\TwigHelpers::class,
+        ],
     ],
-    //'bootstrap' => ['my-module'],
+//    'bootstrap' => [
+//        'my-module',
+//        'twighelpers',
+//    ],
 ];

config/general.php

@@ -8,6 +8,8 @@
  * @see \craft\config\GeneralConfig
  */
 
+use craft\helpers\ConfigHelper;
+
 return [
     // Global settings
     '*' => [
@@ -26,12 +28,18 @@
         // Whether to save the project config out to config/project.yaml
         // (see https://docs.craftcms.com/v3/project-config.html)
         'useProjectConfigFile' => true,
+
+        'pageTrigger' => '?page=',
+
+        'maxUploadFileSize' => ConfigHelper::sizeInBytes('128M'),
     ],
 
     // Dev environment settings
     'dev' => [
         // Dev Mode (see https://craftcms.com/guides/what-dev-mode-does)
         'devMode' => true,
+
+        'enableTemplateCaching' => false,
     ],
 
     // Staging environment settings

config/redactor/Simple.json

@@ -1,4 +1,4 @@
 {
-  "buttons": ["bold", "italic"],
-  "toolbarFixed": true
+    "buttons": ["bold", "italic", "link", "file"],
+    "toolbarFixed": true
 }

config/redactor/Standard.json

@@ -1,6 +1,6 @@
 {
-  "buttons": ["formatting", "bold", "italic", "unorderedlist", "orderedlist", "link", "image", "video"],
-  "plugins": ["fullscreen", "video"],
+  "buttons": ["formatting", "bold", "italic", "unorderedlist", "orderedlist", "link", "file", "image", "video"],
+  "plugins": ["alignment", "fullscreen", "video"],
   "linkNewTab": true,
   "toolbarFixed": true
 }

fortrabbit.yml

@@ -0,0 +1,7 @@
+version: 2
+
+# called before Composer runs
+#pre:
+
+# called after Composer runs
+post: scripts/fortrabbit-post-install.php