From d6d47169eac0093c2b0246b134c4c6cc9e363e54 Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Sat, 6 Aug 2016 01:03:10 -0500 Subject: [PATCH] make the app dmg thing work\!\! --- assets/macdj-dmg-background.png | Bin 7507 -> 4034 bytes assets/macdj-dmg-background@2x.png | Bin 65999 -> 0 bytes src/Gruntfile.js | 20 +++++++------------- src/app/js/index.js | 10 ++-------- src/appdmg.json | 9 +++++++++ src/package.json | 6 +++--- 6 files changed, 21 insertions(+), 24 deletions(-) delete mode 100644 assets/macdj-dmg-background@2x.png create mode 100644 src/appdmg.json diff --git a/assets/macdj-dmg-background.png b/assets/macdj-dmg-background.png index 569e80508e3d02ccbca0d1ff80b65da1c37de1e1..db35c8b5f8e9757f38c4397350db7ee2273045df 100644 GIT binary patch literal 4034 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 L>~`h;a3bcfq8_Oz diff --git a/assets/macdj-dmg-background@2x.png b/assets/macdj-dmg-background@2x.png deleted file mode 100644 index 82aa6c6d53b3da700735ae06eb8c30a5ecbec583..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65999 zcmeFa2{={X`!~F$LdH^&AxDWuBuO%yP?V`b1BHkrGK5UwluSi5sAOzFGLy_hqzoBS zna9jCm3eyB>Fl-l`3}!}J=gVr-|PK7|3BCD{hrg>Yp-?RpZjy)>t6RBj`uNjCFWIJ zs}KZXKBBC60zufGA;>CI`jw!?Jq-~C9}JetTGj|6yqWwTjeUgNb$6^ujuN9vhhL;Y{^cX3X&zc(o^HKC9!ApyCugv1gO5CQnP#EB&&AOi4n zi4#jmKm_3D5+|0BfC#|PB~C0M0TFN4~Zu^2PS-z z?{!En+$P?0i+m)p_SMjq?%wO_`I<)lw*_@R#PK#W#l*aP=!%TVZG9=M#%Xh0sN>^d zFYiq>%y$$|a50aC3JQFDdw*kIPlIe&?T(D538vPjNpt(*Nf)Rt<&&OYoaV1B2%G%n zWq)fT+^$;wwv4j|g#S+Ib zD3B$u#IaZk7dRG6;R3^ADO_MsEQJdk3S=o<;9x9;3k-{;aDhRw6fSTmmcj)U7E9p* z1LHp=TzI`ajEXcQem3~EtoTW)%4t6RUaKkJhzE3f_dhCW2?-lA$%lZ_ecKhFP=(QN?C=k@7X%eTGp-p)K`$lDD7Sjg)8XyKeqid6&Jg z_J|t-dy8I&<%TNxaT>L)&t0C)`KCG~F>HN(peZIbAY~=Z1T9743wp5TKxEYEwPn6( z@If#<_IrSJqtl8y^u`|2d|UiZO82*_ytJ0Yht;5y&-))AMs2GJ`LJ#>$h{~`8I|-n zn$<*}{exiJxQ*uloB93?ZX}(Fi&wj15285v+=OM5w?0BQzX~KVa5n#J-1EJ!xg9AaEuKBM-LB(J@Q^S{=C#xITWY~@2phH*Qz!1?(9Vg(_fX*^Rp?Ltasu%gO2+wniGcS(@heu&JGRR#&E~{nkaO+ zfR1?~_8uontG9(0#$NG{9(7qTipk7y$#cvde{p}HHpv@^?k3n!)_ase&vo$wzvG}M zWcb#@7=RZNCH3hCz3Y~X8#|apO35{DyB60PwxH9z(4F+$KyDCqBI0fgpJg15Itmvm z0eiAD>eX$pnq=0E*X-MPI*55_D`p~9y!-r$=M0B8OVD)5{fcPHn2pVx?1%&-UmqQx z)PTe1d%;3ln}3k3Z7h&uH~rz$p9E#62R-}WkLEBKu)j*bX7Z+P(u&tLBXz9mn2B#! zMBs~AtJ$DW9^_l*z@O+QXcEazii3gZ@Y+1Sl_Q9>`umr#8G`e+0dBu{lWQ81`E0$4 zpecEnptP37<4*GIk9OayQ!H_tvh@EJHqsFy=31C;Jy}0G9z_kvW?W(?Q>y~Dt&x3o zA5tUwhG;)k37!#FJ2mev_9d*RkT;twZ4w`J)^H3-ORw_s>vv@Md33KxNmx0EZj(4@ zsv0JBdY4G~+N_qDk1vOKm(S`$5YWXqIa-Sk@$=MCda_26H zYvLBZ{0RCcj{#sj+hw1+<#UV1>3PSxou;NOTXU!S&nOhR3?}oXNo?fWP8pcUkKv$f zdqC+9Z`;2W;;aOz=>_YL|mH}WXNG~L4Rb}mTA?pt%!z1 z=S+RkP=KXCR^?ARSR$EZ#_xR5wlz*#A7QjGRTaDyDBOrQk?n zdh>a)oSsQX?jn1@^ozRX(be-i<0ZP+IJKno2(?d*A1HhfG;2S1K`^Q3s)Sz?j01er zhgm3t86G>aXdrq13>YBIV%-NpW#5^cYfrcP3jU0pFRUoidqp=nrWDsaamb4j`w`N@ z*i{}>koZGpx3Xh)t}UFe6k^ZWV9Dn?JYb>AwT^N)yz&M+Iw8rFJ&2Hy8J6|^<9UNh zrv_;jCr{qOAF@!O{Hm$-s6dD}TM)sof3j5njrg~$v1T0+AYb~o-rg%o%*`@}s=!f*DcSrWs_zA=tH-ZC*x>_C8* z54dA|_fMjO`5(`9fJ@yEi6ABC+1kD$LC)KbaW}@aR0?ADjfj{p`)R{>GUAJ3XsTcM4oB_JOP9void03hy091zf2L9e|YEZ)|3eExIN&wq9RO+|i%&z|H0rA6wTltE2V_wVu3=YSNH@X!agRBK6pV787N_XuIPgj2 z$%$>x$nj zA=w*`-#ep<`wQUHU13Y|E|vdMHTVAL#fcw#9^8%_O5<};_oYT(2%?`~H7+BObWLdI zDHV@yyYE^16pUm8kt37VS-E2cuhUsE5;DAm*P;l_E_cb{z<^I3+XeOG2Kr$sfFu$O58cZWDm|5c|Ei@!<~Lv1J8_oU}qU7(6g#o`z{#1zbKY5YG*B8Wj5>7{0QYTT(y^c0s` zr&e=iBM9Bpnto=-P_+IaIJG0d-5`B&+7QsQRZ^4+!p>W`r~(r2KS?hb2qqcJT;1p? z6SfEUuVMyVN)@wPawii43Wv_QD~5ibHv?;gPeX@OKD3IzEao7F&+3*h)*7d+YS+Ii zmDCew!NZwK7vTP*h;`p~E1_!zt(7M-wGN>VDZU?4Q2kBH?mm1jrl;DemC%yS8q~_SAysMI$!Ig=ByvI>IuueI z+vlBhEMW`BzO!hkowyLKz3ODdafN^H9`MnOQ$*m`xaWwAG(%j-yW>upd1oYULBR>M zFjGZHs@l52Oaapdn<^d0yPfOi7K&fXXuo+}plR}r4KoH4ez{uA*wJ9;H`A^Up=s~N zHoZO2<1utFNp#Idxu?5tW8-h0I|&~ZsU5A4ljr2)Q|(wB9F!j9z3#)p7b||L(4IfA zaaMmo?efrD--ef6MbRHxR+QNPF7lb}J!te?GO=~Me|*+*ZYG3v2PFWAuEo%<9qoOu z`ua0#w@Bo>>y2c`^HKi|0*>HyJL8aFqvW96@X|nEV5f*W*CwOM<2g=+&cEAAN<(hW z$48ZSB-Ts+yoqKY9tCnj=#q#S9^Pk`*Z@{du#nI_Z{EMp%zVv0TO-YPv9{_myL=HeJ63Skbo?J8H>2Z1kCpc+lN__H4@pi{Yk*JMRi95)?mia zoj#4G00_cy$NfH-$AlhjDc+578W9H0HC`}b##pvMR!Hx9t_2-m){Uu<9K!B3>esi8Qmf3*Qh!iKMGBri48InZJLa!e*x zjT=UgO<0DEutiszuPZo_Y6u7P^1{#~zS=1BbT_=`ND(W&AOv}^9>4y~!3+nyj}yh~ z7yueOM;Tij2x5ObXEm10AYQ7}=N!e)+4LuC%)N{WhZP49q9Qq#V-sQf1ca~#r4~H4 z2}?T=Ht(67WVEJ=5UwqFqe(GBQl2YwolCF)mNRhF7?`|#-;OQo2U0UW(VYVWvZrBa!08bFJ`^`HtAS3 zy*bp1OoiAI2YoZD^ua$FoD57_Zr+gGtI@ zfjo@1lZvtZAQS{4u>61RNB;$5U^@Z?;S8qaePSP!K>pBPQp&49(SgY412?(;RLKS@ms`{DN38Y636=vZDb;I|3KcD?&bZxCwV8kGd<89X zO;O)tK6A-^{Lat})639oLU4dm&gAdZ~g91GyM_gL3j; zMqabmr&#ffY1&nIkdbO+flFt>v|;ZwawumaQ-3*X@btcSN`(W+?Q>Ae{N?!hMo}P_ z++Aph04jAYcNN}KwMo71I=+cAblWPbG^SUJYZF-`iyS7((e!25I)osO4;~kP0A=&S zu>m_>G;2MNU2O&@gzek~#Eu&}DT0a>kEh58N#j9ev0`oIfvY0uzW*;rcc`2*d=ZoS zD~1Ez+MmHndkB&r@JdW9sgY%Fl>M3Oz^~RBL#?Qp8@dFW(zX zoDNcy8fBnTIbHMFW_D1qNVKaPdw@d1P6gO#R5edv?~KXpHx)|GP12wijPI2UW$feV z*xpoQPq`+u{UPRfG8~!8Cq}bk6$QcN5K!fqEcln>mi#-&+%s=vq^L~VNF|nkG{91$ zF-n(%uf3L%%zoF7%Hjh*t1^ZodG*f z>$Th=Dfe;)h0XeXkHv#Fq+E*rraaFoC4QpD=hVLJy*fKrZ{vL+wk5DX`W}bEF{WF{ zrv2)Q=KD3DvoTG5vhJA$PkgBSocZo77v>}w>O_mMoi)GjoojIjE#|cqV*((^truWe^sSna<@&loAemyjz*g1bU72KNVPi*TZ^-B*30;@C0$Q{JjKQXS-+XQp>CqIXqXq|)m3>+OdGYxZ5=wU#pVQPE4NkAQ!F zKN(Q0C@1=b6+WZVMHNV1KP{Tx6lc3$5k->JLoJuGoY>g=h<(+H$IE6mVlkF;?`Fz0 z;Qy~z-bbrEZKtSgu$^c~(G!uR3V5W?-e}Z7=(gZd-G4VWhA7n-V%QSEgICoNq6a4G z%c*j{#h+n|T&UA_c6G?5GSMKUK{!qR=yxAXRFXb>AmtyVhg3Vw{9{<}5_~U?T(}J9 zX)~m9D}1T3{7EG%rzBK?lbMPyOpoB==EFi2>Q)|x=p4R_?G6!ymLINpFO_hABUNMa zU8XX5xF%+gOe#UP`eHLmP|bK09~!%~1~Qn77$VX>a5V=IDUBzlJz1EU>GaqsH32!iO8jKkC)q&VitqI|!GxxnUg!MFAuUZBOCJ{+RDsKRp5BB1gW`fDPO2#=O~@@O?a?NB zs{9pgB2Wcsw24Gb)uq9fFhe;2K9;C~V}T$`?nH&g5;ds6SfU0s7)#WkM&rL_)ZoNY z5|)?E&yJ4dO=cdn6xe4zQT@raF?w)*Vb1f?v#oP^e3qPiE^m#{9XO)US-uj*hQ%o3 z_`c=$2Agi&KYgZqyF*%chp__8w-8R-7IU;?+p%XV^6Wg7MFI71CG|9ib<0#9K4wG@ z`bcAm8H?F#j zNn>TJUt;innM-Jm0U@r(az07_>jUJjVCJ0JtlH%Hx$?u!YtV5>X4w8`^yv7D#}(xq zE8pk;RuCMj(TogpE?xF-{mMVS;up1iBE_ijLa<(jPsJ9ks31r(w#mxhk$NtQ>E_L# ztyfIqtR+&6FP8p*sKipuS>}60;lkFL;}3&>FqipeMxgT{T3F`a7O}qPu1)vvrw2vF z^IUsUHAQ~fNAO2&h1?*9Vb&7)ZuX7&=JS3}wbQN7xTh=kACM6)fa$Q|r$%^laJHtk zN%HSKa&wolRE#!RSG|s6t!WWO zsY&wr1~)*YCnjm?8taG?icYrt^4pqJW$>pGNK+=-hIwLw6K3-qPoksxw^t>wmcB<+NVh-$S=&- zyTFtK#gyohJ%)bGXWaYbwxDEoc^sX|tajSlUo}#Uo9#YzMI5;cAxp;gvH7`|qCS1i zm@XhlJ{b3HrU*4Z(%xU%q}-g)EM-&zCwPnzs_u++v^hObeTb7^bwEs-%7Kv|rDobZ z_eYQ9y!K8+`y=%j^)Kj^gA)FyUq!WcUnf${O?q->D@-?AC0sWxy@t^X+esxRw9f37 z*>bkEPL0*cDI)m$`8QFFJ;v&D>YH{#St>AD>??lUxG%VB@zv+C=8Va$&ST>MrE?TF z6mpE}`uM5{+Q0tiX*P6#N|UrmrkmC0GaL^zr`PZ3igiJZ;!-RP?D~|>Rs?TM(M08SeGAP{J`*6kXZ&Ct}~sHn6@3;zgm58LySjKAG&c*yrtAuufE+srl5xk?VJrK;h@QWX(E_O#C$@uLb zx0?PPmUeVL{@uBg3O6JocS6OA@yJyPA_o{ZCFiReC?NtG2-~hdk@K3lum1Hp0;-?C z3@*mAkc}FEjT@HJ+IH!sePx|=74C}le(|_Q%GmQ~Mq}JI+{y9#kxzoKsc@k!GbhK! zp=0($URwEK=kPEsEJVJ>x5A-Ugw?o~DI}5Qx!NK!l&uny60OTLyqA9UdQ_b7?YLb_ z{rWaUy54ZvAu~7>aIGfr>qV3CxQv_5r~j=tiT%saP(&GbRz%3;M9`k-`q!+TDK$db z1~8gvx}`y#N$e?9u37^hB|&uYt(@fX0q)i)&zzhS6;jrYJLBR%Z$O`lLGl@~*o6qa zX>3#pb8(3Q*v5a3ESfI30Oy;);vf>7o**$2HDpTW<-kr(Y#>=oSJM5&+@zq56B9@G z4^S33CiK|{r0onGl8%x1zV=&*y}I@((bO;&BzzkQEAGZESNL zY)-nOX~Ma(%`ZH7!&+Ytffq4q%1_kO?r3i{yTG;UV%qq-mLlE!7Wv4g{(SmI#ji!e zI?68(i)jgNIJDpT7z_8~T@%Y(3@cni=@uqS z`{K7jw0fl#;H@|L=cQ!hI=;7PC1>|&Jb9@n8Gv#O$t)j-HE_|i>ywoobH649v~mpi z-_fN#f;TVOJi{F0g83<1_5)opW36|gy>x4H!b=x!^bjf7qahguf z+=0o4)F%w~s#QuOZzLt>p6whdYCHX#F$yY8OiO-Z_kHoM_~%Hy=u zjJ5j`^iIR|$)6X8c>Q6ghg0_2LM8p{7{>;w5FEtWoV2oVWzWi3uKyqz?YyS!LAFT0x@THewb)`jG4iVYN8Y0)dn94 zmHY&AeFzDV$FNzCV^hE1@l4S`+E+t|oC0r%u)n7Y3|z=Halm8W@ffQPZKsOOE{zK% zeC8F|bMwd03qFWpQI7-)I%y|x9@mBOv`vtg3pkJcMuN z7celUU+{Wq5_VPrZV?(fPrV<#&Jl125&la!8cy6@84|F`F^BKhyjOj!cgI($S#{4Y zN!4O$_ji=7ue zpJ+Tdtg*;j1BdI~jx!;Osm$tg|KZiJtI!7coC6}&HTX5Ht~qQwRJZq)>+%aD_Z)(x z8du(HE#>Y!dx&4)7Gdko)!f`RVxrQ@ia$?$?A-C2HoNtQ&g{Ae_k|z(DAMJh)c>_U zTVTu4Tfw)t{_gZDc4Qiw{r!B!s<@7eVFQy7vuBzz;~N`G00nrRSw3sALq*}= z4h+N^_l>1EV<*YuCl#2=_C@BnUBr$Z#TO}hkuoQfh$JJJ{1E%FBog^;Ta)tp@#6^(B5M*Y8y30U&G~!p z^o$4`=omt!%FEmgiIDZeXXqAkLdHK^qPguVs=Li@9HYQ%x2d&R_kj2Xbe?5YF!H_C z%<~8HxE5Wu7Shma+4FCmT(1rF_bv3quul(9G?>z&HOZ~`LsH0S=oO<)yJ~wh24}-8 z<_wA{Ga)OeY~Au}D8$<2%{8%v^}Jm<-?S>3Hc)zn6R6N}-FZGb(js0htZq_{1HJnN z*@{2$gp8^KogNQxsQ=zDl&atcWx*eJLq;oplxNsncl@as_NBg<3BB<#oQTgt)J{L4 zmKI+b+`DIj<=)rfn0+2-{r?#LoF+opRVxxawWq<u$r11wuTpGCuuWItt{J z=sql;9#0!d;ealEKc-8Mg?b3G@rD;zKNq9Sa@ikt|tO#4kG z>yVZc-KV}Hb@PAgaVx|5qTsIc@hn3Qm9?(B(ML>3tEp1Mo1ZD%RdBv!EVIWR3PRmu z=l7nknnvjf%&E03%o`~^E-2!Rn{&TXv}66F!hN-oUkkeWkA-DqJdD~ovH^WJLB7}M zdYD${3y}vSJL`qP9OlR-aEEkn<<*273G`NI(rWCM8f0{}#b$PpJWJ3Yy%r|&D!O!3 zkHax{>~1?PMFbx<%ycAHw!m=JcpaJM#T$En_iX$_Mpy{AaGOfho5jnGPQRJd9 zF0h98|B&wEJFZbZMZv8>79+tbCj$(0*{>w&MqwumdmnI-+Pzhe9lpD-r@Fqcq#(4lzIZ3<_7|4p zQRq3j6XTgTeKq5O@|B}Ebl?X0!dko&xUcWn>9TP~ciF|QBM}n~&kv!3``|7>5V+4! zdWFLC^^P8wVoV`pH{;JI(kmI>O3tJNPDU98;3$hsV&P8iu#%?Xv$eA1yv#Gyvdwn#Jc=?q%NrO5v$Nx`UmMQ8-0cVzwbwuK{vj zsti7QH#I}PG7%UD0D;CX4QtqfZM~r`c72fgLR_ZU>B5to=OCr>Bh)I-e7# z#L=#+hCi~p63Fx}4FA^Rp$Q^6qfB9k@oaQTs1{U*Gf)&37{Yfd3VPYpjx_H-)4KtL zt&_iw)QX|-e8k=;gd778XDBBB3F<|;Gbz<|N3~i~m?-^7yK(0F$lPbxlyQCBX7Sgl z=f?JPW^%SQdoZ{aFr4zwvIi0xob}=>IUGH}g7xi2bt*O-et(?LuKNrxw6ga;iz>Mm1%m5P$#|MgY)wupp}=MONPty zsy#eiIiRwUj7^JO%|LwC0WGw_v>*}#h6a4RUivfC2t~zbKj!ln%)C_Dz7zyp$+UHj ztlIOoR(Dd)6B_#%{x+EWvuuHcH%^OEXL^76{nVXl|MX-%N{M6mW2pJX0FyUG4d>e@ zbL;yf$-ate5RN|#OS&&8c2M)ljNQT?p4vzx|L*O}g|a=u7f;b-U|6$gS-n3~YF{-w zhw_D3f;;}^BZjw%!7||9IuGhK*Y$FeAQ}&FQXRfmy!<|SB`|M&3VbNUcc+YFrUj(x z7Cb@n0k`kIIQOP9D*9+r!uZ_iXaw~BNBB}JDhA{lrsOl)y&E>Zz5exXNE4*oQ9J^0 zG62f$bL!UAjxAs3=usXbz4x3BwEb56De-X2P3->FC!A%~PTg@1F-}do3d6}3+@fp2 z-MA+*0WY=F&+qyZ2gvIcrUO++aO<_pJnzoh9^f`D@2#%9%Y+7H!(R??jQ&2u)b|tf z^3UF^o#m=Lda-O1$_}dgDLvG|P_~pD2ZVyDdYArKV{9#&aPMf|IZ7(B*3sinQ3-Q>qA2cy-t2*- zNmo{Kv<__t(VA~#?ptVn5+117!JX41=l(a&upGC3@KeCJdvgb6X_GA@o|)@}0j>^tUIQ$r7S{UfTSczCv6o9S|@+0{$ z*GH2r&8FzAcz(1}-f)?$S(3z=sgW0dbw`r82}~xK8W-nBPAOavSjQVUW!`71a-mI% zTg&mcO)CK%(B2p?tKIQa%|9Yp>NGM8>*8~ASTG?-gJtmzWhVG0QPSd5aTuuyZ(e3U z$<>?QpHo-D>{eYr*gBx3F$s4uq)Aoy?ni{}K1dAGsEW1=_yc%<)>Wsf2HQL|08LRX z%)oz3%~M>{g5u&2qT-Jp#0W!POBEBThLy#gmHr@D6*tN?+I@n<;;*&}{|!9;!bqFs z-Y^?XTn&5$KdNSUYwKyQbK3@5?a*1L@Je#{TX6P|v6OjoZjWL?%EM{*2qZbj2YGp- zx*y^~YvF{bUL8ny5b*JI>5LtkHzKm07!8hX2Rc>jI)#9mD5i2f)!86$gJtTf8CI3m z!?E1Dg1kDJm_^09j-YC{Q9ayu5o8LN8%z^s!xY?5z1r?lEk!_WuoR`@b?doZ7}oi9 zU_pB^3(C{6uJE-PZ6i22KLV{++k)UvRob3v#N|%fEOzjlQywrD%p(?7V@$gc3zn@@ zDc{wy5?VMRlNYI$4haDHo0R(z)ckU#az{o0+B+&Dti&&wb2@-y6CmvYi^*;{H}!E7 z^11bSljWyt2`DO@oVaL)-l}ZPS1vZfvODKi{Fngwm|IQ!Ec()}{CphE&0t~gm6)~5 ztMBK6D$(L$oxC(D_bvE|!1rp9*zxU!4-@&|-zY|Xd^tF7@;3sr<4Mn2a-dHo=R}K> zs7isWzg5otCAckwMR`Y{rBS_mag;*m8;czO1Cv!7Doa7rLQI?-7we8fRW zs~Hi|Wj)ub0rku;z%hEs7D%$ob+8fr+`SLwD{}YU6&PSH)VoX%Rl06scZv1XuXC8W zvXCPVp;SpSz`6x03butjoaQw%Tet!({1~sWoaMUDAUQBl?hLWWKY@#&0v0FZA!+Bm zi@NYx1yTea3f2Q8E2IKj3koe*!Gl_V{_?Bw(;2~9)N@rWvao$D8bd$|XNW!!ExS3V zesrqjK0MCpj(K|`+a`9)mXf)R5)zXbK$mf^Q4s=5UE1D27SB&n9w@*U#BryL0E^3H zV{;I*Ul`8@7>kbM;ynRNwCrH}OWMuo$)dPyZ6~}`^F6O>uz2?Tf^Ul}m!?p3p4?93hbgD6w2Kx>1>hlTCabL!~CZEvPJ%Mx5>%FqQJ zZ3Z8;t#{z{S*(!@g8*yVwA6%Rv4jL9#S#)rNI(SO=MpEDkbnrl&m~SQApsG9pG%xr zLINTHKbJVMgakwYelBrh2?>Y*{QUoc6Q{wA_;aStLtoolnuExtfMl0Chuu6I!_cY) zXHiJwJ`WMu#m`{3POPahys{iQOMY8bn_ODWX-~SzT5^5Ca6Wqy)*3~h?Yqxlkq(}Y z7X#hS-dhK6)`wam;&=@owkgJfTZ7Y!CpxP@p(Q_cylo+qa&d#S!_>|~Vo)}ST!u)0 zY#tZKGCAA=$~8XZi}UGKe*{9>8enN9J{itF&|fjc4GIgQ5B|?2_!pu6XE)`y4mRB+ z8;C@39XKfL4{e1Y7v!;LAz-5@KXz|7Y zECq=FJ^>=hZZh#|h)HgK>zAX?IcNLb&O3j&_m)$%Uos%#&bvFDY&3hV-aQaDUv1~s zX1>QHs_Dv2vlL>Y&WZE+Z-#xjX;%5KRoATV(>$NQgX!=+<}#19T8T>4QdRM~!mS9-CE@-XAUA&$C06Gt+irvO>4kHvzO3+6`qa+1 zIL_MM)~PoT>NmbHR~FSi{4v)+yzeDzWMRbEE%|(hoKFjVxtq|l=d{AspkEzMg=B=& z>xiB0WmLKQ(A$33h$_b}yy8&rP0pXk^0eO# z@3%I|uA&cmU2$I1=gjBId*Zhwq2Fa5fv)JU5)i#_-E$?fZ~=WUY%2rb%j=Pmd#<}< z$4Bq#QIa-ds5sVnKp1^4k+91qjWP`ByknHoLAtpoT}36KOorN%E$3bb6jc9E9HzT= zk$ENa7TQ<3bF#CR(?cH>>d>OU$@7#Il(Re4jWRFiXMH;CIa4?{_}aEII-~#CMM9dm zw14A3f+~XyjdIpke{Yozcj~ia;Mo-xmxQ;=FWdR;X!}q5_nAGKJjL_9ZheOl<&mSYvpR}N9UcVdJ<2mP8~vQD-vjRo`7y5N zA#_bXkmC>=>!0^cL_O+3tRDJ}B<=0iGBnj2HoQZZac?d_S&dIl?!cO1^FhyMW05$g z(&lv8^}rM+15E&pbZK4su%;Pd9v)ufcnPaI`-~z{-+=E!AD!H4V^lc`Jyk5i`u59e zO$(cu^KQL#=R^1lckLtmy>BMfa|fO=BuFs_757haQSj~)6hq(iQyd`a^Le@_uM(9iy{;bP>&sfl$>j*Xg&b?^)J$6R+}=&d*!8Hq!?eKZ__T`KW7A)9psf&yFzI z%ywoCe|h*aGOyO4PBE#?*pV{6z+IO0lyCk!@&Yqn)9YBy#zgIMXV#3oqwjM4L#8p2 zNy*DKXMT2`uR%)AWB1&!Tc79|-cnUHgQ_F8-SS^QeVSBf8bk;VEb6i^J0^o6e$}dz z=qs#>eaiqH*bekqOxBkrzRUeuy?^Ip-2cYfU6b&*u=kiNSyt5>BZ&Xp$bNlvwR#m0kG}ZJ zpBu2@PL^XllF?7oW~Vfy1~75$fX+_2U?u$_DvMZxxV{; zqPI8(coDZ-hRG^sZzl@}tKkj0VA7+`u zQP48(c9B431)%aSUcHbEw(Y!U_Y8#Y%&OFtSZOt4KA1Mo!8zhf1s2M59WdC&#SY8y%-Qx86v~ZLHo8el*n>JnA)E!cJ#(@pZvaLTISI zj)=I2wMrqaclJkM?#K81MtnWhSOjVP2S+3^t#7hGtsSg5oykGf(d??T(2cxB1z^Ly zF?zesP5NY7TZr69{;4A=EoDA1CmB5Zh3@NfF&))!w%<*=KAM`I<~e+Cgc(Ubh{uBi zXgn~~HG1=!p25m=+)Cw>UY1z(b$_C5_pMt(P2DvIRSMJPB*4nSC!E9EZLGA$N(KaQ z{pY8z^aTfezsmib_NW5w9Ynwb!udem7{Zxdok-L9%Ip0yJ=d(->izp#cufZux36C~ z{QhKH`@@$XMTbAmb6l1C4ac!-3v7Ia(E;EZ8-9>8b8eQ&zh%*I3Xee{ z1>er!?yb(EyxngUbeziLhRYN3ni+%6(XHnu2;D|gK!0(mKM#^t-#xv6MnycBU zVcyPN>bD)^ZgkhKnbeJ`v^KTP+I^M@xsQ!?q!t@13wRMl$;DO7Pc_qny%jR}T;Ht& ziyQ9zdzkw_=IpC0nC70;3ziN&M?@AHC!b-%9sC4`Q%s-l`ug}@LdAJWhx3~0Jla~# zENOX;4HMH=BOeYnPgLa8N#<#R+)gNAGU*U)n-Gkh;T$$-KtYsmdurS(;26l-6_S!I zsb3`)HQdz57#4e@mj2phC7y3rPc@lZRi^%^>A!x_ixY9V2j$3Ai-K}|ID4+u#Iab6 z3$SqJdvZb7H{jS)Qz>zeCq8QdbR;Iue@z&9f3Plnu}Pk0R2!1JS5OD$g=>tAY_lRd z5-1rK7y(3c-}g;f+_OD1i<-v5q0++Q&U3(?WlkGNH`w6{mDVeYu2BA4S;KhT0qsru zg1d^2C_LVOeYEG8C-B%N80N9wDVX!~@%FQh z#~8Vn&E{&gn(Tk|YJ-(UkxWf&IUOBXV`LbY5zj%lvTU(|?`TjCmb~CVj&eQcv&7Z_ zuC5gsaq1aOe_44ZP*`H(bP9{c#Bgc zJ}f5?>Jxy7U*?_+3zOCbj#2&Nc7c^3IRN)f0mKUn1?fl+%^a+%f6xl}!%3x%aA1Tv zr{&DU;&(4dHdpKvlXc#P6Os)l5(2nsGt2KNw@t)E~#d;$g8$cWw;O-cb(ab;`FK@#L4No zl=W_qZ{2yH0WiJ{1@?4)XcjLe5WFSg2a-{FsQAg(MDM8uzk_QMthppsS95=?TcJ%Sw5unGMevWpcIzI-cY&egu3M(mFjsEs=c~`YIGPt(kT(}b=Npbj^`A=U7K-RmbTgft zcNaf$bs7~q$WD$rTnFi8J0xSOM~PsExGTgOc#hyo>khpXKYnhK)0LmbFXj$!e!AVm z8-}f7KGz3mcqeIUpKE3C3+36i+&KBI6d3|LGS01x`Zf~M+JTK`>7J~H|y zdcPP!t=II0A02>@D!bSpy{YQmbp8Eff!ihi1edcwMfO@!Ci^&sGpE-d|3x&{LXUkUSZt#PpjT%?3b>; zxMM@ZMaI+zhgP)ZtwtlDKcAF5BzFr?9fVkUeo2nB(`no{1+^?4ve`gNuznpWOaN-a zHxocPfsl1QEC($2ENgG6?w6K6z1*c5WCf!jBavd_@_FTEKq~n--xHV-IvMY$rD>_5 z#xg!Wzy171*Uj0xM`vbV0SD1AcYYEWjz*z{XJ}!G#FPb66MLldAkXdW)J$IU+{MQR zRjWOPoVKrgYIq1Rar?F;!RoYN%n+-)`4E%}4Iy}Bm{{E7z6UJdWEz(PUbHL$H}uhMJj_5s_K+Xp5m z#H?ik`V3yHuG_VfSONJ&sGdh-8Q~-u3lMl#9c(l>RstePWPCK3?JU9t<9zrp^sODl zZs39BZP3=`SG^Bz*_|k`17Q4I?9|&tYAX($L9K`+U$!2|x0Jc+P}f;?Rr_1Q<6YbH z<{YNm!gpJSX6ESZ@C3YBCLg3;C}==ZWO`s90+6*=m*)5b1L^k~5m?6XKMr=^qEekB z{>bQ8(0$|H4aqiK632H=_3{7dOnlZifr5t^YR+HLT8&H{g3;ioQWRP|K?rU@VtsO^ zkJ#^m>&f&B><#e#yRAkiKaTHqN5W08(-l0i(=UQdy)gW}9-@uY%Ek`PEGED*TTyv$ z>vH5OMpI|01Mu($u|MH$cA4c$ICiqy8Eov$KS(1Wj>#jIm$1VsO8DXaGiCZ!BoTyn z6J&IdjWrxwEF45qP#ZW-k4V8~gE-OK36C4*%g4Q4o=Gi;o4q(Ydh*bpLnMJO zIVi8dzn@`p&fAz{r;;Ke36=NhaAVEkTcFO>DxX$j&6fjVaImS4!-sCbhIY2Of^{an z!-nS2K?@t;V4Esr@+(gkW~?`ka`izwe8ygSh)_w?9+ddt94v((8Ga4G1;Met)>n)T zjqqaOGtlND)=aYIhn91&F`#PR44buV^r@P+z~=ohav?~s2dG}j8@;LH=8HH zv{G5zTF#Pssjk}aA{P~r6b~Z1(rSdzL-rb({a5;@faMI{SMpLiNFC}y_o_(mozrwG zG|1#~n7@-Ms%@dBnTJ7`s;ZE=3C&UQ#R@w{=G$M6Rb9o7ssHU*%2yM3%u)XD$G#Y0 z$NoOwL|-CAMuv>b<(^O?IGy}Qbh0^v9wUX46Xdtn8Uz%&a9gPz=rQ6ZaxI}DL&!^? zec$53g96H2;?c1FhLB!K^6vC?4U}f_tq-kze<)7pG@7@>hx7TCOS78q| zaw!Jvg)NTL5R}vv1ciM$fIp6QhPHoQoKH{@K0tWkmrBx4t+NWo>=b<5v&gn(K(O&bpcOnGA-8|3qCHGijH zDVv{*ONX-|yaFgZgupo|7=$mgNgNDi4jr70C}MC&dfA}PC0$SWQ3mJh(FYMKx1TJc zTpBROhN++14u_fAVYSu9<+>(+afD+W57^eMqNx(Z#uCEtLl(>ut2jWJP?aBPAV7I| zF>@jLJKpT!P~XV0Zdv#Wh;p?8hB7i&{PTz6#miizT6UBM{=%6k=@4XevzvQv;#LyL3nzO&3g!Eo3RhexF^_g z%OlzH&>)!@qY#pwxo}7(L-DHuMvW++xv^ zueY!ShXMK=LXw^Mwm{gv&b>ibH`3?87#4R>T3x$La$i8S!PBtu{j`RD(C-G>;RPyU z|NI&q|UxxY9$gsx1Zd7ute%IyPN=Rbe`Qu2Z% z0Z=CUQw2fRsG(gDEW{}T+Yuk=fI7$auZP@`HDE-_smJj>r-?nmhsBiP{w}|Feg*Hp zB*}L^@@F70KjsiB{1mqEWir6&it?iZZs+zKyH5qJ_n5?Ov!UXH)ijh9xj0eMKj+wv zZOa3HmXzA*TMrQVugwGkZ%}so@_Ye=050;%R4B9e)dP60*}zGddOsKjSu7Cr&4&xO z$~soKBPX!HHG%mF;fq23htwULfoXpJVkD?xfVpAFuGzt2QhCaA?K0&EaIx)JLcqFZ z$}1pwr!fa0DXtNtF?>&{q^zP5_%}=c0Axs>2wdr}3F8U2OGXgyO@_;gpMlFCpfI_0 zxxXaV1-llBc!NMv{02rf0i19B=!Szd2)4#1(nvKC7}*E}ppQN0dHO%f?6uJz>)g{_ z*p&vZ=gOb_#E32c#c8tW4h{*g1-d(c?eI)2trVmM61N8P2n|5fpPk@}>&Ih~L?IYc z!g(`m(BS;r$Dbj*QDQi+w{KC7OxD4mw`}==a4`wj!3fmL0PG?X8!KzhbZ+v5ZFfOQ z$BQDQ0meB}3hqC(WasE=>y>QMZXTWP!0pjX5QfkS) zeWsk0l4KF04UqjKBT1cVV4%SR15kO~O=?yFTmIXnHeU=7wbkgj#3;8=jwH_x z8i5i|ACN&e*o?`Kc5V$Mfz1P9SY_$~$oVVU4G+14a-obfGbqD72UV%vq%atbNa|RS z$uD~Rg6g6Dw~qINlFGUX0lQXK!N5xTg{?KDdjqz`;IhEG zLx}c++m*iV+S|^XUwh3{EDSXa-ggkDcQ#}{_WePc0Ci&-SKbjFz7$UXi)6C4$<=2$ z)kxlxBo(^7*mQ+y_p6j0FU5?uKcPu8ncvW~@;Cpo8J=q!_T6Hvb2mG6KgKMrp__$~ z-zthjU7L4}Qnu2vRRTZnUbnks5k~heJES8o?WBnd*>DYs;89G*0ul$fO`-H~wpE%AsK4IGMVrNta8L`xr*@ZP-gH3E=H+M6-t}1EO`j+{;H# zDWdtNvM)xt5};bYjisML;{m6r=bQl^^f$2IKtF+l`T*dOX*6AwBda%bTHFlv=fEC#^#^Z)3qPVI8#ko;{pM(^osh?> zxw{Ys9eynQ*#H>6-Z`!{FuyXZ!}6NT#l-wuSU2qT(nRp$PvX}%gb$sAnG>_-fMCJ| zIA;$wCmVRpbCt)=Fo|oe24_9eMl_f?9aW+5!teoKgs_TieIR_26KjiaVac>FzXB`7 zqUu!4VH68uqoQE-`;6&SBU)2Fn%mh&-xnFtfNBgVsc>=nu3dx2Vw$u}BGrT&ny=o$0w)lh(F@%Zo|Q&aanf*DO7e4*`K?neQ6|cIeeM-k8Uw03w%Ti z%<+(%6HMS2q5k#AgRYbRnpGHB$x~eDu{Y$Z`n*R7_7pq^r4Lc`vmqSJSzF6I{BW$Lugh8Py@+on1VhbJYS4s~@M>BR93^RUAc zeFtl>dt*=beTT8qPN_t+>?q3I!n!Pd-ITl|pGw~8NNTgUmsaJ#O8=ba%|Pbse!X7{ z^nN81xn40L*CmBo)w`>)CDObi6p)!wO+}zMHjythUbgSpRQbn!cP**|!lDLK?M3A6 zh;i(-e7St71}ZVsG~z2ekX|5j{COgJ|Ht$?!yt0MO)+_A5TSxUP_Oq}%=#Pf+A7ft z$7yx7RFhslnN4_DAqkQwdBDNwkg-4#927Vxa8N)LkOWB-r$Bjslr|sb6C$2Ezk)Jnr#&4~{-GuNqA)-tE3uwX^nQu4`<~mrsweW~p>q zA)`v=;56Ap5|}F?iGNKZTrA?5Jpag#mHWjajplLRwff>pQY{`ibIT+&TQSR#HdBN7Tl` Installer', - icon: '../assets/macdj.icns', - "background": "../assets/macdj-dmg-background.png", - "contents": [ - { "x": 750, "y": 375, "type": "link", "path": "/Applications" }, - { "x": 170, "y": 375, "type": "file", "path": "../builds/MacDJ-darwin-x64/MacDJ.app" } - ] - }, - target: '../builds/MacDJ.dmg' + exec: { + appdmg: { + cmd: 'appdmg ./appdmg.json ../builds/MacDJ-darwin-x64/MacDJ.dmg' + } } }); // load plugins grunt.loadNpmTasks('gruntify-eslint'); + grunt.loadNpmTasks('grunt-exec'); // register tasks grunt.registerTask('lint', ['eslint']); - grunt.registerTask('appdmg', ['appdmg']); + grunt.registerTask('appdmg', ['eslint', 'electron:osxBuild', 'exec:appdmg']); grunt.registerTask('build-osx', ['eslint', 'electron:osxBuild']); grunt.registerTask('build-win', ['eslint', 'electron:win32Build', 'electron:win64Build']); grunt.registerTask('build-all', ['eslint', 'electron:osxBuild', 'electron:win32Build', 'electron:win64Build']); -}; \ No newline at end of file +}; diff --git a/src/app/js/index.js b/src/app/js/index.js index 0d03bcf..2561c2f 100644 --- a/src/app/js/index.js +++ b/src/app/js/index.js @@ -24,6 +24,8 @@ function MainController($scope, $sce) { $scope.queue = {}; + $scope.dfm = []; + function updateClient(event, client) { $scope.client = client.user; $scope.prefix = client.prefix; @@ -44,14 +46,6 @@ function MainController($scope, $sce) { applyJS(); } - fetch('https://temp.discord.fm/libraries/json').then(r => r.json()) - .then(data => { - $scope.dfm = data; - console.log(data); - $scope.$apply(); - }) - .catch(e => $scope.dfm = []); - ipcRenderer.on('ready', updateClient); ipcRenderer.on('update', updateClient); diff --git a/src/appdmg.json b/src/appdmg.json new file mode 100644 index 0000000..73c068d --- /dev/null +++ b/src/appdmg.json @@ -0,0 +1,9 @@ +{ + "title": "MacDJ Installer", + "icon": "../assets/macdj.icns", + "background": "../assets/macdj-dmg-background.png", + "contents": [ + { "x": 486, "y": 285, "type": "link", "path": "/Applications" }, + { "x": 115, "y": 285, "type": "file", "path": "../builds/MacDJ-darwin-x64/MacDJ.app" } + ] +} diff --git a/src/package.json b/src/package.json index 14c586a..1a51b1a 100644 --- a/src/package.json +++ b/src/package.json @@ -26,14 +26,14 @@ "ytdl-core": "^0.7.17" }, "devDependencies": { + "appdmg": "^0.4.5", "electron-packager": "7.4.0", "electron-prebuilt": "^1.3.1", "grunt": "^1.0.1", "grunt-electron": "^4.0.0", + "grunt-electron-installer": "^2.1.0", + "grunt-exec": "^1.0.0", "gruntify-eslint": "^3.0.0", "load-grunt-tasks": "^3.5.0" - }, - "optionalDependencies": { - "grunt-appdmg": "^0.4.0" } }