From 44a22ff51c9eb2dc68c0d6ec03012ee014cf1a13 Mon Sep 17 00:00:00 2001 From: stormhouse Date: Sun, 15 Jun 2014 13:58:24 +0800 Subject: [PATCH] add git ignore, del *.pyc, add grunt --- .gitignore | 5 +++++ conext/__init__.pyc | Bin 405 -> 0 bytes conext/receivers.pyc | Bin 1967 -> 0 bytes conext/settings.pyc | Bin 3872 -> 0 bytes conext/startup.pyc | Bin 968 -> 0 bytes conext/static/Gruntfile.js | 35 ++++++++++++++++++++++++++++++++ conext/static/grunt-install.txt | 21 +++++++++++++++++++ conext/static/js/app/lib.js | 3 +-- conext/static/package.json | 13 ++++++++++++ conext/urls.pyc | Bin 1194 -> 0 bytes conext/views.pyc | Bin 642 -> 0 bytes conext/wsgi.pyc | Bin 1093 -> 0 bytes qa/__init__.pyc | Bin 127 -> 0 bytes qa/admin.pyc | Bin 473 -> 0 bytes qa/api.pyc | Bin 671 -> 0 bytes qa/models.pyc | Bin 1353 -> 0 bytes 16 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 .gitignore delete mode 100644 conext/__init__.pyc delete mode 100644 conext/receivers.pyc delete mode 100644 conext/settings.pyc delete mode 100644 conext/startup.pyc create mode 100644 conext/static/Gruntfile.js create mode 100644 conext/static/grunt-install.txt create mode 100644 conext/static/package.json delete mode 100644 conext/urls.pyc delete mode 100644 conext/views.pyc delete mode 100644 conext/wsgi.pyc delete mode 100644 qa/__init__.pyc delete mode 100644 qa/admin.pyc delete mode 100644 qa/api.pyc delete mode 100644 qa/models.pyc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..da7f172 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.idea/ +node_modules/ +js-dist/ +*.pyc +db.sqlite3 \ No newline at end of file diff --git a/conext/__init__.pyc b/conext/__init__.pyc deleted file mode 100644 index 6ee9625c0019a0dd3f5df64be459285cd75a8b43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 405 zcmYLFu}%Xq486hv5&VPIsYBcQ0fbn)Af$?g<&-AwU8=jdik+778+-YvouDEO*+Q=C-m*;V0w6wE4u^*%_T2tsh|tUzGcCprX= z9yTYC4q^I%iKd0#p_93C=cE#uOEN1=SkvIUEo!&oJ0%TO2S7Y;$x)%l1J|OIVE~TG*Cr}k&Z_W91|&-^*)eeZvBL#RFm{=dRU{=g97k3j;EGVmBM z>Kl+4kec9`W#82O7I-a4+u*fJw53rCJPXnec%2e$L$U#B7rZVo!9aB23xmjluRsm2 z2LzfL?9||<1}zP4)L>tOEe&>SaG=4q275Jl3!+VM?LKA`|H6;Wu%$LI6e1Myg(ym7 zh{!yU@-i0GH>%>fbNQ2D~`8c*_Boc%c+ zVO-pgvvOw>ry~^7!Dzz{K5y}nPcSH5fzJ%iktn89Gaxb{YC(*ofk`!S?KVzzR0|`W zR9V;vLKWwkKIGIr;QqUl!^4Ap|Hx4^S$tGQppVOGvZ6!GgenstM2ak`R{C%m6f{2^yFYsZ=9nCxbT`BRu|8*UbzRZM$uMr5vPZaRld?54 zBFRcJq$X(%+OBOX4JFa?+DeENw36xMf8V8b+n}Vi(LSSesa~~hI5z2AQHajbyz@~M z%Xy%}GfuPgKoExcB2yz;B}gPE!{y|-TuYwR&dD3~WN{%fg*G)x^GM)i@#8BsMgLY=`X_Lvy=}-~RUCH}!dfMgRZ+ diff --git a/conext/settings.pyc b/conext/settings.pyc deleted file mode 100644 index 21663f9d1817289e547fd8016d700263606a6926..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3872 zcma(T*>>B;^^%aN#qtubO5CP(94GPyN^&B(Z8nGmX~ZPR5Mb@#Avh3cL_q-o3Ny5< zy!x@P{gnJ!KcKyH0Z^39Q$-YJx%)PEM*Gj@)qmalw=;nJ?<&qe;3s}B12FtAK?L9d zaDbx{9F>cORxB2PFT%SLZ7cAutk&LAft}J9WD2_sdJVTcDyUVu7GzH*j4bZ0sn|}Ux%X`z^(!N zsIciKX}v|`Z5rM)`8sw@8b`!w+QJH8HVWFpMc!~ zwhqHGcz*`=F?gQ>LzcS)`3o>4KsW+%{a0Z3fPDt+KCsV$J%Axb1c6@w`x4j&u!q1N z!Eg~gBzp`VQa%Ci{(03;3)Lt=2UZ2P32Y14Hn3;Fz5@0&upMB#z@7v98?e8F3hX~% zh~atw;i3u=`v!J6YW)^=R0>MKz616>#`g#Oj0~s&+XGf3AbP66tPae?sexZ}O4U$- zQ2U%7lg(b>&cg3U%-5GQ_Adc@S=f*Mw!nKxsd)rwj`x_xCj@y)Yjm&;9{PwQx@m)l zo^~km=x+&}jV@Mi_+R|9#X2t8Q4kLko$c%U!QfXOGog=8#c?Dnh&1h{Wt+4dBr$(0 z(-$vg)I@lf^9sA;B^Os|P82QKXv*XjP`=@-IoK7~rexCBl@!{^X zr-68QrV{NKM}g#elmuiSSxffmtsL}!sDts?XJ=*=ERWAvidX~_d8n%mrrsZ?$$$%y zU_2CDd_GH`@_BTO?@xx}{>6mh*7Nv}2+Z>R;9`M!-tS#ZDSs1RTuhbn;|UjXUcrno zD8Ue`Wlo?9ocIh?1cN~`iRC=H93^xl8;5c5)|ZET#Ql9dVM3{w4McjN*Kqh}$WLad=bR6! zr5RQOYlz2qIPrj9WMUD)HmMi4^;biKV+cn$5Nh-(J-a@J-)(+c{q`$V4fkWuL<$VhXQ9BmAs7T zX{{V2=}6u}$lOYzzM9t?^=$qI(-0*?>X#!fQ#|jgm&-t)Ga;Aw(t+cE_}*YQ#B52r zIYJTaN8IOcLm|U>=%b7w;;Ghi=O;3Z1h%Q6-opcgJ*TcZLL-RKV0GuydV+w{E-zAseuwhX)3SGsDQ zx=F7AG@LBw@taW9q}XaShk1WmxsP$oC3;ZMtn(Ez|Mq7CND7HKWOZ4a=@8=ZM#=^-R})Y5q*S)3CHU z2GOXNF$LB-wrjq2eT;a`bes;#P>-0lRj;?qS4I!R(88w_MoQ&H<-`z!6djwt7X;|twVXEqeo$Fb(;9NYm$P7_1f*DQsPwEFx!UJ z^7kg+AtZ|IR1g3 z;ph1QdTuot#;tbx-m3ems&npjf3=%GTR%o~>_3O=ON#zL74TPxfka`Vpu~0%J4jqi z+|qUtSCCXOsg`yHaScfwlRE7xz5|mZ1U0*9AgE*H9r5VsH$P8tXT;Q@F;TkErKc?k z$tuguG|7S@4omlax=VZd#n)3^%x*`kjQT+mrE@v8La9++QFKbRS-=2Gg|p9}uv0J& zwhGq@I|rLL*n)u<*txhokr;6=UCG$GxOOB@jn|K$lrj};S!><-4BvqD3=DmwjMq(! z$CVG_*v>doQv)@y$@mJ;7j_ zR5wVqacTOim0gM6G;W7I8n8+~=C1c%hq>;>Vb&Yu*)p7)-aJdg&CQ~XpPORUU0vEH z_=U;h%nxisI&zlksFrFgSDjGqs=ubhGW(E8q?K$fESbuXH`2w@0}b|(c{mTFuY8Xu z5QYM4C_B@llAD7_&od?*K>QmLIW#ZQdt9_I2m <%= grunt.template.today("yyyy-mm-dd") %> */\n' + }, + build: { + src: 'js/app/**/*.js', + dest: 'js-dist/app/<%= pkg.name %>_<%= pkg.version %>.js' + } + } + }); + + // load task plugins + grunt.loadNpmTasks('grunt-contrib-clean'); + grunt.loadNpmTasks('grunt-contrib-copy'); + grunt.loadNpmTasks('grunt-contrib-uglify'); + + // exec task +// grunt.registerTask('default', ['clean']); + grunt.registerTask('default', ['clean', 'copy', 'uglify']); +} \ No newline at end of file diff --git a/conext/static/grunt-install.txt b/conext/static/grunt-install.txt new file mode 100644 index 0000000..197551f --- /dev/null +++ b/conext/static/grunt-install.txt @@ -0,0 +1,21 @@ +for mac +========================= +1. 文件 packeage.json, Gruntfile.js + +2. 安装 + #安装node + brew install node + node -v + npm -v + + #安装cli + npm install -g grunt-cli + npm install -g grunt + grunt --version + + + #安装package.json中依赖模块 + npm install + +3. build + grunt default \ No newline at end of file diff --git a/conext/static/js/app/lib.js b/conext/static/js/app/lib.js index 80ecea8..21ab170 100644 --- a/conext/static/js/app/lib.js +++ b/conext/static/js/app/lib.js @@ -1,5 +1,4 @@ define(['jquery','bootstrap'], function ($) { - debugger; alert("right"); - } + }); diff --git a/conext/static/package.json b/conext/static/package.json new file mode 100644 index 0000000..55f41f8 --- /dev/null +++ b/conext/static/package.json @@ -0,0 +1,13 @@ +{ + "name": "context", + "version": "0.0.1", + "devDependencies": { + "grunt": "^0.4.5", + "grunt-contrib-jshint": "~0.6.0", + "grunt-contrib-nodeunit": "~0.2.0", + "grunt-contrib-uglify": "~0.2.2", + "grunt-contrib-copy": "~0.4.0", + "grunt-contrib-clean": "~0.4.0" + + } +} diff --git a/conext/urls.pyc b/conext/urls.pyc deleted file mode 100644 index e01e2a8cc14ba1099ffc498b2b29eb9375502152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1194 zcmZuvOK;Oa5T1?mXp*LR(03~is7N^_>WK>=DuDzNP;grgJ|r^UA+_bTgLhKsIX{9Q z$`62;3MuUOfGE5y9Ql=KU4_Hc9PifuK|32BceHx)5|r zya8zsOdoK=KH%&k&ZJ8hW7HfHlyYfK5oYL3coJiM3|W9xN+L z*gjxKSauWrV5R3+_g=y}ubmaU3s?ngL$U+OuAH~5xU=>|ulFBl4xA+?w=!FDJJ^iB z2B3muAM~LU4%kaQV@@Bz#qgMW9{=HI$bARekP#qJoXzaeTWRJY5f+)HhFE7&y3k0% zE{e4DtBW6n6h|fAWPFKco`!^9V*F8RYpe~miL>=#Z*%j&Kw_TFwD<1^vL0x(<$?ARt3&t z%h$$Tn$S)qo*RIT37sI#aiz0xf5jx!hc~a^olUR&_at|qME?2t<&Y7q7c1iU%3@*1 zDdyu(MV??pV=e`M-fwcsXnyN*dTw&PNb#j~(LUj&r;b%m^(yY=y{md&T|HL&?jNWl F?=P|t`@;YL diff --git a/conext/views.pyc b/conext/views.pyc deleted file mode 100644 index 6b6c41e47ec08fbb587eeb3b1a4ab1a9e72ada03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 642 zcmbtS!A`?440YOVf=Nh&8y|pFF6|v5gg9{;sM8Si5|!5LHri&2GY04J4}2&e0CtMD zJ4E%1o!WlSX~VCh;p5roq=4TQ@_x-m7Yrpo3Tl8xL8d@S96%jF6G9ep90DqsDJXmJ z0k8#l%6d@tVG<3veDTdIQtY`N!@~kMU39{c#kNGNozWI)Wm-aaz{j_yK}p;RlJXli zI%Yr+9V~;{vH;SF?^j5U2oKoq*l5V$y!fqRF>*epL&iC`kLRwbePJqvkyLttg!Rlj zxvj{_1TPzLBlf@powJur2`wcxn&jS^B^E9zOp9;3?UnUYyn1)ixkBHGL<6XfOa|4u z%^TF(iB_!}Q?6?cQ=#1x{(&_Wraqge9H?<5fjea=mw8*6xYJi*i*`}O&pBbrFTsuW gDKt0M6>CTSihRp|iSpm}vK#VB1d{v_BQ*+s0FxbtZvX%Q diff --git a/conext/wsgi.pyc b/conext/wsgi.pyc deleted file mode 100644 index 300a2a872676c0712620d849fc5ecbd59e0f1596..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1093 zcmZWo&2G~`5MC!u8%&{t03%2e(w(PN4k7183_t`yb9X+NFSkY&*J`1q#w`Wg0+GMcrlYH+m7Ji*v zj3CwJLT0eg#!vCiL1pw3Qx}EdG?x|%Eoz0{>9{N{xE!H5$*W4qlsl{Y zh_K>D^0~sWbq5Sq zk~eov63;R|xxT&}ot{ibS7SPF(K%UWRHGYPbEP)0(KW24Qjqf%HV3Vv4BUt95Q@zsKI$Z#XNtfad z6nAJy5QQ1dNI>1t+oDid1RqI#yyHcsh>*WY+DITv*J#xWPV9tGxaJ0-rQY;RF_)#6 zX^Xd8!j@3^Us?5n#L(14CR`ZOaIMWPl~MktXY5{4bDn)V8DCt*lk@3xG`^U`pRdkt zF3;@|x!Mkmw$-VaIMkStZAJRmj_oXaQhr+fhHI*1Rz zvez@Cear@5$IFY;&#c1l3HZO}XSW<`z6u@CE944FxJIYZ2gn2F0Z5?@@uX0P_y7*T zLmqiGM!NuUMudar+z43`bJOOVPofyPh(lTT%`j8V^nT+O{@aNDXG_v=_}L>41aXsQ z31cKuvsRy?fqN}uT;2+mx` diff --git a/qa/api.pyc b/qa/api.pyc deleted file mode 100644 index aec8df6adc24c0b5445ecac98aaf89d2d72a74cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 671 zcmbVI%}&EG40hVCz@&+ZE8@hZr&Z#J5CZN)EE5NMsX}X{R_U@fnZ(ZU2)qrC#RGty z?nm4ZQSv2r?9ZPaevO8o7a#KiHY=q2hK{`?C}|7O0F8i5fM7cS9Y7O87LpwT3V0Dv zM(_^s2Jni@kbFf>oU-GDZ)SleG{#=0@XL8GrSllN}>rNPy rb?aq?lWiwfk{8?&L8~S-64cfYL~`yw1^B^T_4B>v>H1d3VjTPc!sdZG diff --git a/qa/models.pyc b/qa/models.pyc deleted file mode 100644 index dfebe06b5040a87f470596013ada4cb425ced5f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1353 zcmb7EOLNmO5MIY=`k;kSUZuQlGzTV`;S3BErZXI1AT0-S(I}RhD3L8=DYQAmPw0(5 z#Q%Xi?5>^GOeY8INZI|g+HY68a{Oy+{y9zxe-T)KG=f0{5$O%E z4M<}c#Hh!hBbYSdI0Ds#?*QKbJ`Ywvt-xWYg&xcwd^!ZEyiO+qQPp-vPq#?EJHrPUh|< zWcLzskCFSJ@VMxNqrrnq$V2EKcGj^vVFRaBo(ik8Q5c)wSgb&$8(Nu7O?wY(kL?2H zCrwXr3adCNeJp1-giVy?EI5(56CsuAJR*xVoP@|^s)b+zA+Td+7S%p3K_KSWV_6&+ zZB?KSIx1$Gd4ma7v%!%*4W$7wCN2v)3(TIlG?&?&HwHQKOqj@^N3xigUR-VxZdDn? z$=GqAZ_&d@SEQ8pR~NKM+zj1vBAGwYMFr5hHPglV7OKkl8bStBt@D}#ycGJ}BORg- zvhZb?^IS8@zH?T~tW1n-4y5(vlJP>#a%(7)z=R7;80GmOlS1R762m#Gvs^7yvVVih zkx6ywoKm7?QEg&+2C8ixG=PiAKSs4jSK0ThcD)aUo9HC;@Z_-)y)Uv?Ui)r7@6%o9 z1fQVLigu!H9E*1|s=u^$@xJHJ3D;LmWHxeLH7t8#7d=%F)w(dlE_T+qTaxzq+e4J^ d=-a~qT!hZjf5guX^Q`R27v$Mf54NLr{1-jj9d`f#