From ba4ab7dbc102c43a861654910ba33989021e9c8b Mon Sep 17 00:00:00 2001 From: marudor Date: Thu, 3 May 2018 17:33:49 +0200 Subject: [PATCH] add documentation, include old custom font again --- README.md | 9 ++++++++ frontend/angelFont/angelFont.css | 28 ++++++++++++++++++++++++ frontend/angelFont/angelFont.eot | Bin 0 -> 1300 bytes frontend/angelFont/angelFont.svg | 11 ++++++++++ frontend/angelFont/angelFont.ttf | Bin 0 -> 1136 bytes frontend/angelFont/angelFont.woff | Bin 0 -> 1172 bytes {js => frontend/js}/forms.js | 0 {js => frontend/js}/moment-countdown.js | 7 +++++- {js => frontend/js}/sticky-headers.js | 0 {js => frontend/js}/vendor.js | 1 - {themes => frontend/themes}/base.less | 9 ++++---- {themes => frontend/themes}/theme0.less | 0 {themes => frontend/themes}/theme1.less | 4 +--- {themes => frontend/themes}/theme2.less | 2 +- {themes => frontend/themes}/theme3.less | 2 +- {themes => frontend/themes}/theme4.less | 6 ++--- {themes => frontend/themes}/theme5.less | 2 +- {themes => frontend/themes}/theme6.less | 4 +--- package.json | 11 +++++----- webpack.config.js | 18 ++------------- 20 files changed, 72 insertions(+), 42 deletions(-) create mode 100644 frontend/angelFont/angelFont.css create mode 100644 frontend/angelFont/angelFont.eot create mode 100644 frontend/angelFont/angelFont.svg create mode 100644 frontend/angelFont/angelFont.ttf create mode 100644 frontend/angelFont/angelFont.woff rename {js => frontend/js}/forms.js (100%) rename {js => frontend/js}/moment-countdown.js (72%) rename {js => frontend/js}/sticky-headers.js (100%) rename {js => frontend/js}/vendor.js (95%) rename {themes => frontend/themes}/base.less (97%) rename {themes => frontend/themes}/theme0.less (100%) rename {themes => frontend/themes}/theme1.less (99%) rename {themes => frontend/themes}/theme2.less (93%) rename {themes => frontend/themes}/theme3.less (96%) rename {themes => frontend/themes}/theme4.less (99%) rename {themes => frontend/themes}/theme5.less (94%) rename {themes => frontend/themes}/theme6.less (99%) diff --git a/README.md b/README.md index 418dc625..4a6211a2 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ To report bugs use [engelsystem/issues](https://github.com/engelsystem/engelsyst * PHP >= 7.0.0 * MySQL-Server >= 5.5 or MariaDB-Server >= 5.5 * Webserver, i.e. lighttpd, nginx, or Apache + * Node >= 8 (Development/Building only) + * Yarn (Development/Building only) ### Directions: * Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git` @@ -20,13 +22,20 @@ To report bugs use [engelsystem/issues](https://github.com/engelsystem/engelsyst * Install project dependencies: ```bash composer install + yarn ``` On production systems it is recommended to use ```bash composer install --no-dev composer dump-autoload --optimize + ``` to install the engelsystem + * Build the frontend assets + ```bash + yarn build + ``` + * The webserver must have write access to the ```import``` directory and read access for all other directories * The webserver must point to the ```public``` directory. * The webserver must read the ```.htaccess``` file and ```mod_rewrite``` must be enabled diff --git a/frontend/angelFont/angelFont.css b/frontend/angelFont/angelFont.css new file mode 100644 index 00000000..01551ecd --- /dev/null +++ b/frontend/angelFont/angelFont.css @@ -0,0 +1,28 @@ +@font-face { + font-family: 'angelFont'; + src:url('./angelFont.eot?-kja6ux'); + src:url('./angelFont.eot?#iefix-kja6ux') format('embedded-opentype'), + url('./angelFont.woff?-kja6ux') format('woff'), + url('./angelFont.ttf?-kja6ux') format('truetype'), + url('./angelFont.svg?-kja6ux#icomoon') format('svg'); + font-weight: normal; + font-style: normal; +} + +[class^="icon-"], [class*=" icon-"] { + font-family: 'angelFont'; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-icon_angel:before { + content: "\e600"; +} diff --git a/frontend/angelFont/angelFont.eot b/frontend/angelFont/angelFont.eot new file mode 100644 index 0000000000000000000000000000000000000000..9b08a3472b9875014bb767a018ab3e0907b64b04 GIT binary patch literal 1300 zcma)6K~EDw6#i!0(o&$c&`OI?N?QRhTWl#xw8R7yNidQc#2c=qP_(5DU;-E8!K(@J z=3Py^a55f@Kfr^Di6;*xVoZo9PjUm-Z+5m|2?yV1_kHi1_ukCDnKwZfP;&wT8X84l zOGsvVrjeJvO3rQE-#$JD_^^xus;Ka-VucPq= zXP?rR{C=ruEQoOU4xp83kCaF_zKdPjFK8!AmGupWHKX={cCcJ67#PGej(?@yS}`_i zXvP%npR{8uMx{6xdG!l$co=rIR$W`?Iw{T>ISz*gu?1FHOp8S_leXSN1W%;jKO(s7 zM!5p)LhP7)#16ArD?4e5p;TWe!Y!~K%X_DiLY%I(lT~0f~ z8sJAj(93USQ5#2M$k;vs! z1LK*Vp3L|_|Af>N{o;9eaHKa7i$=Wh?7VaSQp_8P#sa+~gW+qwNMA=sU&QZM+NXQl zJKNei+r4#N|IgRE?|#qwFYlp6^~I-y2cKmbl(zqn=j*U-SR}bmYCDL{dL|iV3D3Zh z$eJ>$^>~eV(&in+NgF$fXKn0a)A?-N1UJ$) z_F|ar%3X6dlaV + + +Generated by IcoMoon + + + + + + + \ No newline at end of file diff --git a/frontend/angelFont/angelFont.ttf b/frontend/angelFont/angelFont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..ac4f0a45d206b55cecb71a0ac605b7de8480c57c GIT binary patch literal 1136 zcma)5&rcIU7=5#CX<4AP&`OI?N?U=`7F&uEEinN_5{#w>@rG+Dl-RP3U;-E8!K;b! z=3Py^crqT0e}D%Q6HgvY#F#XmJjo4Q-|TGpk$7;L-S53O-}h$rn<)f<4m^YhW7lqE zbAi;}TPpAQ+%DJ6M&H86ML_hE&##&r4aO7XRmQ+-ZF}WP_4H$Msqa-Q=CX*zZUI`2 ze4A5M~~_1fS^&c!;$QI_|>+fGG#Dy%#eR-Otg zPlc7I!fmXbbZeF88htI)`B+%TO;m6X8(4E#l6S+v7}=4WwX#*Wto7p}N-SK(ebivm q;8+2#m$cqQk{J~uxr9kx!7{Zw*yelAS>md@4MTR*`F~3A@9`JXij!CX literal 0 HcmV?d00001 diff --git a/frontend/angelFont/angelFont.woff b/frontend/angelFont/angelFont.woff new file mode 100644 index 0000000000000000000000000000000000000000..c7107a546f88db516d08d22ccdbb7a77236327af GIT binary patch literal 1172 zcmaJ=O=uHA6#gc=Nz+)9RGZQtl^~%Y)S4D4t#}Z$X@yE^|2-7lq_K&bq}W6&;!Tk9 zKtys;=(QGzmz;wjjRUH}88t^Uc1Q*_+WwBsw}8 z1=IpOU{MF<_%Asfi3B^KyHp?;TORm9|u{RSl z+MJ9%W8ZD7Kbg>`IaXr7TdHVknoM$#W8c{iNmagxax$Hp2NXa14N?_eJgv<$pCW5q zraFg^(b5TywR5^p>O}L>kJ;>8j(cK7&{R1YstO^5I~C8Sv)K%UgJUQ30}j1a(VNsm z9yE^_L{(c?Lvg*J=bQ(b;f7C+x9jCt%Y(o^xR}dVzrV57CbUgHobSwch4X#g;V}0k z7NEc>gj(a-duOZQwcbj>yZKl@8t9|*1Jp}Xi?QWdH>D~AJB4>kS`|HPJ$w@!{0IcgFt!bYWB7xG@wG*@XP5~d1O!+4Ocr*FSLTmg z^qt(m9`pX;-S*WFvedH1M`4K1?8;Rv;nn50@>!U^Fse*;9&#W4iu_ovWHVIFcu}~ zg{v*Eu2#(Y& literal 0 HcmV?d00001 diff --git a/js/forms.js b/frontend/js/forms.js similarity index 100% rename from js/forms.js rename to frontend/js/forms.js diff --git a/js/moment-countdown.js b/frontend/js/moment-countdown.js similarity index 72% rename from js/moment-countdown.js rename to frontend/js/moment-countdown.js index 78bf3f9d..feb7b604 100644 --- a/js/moment-countdown.js +++ b/frontend/js/moment-countdown.js @@ -1,3 +1,8 @@ +/* + * Initialize all moment countdowns on the page. A moment countdown has the + * class "moment-countdown" and the attribute "data-timestamp" which defines the + * countdown's time goal. + */ $(document).ready(function () { if (typeof moment !== "undefined") { $.each($(".moment-countdown"), function (i, e) { @@ -11,4 +16,4 @@ $(document).ready(function () { }, 1000); }); } -}); \ No newline at end of file +}); diff --git a/js/sticky-headers.js b/frontend/js/sticky-headers.js similarity index 100% rename from js/sticky-headers.js rename to frontend/js/sticky-headers.js diff --git a/js/vendor.js b/frontend/js/vendor.js similarity index 95% rename from js/vendor.js rename to frontend/js/vendor.js index 7fb51099..aa36cd5a 100644 --- a/js/vendor.js +++ b/frontend/js/vendor.js @@ -9,7 +9,6 @@ import 'imports-loader?this=>window&define=>false&exports=>false!moment'; import 'imports-loader?this=>window&define=>false&exports=>false!moment/locale/de'; import './forms'; import './sticky-headers'; -import 'icomoon/style.css'; import './moment-countdown'; $(function () { diff --git a/themes/base.less b/frontend/themes/base.less similarity index 97% rename from themes/base.less rename to frontend/themes/base.less index 0b6eb79c..f9fa139e 100644 --- a/themes/base.less +++ b/frontend/themes/base.less @@ -1,6 +1,5 @@ -@import "../node_modules/bootstrap/less/bootstrap"; - -@icon-font-path: "../fonts/"; +@import "../../node_modules/bootstrap/less/bootstrap"; +@import "../angelFont/angelFont.css"; body { padding-top: 50px; @@ -57,7 +56,7 @@ body { position: relative; font-size: 20px; color: @headings-color; - + .panel-link { position: absolute; width: 100%; @@ -70,7 +69,7 @@ body { opacity: 0; /* Fix to make div clickable in IE */ filter: alpha(opacity=1); /* Fix to make div clickable in IE */ } - + .panel-link:hover { opacity: 0.3; } diff --git a/themes/theme0.less b/frontend/themes/theme0.less similarity index 100% rename from themes/theme0.less rename to frontend/themes/theme0.less diff --git a/themes/theme1.less b/frontend/themes/theme1.less similarity index 99% rename from themes/theme1.less rename to frontend/themes/theme1.less index 5754371a..f1b5bd92 100644 --- a/themes/theme1.less +++ b/frontend/themes/theme1.less @@ -1,4 +1,4 @@ -@import "../node_modules/bootstrap/less/variables"; +@import "../../node_modules/bootstrap/less/variables"; /* The MIT License (MIT) @@ -96,8 +96,6 @@ THE SOFTWARE. // //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. -//** Load fonts from this directory. -@icon-font-path: "../fonts/"; //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; //** Element ID within SVG icon file. diff --git a/themes/theme2.less b/frontend/themes/theme2.less similarity index 93% rename from themes/theme2.less rename to frontend/themes/theme2.less index 259e0619..231dc4c4 100644 --- a/themes/theme2.less +++ b/frontend/themes/theme2.less @@ -1,4 +1,4 @@ -@import "../node_modules/bootstrap/less/variables"; +@import "../../node_modules/bootstrap/less/variables"; @brand-primary: #758499; @brand-success: #7b9c41; diff --git a/themes/theme3.less b/frontend/themes/theme3.less similarity index 96% rename from themes/theme3.less rename to frontend/themes/theme3.less index 6aab3dde..e4012d7b 100644 --- a/themes/theme3.less +++ b/frontend/themes/theme3.less @@ -1,4 +1,4 @@ -@import "../node_modules/bootstrap/less/variables"; +@import "../../node_modules/bootstrap/less/variables"; @brand-primary: #f19224; @brand-success: #39AB50; diff --git a/themes/theme4.less b/frontend/themes/theme4.less similarity index 99% rename from themes/theme4.less rename to frontend/themes/theme4.less index 0e0ab730..40c53f6c 100644 --- a/themes/theme4.less +++ b/frontend/themes/theme4.less @@ -1,4 +1,4 @@ -@import "../node_modules/bootstrap/less/variables"; +@import "../../node_modules/bootstrap/less/variables"; /* The MIT License (MIT) @@ -96,8 +96,6 @@ THE SOFTWARE. // //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. -//** Load fonts from this directory. -@icon-font-path: "../fonts/"; //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; //** Element ID within SVG icon file. @@ -1046,7 +1044,7 @@ a.thumbnail.active { } } -.label-warning, .label-success, .progress-bar-warning, .progress-bar-success, +.label-warning, .label-success, .progress-bar-warning, .progress-bar-success, .panel-warning .panel-heading, .panel-warning .panel-heading a, .panel-success .panel-heading, .panel-success .panel-heading a { color: @gray-darker; diff --git a/themes/theme5.less b/frontend/themes/theme5.less similarity index 94% rename from themes/theme5.less rename to frontend/themes/theme5.less index c9101b7f..bd2b9330 100644 --- a/themes/theme5.less +++ b/frontend/themes/theme5.less @@ -1,4 +1,4 @@ -@import "../node_modules/bootstrap/less/variables"; +@import "../../node_modules/bootstrap/less/variables"; @brand-primary: rgb(164, 28, 49); @brand-success: rgb(153, 204, 0); diff --git a/themes/theme6.less b/frontend/themes/theme6.less similarity index 99% rename from themes/theme6.less rename to frontend/themes/theme6.less index 1b0cd9b9..86c2f463 100644 --- a/themes/theme6.less +++ b/frontend/themes/theme6.less @@ -1,4 +1,4 @@ -@import "../node_modules/bootstrap/less/variables"; +@import "../../node_modules/bootstrap/less/variables"; /* The MIT License (MIT) @@ -99,8 +99,6 @@ THE SOFTWARE. // //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. -//** Load fonts from this directory. -@icon-font-path: "../fonts/"; //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; //** Element ID within SVG icon file. diff --git a/package.json b/package.json index c8c96dc9..ddd8ef8b 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,7 @@ "bootstrap": "^3.3.7", "bootstrap-datepicker": "^1.7.1", "chart.js": "^1.0.2", - "icomoon": "^1.0.0", - "jquery": "^2.1.1", + "jquery": "^3.3.1", "jquery-ui": "^1.11.2", "moment": "^2.8.2", "select2": "^4.0.6-rc.1", @@ -27,10 +26,10 @@ "css-loader": "^0.28.7", "extract-text-webpack-plugin": "^3.0.2", "file-loader": "^1.1.6", - "imports-loader": "^0.7.1", - "less": "^2.7.3", + "imports-loader": "^0.8.0", + "less": "^3.0.2", "less-loader": "^4.0.5", - "style-loader": "^0.19.1", - "webpack": "^3.10.0" + "style-loader": "^0.21.0", + "webpack": "^3" } } diff --git a/webpack.config.js b/webpack.config.js index a743f393..ecfc0704 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -17,24 +17,10 @@ const plugins = [ new ExtractTextPlugin('[name].css'), ]; -// if (!__DEV__) { -// plugins.push( -// new webpack.optimize.UglifyJsPlugin({ -// compress: { -// warnings: false, -// }, -// output: { -// comments: false, -// }, -// screwIe8: true, -// sourceMap: false, -// }) -// ); -// } const themeEntries = {}; for (let i = 0; i < 7; i++) { - themeEntries[`theme${i}`] = `./themes/theme${i}.less`; + themeEntries[`theme${i}`] = `./frontend/themes/theme${i}.less`; } module.exports = { @@ -44,7 +30,7 @@ module.exports = { }, entry: { ...themeEntries, - vendor: './js/vendor.js', + vendor: './frontend/js/vendor.js', }, output: { path: path.resolve('public/assets'),