1.4.2

1.4.1
hotfix
2021-12-16 12:40:54 +03:00 · 2020-12-06 21:54:53 +03:00 · 2020-12-06 21:54:40 +03:00 · 2020-12-06 19:26:42 +03:00 · 2020-12-06 19:26:21 +03:00 · 2020-05-05 17:37:13 +03:00
9 changed files with 51 additions and 17 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@ijl/ltemplates",
-  "version": "1.0.1",
+  "version": "1.4.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@ijl/templates",
-  "version": "1.0.1",
+  "version": "1.4.2",
  "description": "Templates library for @ijl projects",
  "main": "src/index.js",
  "scripts": {
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,5 @@
 const path = require('path');
-const hbs = require(path.resolve('node_modules', 'hbs'));
+const hbs = require('hbs');

 const registerPartialsWithExtensions = require('./utils/registerPartialsWithExtensions');

--- a/src/templates/dev.hbs
+++ b/src/templates/dev.hbs
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  {{>"partials/header.hbs"}}
+  <title>{{ pageTitle }}</title>
+</head>
+
+<body>
+  <script src="{{baseUrl}}/fire.app/{{fireappVersion}}/dist/index.js"></script>
+  {{>"partials/scripts.hbs"}}
+  <div id="app"></div>
+</body>
+
+</html>
--- a/src/templates/index.hbs
+++ b/src/templates/index.hbs
@@ -2,23 +2,13 @@
 <html lang="en">

 <head>
-  <meta charset="UTF-8">
-  <link href="https://fonts.googleapis.com/css?family=Montserrat:400,600,700,900&amp;subset=cyrillic,cyrillic-ext"
-    rel="stylesheet" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  {{>"partials/header.hbs"}}
  <title>{{ pageTitle }}</title>
 </head>

 <body>
-  <script src="{{resourceUrl}}/inno-bootstrap/{{versionBootstrap}}/dist/index.js"></script>
-  <script>
-    bootstrap({
-      apps: {{{ toJSON apps }}},
-      navigations: {{{ toJSON navigations }}},
-      config: {{{ toJSON config }}}
-    })
-  </script>
+  <script src="{{baseUrl}}/fire.app/{{fireappVersion}}/index.js"></script>
+  {{>"partials/scripts.hbs"}}
  <div id="app"></div>
 </body>

--- a/src/templates/partials/header.hbs
+++ b/src/templates/partials/header.hbs
@@ -0,0 +1,6 @@
+<meta charset="UTF-8">
+<link href="https://fonts.googleapis.com/css?family=Montserrat:400,600,700,900&amp;subset=cyrillic,cyrillic-ext"
+rel="stylesheet" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta http-equiv="X-UA-Compatible" content="ie=edge">
+<style>body {margin: 0; padding: 0;}</style>
--- a/src/templates/partials/scripts.hbs
+++ b/src/templates/partials/scripts.hbs
@@ -0,0 +1,8 @@
+<script>
+    fireapp({
+        apps: {{{ toJSON apps }}},
+        navigations: {{{ toJSON navigations }}},
+        config: {{{ toJSON config }}},
+        features: {{{ toJSON features }}}
+    })
+</script>
--- a/src/templates/simple.hbs
+++ b/src/templates/simple.hbs
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,600,700,900&amp;subset=cyrillic,cyrillic-ext" rel="stylesheet" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <style>body {margin: 0; padding: 0;}</style>
+    <title>{{title}}</title>
+</head>
+<body>
+    <div id="{{appRootId}}"></div>
+    <script src="{{scriptUrl}}"></script>
+</body>
+</html>
--- a/src/utils/registerPartialsWithExtensions.js
+++ b/src/utils/registerPartialsWithExtensions.js
@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');

-const glob = require(path.resolve('node_modules', 'glob'));
+const glob = require('glob');

 module.exports = (hbs, rootDir) => {
    glob
Author	SHA1	Message	Date
Александр Примаков	fae0236e66	1.4.2	2021-12-16 12:40:54 +03:00
Andrey Vlasov	ef6a015d9f	1.4.1	2020-12-06 21:54:53 +03:00
Andrey Vlasov	860f918d78	hotfix	2020-12-06 21:54:40 +03:00
Andrey Vlasov	9867ce976f	1.4.0	2020-12-06 19:26:42 +03:00
Andrey Vlasov	6bc2da15c1	add features	2020-12-06 19:26:21 +03:00
Александр Примаков	317a976241	1.3.2	2020-05-05 17:37:13 +03:00
Александр Примаков	f4815e79c8	Поменял местами app и скрипт	2020-05-05 17:37:05 +03:00
Александр Примаков	de622234e6	1.3.1	2020-05-05 17:29:00 +03:00
Александр Примаков	e423bd4a85	Исправил ошибку количества скобок	2020-05-05 17:28:52 +03:00
Александр Примаков	7143060135	1.3.0	2020-05-05 13:28:01 +03:00
Александр Примаков	f4fc1b2e16	add simple hbs	2020-05-05 13:27:49 +03:00
Александр Примаков	872e8e7ce6	1.2.4	2020-04-05 17:48:08 +03:00
Александр Примаков	89db780648	fix mistake	2020-04-05 17:48:03 +03:00
Александр Примаков	6a801d73c8	1.2.2	2020-04-05 17:47:28 +03:00
Александр Примаков	9bc857d7c8	Merged in bugfix/WEBUI-36-body-style-reset (pull request #1 ) WEBUI-36 Добавил reset по минимуму	2020-04-05 14:45:07 +00:00
Александр Примаков	93beb1acec	WEBUI-36 Добавил reset по минимуму	2020-04-05 17:44:29 +03:00
Александр Примаков	21ad5bdf25	1.2.1	2020-03-31 00:17:27 +03:00
Александр Примаков	24e7df04ca	fireapp	2020-03-31 00:17:20 +03:00
Александр Примаков	d0ca86e9f3	1.2.0	2020-03-31 00:12:27 +03:00
Александр Примаков	6b7dedccfa	fireappVersion	2020-03-31 00:12:20 +03:00
Andrey Vlasov	cf38031df0	change name	2020-03-28 23:47:20 +03:00
Александр Примаков	8d458efb9b	1.1.2	2020-03-23 22:07:00 +03:00
Александр Примаков	e661a0f9a3	change hbs & glob path	2020-03-23 22:06:53 +03:00
Александр Примаков	edc6a9f401	1.1.1	2020-03-14 16:39:40 +03:00
Александр Примаков	0294cef397	+ dev.hbs template	2020-03-14 16:39:26 +03:00
Александр Примаков	2b41f645f7	1.1.0	2020-03-10 20:54:05 +03:00
Александр Примаков	297ba65bbf	baseUrl	2020-03-10 20:53:56 +03:00