From 5d43697ed8f1e87a7bc4459ab155d1f81bedea89 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Fri, 19 Jan 2018 12:42:44 -0600 Subject: [PATCH] Cleaned folder heirarchy --- Gruntfile.js | 15 ++++++++------- app/assets/images/.keep | 0 app/assets/images/archive.png | Bin 2056 -> 0 bytes app/assets/images/encryption.png | Bin 3360 -> 0 bytes app/assets/images/filter.png | Bin 1808 -> 0 bytes app/assets/images/logo.png | Bin 9211 -> 0 bytes .../javascripts/app/{app.frontend.js => app.js} | 2 +- .../app/{frontend => }/controllers/editor.js | 4 ++-- .../app/{frontend => }/controllers/footer.js | 4 ++-- .../app/{frontend => }/controllers/home.js | 2 +- .../app/{frontend => }/controllers/lockScreen.js | 4 ++-- .../app/{frontend => }/controllers/notes.js | 4 ++-- .../app/{frontend => }/controllers/tags.js | 4 ++-- .../directives/functional/autofocus.js | 2 +- .../directives/functional/click-outside.js | 2 +- .../directives/functional/delay-hide.js | 2 +- .../directives/functional/file-change.js | 2 +- .../directives/functional/infiniteScroll.js | 2 +- .../directives/functional/lowercase.js | 2 +- .../directives/functional/selectOnClick.js | 2 +- .../directives/views/accountMenu.js | 4 ++-- .../directives/views/actionsMenu.js | 4 ++-- .../directives/views/componentModal.js | 4 ++-- .../directives/views/componentView.js | 4 ++-- .../directives/views/editorMenu.js | 4 ++-- .../directives/views/globalExtensionsMenu.js | 4 ++-- .../{services => }/directives/views/menuRow.js | 4 ++-- .../directives/views/panelResizer.js | 4 ++-- .../directives/views/permissionsModal.js | 4 ++-- .../app/{services => }/filters/appDate.js | 2 +- .../app/{services => }/filters/sortBy.js | 2 +- .../app/{services => }/filters/startFrom.js | 2 +- .../app/{services => }/filters/trusted.js | 2 +- .../app/{frontend => }/models/api/item.js | 0 .../app/{frontend => }/models/api/mfa.js | 0 .../app/{frontend => }/models/api/syncAdapter.js | 0 .../app/{frontend => }/models/app/component.js | 0 .../app/{frontend => }/models/app/editor.js | 0 .../app/{frontend => }/models/app/extension.js | 0 .../app/{frontend => }/models/app/note.js | 0 .../app/{frontend => }/models/app/tag.js | 0 .../app/{frontend => }/models/app/theme.js | 0 .../models/local/encryptedStorage.js | 0 .../{frontend => }/models/local/itemParams.js | 0 .../javascripts/app/{frontend => }/routes.js | 3 +-- .../javascripts/app/services/actionsManager.js | 2 +- .../javascripts/app/services/authManager.js | 2 +- .../javascripts/app/services/componentManager.js | 2 +- app/assets/javascripts/app/services/dbManager.js | 2 +- .../javascripts/app/services/desktopManager.js | 2 +- .../javascripts/app/services/httpManager.js | 2 +- .../javascripts/app/services/migrationManager.js | 2 +- .../javascripts/app/services/modelManager.js | 2 +- .../javascripts/app/services/packageManager.js | 2 +- .../javascripts/app/services/passcodeManager.js | 2 +- .../javascripts/app/services/singletonManager.js | 2 +- .../javascripts/app/services/storageManager.js | 2 +- .../javascripts/app/services/syncManager.js | 2 +- .../javascripts/app/services/sysExtManager.js | 2 +- .../javascripts/app/services/themeManager.js | 2 +- app/assets/javascripts/frontend.js | 5 ----- app/assets/javascripts/main.js | 1 + app/assets/stylesheets/{ => app}/_ionicons.scss | 0 .../{frontend.css.scss => main.css.scss} | 3 +-- .../directives/account-menu.html.haml | 0 .../directives/actions-menu.html.haml | 0 .../directives/component-modal.html.haml | 0 .../directives/component-view.html.haml | 0 .../directives/editor-menu.html.haml | 0 .../directives/global-extensions-menu.html.haml | 0 .../{frontend => }/directives/menu-row.html.haml | 0 .../directives/panel-resizer.html.haml | 0 .../directives/permissions-modal.html.haml | 0 .../templates/{frontend => }/editor.html.haml | 0 .../templates/{frontend => }/footer.html.haml | 0 .../templates/{frontend => }/home.html.haml | 0 .../{frontend => }/lock-screen.html.haml | 0 .../templates/{frontend => }/notes.html.haml | 0 .../templates/{frontend => }/tags.html.haml | 0 app/controllers/application_controller.rb | 2 +- .../{frontend.html.erb => app.html.erb} | 4 ++-- config/cable.yml | 10 ---------- config/initializers/assets.rb | 3 +-- config/routes.rb | 2 +- test/javascripts/controllers/HomeCtrl_spec.js | 4 ++-- test/javascripts/filters/DateFilter_spec.js | 2 +- 86 files changed, 75 insertions(+), 91 deletions(-) delete mode 100644 app/assets/images/.keep delete mode 100644 app/assets/images/archive.png delete mode 100644 app/assets/images/encryption.png delete mode 100644 app/assets/images/filter.png delete mode 100644 app/assets/images/logo.png rename app/assets/javascripts/app/{app.frontend.js => app.js} (97%) rename app/assets/javascripts/app/{frontend => }/controllers/editor.js (99%) rename app/assets/javascripts/app/{frontend => }/controllers/footer.js (98%) rename app/assets/javascripts/app/{frontend => }/controllers/home.js (99%) rename app/assets/javascripts/app/{frontend => }/controllers/lockScreen.js (78%) rename app/assets/javascripts/app/{frontend => }/controllers/notes.js (98%) rename app/assets/javascripts/app/{frontend => }/controllers/tags.js (98%) rename app/assets/javascripts/app/{services => }/directives/functional/autofocus.js (92%) rename app/assets/javascripts/app/{services => }/directives/functional/click-outside.js (95%) rename app/assets/javascripts/app/{services => }/directives/functional/delay-hide.js (97%) rename app/assets/javascripts/app/{services => }/directives/functional/file-change.js (92%) rename app/assets/javascripts/app/{services => }/directives/functional/infiniteScroll.js (89%) rename app/assets/javascripts/app/{services => }/directives/functional/lowercase.js (95%) rename app/assets/javascripts/app/{services => }/directives/functional/selectOnClick.js (94%) rename app/assets/javascripts/app/{services => }/directives/views/accountMenu.js (99%) rename app/assets/javascripts/app/{services => }/directives/views/actionsMenu.js (94%) rename app/assets/javascripts/app/{services => }/directives/views/componentModal.js (85%) rename app/assets/javascripts/app/{services => }/directives/views/componentView.js (91%) rename app/assets/javascripts/app/{services => }/directives/views/editorMenu.js (92%) rename app/assets/javascripts/app/{services => }/directives/views/globalExtensionsMenu.js (97%) rename app/assets/javascripts/app/{services => }/directives/views/menuRow.js (78%) rename app/assets/javascripts/app/{services => }/directives/views/panelResizer.js (96%) rename app/assets/javascripts/app/{services => }/directives/views/permissionsModal.js (91%) rename app/assets/javascripts/app/{services => }/filters/appDate.js (91%) rename app/assets/javascripts/app/{services => }/filters/sortBy.js (97%) rename app/assets/javascripts/app/{services => }/filters/startFrom.js (56%) rename app/assets/javascripts/app/{services => }/filters/trusted.js (52%) rename app/assets/javascripts/app/{frontend => }/models/api/item.js (100%) rename app/assets/javascripts/app/{frontend => }/models/api/mfa.js (100%) rename app/assets/javascripts/app/{frontend => }/models/api/syncAdapter.js (100%) rename app/assets/javascripts/app/{frontend => }/models/app/component.js (100%) rename app/assets/javascripts/app/{frontend => }/models/app/editor.js (100%) rename app/assets/javascripts/app/{frontend => }/models/app/extension.js (100%) rename app/assets/javascripts/app/{frontend => }/models/app/note.js (100%) rename app/assets/javascripts/app/{frontend => }/models/app/tag.js (100%) rename app/assets/javascripts/app/{frontend => }/models/app/theme.js (100%) rename app/assets/javascripts/app/{frontend => }/models/local/encryptedStorage.js (100%) rename app/assets/javascripts/app/{frontend => }/models/local/itemParams.js (100%) rename app/assets/javascripts/app/{frontend => }/routes.js (90%) delete mode 100644 app/assets/javascripts/frontend.js create mode 100644 app/assets/javascripts/main.js rename app/assets/stylesheets/{ => app}/_ionicons.scss (100%) rename app/assets/stylesheets/{frontend.css.scss => main.css.scss} (90%) rename app/assets/templates/{frontend => }/directives/account-menu.html.haml (100%) rename app/assets/templates/{frontend => }/directives/actions-menu.html.haml (100%) rename app/assets/templates/{frontend => }/directives/component-modal.html.haml (100%) rename app/assets/templates/{frontend => }/directives/component-view.html.haml (100%) rename app/assets/templates/{frontend => }/directives/editor-menu.html.haml (100%) rename app/assets/templates/{frontend => }/directives/global-extensions-menu.html.haml (100%) rename app/assets/templates/{frontend => }/directives/menu-row.html.haml (100%) rename app/assets/templates/{frontend => }/directives/panel-resizer.html.haml (100%) rename app/assets/templates/{frontend => }/directives/permissions-modal.html.haml (100%) rename app/assets/templates/{frontend => }/editor.html.haml (100%) rename app/assets/templates/{frontend => }/footer.html.haml (100%) rename app/assets/templates/{frontend => }/home.html.haml (100%) rename app/assets/templates/{frontend => }/lock-screen.html.haml (100%) rename app/assets/templates/{frontend => }/notes.html.haml (100%) rename app/assets/templates/{frontend => }/tags.html.haml (100%) rename app/views/application/{frontend.html.erb => app.html.erb} (95%) delete mode 100644 config/cable.yml diff --git a/Gruntfile.js b/Gruntfile.js index 939abb961..6878b6524 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -34,7 +34,7 @@ module.exports = function(grunt) { style: 'expanded' }, files: { - 'vendor/assets/stylesheets/app.css': 'app/assets/stylesheets/frontend.css.scss' + 'vendor/assets/stylesheets/app.css': 'app/assets/stylesheets/main.css.scss' } } }, @@ -59,7 +59,7 @@ module.exports = function(grunt) { src: ['**/*.html'], dest: 'vendor/assets/javascripts/templates.js', options: { - module: 'app.frontend' + module: 'app' } } }, @@ -70,12 +70,13 @@ module.exports = function(grunt) { }, app: { src: [ - 'app/assets/javascripts/app/services/encryption/*.js', + 'app/assets/javascripts/app/services/encryption/*.js', // this should come first 'app/assets/javascripts/app/*.js', - 'app/assets/javascripts/app/frontend/*.js', - 'app/assets/javascripts/app/frontend/controllers/*.js', - 'app/assets/javascripts/app/frontend/models/**/*.js', - 'app/assets/javascripts/app/services/**/*.js' + 'app/assets/javascripts/app/controllers/**/*.js', + 'app/assets/javascripts/app/models/**/*.js', + 'app/assets/javascripts/app/services/**/*.js', + 'app/assets/javascripts/app/filters/**/*.js', + 'app/assets/javascripts/app/directives/**/*.js', ], dest: 'vendor/assets/javascripts/app.js', }, diff --git a/app/assets/images/.keep b/app/assets/images/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/assets/images/archive.png b/app/assets/images/archive.png deleted file mode 100644 index d6e8a204955502ecce1e5bf7bc08eed2131a7d27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2056 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 diff --git a/app/assets/images/filter.png b/app/assets/images/filter.png deleted file mode 100644 index b707c70b56a25be9871334b94cfe9ad1150b5381..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1808 zcmaJ?X;2eq7>>0A1{4s4qE@;Did;!HAqf(R5)+O%3B`ySPh66PEMc=DSs;L-99|rw zEf%qAQ7T|PX|+M2h@^m`crha&XhBe^H!9FdC3b_L{ZYCzyWcVI^SsaZzRx$iBO*L> zn$;{T5{WcT6eg4sBZqheQ!I#Y+tHy@#4r;Nmf=gW7(5x$!X&-|i-rLa3dO=w7*eDp zG{J!+(qvC0QijVUVy+xRX^=UFrbjgdnnVg*sMkPp6^sMXa4e$cQC?KnQUFB3qpV;{ zK#4{GE0M5NExa@}JW`&jk_RX#3l{)^dM-hL!Z-xz(Rj6vtLIThdAY>gyiKP7qanD8 zM|m$wCW!z9m=*@uG&WTZG8uq>0FA+B`};F}0Vc>`(Ln~C;YVcza9J!a2m)gdg~+B= z#Bim;kg;6Eibql6xQ0uoCnqPUK2Y3K|ZXg<<-phWWjp(y$xT8B&F zk9z-;SQnY1f$36Mhb3y|MB`%I%&9b7ffj~vOdE+|@#9sDP+~ZyQ(_uGAQ-J0;3r;JpTpts{TLiSKMse@ z4q%OAg_t}Mh1K{tR`C(bnh+c7z&IYoQq7Xg)t%D7*;W{7UqOl zIw6K`ZtuU^J-$VF$UOaEUSjdV{;-sb=tJG^$GY z3|H^PQ*$WuoOe_+a~}5OtX>nAdGNEr=ud4+?CfmgOq=gyW^Oy8kFclHoFnq)hvofU zxZRTmG#+&Rp&sO>!<)9ioxG_sc~wVxfA6xgs$7%w?y0DnI9Jn|(r%9?k zjF5Ncp@+Nr>`N&M$4=Nlp3UEMtNh*8R2$TxRaD&nsCaP~y05}*p!0(JPSePM#6X_k z$P7BEdCZ*eEcC9US`-%FZ1M3Ps@iZP-sLQ5anOm-cX9ofRE^rT3zV&sJhI~Y_ty@B zQm3qf=MH64%9(>(u!NNUmn_@3DA=V6?JkNPv5`G3DDm{3?0x+5S4F=%hQ`gIikIBq zO`E*uuQWGjhYOw3hVAL=4*U{1Qr~xf`Op_O-FfJPqQ07#cyedjhVb7dwKoio0~*6f zjCk3~*M#s!LzhSWC&O(9@=|0myQ`zGIw8lCndDDr>)YNZgh{|V%QMXSGl`V)UMae+22}!X=7!%(F<7VC3f1R&bs}! zddHh`-zWKw;ggW_`NsQ3+^+aX^7;VTZM&#Y!imGcm6T_zqUK_PM{rH) z9S^8j0LEwiAlJe}+ z7YCbLn*})qt9cEpc6s)m*n4aL%cuuA+Nhw7hmz)sMVbt!K&#)}eOD<%%ti#$wlo;M zJOT^g+CcQXQx{X{gJNK1a(~7OH1?M_D>Qtty=~F;befO1R Us{F7y=6{qZI9zyg(fZ7P0R3dqL;wH) diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png deleted file mode 100644 index 9b0c179d221b755e4ab47978e56c125f4ba0f665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9211 zcmaia1y~ec-!|Qiq{K=J(#;|Z3rj5B-Q7zp-64X~C5?mvi*$peNK3cU0@5JeAO4?w zulISrcdu)9X3qTX`xi6!%$aj0T1`a`ABP$T2?+@wDi6_kT<<(CE?5|k|7`W~A&)C$ z4-Gjfq>2%m?Z+K#S9yI8BqUtYKMOKaW;P`f5*mfQmL6PBSqW$fbLKL)f>~H|`8c~i zS|cI7^Z`C@I$Oid0Y1)7E*?N1afZJvfREdMnzK-8 zydE>;_Az(m=H=qyc6R3ePe>2AhV{RK{EtWvEnin_ZVhV>n5Vm?^`klCeje~$bW_djd$nDWax*QT{vX z5Ad%vf%YyQaB~++YbXTt$i!uDZv~W<5f&7X7U2c+3dr#C$_R-F%JPfyLS%(`goQ+f zz&tOx{}=Rs)c^0yRxnFXXKNSu-HM3N z{-)EvS|5c9!g=)c57C2gazP7p(e>g zO{R`!twy7cEUl%5mTk!d{%TG|^cu2;MVIo)VEMr%dq&1N%0m+l8K2&QGA}X|8 z`SwHj{zsSP_QtKrttCVM@{Tf<9H4fq*M0{=C1-MR=wKYsyj#(lmOmn{Z9iXQ?Y)U` za}kW2#mowe?F{cS4edaB8sgd6MuOmrT1LOmHuLok(Owa9_2`a`5Dr-mmtZoI^Wo(A zjBY$Eq39kcYH#eFI9nxO-Kob3;Qh$nT)XvCspkjH1|2RPJ{@{mIA&;lCzFiSa*C_? zs>0C=SM*EKCN!hib`t+crZ(jpk7xUMlPTfE96W*r7+|sfW)|nfbX8QbQ0K0e_nO(v z{@;um%5`%`+{L|wa!0w+*uc#DuU2eV0;Cr#3=HioQ?%v3Hz-8oS%zNGxTpX2GfBp3 zp;oyo?pIn6>M=#iMQ5_*Fph3`SJ^u)ymHLM)W1k2Ys}TvI*`hA&wa@yf_j@Sv?Qg6 z?F`rFGN-kA^8^>qDs&+#6U$GPratfxx-dC@j#Txu$@F706M>X$dQPr`7Rr`dhstk6 z2mikPO4-T}%5*!A3~OHb#4ZjsT=irRou{19RsIE=Wu06ZE#MK?pL<&Cg0IbKa!IWO7F5-$BfPYAOM zhug{gOwP~BkafVGD7yw$8QGiDn$Dj7P*jC6hYZC4%_pKXpLy7d82w$Ui3J2lU4rDdb9oszY?H zqi{(nf)Zwuyr*|yiYc_a)`BEaa_)E(E!HQih5Mn?VO}=CR>_M)k3eaX_rzb2;H_Dx zO80$IU87lFavgz}Q>D^NlM*ShQ~pftw6nHro_U3^hUF1P=lW`*diGxjH{;sSEZ zK;uz;OO7+O5sTCj=Ho5g3<1FK&O9a|d*9#B= zv>`bbqF35kvZbU(?QJ!PjRXI2xLz2D!;E#_{Cr4z1<-#j+Kn#Wy7u%UAA5I#+!UuY zLg2fe^LygnyUT)LU10t9227jJXvsdO@*@%yd-x4#rt$tvYvH)BFrc$5JEI|Ok}$mYf-*JZMB=cpn)d&-0_VEb$oM!#O+K zz)^QF(Xw#wpQ(_@+-GFyP|hCRpEyu|1LqPvug|obgIm;95-Laau1O{Y;QLY>KMeI8 z^}sGm%l9YR7nTvvf~Jq$k8mGl&fN55Zu4o#vRR8;!nsDHP;%7*%qhvK@?q2f|7U8# zsJ^@SiX~K6j^udNOtXsYQV|gBj%~bt&gyiQ6dFz4+X!DfP-*$WnI%hY8- zIbaI$yFJ}#`pY|-YvKxNwq?vLR9Yjs7=7FJ@0DWxtm>8M9jHOJdJ_sO@*d>v=$BDL zCmmlwo23xim;~~(dKJ85sQxq>**o`Jp0$yfAXWqUK}=-ZVayQucXf*p3n1l?wEDI} ziB>It{#)994n zd^B#UBhn&=8cx5c<(i1v)XF@$m2YdG)DuR9w&@Ole*>zoVqcGLn)iqe!EM9|J`;*p zOb163!h>N?n|hf)-|#MJ(qZRfxmTN}j5T}0g`bJ%D)#k%ryAruJ2MHop_~Tte*?-w zbHLVl-=I*0-qm{?EsC`Gd=9hVZ9K1n!WOa8vPte>hHMy|#qlo8q-1(#2)_`_6fh+8 zU1-&b{5T*Ci%*f#nURKQ1`{*9c5Hp%n%gaPXUJ9)#8q~?1m08vKnnwQ-*z$1)@t^( z?-YJ=StBI*VY4bOW0|aPdz3L!y^WH(zk8iamVy_qCz*vyd)&NIb~*$c$bct&e8V4J z5SPQR>S+-b5AcXsV3ubnWu9PPksYz0+a{YU&Af}ckj|aM`<}OJOzczX>^ozAHACS^ zniCZ;s!?udQVkx!)*8OifTc^%`&M$Yvf3c$NZTfUI%o>c2{Mq_Wlf@H1S`;w-jbL2 z7bzP+@4nyo?^|7B@4BDj7R|(>?9y{bLCcwVA%^u{c>-LS#d=i)StC0nNtBqxY4ID`B`Z3{?SQs~J z&4R6QP8F!$Kv2~G+3Jd^^4YGm=QqT-)jqM+9TU)b)>(})=jVCtY+=)8*L#&D1Z-{- z4sRyQ(aB1N=kw(I#vy@lHC9C{SB(<4^#Ez!tr~X&r}NantjD-LZKkRDduByXp7P)q zAX3i9ULT^y^@1)`y#@nYYN)mdm_`pI-TNe^;cE=g!uCoT=jO0Pa`S9|QS8=`7BT{H zg}FTRJ)@j4{~1+e`rnE(zvPlXGW;SQ^{ z0IzZ0L$qI-7TXbG62k~pl*n{@as&$t>^{G$#-<{a&#>K4+-A1RMelCjTk#&tyIBtb zN+w^AiN~9w=1k~2Qm^$C8hfGKm=(SudhC>>p`IbW+w2t5yasjTA7(3;)w#TZ$aSRQ z(iqeDwrnsq%S&^b1G!%8KlMRm54yS*L0nLunSE2m?MA5!lqHY+=vZbJp3wj-``x+< z)-qZUKlAA)O$u9nUsryfppGXE&0WV#%pzX2se2*HTm;{LrfyF9_v9&HKzHOx?XLux z+mAR_h7r;)FbCZ?K~>1Wj?g+Ja)D7rL$wa6iguWO;NN zF`Zed^rSmH%#cPwavW@R3{v9V^g4s;Dn0ufrDiDBpG^0Th~UsS;K54{GOz>ngS}lb z5I>#yu2R&u+%7I}x(wX})6nJdb>#Ea2S zvKUm-U5ovzyPCMxLY`=FtDOkpEl*D#ZBEK@(YkL7D?ZtlZGb@m!w`a{GKCrK75Z^& z?kW~lG!fE?~6>|BT7-EfgTarEP4bw__!rY2fQFc+kIGZ}ih?QJ(1 z*D#6v=JGRB`3UP5pN`*ZB<+|11K_O+d8Ijl>Q#m)A7nRE6BFb;d0n(%{9Gg%tK)1^HryD6)R9rBGR)A z7)}ZaPoB=_uEp9Ih;M~RxxUdZ+{ zHE!h29i@P2SYOyOsKZOKqD*$S*Nfzc_b_vDg)p80TYR&m^v*m1G0|O?^xi>qx2*fk zxvndwGASiog4ybK8L7HRPjll@XoRHP`>t)_LAG|U4yc*aT&A76e5LW%_WV%hFrL&{ zL@0IB-P;@_S7nSIUDIvUy0efg2kuHQ13sZ1RhX%+I+-zkO&-_3$`uYrf=I;bW|f`64SX0~AnS79RUWST-FHyJ;jim^3Sg1k#eA zb;8e_15IUS_H^D_3d~XYFTUT$dSRiYTo(6ce4wjISx+_jTs{o7YbZ3L9=3l$SrJ(jeHP_N%-Oqem4NGGS#of2*Y>7w{_!hhNPei5X>1YE(#a4LzFic(;qLM{Dx|r zO@)*9(m#RCTF@Xg9Y#2nmQ00!&P6$Q|rUA8GT>!UA*KM zA(sZqPi&UojLX$DqF-CAZ|#}^f9N?+meh$O zPOnYS>hr)_NcQ#x%bIOCWk8K4qnzc&G5*di15>K-m!-I~4>6Fy=X$~$F6`=p4XyR- zM2*L9hhfMA2!0SQ>#gMAj?=W(gIy!Wn$|K7AJZ`rk>XT#&;G46j1ol7*dmNm%?z^a5lHpYf$WbD}v$ifdJQ z(-L#eL{CG5fMc(%OCI6sWzb~dxL6mh4enh$(;fK=yE*0Z_VWhg-p1;_!^sdL&_af{ zQy=i?qvZ={K6Lbf^UmjlT_Rl0YqIUj)PBBN$H%%BH#U-GQFO7UW=GD_?YD^fjannqh8_H zy5?8<^xuN>zSEk=K?5DbWj2ttvd{{@ECK|lhm>$Z96HF$)thUO(V&PBx5;VBB@4O3 znzX~l&M%oct!Pl1n&UD$^bu0E0mKj#;( zT$q{;^uJc4j=$?94Ml^sc;s6!%Cw3mUw*|8_N()gj^VK>XJI!^#FA)2+33A0cnfL! zFoGf0eQEsd6<~*5e=-053Bg*294rxw%|7rIht#3vEXqyNg;AAQLXol;`;_D7PjQhW zpGJ}LP-2665ir2`)>heJ6iIC{OKrvMj7~J zlPK2O8de^vA-_=bMFiv-u;0wx&_T;bgGED`V{SRkALrMrE&GG|?j>2tVGMgaTQR-^ zDU_N~#W^)jFEP^V$)s8ZMsBhskK%Cg2}hmKh=Y7M2|VCN@`fG>42yV=DV+X^cimUD zlsn=9Efng|UQ(xLSCB|+CGc61H>bCWht3{?3l;26m$|{+->2uGb-4oTtm7vEc2a*m zsmzyMsB-YbRoh*mFC41EQN014#cPA{fYdw_P2Z>@VLbE@; zmYlIfGIE}3?b;F9=_DR9g0ky7lBRaFH!LW~yq!k@>%cyoV+N_7EG5*l9b(*gEj0CS z)XdTwsfB$mFT@UX_~EEA&xQXu$Q5IOdd8RR!yF>$p3)Xy^StlZ= zWeTo8w+oGzv_DrX(law6Pe9}1W!@$2oF_VEOG@=QYbiF5B`Nyx2FRSwA5?^27Ae*q z1kD#pEYY3PF)Xz!)stlSHGEJ5LJL5xX(y@iTQ|7yHn2ps$2?V&H5T=2`%E><9ao~M zI-bs32%LZvu1VonSP+k-=H|uwM40gFz8u`e`&JpDezI$5Ymk>nmtUIWHtCmYnVWFy zH@PQG3>f*#geVhkc%UgyodYn~O2 zOS|qb&wi0bxE=0H_;5sgxV_~1UC4G1*p*~jcuw+yf2e=GFlBzWzL0%Mml;<)IY;Fw z2>Bd!9Q@Vmi>DK)%os{ckI@GnbL1p2RCI7I%VBnz%lfjER1tqT=+Z-09LfncfgOgm zY+)Hsao-~*OaXO!(Qi!WYA4p<{NHFUR6(de(lqms>Ie^tlG0BovMORHqov|LRxfhm{94E=HJg zLTC*(Wc;2*!X6}^9|zif?67D=uB!cFA4N_Tj?R=iLVpoEf>=f|MYfd=anM)#49g!C zVyV3-f+2x+X(*sb6evas7IH*3`O@Zjl9VfL!SG1E@u*<~dv61mQG`^z8YbUmJ8OK;A`*G(RdLP)NnnujjQyO+GO`CXRfVj_i3J&p z4-YT{!BN)Uv0btsGZgdIdW=png0#*tRy8;#s2U^{=ui z^ZWbB6HtF!F^hmw$$OMvClf9}J|IeN8P- zXlIA3!|vy55l2iZ-*F>qAdh!{4k}y`XtRcQ6tq-Jj5K~z(9oGtGw2sr zz&}8*o|98nqK6gDs_mT|J-khN5Vmm7OfFeKvcB6uwVkPSyJVjv%BxoKY%{S}2fab> zwG9PqTR&+QyALu+mUrOaVs@wrUtWb=Sl?Idcd>oj9URV#Q4d3RL}sP2RXT(QW95eB zJ(Sop$y6>uWR7>f#Xx2*JihI=5xLno_td|2gQS7j8j3c)mP0mJcmx2xqoVq|WiRaGCPrLLAVEdr1@S5-L zN1^PJgN-ti=TFgiQn4`05VW+Sr1~GN77+}w)sjS7uTIqu6(!IDyf5&uS~5u!f|Ly` zt>04#!q8(Kxk;lAyPCaGg7v}CXAhF7;N6Me`W!suxbkWP#qqD{uRo5rKHGTgf69CZ z?YSje+Z8N4r$!*t#6>M_c*~gL-XibfhmzEmUCAQK*vlX5aM}>^^NEXB8Lwv3Lwz#fp_yPN$r&y&OTP6W9|NsqDCf&1?mC&Z*HTj`AO znKmCn=~05=F!UaH#`iRcN<784y?GZS@{G(A>mu!(ib6AnLyTEXsJAEq>=Q<_iAR!!Bf%-U&i*)!xH)KfTmR)}Pw^!r}=@rJ$ z0v6k)BR47#w?~N&rdwdI_9ARpoAPQMvzcC=&i03A=+84fN>j|Ho^#<)=GuHk$H^JA zCHlTzNV_Q5J&}$)!KuPxuUNa&y8{MoidJhfBI`gMNmw%gh%)Z?UR`GfjlAntj7*=i zjTDG1;jdc*5YJk9;%SY5`v?RI)zg?#vXczMaMnqtnd|#V^wQ~g7V`>;H)C&s@v~H$ z5W new LockScreen); +angular.module('app').directive('lockScreen', () => new LockScreen); diff --git a/app/assets/javascripts/app/frontend/controllers/notes.js b/app/assets/javascripts/app/controllers/notes.js similarity index 98% rename from app/assets/javascripts/app/frontend/controllers/notes.js rename to app/assets/javascripts/app/controllers/notes.js index c5660f93d..4b7376f8c 100644 --- a/app/assets/javascripts/app/frontend/controllers/notes.js +++ b/app/assets/javascripts/app/controllers/notes.js @@ -1,4 +1,4 @@ -angular.module('app.frontend') +angular.module('app') .directive("notesSection", function(){ return { scope: { @@ -7,7 +7,7 @@ angular.module('app.frontend') tag: "=" }, - templateUrl: 'frontend/notes.html', + templateUrl: 'notes.html', replace: true, controller: 'NotesCtrl', controllerAs: 'ctrl', diff --git a/app/assets/javascripts/app/frontend/controllers/tags.js b/app/assets/javascripts/app/controllers/tags.js similarity index 98% rename from app/assets/javascripts/app/frontend/controllers/tags.js rename to app/assets/javascripts/app/controllers/tags.js index e053b5b4e..76f11ddf2 100644 --- a/app/assets/javascripts/app/frontend/controllers/tags.js +++ b/app/assets/javascripts/app/controllers/tags.js @@ -1,4 +1,4 @@ -angular.module('app.frontend') +angular.module('app') .directive("tagsSection", function(){ return { restrict: 'E', @@ -13,7 +13,7 @@ angular.module('app.frontend') updateNoteTag: "&", removeTag: "&" }, - templateUrl: 'frontend/tags.html', + templateUrl: 'tags.html', replace: true, controller: 'TagsCtrl', controllerAs: 'ctrl', diff --git a/app/assets/javascripts/app/services/directives/functional/autofocus.js b/app/assets/javascripts/app/directives/functional/autofocus.js similarity index 92% rename from app/assets/javascripts/app/services/directives/functional/autofocus.js rename to app/assets/javascripts/app/directives/functional/autofocus.js index cbc093a5f..8bcf6c1d1 100644 --- a/app/assets/javascripts/app/services/directives/functional/autofocus.js +++ b/app/assets/javascripts/app/directives/functional/autofocus.js @@ -1,5 +1,5 @@ angular - .module('app.frontend') + .module('app') .directive('snAutofocus', ['$timeout', function($timeout) { return { restrict: 'A', diff --git a/app/assets/javascripts/app/services/directives/functional/click-outside.js b/app/assets/javascripts/app/directives/functional/click-outside.js similarity index 95% rename from app/assets/javascripts/app/services/directives/functional/click-outside.js rename to app/assets/javascripts/app/directives/functional/click-outside.js index 10e40e1da..dd8296470 100644 --- a/app/assets/javascripts/app/services/directives/functional/click-outside.js +++ b/app/assets/javascripts/app/directives/functional/click-outside.js @@ -1,5 +1,5 @@ angular - .module('app.frontend') + .module('app') .directive('clickOutside', ['$document', function($document) { return { restrict: 'A', diff --git a/app/assets/javascripts/app/services/directives/functional/delay-hide.js b/app/assets/javascripts/app/directives/functional/delay-hide.js similarity index 97% rename from app/assets/javascripts/app/services/directives/functional/delay-hide.js rename to app/assets/javascripts/app/directives/functional/delay-hide.js index 6e381ed3f..fd52d70fb 100644 --- a/app/assets/javascripts/app/services/directives/functional/delay-hide.js +++ b/app/assets/javascripts/app/directives/functional/delay-hide.js @@ -1,5 +1,5 @@ angular - .module('app.frontend') + .module('app') .directive('delayHide', function($timeout) { return { restrict: 'A', diff --git a/app/assets/javascripts/app/services/directives/functional/file-change.js b/app/assets/javascripts/app/directives/functional/file-change.js similarity index 92% rename from app/assets/javascripts/app/services/directives/functional/file-change.js rename to app/assets/javascripts/app/directives/functional/file-change.js index afec10954..c133c0852 100644 --- a/app/assets/javascripts/app/services/directives/functional/file-change.js +++ b/app/assets/javascripts/app/directives/functional/file-change.js @@ -1,5 +1,5 @@ angular - .module('app.frontend') + .module('app') .directive('fileChange', function() { return { restrict: 'A', diff --git a/app/assets/javascripts/app/services/directives/functional/infiniteScroll.js b/app/assets/javascripts/app/directives/functional/infiniteScroll.js similarity index 89% rename from app/assets/javascripts/app/services/directives/functional/infiniteScroll.js rename to app/assets/javascripts/app/directives/functional/infiniteScroll.js index 372f0bf7b..3e1e633ef 100644 --- a/app/assets/javascripts/app/services/directives/functional/infiniteScroll.js +++ b/app/assets/javascripts/app/directives/functional/infiniteScroll.js @@ -1,4 +1,4 @@ -angular.module('app.frontend').directive('infiniteScroll', [ +angular.module('app').directive('infiniteScroll', [ '$rootScope', '$window', '$timeout', function($rootScope, $window, $timeout) { return { link: function(scope, elem, attrs) { diff --git a/app/assets/javascripts/app/services/directives/functional/lowercase.js b/app/assets/javascripts/app/directives/functional/lowercase.js similarity index 95% rename from app/assets/javascripts/app/services/directives/functional/lowercase.js rename to app/assets/javascripts/app/directives/functional/lowercase.js index 1899a251b..40ce7421c 100644 --- a/app/assets/javascripts/app/services/directives/functional/lowercase.js +++ b/app/assets/javascripts/app/directives/functional/lowercase.js @@ -1,5 +1,5 @@ angular - .module('app.frontend') + .module('app') .directive('lowercase', function() { return { require: 'ngModel', diff --git a/app/assets/javascripts/app/services/directives/functional/selectOnClick.js b/app/assets/javascripts/app/directives/functional/selectOnClick.js similarity index 94% rename from app/assets/javascripts/app/services/directives/functional/selectOnClick.js rename to app/assets/javascripts/app/directives/functional/selectOnClick.js index a8ad86cb1..598e45086 100644 --- a/app/assets/javascripts/app/services/directives/functional/selectOnClick.js +++ b/app/assets/javascripts/app/directives/functional/selectOnClick.js @@ -1,5 +1,5 @@ angular - .module('app.frontend') + .module('app') .directive('selectOnClick', ['$window', function ($window) { return { restrict: 'A', diff --git a/app/assets/javascripts/app/services/directives/views/accountMenu.js b/app/assets/javascripts/app/directives/views/accountMenu.js similarity index 99% rename from app/assets/javascripts/app/services/directives/views/accountMenu.js rename to app/assets/javascripts/app/directives/views/accountMenu.js index 39028041d..2efe01744 100644 --- a/app/assets/javascripts/app/services/directives/views/accountMenu.js +++ b/app/assets/javascripts/app/directives/views/accountMenu.js @@ -2,7 +2,7 @@ class AccountMenu { constructor() { this.restrict = "E"; - this.templateUrl = "frontend/directives/account-menu.html"; + this.templateUrl = "directives/account-menu.html"; this.scope = { "onSuccessfulAuth" : "&", "closeFunction" : "&" @@ -584,4 +584,4 @@ class AccountMenu { } } -angular.module('app.frontend').directive('accountMenu', () => new AccountMenu); +angular.module('app').directive('accountMenu', () => new AccountMenu); diff --git a/app/assets/javascripts/app/services/directives/views/actionsMenu.js b/app/assets/javascripts/app/directives/views/actionsMenu.js similarity index 94% rename from app/assets/javascripts/app/services/directives/views/actionsMenu.js rename to app/assets/javascripts/app/directives/views/actionsMenu.js index f4ef1a4ae..f7842fc05 100644 --- a/app/assets/javascripts/app/services/directives/views/actionsMenu.js +++ b/app/assets/javascripts/app/directives/views/actionsMenu.js @@ -2,7 +2,7 @@ class ActionsMenu { constructor() { this.restrict = "E"; - this.templateUrl = "frontend/directives/actions-menu.html"; + this.templateUrl = "directives/actions-menu.html"; this.scope = { item: "=" }; @@ -83,4 +83,4 @@ class ActionsMenu { } -angular.module('app.frontend').directive('actionsMenu', () => new ActionsMenu); +angular.module('app').directive('actionsMenu', () => new ActionsMenu); diff --git a/app/assets/javascripts/app/services/directives/views/componentModal.js b/app/assets/javascripts/app/directives/views/componentModal.js similarity index 85% rename from app/assets/javascripts/app/services/directives/views/componentModal.js rename to app/assets/javascripts/app/directives/views/componentModal.js index a02cb1f00..9d73df8ad 100644 --- a/app/assets/javascripts/app/services/directives/views/componentModal.js +++ b/app/assets/javascripts/app/directives/views/componentModal.js @@ -2,7 +2,7 @@ class ComponentModal { constructor() { this.restrict = "E"; - this.templateUrl = "frontend/directives/component-modal.html"; + this.templateUrl = "directives/component-modal.html"; this.scope = { show: "=", component: "=", @@ -39,4 +39,4 @@ class ComponentModal { } -angular.module('app.frontend').directive('componentModal', () => new ComponentModal); +angular.module('app').directive('componentModal', () => new ComponentModal); diff --git a/app/assets/javascripts/app/services/directives/views/componentView.js b/app/assets/javascripts/app/directives/views/componentView.js similarity index 91% rename from app/assets/javascripts/app/services/directives/views/componentView.js rename to app/assets/javascripts/app/directives/views/componentView.js index 2cbd6e586..2ebc2b24a 100644 --- a/app/assets/javascripts/app/services/directives/views/componentView.js +++ b/app/assets/javascripts/app/directives/views/componentView.js @@ -2,7 +2,7 @@ class ComponentView { constructor(componentManager, $timeout) { this.restrict = "E"; - this.templateUrl = "frontend/directives/component-view.html"; + this.templateUrl = "directives/component-view.html"; this.scope = { component: "=" }; @@ -71,4 +71,4 @@ class ComponentView { } -angular.module('app.frontend').directive('componentView', (componentManager, $timeout) => new ComponentView(componentManager, $timeout)); +angular.module('app').directive('componentView', (componentManager, $timeout) => new ComponentView(componentManager, $timeout)); diff --git a/app/assets/javascripts/app/services/directives/views/editorMenu.js b/app/assets/javascripts/app/directives/views/editorMenu.js similarity index 92% rename from app/assets/javascripts/app/services/directives/views/editorMenu.js rename to app/assets/javascripts/app/directives/views/editorMenu.js index 2daea9aea..51d301fb0 100644 --- a/app/assets/javascripts/app/services/directives/views/editorMenu.js +++ b/app/assets/javascripts/app/directives/views/editorMenu.js @@ -2,7 +2,7 @@ class EditorMenu { constructor() { this.restrict = "E"; - this.templateUrl = "frontend/directives/editor-menu.html"; + this.templateUrl = "directives/editor-menu.html"; this.scope = { callback: "&", selectedEditor: "=" @@ -68,4 +68,4 @@ class EditorMenu { } -angular.module('app.frontend').directive('editorMenu', () => new EditorMenu); +angular.module('app').directive('editorMenu', () => new EditorMenu); diff --git a/app/assets/javascripts/app/services/directives/views/globalExtensionsMenu.js b/app/assets/javascripts/app/directives/views/globalExtensionsMenu.js similarity index 97% rename from app/assets/javascripts/app/services/directives/views/globalExtensionsMenu.js rename to app/assets/javascripts/app/directives/views/globalExtensionsMenu.js index f2dc67cef..649c4c2fb 100644 --- a/app/assets/javascripts/app/services/directives/views/globalExtensionsMenu.js +++ b/app/assets/javascripts/app/directives/views/globalExtensionsMenu.js @@ -2,7 +2,7 @@ class GlobalExtensionsMenu { constructor() { this.restrict = "E"; - this.templateUrl = "frontend/directives/global-extensions-menu.html"; + this.templateUrl = "directives/global-extensions-menu.html"; this.scope = { }; } @@ -212,4 +212,4 @@ class GlobalExtensionsMenu { } -angular.module('app.frontend').directive('globalExtensionsMenu', () => new GlobalExtensionsMenu); +angular.module('app').directive('globalExtensionsMenu', () => new GlobalExtensionsMenu); diff --git a/app/assets/javascripts/app/services/directives/views/menuRow.js b/app/assets/javascripts/app/directives/views/menuRow.js similarity index 78% rename from app/assets/javascripts/app/services/directives/views/menuRow.js rename to app/assets/javascripts/app/directives/views/menuRow.js index 1809a2505..20fc1653c 100644 --- a/app/assets/javascripts/app/services/directives/views/menuRow.js +++ b/app/assets/javascripts/app/directives/views/menuRow.js @@ -3,7 +3,7 @@ class MenuRow { constructor() { this.restrict = "E"; this.transclude = true; - this.templateUrl = "frontend/directives/menu-row.html"; + this.templateUrl = "directives/menu-row.html"; this.scope = { circle: "=", title: "=", @@ -28,4 +28,4 @@ class MenuRow { } } -angular.module('app.frontend').directive('menuRow', () => new MenuRow); +angular.module('app').directive('menuRow', () => new MenuRow); diff --git a/app/assets/javascripts/app/services/directives/views/panelResizer.js b/app/assets/javascripts/app/directives/views/panelResizer.js similarity index 96% rename from app/assets/javascripts/app/services/directives/views/panelResizer.js rename to app/assets/javascripts/app/directives/views/panelResizer.js index 62226c107..917ab06bf 100644 --- a/app/assets/javascripts/app/services/directives/views/panelResizer.js +++ b/app/assets/javascripts/app/directives/views/panelResizer.js @@ -2,7 +2,7 @@ class PanelResizer { constructor() { this.restrict = "E"; - this.templateUrl = "frontend/directives/panel-resizer.html"; + this.templateUrl = "directives/panel-resizer.html"; this.scope = { index: "=", panelId: "=", @@ -198,4 +198,4 @@ class PanelResizer { } -angular.module('app.frontend').directive('panelResizer', () => new PanelResizer); +angular.module('app').directive('panelResizer', () => new PanelResizer); diff --git a/app/assets/javascripts/app/services/directives/views/permissionsModal.js b/app/assets/javascripts/app/directives/views/permissionsModal.js similarity index 91% rename from app/assets/javascripts/app/services/directives/views/permissionsModal.js rename to app/assets/javascripts/app/directives/views/permissionsModal.js index 5988bae86..fb7609d55 100644 --- a/app/assets/javascripts/app/services/directives/views/permissionsModal.js +++ b/app/assets/javascripts/app/directives/views/permissionsModal.js @@ -2,7 +2,7 @@ class PermissionsModal { constructor() { this.restrict = "E"; - this.templateUrl = "frontend/directives/permissions-modal.html"; + this.templateUrl = "directives/permissions-modal.html"; this.scope = { show: "=", component: "=", @@ -74,4 +74,4 @@ class PermissionsModal { } -angular.module('app.frontend').directive('permissionsModal', () => new PermissionsModal); +angular.module('app').directive('permissionsModal', () => new PermissionsModal); diff --git a/app/assets/javascripts/app/services/filters/appDate.js b/app/assets/javascripts/app/filters/appDate.js similarity index 91% rename from app/assets/javascripts/app/services/filters/appDate.js rename to app/assets/javascripts/app/filters/appDate.js index 381c3ed54..9a84a796e 100644 --- a/app/assets/javascripts/app/services/filters/appDate.js +++ b/app/assets/javascripts/app/filters/appDate.js @@ -1,4 +1,4 @@ -angular.module('app.frontend') +angular.module('app') .filter('appDate', function ($filter) { return function (input) { return input ? $filter('date')(new Date(input), 'MM/dd/yyyy', 'UTC') : ''; diff --git a/app/assets/javascripts/app/services/filters/sortBy.js b/app/assets/javascripts/app/filters/sortBy.js similarity index 97% rename from app/assets/javascripts/app/services/filters/sortBy.js rename to app/assets/javascripts/app/filters/sortBy.js index c3902604b..2f19d3769 100644 --- a/app/assets/javascripts/app/services/filters/sortBy.js +++ b/app/assets/javascripts/app/filters/sortBy.js @@ -1,4 +1,4 @@ -angular.module('app.frontend') +angular.module('app') .filter('sortBy', function ($filter) { return function(items, sortBy) { let sortValueFn = (a, b, pinCheck = false) => { diff --git a/app/assets/javascripts/app/services/filters/startFrom.js b/app/assets/javascripts/app/filters/startFrom.js similarity index 56% rename from app/assets/javascripts/app/services/filters/startFrom.js rename to app/assets/javascripts/app/filters/startFrom.js index 3cf824c4c..7b64038f6 100644 --- a/app/assets/javascripts/app/services/filters/startFrom.js +++ b/app/assets/javascripts/app/filters/startFrom.js @@ -1,4 +1,4 @@ -angular.module('app.frontend').filter('startFrom', function() { +angular.module('app').filter('startFrom', function() { return function(input, start) { return input.slice(start); }; diff --git a/app/assets/javascripts/app/services/filters/trusted.js b/app/assets/javascripts/app/filters/trusted.js similarity index 52% rename from app/assets/javascripts/app/services/filters/trusted.js rename to app/assets/javascripts/app/filters/trusted.js index 7bb57b301..f2a41a3c0 100644 --- a/app/assets/javascripts/app/services/filters/trusted.js +++ b/app/assets/javascripts/app/filters/trusted.js @@ -1,4 +1,4 @@ -angular.module('app.frontend').filter('trusted', ['$sce', function ($sce) { +angular.module('app').filter('trusted', ['$sce', function ($sce) { return function(url) { return $sce.trustAsResourceUrl(url); }; diff --git a/app/assets/javascripts/app/frontend/models/api/item.js b/app/assets/javascripts/app/models/api/item.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/api/item.js rename to app/assets/javascripts/app/models/api/item.js diff --git a/app/assets/javascripts/app/frontend/models/api/mfa.js b/app/assets/javascripts/app/models/api/mfa.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/api/mfa.js rename to app/assets/javascripts/app/models/api/mfa.js diff --git a/app/assets/javascripts/app/frontend/models/api/syncAdapter.js b/app/assets/javascripts/app/models/api/syncAdapter.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/api/syncAdapter.js rename to app/assets/javascripts/app/models/api/syncAdapter.js diff --git a/app/assets/javascripts/app/frontend/models/app/component.js b/app/assets/javascripts/app/models/app/component.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/app/component.js rename to app/assets/javascripts/app/models/app/component.js diff --git a/app/assets/javascripts/app/frontend/models/app/editor.js b/app/assets/javascripts/app/models/app/editor.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/app/editor.js rename to app/assets/javascripts/app/models/app/editor.js diff --git a/app/assets/javascripts/app/frontend/models/app/extension.js b/app/assets/javascripts/app/models/app/extension.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/app/extension.js rename to app/assets/javascripts/app/models/app/extension.js diff --git a/app/assets/javascripts/app/frontend/models/app/note.js b/app/assets/javascripts/app/models/app/note.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/app/note.js rename to app/assets/javascripts/app/models/app/note.js diff --git a/app/assets/javascripts/app/frontend/models/app/tag.js b/app/assets/javascripts/app/models/app/tag.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/app/tag.js rename to app/assets/javascripts/app/models/app/tag.js diff --git a/app/assets/javascripts/app/frontend/models/app/theme.js b/app/assets/javascripts/app/models/app/theme.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/app/theme.js rename to app/assets/javascripts/app/models/app/theme.js diff --git a/app/assets/javascripts/app/frontend/models/local/encryptedStorage.js b/app/assets/javascripts/app/models/local/encryptedStorage.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/local/encryptedStorage.js rename to app/assets/javascripts/app/models/local/encryptedStorage.js diff --git a/app/assets/javascripts/app/frontend/models/local/itemParams.js b/app/assets/javascripts/app/models/local/itemParams.js similarity index 100% rename from app/assets/javascripts/app/frontend/models/local/itemParams.js rename to app/assets/javascripts/app/models/local/itemParams.js diff --git a/app/assets/javascripts/app/frontend/routes.js b/app/assets/javascripts/app/routes.js similarity index 90% rename from app/assets/javascripts/app/frontend/routes.js rename to app/assets/javascripts/app/routes.js index 5409347db..fe6dac476 100644 --- a/app/assets/javascripts/app/frontend/routes.js +++ b/app/assets/javascripts/app/routes.js @@ -1,4 +1,4 @@ -angular.module('app.frontend') +angular.module('app') .config(function ($locationProvider) { if(!isDesktopApplication()) { @@ -11,5 +11,4 @@ angular.module('app.frontend') } else { $locationProvider.html5Mode(false); } - }); diff --git a/app/assets/javascripts/app/services/actionsManager.js b/app/assets/javascripts/app/services/actionsManager.js index f2926b139..9a5b9d1cc 100644 --- a/app/assets/javascripts/app/services/actionsManager.js +++ b/app/assets/javascripts/app/services/actionsManager.js @@ -241,4 +241,4 @@ class ActionsManager { } -angular.module('app.frontend').service('actionsManager', ActionsManager); +angular.module('app').service('actionsManager', ActionsManager); diff --git a/app/assets/javascripts/app/services/authManager.js b/app/assets/javascripts/app/services/authManager.js index 46cff40fc..af3f39d9c 100644 --- a/app/assets/javascripts/app/services/authManager.js +++ b/app/assets/javascripts/app/services/authManager.js @@ -1,4 +1,4 @@ -angular.module('app.frontend') +angular.module('app') .provider('authManager', function () { function domainName() { diff --git a/app/assets/javascripts/app/services/componentManager.js b/app/assets/javascripts/app/services/componentManager.js index a18670b10..1329c3cb2 100644 --- a/app/assets/javascripts/app/services/componentManager.js +++ b/app/assets/javascripts/app/services/componentManager.js @@ -749,4 +749,4 @@ class ComponentManager { } -angular.module('app.frontend').service('componentManager', ComponentManager); +angular.module('app').service('componentManager', ComponentManager); diff --git a/app/assets/javascripts/app/services/dbManager.js b/app/assets/javascripts/app/services/dbManager.js index 4c5d0341e..521fe2a1e 100644 --- a/app/assets/javascripts/app/services/dbManager.js +++ b/app/assets/javascripts/app/services/dbManager.js @@ -158,4 +158,4 @@ class DBManager { } } -angular.module('app.frontend').service('dbManager', DBManager); +angular.module('app').service('dbManager', DBManager); diff --git a/app/assets/javascripts/app/services/desktopManager.js b/app/assets/javascripts/app/services/desktopManager.js index ebe16d93c..c63bc4e4c 100644 --- a/app/assets/javascripts/app/services/desktopManager.js +++ b/app/assets/javascripts/app/services/desktopManager.js @@ -108,4 +108,4 @@ class DesktopManager { } -angular.module('app.frontend').service('desktopManager', DesktopManager); +angular.module('app').service('desktopManager', DesktopManager); diff --git a/app/assets/javascripts/app/services/httpManager.js b/app/assets/javascripts/app/services/httpManager.js index a5d157d57..71692f478 100644 --- a/app/assets/javascripts/app/services/httpManager.js +++ b/app/assets/javascripts/app/services/httpManager.js @@ -77,4 +77,4 @@ class HttpManager { } -angular.module('app.frontend').service('httpManager', HttpManager); +angular.module('app').service('httpManager', HttpManager); diff --git a/app/assets/javascripts/app/services/migrationManager.js b/app/assets/javascripts/app/services/migrationManager.js index bb139860c..59eb9a2e1 100644 --- a/app/assets/javascripts/app/services/migrationManager.js +++ b/app/assets/javascripts/app/services/migrationManager.js @@ -58,4 +58,4 @@ class MigrationManager { } -angular.module('app.frontend').service('migrationManager', MigrationManager); +angular.module('app').service('migrationManager', MigrationManager); diff --git a/app/assets/javascripts/app/services/modelManager.js b/app/assets/javascripts/app/services/modelManager.js index 879ffede9..7c96f338d 100644 --- a/app/assets/javascripts/app/services/modelManager.js +++ b/app/assets/javascripts/app/services/modelManager.js @@ -437,4 +437,4 @@ class ModelManager { } -angular.module('app.frontend').service('modelManager', ModelManager); +angular.module('app').service('modelManager', ModelManager); diff --git a/app/assets/javascripts/app/services/packageManager.js b/app/assets/javascripts/app/services/packageManager.js index 4ff78561c..7c61b2bac 100644 --- a/app/assets/javascripts/app/services/packageManager.js +++ b/app/assets/javascripts/app/services/packageManager.js @@ -38,4 +38,4 @@ class PackageManager { } -angular.module('app.frontend').service('packageManager', PackageManager); +angular.module('app').service('packageManager', PackageManager); diff --git a/app/assets/javascripts/app/services/passcodeManager.js b/app/assets/javascripts/app/services/passcodeManager.js index e4862fbe6..28202fdcc 100644 --- a/app/assets/javascripts/app/services/passcodeManager.js +++ b/app/assets/javascripts/app/services/passcodeManager.js @@ -1,4 +1,4 @@ -angular.module('app.frontend') +angular.module('app') .provider('passcodeManager', function () { this.$get = function($rootScope, $timeout, modelManager, dbManager, authManager, storageManager) { diff --git a/app/assets/javascripts/app/services/singletonManager.js b/app/assets/javascripts/app/services/singletonManager.js index dc8c6583f..489527239 100644 --- a/app/assets/javascripts/app/services/singletonManager.js +++ b/app/assets/javascripts/app/services/singletonManager.js @@ -147,4 +147,4 @@ class SingletonManager { } -angular.module('app.frontend').service('singletonManager', SingletonManager); +angular.module('app').service('singletonManager', SingletonManager); diff --git a/app/assets/javascripts/app/services/storageManager.js b/app/assets/javascripts/app/services/storageManager.js index cc8a3fa9b..0d2f02164 100644 --- a/app/assets/javascripts/app/services/storageManager.js +++ b/app/assets/javascripts/app/services/storageManager.js @@ -228,4 +228,4 @@ StorageManager.FixedEncrypted = "FixedEncrypted"; // encrypted memoryStorage + l StorageManager.Ephemeral = "Ephemeral"; // memoryStorage StorageManager.Fixed = "Fixed"; // localStorage -angular.module('app.frontend').service('storageManager', StorageManager); +angular.module('app').service('storageManager', StorageManager); diff --git a/app/assets/javascripts/app/services/syncManager.js b/app/assets/javascripts/app/services/syncManager.js index a47cbbb27..67a93ee77 100644 --- a/app/assets/javascripts/app/services/syncManager.js +++ b/app/assets/javascripts/app/services/syncManager.js @@ -448,4 +448,4 @@ class SyncManager { } } -angular.module('app.frontend').service('syncManager', SyncManager); +angular.module('app').service('syncManager', SyncManager); diff --git a/app/assets/javascripts/app/services/sysExtManager.js b/app/assets/javascripts/app/services/sysExtManager.js index 876506ace..b08738055 100644 --- a/app/assets/javascripts/app/services/sysExtManager.js +++ b/app/assets/javascripts/app/services/sysExtManager.js @@ -80,4 +80,4 @@ class SysExtManager { } -angular.module('app.frontend').service('sysExtManager', SysExtManager); +angular.module('app').service('sysExtManager', SysExtManager); diff --git a/app/assets/javascripts/app/services/themeManager.js b/app/assets/javascripts/app/services/themeManager.js index 2a475ac62..5f7d745c8 100644 --- a/app/assets/javascripts/app/services/themeManager.js +++ b/app/assets/javascripts/app/services/themeManager.js @@ -103,4 +103,4 @@ class ThemeManager { } -angular.module('app.frontend').service('themeManager', ThemeManager); +angular.module('app').service('themeManager', ThemeManager); diff --git a/app/assets/javascripts/frontend.js b/app/assets/javascripts/frontend.js deleted file mode 100644 index 7e4f399dd..000000000 --- a/app/assets/javascripts/frontend.js +++ /dev/null @@ -1,5 +0,0 @@ -//= require app/app.frontend.js -//= require_tree ./app/services - -//= require app/app.frontend.js -//= require_tree ./app/frontend diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js new file mode 100644 index 000000000..d7ba63e74 --- /dev/null +++ b/app/assets/javascripts/main.js @@ -0,0 +1 @@ +//= require_tree ./app diff --git a/app/assets/stylesheets/_ionicons.scss b/app/assets/stylesheets/app/_ionicons.scss similarity index 100% rename from app/assets/stylesheets/_ionicons.scss rename to app/assets/stylesheets/app/_ionicons.scss diff --git a/app/assets/stylesheets/frontend.css.scss b/app/assets/stylesheets/main.css.scss similarity index 90% rename from app/assets/stylesheets/frontend.css.scss rename to app/assets/stylesheets/main.css.scss index f33649227..9e28dc002 100644 --- a/app/assets/stylesheets/frontend.css.scss +++ b/app/assets/stylesheets/main.css.scss @@ -8,5 +8,4 @@ @import "app/modals"; @import "app/lock-screen"; @import "app/stylekit-sub"; - -@import "ionicons"; +@import "app/ionicons"; diff --git a/app/assets/templates/frontend/directives/account-menu.html.haml b/app/assets/templates/directives/account-menu.html.haml similarity index 100% rename from app/assets/templates/frontend/directives/account-menu.html.haml rename to app/assets/templates/directives/account-menu.html.haml diff --git a/app/assets/templates/frontend/directives/actions-menu.html.haml b/app/assets/templates/directives/actions-menu.html.haml similarity index 100% rename from app/assets/templates/frontend/directives/actions-menu.html.haml rename to app/assets/templates/directives/actions-menu.html.haml diff --git a/app/assets/templates/frontend/directives/component-modal.html.haml b/app/assets/templates/directives/component-modal.html.haml similarity index 100% rename from app/assets/templates/frontend/directives/component-modal.html.haml rename to app/assets/templates/directives/component-modal.html.haml diff --git a/app/assets/templates/frontend/directives/component-view.html.haml b/app/assets/templates/directives/component-view.html.haml similarity index 100% rename from app/assets/templates/frontend/directives/component-view.html.haml rename to app/assets/templates/directives/component-view.html.haml diff --git a/app/assets/templates/frontend/directives/editor-menu.html.haml b/app/assets/templates/directives/editor-menu.html.haml similarity index 100% rename from app/assets/templates/frontend/directives/editor-menu.html.haml rename to app/assets/templates/directives/editor-menu.html.haml diff --git a/app/assets/templates/frontend/directives/global-extensions-menu.html.haml b/app/assets/templates/directives/global-extensions-menu.html.haml similarity index 100% rename from app/assets/templates/frontend/directives/global-extensions-menu.html.haml rename to app/assets/templates/directives/global-extensions-menu.html.haml diff --git a/app/assets/templates/frontend/directives/menu-row.html.haml b/app/assets/templates/directives/menu-row.html.haml similarity index 100% rename from app/assets/templates/frontend/directives/menu-row.html.haml rename to app/assets/templates/directives/menu-row.html.haml diff --git a/app/assets/templates/frontend/directives/panel-resizer.html.haml b/app/assets/templates/directives/panel-resizer.html.haml similarity index 100% rename from app/assets/templates/frontend/directives/panel-resizer.html.haml rename to app/assets/templates/directives/panel-resizer.html.haml diff --git a/app/assets/templates/frontend/directives/permissions-modal.html.haml b/app/assets/templates/directives/permissions-modal.html.haml similarity index 100% rename from app/assets/templates/frontend/directives/permissions-modal.html.haml rename to app/assets/templates/directives/permissions-modal.html.haml diff --git a/app/assets/templates/frontend/editor.html.haml b/app/assets/templates/editor.html.haml similarity index 100% rename from app/assets/templates/frontend/editor.html.haml rename to app/assets/templates/editor.html.haml diff --git a/app/assets/templates/frontend/footer.html.haml b/app/assets/templates/footer.html.haml similarity index 100% rename from app/assets/templates/frontend/footer.html.haml rename to app/assets/templates/footer.html.haml diff --git a/app/assets/templates/frontend/home.html.haml b/app/assets/templates/home.html.haml similarity index 100% rename from app/assets/templates/frontend/home.html.haml rename to app/assets/templates/home.html.haml diff --git a/app/assets/templates/frontend/lock-screen.html.haml b/app/assets/templates/lock-screen.html.haml similarity index 100% rename from app/assets/templates/frontend/lock-screen.html.haml rename to app/assets/templates/lock-screen.html.haml diff --git a/app/assets/templates/frontend/notes.html.haml b/app/assets/templates/notes.html.haml similarity index 100% rename from app/assets/templates/frontend/notes.html.haml rename to app/assets/templates/notes.html.haml diff --git a/app/assets/templates/frontend/tags.html.haml b/app/assets/templates/tags.html.haml similarity index 100% rename from app/assets/templates/frontend/tags.html.haml rename to app/assets/templates/tags.html.haml diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 76def86a7..e3aa18d09 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base layout :false - def frontend + def app end diff --git a/app/views/application/frontend.html.erb b/app/views/application/app.html.erb similarity index 95% rename from app/views/application/frontend.html.erb rename to app/views/application/app.html.erb index 192df1a16..d05065dc1 100644 --- a/app/views/application/frontend.html.erb +++ b/app/views/application/app.html.erb @@ -1,5 +1,5 @@ - + @@ -43,7 +43,7 @@ -
+
diff --git a/config/cable.yml b/config/cable.yml deleted file mode 100644 index 73739d638..000000000 --- a/config/cable.yml +++ /dev/null @@ -1,10 +0,0 @@ -development: - adapter: redis - url: redis://localhost:6379 - -test: - adapter: async - -production: - adapter: redis - url: redis://localhost:6379/1 diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 4a7e35fa7..cb2eb3fc6 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -12,8 +12,7 @@ Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/ # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. -# Rails.application.config.assets.precompile += %w( search.js ) -Rails.application.config.assets.precompile += %w( stylekit.css app.css compiled.min.js compiled.js ) +Rails.application.config.assets.precompile += %w( app.css compiled.min.js compiled.js ) # zip library Rails.application.config.assets.precompile += %w( zip/zip.js zip/z-worker.js zip/inflate.js zip/deflate.js ) diff --git a/config/routes.rb b/config/routes.rb index 3bd46ba1b..1697cb1b1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,3 @@ Rails.application.routes.draw do - root 'application#frontend' + root 'application#app' end diff --git a/test/javascripts/controllers/HomeCtrl_spec.js b/test/javascripts/controllers/HomeCtrl_spec.js index 0ae1e1650..d93065c78 100644 --- a/test/javascripts/controllers/HomeCtrl_spec.js +++ b/test/javascripts/controllers/HomeCtrl_spec.js @@ -1,6 +1,6 @@ -describe("app.frontend", function() { +describe("app", function() { - beforeEach(module('app.frontend')); + beforeEach(module('app')); describe('Home Controller', function() { diff --git a/test/javascripts/filters/DateFilter_spec.js b/test/javascripts/filters/DateFilter_spec.js index b79c1dce9..cdfa55a55 100644 --- a/test/javascripts/filters/DateFilter_spec.js +++ b/test/javascripts/filters/DateFilter_spec.js @@ -1,5 +1,5 @@ describe("date filter", function() { - beforeEach(module('app.frontend')); + beforeEach(module('app')); var $filter; beforeEach(inject(function(_$filter_){