From 489ed81c844aafea4379ac548dc6f0fcfb47d5d2 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Thu, 2 Feb 2023 17:19:06 +0100 Subject: [PATCH] Move "assets" to proper location in snappymail/v/0.0.0/static/ --- assets/css/images/empty-contact.png | Bin 1881 -> 0 bytes dev/Stores/User/Notification.js | 2 +- dev/Styles/Admin/About.less | 3 ++- gulpfile.js | 3 +-- .../app/libraries/RainLoop/Actions/Messages.php | 2 ++ {assets => snappymail/v/0.0.0/static}/.htaccess | 0 .../v/0.0.0/static}/android-icon.png | Bin .../v/0.0.0/static}/apple-touch-icon.png | Bin .../v/0.0.0/static}/favicon-light.ico | Bin .../v/0.0.0/static}/favicon-light.png | Bin .../v/0.0.0/static}/favicon.ico | Bin .../v/0.0.0/static}/favicon.png | Bin .../v/0.0.0/static}/favicon.svg | 0 .../static}/images/icon-message-notification.png | Bin .../v/0.0.0/static}/images/snappymail-logo.png | Bin .../v/0.0.0/static}/logo-512.png | Bin .../v/0.0.0/static}/manifest.json | 0 .../v/0.0.0/static}/sounds/alert.mp3 | Bin .../v/0.0.0/static}/sounds/alert.ogg | Bin .../v/0.0.0/static}/sounds/new-mail.mp3 | Bin .../v/0.0.0/static}/sounds/new-mail.ogg | Bin .../v/0.0.0/static}/sounds/ping.mp3 | Bin .../v/0.0.0/static}/sounds/ping.ogg | Bin tasks/assets.js | 7 ------- tasks/common.js | 2 +- tasks/config.js | 5 ----- 26 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 assets/css/images/empty-contact.png rename {assets => snappymail/v/0.0.0/static}/.htaccess (100%) rename {assets => snappymail/v/0.0.0/static}/android-icon.png (100%) rename {assets => snappymail/v/0.0.0/static}/apple-touch-icon.png (100%) rename {assets => snappymail/v/0.0.0/static}/favicon-light.ico (100%) rename {assets => snappymail/v/0.0.0/static}/favicon-light.png (100%) rename {assets => snappymail/v/0.0.0/static}/favicon.ico (100%) rename {assets => snappymail/v/0.0.0/static}/favicon.png (100%) rename {assets => snappymail/v/0.0.0/static}/favicon.svg (100%) rename {assets/css => snappymail/v/0.0.0/static}/images/icon-message-notification.png (100%) rename {assets/css => snappymail/v/0.0.0/static}/images/snappymail-logo.png (100%) rename {assets => snappymail/v/0.0.0/static}/logo-512.png (100%) rename {assets => snappymail/v/0.0.0/static}/manifest.json (100%) rename {assets => snappymail/v/0.0.0/static}/sounds/alert.mp3 (100%) rename {assets => snappymail/v/0.0.0/static}/sounds/alert.ogg (100%) rename {assets => snappymail/v/0.0.0/static}/sounds/new-mail.mp3 (100%) rename {assets => snappymail/v/0.0.0/static}/sounds/new-mail.ogg (100%) rename {assets => snappymail/v/0.0.0/static}/sounds/ping.mp3 (100%) rename {assets => snappymail/v/0.0.0/static}/sounds/ping.ogg (100%) delete mode 100644 tasks/assets.js diff --git a/assets/css/images/empty-contact.png b/assets/css/images/empty-contact.png deleted file mode 100644 index b2f2071d177ee53ecfaa3e46f780e9794cf05530..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1881 zcmV-f2d4OmP)b)ZP^ncP8ubTS^(jwODW#<%A%Q?3 zB#3}*F244xJzm4k!JZl0WF*U;nKNhBzO8++*RY2PIqLPgNhA`6%RJAM)i{@HUcxjl znM$Q*s@1C8=Q=z;G?bESxSve+$$ELze*3#!9@taAgTGyfUKDUX&~8IWT`ZoOH*emU zi;D{ZUa3?>sJ^~F`9SdD;bAj6I%?ACK>=N_TNosi`S5Fp#wO?3#oRTw5s)_>O>U%@m78b9i`Y3Rc?y zhY!pOaQMbrx*5;uMgTuPK5m5=4qV06dXyDn0p}+C2B7`@eRFVdU=n@()^C#n7Mdnl zXpP#&J$$eZ*UIIxxpCu$$>;NCxat3{*7ZKEED#Gg06~*HN~Mz7+uJjzr>8c${Ohe^ zoPmXB0Tycp1_pwChK7dB2eZ>65ckkQjo4^+!~*V0k3ihr-SuB)5`kv%BD#eZgx9Ef z1TPK<0pQTSUgHYUwZ>gnIX*r%TU%RAI`n;7Yu%+VK9B2+1^%9y&Y6*s5wU1oDwIHu zqC#%G>|mA1x||gv<0YS) ze2Wg_S}s!Kt|qYY^XJda%aO#73^@H+in3-ahhU$bwc4J@zEv5zm1w(tV*__< za@5ptnXT=eP~h}&f~WQ7=H?{TqvyoYs>|xRkpM{erRy><_sXA-Vi5ra;HYDHdD(XS zDU)bc#qR{TF8=ikAP|6~EdwyP5WXQKuCZ|z+O%$hZ`@C%Qs&N`J2F=Ra5ufjNk);b z5~a?6{{7Fqdi5%JIl(aq-GLIWqo}%d>y{PJc2DXBQT2(&5(%8z4x+g^dLUaIpA^m7 z+M2KgdPr*5?LDy`0g0@+xVUKBwfAJpsjr%& z0O-sJAs8C~eRg&xb;-iQf>0ou_*Nr0mqJ@vJr-~+xu!*E`O#m0i?-dDaX3Ul5Dyr` zp+Zl=Xm9@@D8L{ft)c^(9X#t6tQi{{Gq-Qw zHmO0s)@c=>VVaKx+%*+IZ*OnQhyt0DRL2*!nyp|D&JuAStTR79Zx%mZ5O>l7b3PMB z43WUKo50*i_W+FKBU)7{->o<30#b}MYZUCksTeGow+xfB6(Z}EC>IGxqHb4~ZQ924 z6bJk+Vab&w9+g-kd371dS>&o6QPMa(>R| z+yv#7E44;4d382Yt@;yKl&>gbQJX+hUdCy%gdh%Cf@gI zR^|9x1AXMm%8CS^NYu=bnjy#@6bc&XRpYc8>64&Iojgyc)8_8oyP|#Z|7xw#K;w(- zhsBI~`Vv7x7;a8WXol!U+uV~@eAZ6nKJSQ(o4e*68820C`S2NuGwAP6_%KwbkRNB06+KdXIQ zyDEMoL7`0q9w-adrT5E&UmGZX2vkd~|KGeWfZgmv9AqB&yZ7TyKU+Gi2o1G!jc#6c zUC+224voVC-gn>sU|Ged8P^p$9sPC(_UgO+eXb@&9e3WBUwzx454+{%b^CE^!J>f^ zho(yJ{ukc}a54%5L!Wo2$+%C21J^;TaeANM|5}O-R&bg@;#O*LA$Ftjb|v!vQy9V& T6R?S>00000NkvXXu0mjf(mH~* diff --git a/dev/Stores/User/Notification.js b/dev/Stores/User/Notification.js index 76a46f8b6..32335ef33 100644 --- a/dev/Stores/User/Notification.js +++ b/dev/Stores/User/Notification.js @@ -57,7 +57,7 @@ export const NotificationUserStore = new class { if (DesktopNotifications && NotificationsGranted()) { const options = { body: text, - icon: imageSrc || Links.staticLink('css/images/icon-message-notification.png'), + icon: imageSrc || Links.staticLink('images/icon-message-notification.png'), data: messageData }; if (messageData?.uid) { diff --git a/dev/Styles/Admin/About.less b/dev/Styles/Admin/About.less index 73d0991cd..945f04738 100644 --- a/dev/Styles/Admin/About.less +++ b/dev/Styles/Admin/About.less @@ -4,6 +4,7 @@ display: inline-block; width: 250px; height: 200px; - background: url("images/snappymail-logo.png") -30px -30px; + /* Yes this LESS css relative path quirk becomes ../ */ + background: url(../../images/snappymail-logo.png) -30px -30px; } } diff --git a/gulpfile.js b/gulpfile.js index e6cf1c2ed..9b0d1bbb4 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,7 +2,6 @@ const gulp = require('gulp'); const { cleanStatic } = require('./tasks/common'); -const { assets } = require('./tasks/assets'); const { js, jsLint } = require('./tasks/js'); const { css, cssLint } = require('./tasks/css'); const { vendors } = require('./tasks/vendors'); @@ -12,7 +11,7 @@ const clean = gulp.series(cleanStatic); const lint = gulp.parallel(jsLint, cssLint); const buildState1 = gulp.parallel(js, css, vendors); -const buildState2 = gulp.series(clean, assets, buildState1); +const buildState2 = gulp.series(clean, buildState1); const build = gulp.parallel(lint, buildState2); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php index da5d154b9..fc4236d3a 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php @@ -500,11 +500,13 @@ trait Messages try { if ('SPAM' === $sLearning) { +// $this->MailClient()->MessageSetFlag($sFromFolder, $oUids, '\\junk'); $this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK); $this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK, false); } else if ('HAM' === $sLearning) { $this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK); $this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK, false); +// $this->MailClient()->MessageSetFlag($sFromFolder, $oUids, '\\junk', false); } } catch (\Throwable $oException) diff --git a/assets/.htaccess b/snappymail/v/0.0.0/static/.htaccess similarity index 100% rename from assets/.htaccess rename to snappymail/v/0.0.0/static/.htaccess diff --git a/assets/android-icon.png b/snappymail/v/0.0.0/static/android-icon.png similarity index 100% rename from assets/android-icon.png rename to snappymail/v/0.0.0/static/android-icon.png diff --git a/assets/apple-touch-icon.png b/snappymail/v/0.0.0/static/apple-touch-icon.png similarity index 100% rename from assets/apple-touch-icon.png rename to snappymail/v/0.0.0/static/apple-touch-icon.png diff --git a/assets/favicon-light.ico b/snappymail/v/0.0.0/static/favicon-light.ico similarity index 100% rename from assets/favicon-light.ico rename to snappymail/v/0.0.0/static/favicon-light.ico diff --git a/assets/favicon-light.png b/snappymail/v/0.0.0/static/favicon-light.png similarity index 100% rename from assets/favicon-light.png rename to snappymail/v/0.0.0/static/favicon-light.png diff --git a/assets/favicon.ico b/snappymail/v/0.0.0/static/favicon.ico similarity index 100% rename from assets/favicon.ico rename to snappymail/v/0.0.0/static/favicon.ico diff --git a/assets/favicon.png b/snappymail/v/0.0.0/static/favicon.png similarity index 100% rename from assets/favicon.png rename to snappymail/v/0.0.0/static/favicon.png diff --git a/assets/favicon.svg b/snappymail/v/0.0.0/static/favicon.svg similarity index 100% rename from assets/favicon.svg rename to snappymail/v/0.0.0/static/favicon.svg diff --git a/assets/css/images/icon-message-notification.png b/snappymail/v/0.0.0/static/images/icon-message-notification.png similarity index 100% rename from assets/css/images/icon-message-notification.png rename to snappymail/v/0.0.0/static/images/icon-message-notification.png diff --git a/assets/css/images/snappymail-logo.png b/snappymail/v/0.0.0/static/images/snappymail-logo.png similarity index 100% rename from assets/css/images/snappymail-logo.png rename to snappymail/v/0.0.0/static/images/snappymail-logo.png diff --git a/assets/logo-512.png b/snappymail/v/0.0.0/static/logo-512.png similarity index 100% rename from assets/logo-512.png rename to snappymail/v/0.0.0/static/logo-512.png diff --git a/assets/manifest.json b/snappymail/v/0.0.0/static/manifest.json similarity index 100% rename from assets/manifest.json rename to snappymail/v/0.0.0/static/manifest.json diff --git a/assets/sounds/alert.mp3 b/snappymail/v/0.0.0/static/sounds/alert.mp3 similarity index 100% rename from assets/sounds/alert.mp3 rename to snappymail/v/0.0.0/static/sounds/alert.mp3 diff --git a/assets/sounds/alert.ogg b/snappymail/v/0.0.0/static/sounds/alert.ogg similarity index 100% rename from assets/sounds/alert.ogg rename to snappymail/v/0.0.0/static/sounds/alert.ogg diff --git a/assets/sounds/new-mail.mp3 b/snappymail/v/0.0.0/static/sounds/new-mail.mp3 similarity index 100% rename from assets/sounds/new-mail.mp3 rename to snappymail/v/0.0.0/static/sounds/new-mail.mp3 diff --git a/assets/sounds/new-mail.ogg b/snappymail/v/0.0.0/static/sounds/new-mail.ogg similarity index 100% rename from assets/sounds/new-mail.ogg rename to snappymail/v/0.0.0/static/sounds/new-mail.ogg diff --git a/assets/sounds/ping.mp3 b/snappymail/v/0.0.0/static/sounds/ping.mp3 similarity index 100% rename from assets/sounds/ping.mp3 rename to snappymail/v/0.0.0/static/sounds/ping.mp3 diff --git a/assets/sounds/ping.ogg b/snappymail/v/0.0.0/static/sounds/ping.ogg similarity index 100% rename from assets/sounds/ping.ogg rename to snappymail/v/0.0.0/static/sounds/ping.ogg diff --git a/tasks/assets.js b/tasks/assets.js deleted file mode 100644 index 0f967dc84..000000000 --- a/tasks/assets.js +++ /dev/null @@ -1,7 +0,0 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ -const gulp = require('gulp'); -const { config } = require('./config'); - -const assetsCopy = () => gulp.src(config.paths.assets.src).pipe(gulp.dest(config.paths.static)); - -exports.assets = gulp.series(assetsCopy); diff --git a/tasks/common.js b/tasks/common.js index 1f88d14ed..d1f8dfdb8 100644 --- a/tasks/common.js +++ b/tasks/common.js @@ -14,4 +14,4 @@ exports.copy = (sFile, sNewFile, done) => { exports.getHead = () => config.head.agpl; -exports.cleanStatic = () => del(config.paths.static); +exports.cleanStatic = () => del(config.paths.staticJS) && del(config.paths.staticCSS); diff --git a/tasks/config.js b/tasks/config.js index 99dd40a6a..638390983 100644 --- a/tasks/config.js +++ b/tasks/config.js @@ -14,15 +14,10 @@ const config = { }; config.paths.globjs = 'dev/**/*.js'; -config.paths.static = 'snappymail/v/' + config.devVersion + '/static/'; config.paths.staticJS = 'snappymail/v/' + config.devVersion + '/static/js/'; config.paths.staticMinJS = 'snappymail/v/' + config.devVersion + '/static/js/min/'; config.paths.staticCSS = 'snappymail/v/' + config.devVersion + '/static/css/'; -config.paths.assets = { - src: ['assets/**/*.*', 'assets/**/.htaccess'] -}; - config.paths.less = { main: { src: 'dev/Styles/@Main.less',