From 955ed2336e2e5c6efd5ea9bd20a2fea6ff69ebe5 Mon Sep 17 00:00:00 2001 From: Peter Morris Date: Wed, 18 Mar 2020 12:15:25 +0000 Subject: [PATCH 01/13] Blazor.Web samples index --- README.md | 2 +- Samples/README.md | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 Samples/README.md diff --git a/README.md b/README.md index 189a78ea..5b849382 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The video is based on the original [Blazor-Fluxor](https://github.com/mrpmorris/ The aim of Fluxor is to create a multi-UI, single-state store approach to front-end development without the headaches typically associated with other implementations, such as the overwhelming amount of boiler-plate code required just to add a very basic feature. ## Getting started -The easiest way to get started is to look at the [Sample projects](https://github.com/mrpmorris/Fluxor/Samples/README.md). They are numbered in an order recommended for learning Fluxor. Each will have a `README` file that explains how the sample was created. +The easiest way to get started is to look at the [Sample projects](./Samples/README.md). They are numbered in an order recommended for learning Fluxor. Each will have a `README` file that explains how the sample was created. ## Installation You can download the latest release / pre-release NuGet packages from the official Fluxor nuget pages. diff --git a/Samples/README.md b/Samples/README.md new file mode 100644 index 00000000..51b78f65 --- /dev/null +++ b/Samples/README.md @@ -0,0 +1,8 @@ +# Fluxor - Samples + +## Blazor for web + +* [State, actions, and reducers](./Blazor/01CounterSample/README.md) +* [Effects](./Blazor/02EffectsSample/README.md) +* [Redux Dev Tools](./Blazor/03ReduxDevToolsSample/README.md) +* [Custom middleware](./Blazor/04MiddlewareSample/README.md) \ No newline at end of file From d34ee0fc55600ea33753bee263abe59cf2df35c0 Mon Sep 17 00:00:00 2001 From: Peter Morris Date: Wed, 18 Mar 2020 13:50:18 +0000 Subject: [PATCH 02/13] Rename sample 1 --- Images/fluxor-blazor-logo.png | Bin 30917 -> 14562 bytes Images/fluxor-logo.png | Bin 16701 -> 8569 bytes ...j => FluxorBlazorWeb.CounterSample.csproj} | 0 .../CounterSample/Pages/Counter.razor.cs | 4 ++-- .../CounterSample/Pages/_Host.cshtml | 2 +- .../01CounterSample/CounterSample/Program.cs | 10 +--------- .../01CounterSample/CounterSample/Startup.cs | 2 +- .../Store/CounterUseCase/CounterState.cs | 2 +- .../Store/CounterUseCase/Feature.cs | 2 +- .../CounterUseCase/IncrementCounterAction.cs | 2 +- .../Store/CounterUseCase/Reducers.cs | 2 +- .../CounterSample/_Imports.razor | 4 ++-- .../Fluxor.Blazor.Web.ReduxDevTools.csproj | 2 +- .../Fluxor.Blazor.Web.csproj | 8 -------- Source/Fluxor.sln | 12 ++++++++---- Source/Fluxor/Fluxor.csproj | 2 +- 16 files changed, 21 insertions(+), 33 deletions(-) rename Samples/Blazor/01CounterSample/CounterSample/{CounterSample.csproj => FluxorBlazorWeb.CounterSample.csproj} (100%) diff --git a/Images/fluxor-blazor-logo.png b/Images/fluxor-blazor-logo.png index da41e480cad6e6ef84ad729281e07694fac652c0..a34e665a372f1f66d8f85db4c333f1e8a420ea40 100644 GIT binary patch literal 14562 zcmXAQcU+R+|29Lwf#M!%YK}BD_be5uG)q5frfIpzoth(a4?t3LTWM~k(z0?l+=8pz znweU;XYRcK;oe+>x8%@<_cWb#1$hXMeqQzI$2UNAn3yBJ&k2LOai0{~b& z0B}NQ^eX^BkTL+UiUt5KWdi^Le$SmcjQ{{`+Z)$VR-u3TQX6l!qXpxNko`qhZ<}^- zdp&vH`rpv+Zd4OcYpaLN|Iv<|J(HHXg~SN>)@Q@cIfRNV%Z+5AMBd4$ms|VMO_dgv z7e0AjY@I(~`l*?HbT-bzh2#R<3rqbJ)XYFWT+C2H){6C&=EU zy)N;#7nxMiZt-x5DA`#J)eOEqr>LzvVfybtFJ|bCp2u?!$kr;4gV*CMdy%nXxsMO- z96aAW%-1|sa4YA@C3y*3S!+xR56?W(M$^%iIYc%3H&1nmRF}x<>lb1(xO;1uW3aM` zT{UGV<=&Mo50}DP3Z)Wk*38?LC(5I9Y2X$nPPTSgaUrZkc5E!zH!1)ryR! zDuav~;LlY#P^eZKhE8Lbs|7O+c|Li;oSl;+M5CUx2QV%Y=mB%u$=*9|&7hi^n#(vH z5ql8)Jb=^S4VT%K3aH^>W5||-V{>@s-ocv9g$EB-q6~JT(be?pR#q7Tw)u@MQIt_g z=_dZklMYRb2OPs{*#HATijg)KHX(s!oc~ycdb~5wk51*ApP$bwe*5-oK~WK1O*vi- z(AgTK%X#Ej=YL|Hy?BA{n1>hIKz*$e5o8N;aB1I!23@ zmT)8*+s+FYLv8cbs;aA1A}NRLR@~GV85z19R%~W)Jp2C*>yqGU(R=3FbYsXMjWO}O zg@pwDm-3AzC|5)PK{}9leZ(1)@*=EhN`YDM#?-fr6h+(Wm5_XiUWWckh;Y({*KG#IQYR zy8@aEF@{)A+yHzXpkosw$-%9tUp-=I1SmwKt+TVAu_p>wku|upj=q}Eb1X*C{c4`` zXjdoXLC5LZyCSb8QLh)6XnKnJc3Tgrwfh@j1Oop+mt|K+pUOuaZBAycudj85u4B zX2LmvSyR$P57Yhvrg(}&1|bXv;n766i69j;z&7e`C3v&nkkB}91Z2y?)r!K%x$wmfmycpj(bW#RWYWOUoq*0kF^qV^lO+7?Y_kl!h#2WUGrNSl zew-q#1#)VM6l&}44!dJy5(pfM~FWh1Ln_>QV(;qVKzg z?jA$HrRr^?mjOC_QXHHHSI@Wo9=|I%MI?JQVh*fT&<2&Unc2i>+Wo3+3y+~MFI|rJ zgr7&CTsEhP)H%B!nBp}`R*?_ExZ%-yKwY*veYFS~O^1{)`_K{skA4s28RmQ$+ZLqEUgXerRe` zy%8)viLZ3JTx@qehgA5c?tml)k`JwV^eZ) zeA%DOx9an%!iTF9#HOR?DTfEk8+HPPxIi^|3sI|U#E27!ZJC-H^HYD^LBT}W<>=*M zw%-IxpvVnE-1s}OCJc@GlmFRVGxcZ?gT5B!aZIM@fssT2__FY2&(EgI2Ww*|LoW|e z=z&w<>b+J8!BJ)~UlQpW@Ed_&kFlaDm;D`X{&ZyiY{Kl7u(!Jl4AhjWA!6u8&+h_& z9je-a8j@g{szvs`dat~t{P)Puw0pd=GQA&Ikv1b-5nXLPecJ+pvjnD{{msk%V0Hzl zPr8HtVV8ICX<;`e`qT~B-F`EnXqu)Rd2)Q!$toAqIk-i-wz~?CEviSiD3b|1%B~`}K7n(sN_DeG0b2$7db;tQ?Z+ zV;KQvETpGIKG&HC1PQ_HVr#{-5u5?;Tg?;8N7G5w)oNU|>OrNxa2*dW0y1 zaFUGpO7BC4+c}c838F8NMEXszv=Hb3!6_nqtbiB&8aR5=r_HlaJBWn%7Ge~;l(rXFUPM%4 zb+|`DJY0cBp-k#pbUrSw-z)V^#NE$FKgQ!$}q#wIbbGyU8EE&ODHiVIQRXz9;oX1c(1LM0{4m=h8tXb9S?1E<4kwH!{j%vRxK_G$-H7 zh|ED|8}%EZD_!^rijCui7^9!#32?z7WjPs{BVwLXno53SZ63<>O2#Z@EbSiQ+Zp4+ ztgIsz<+fHy@2c5b;q1?b*%*iU*11mRaudJ8h^5Adt@Yi5o6Rp^i@HO$8l{TRv^jv} zl2X+_H<)IFpiuVAEe=+tA&G1L0lnWqqMNR+9U@2H_zcSw*5Rs&b0NM(QD^=4COSpX z324ejuaahZu1D*F!5h{faQRRshD>fB6y z%-*`k7!(GV@BtXx>HJ88jqSxkb-C7>*;f4vKp9NOfa^PnDkk#Glr+abUPF^ES9pBY z&}L3b*?F+{Lqa5Oj5v)^i$2-E&18%GJE6U21snIcL#7=FghpLZtFlg&ZxVlThAvpq zGTrZA9pS(t8%e~RKzz4x--d;{m^}%0IaA2G+Xsuwl;u8C1^Af06IkP0{{3Cj>xtdD z&ZG_Tl56Y-s%rG%p`m}^;jIhn5Ab$J&d!!IP~nS`XT`DGM%pr3^6mJw%KSV3>0X+h z?bm7`Ot2*S82h@p52W?XW$;F84+L9vbL7{7Hf#zserSOA=7tEy? zxZGD%dxjCmP1x}hZHm=_^pUX~Yc%Xvdl3pOWT4~g80L&a=$Jt}wV2zdFU)NOZL`M(X*AduOW2q* zh?A3t=P#?zzbKintR%kQWb!vSjdp(~Q;pzU@bc;x0Pu-M8|oQ_IvYXnJPQ+uj;0rg zb-?(hsaNd9$|Fbe)RT)nCK?ZSg*`t3WhGELjyLRh$CYTk;<5wm6^V~e!ZGlDohip0j!A9-NwW~J0RJ%md!^HJ4v{QFw&b|9X`~mLA zoYems<^@dpM&WA zjY2(xU%Apoaz2%*A}x+TkM8dhQCa(c~K=N#=oC14-Am;kF}A)PvJO zH#7$gAeWCSfqAO5d7uZftT^jjR>}({B>F>~DRX-~$d;2HNWx<%^p24kRFhv3DthM@ zLDL;7jW&3|d|9=LLd%||eg6qRnku{>N}W~3$C^sv1>;%U{rrnvlsM=B6PXKPvsx|E z^*?hj$suu22T{FnUe*^`85tAO($X4RnzAy5s*=GA`|H0yDWi*vz=yNl ztf3aQCYF}D=hW5XPzC_i?`CNnKm$NEAoi3gp-x6(8C@U-e}mXzqmnOv(@X7*l zXCBV1t|OHNR1A!=#$o)R$jZkKYi7N z-QSf?Z6~~z324=^*IH);fTOTu9l?yU4k2ucBD$Gcu+#R6Vz|sPVICfSRL*aFQH?Fs z06I~HPszZ6z~c?>Ak8V)!l@{kz=LDS>7Nms?snlH{<9w8&N~8+@4mdn2mSc7_RfUT zIZ0lP=10q;M}95-_=d>r&Q)X_l8%X43ky&Tg5J`RjrJadf2?x=9mC?UTP1XOYZ$(X4!60l@z5fBX;p+hg;2eH>-AF1v7pZ7!x zc?$ApaAFOQko=z1OA)w=auc7p?t!qB%)1-OM2W~`+cNEvqhym8;3KWFke(Qkay#E|+xQ-Ha+cefzR zlBdOcuwoePDtB2zf*z-x@&Fb9pS$s{R2i zs>df%D*ygnP!+lSRcxFvj|Q-Jk)U>1mIdzWzfTS1y`IFD2)Y($l9t$56O_BU(1r4U4}&C7J2(0AU_M04Z(WgXcNXQ6mHePPq?S5mxK13u0bS4(mS&Pbm+lqkh=1=A?gy2D-2@mS41Tru(j9vO$+t)l?fJ0 z2MOv&QQK#hR=YU4x%;X@wm9Oh#viIM7@PL%9Z!YSU|$;e7JdnuCT|Fao-n<-{VsWE zLSK1p765u`X!{&yAL68UBE`h}ps!D1h6zySA_HFAnI@dGve=<5wuiiBB)DHdYav0J z|CnIL93y-$ta)0z{}Dd7jo*5pQz^b|{lM*9K7S$7zX)~3QJH0&eeL9UDNo$fVrigr zIk)kpLz!7cV0WIH_Z0D8oh&rq!K>x3`uBSIkJjbSi_Ff%*3AgXuyeuU&W4Z$9Wj_L z@qzcO>+N(XJ6T!q&xMWWWAhYp#3CXNA*P?(y3fMKwgrUJh?UbVs$Jc(s-b|jQ5o|o zwWhFBPTkwzdcSv~{kA~9T@Fp5{7s*qj^C+!{+t#62Cq~#LSb9Lz?N2#Gvo;I@5}$g zCrMfO*~NLpdD7F*u8`4cg2eA0yQtc?34JX7NMT!K;Et-A$mAnQ`a;ED+{}ruQI}D~ z&~v9FL3}KKp_g^!mHa`Hp`datF?1i8&uOt_f)xRB`EH9R<5H-)IvUTm0)-C;V8Qd_ zC>FSFlZSUsujuE4U-px>f7_~pPu!tVJoxuDJw&PL8Z5jScmCU`C;Hz zXR!jN0G_c!!{xs;DplsQH$6D6cwaUy=x^3k?f%fjHbtOX@-74AR>jKpNe^zX_XeTQ za`ah~Cd%E#!_016-=Eo;|BkKSx0I_=`3AGRC@x;bW*ahn3VD3h--0((L^vZG#jeF~ zA<6S+4WRMapoBog$l_nUy3nK&-!uTvP&PPyAnj%i4Gi>-`}Z#t-H2mX(E1@SZw&CKgy50KNfNKzJu{&JC9fyj;byWGdg- z3z^E)nwsjfR5pik#A@)pyO&h#n;&J)?q#LTNdHIZAa!)KF(5pNP*%*c`H_uf56{z8 z>sKTQ6=q1sc)s0W`K}RXR zl09yd9Ie`A5G!=lT-%&3d{8WMM(68+dmHUn)*g1L8{8@MEa|dEa|uD3U*Viml@M<| z;hE-84ATOHi@;Rtu@Sq_q&U6!>fC+exL}xIv8!}2+l^gakfvhh)1+-8+}?+3u$L`p zAdP=sv(07=-s!)+tl)mUzvA+b5#-?ayogMNN3Vy!ie?sv((0~M*ziuH(nBmF~$-y9auW ztkn}KT>PVx*^Fsj#D@R@&xDHw4-JW5{tkmM(0T99q)k*yB(=MvwG)&(bgZP%8fbnk zCJS{fQNZ46TAR|h!{B6Q6nRTuL4E4!)}vh0EQ!f<(wwNe|EH+g6Ee?bUl`VC*?;j$ z7q8|#^2&=W68Do82J&1b0g!#|h}Dao=NbN*T`gKhob%6muINB!lbRE;_1gX#t)G#L19oI$B6r z`=p5yuTTzWdragNUB43RC!+X!YeyALuE#qYwL^?1VGwzq)$TO`OWipYkZm{a@=lEL zm^HXBUn2Dw%st*w7IFN2dzQimJ;$LFw=L3GW5*alKZ*?BE4UnTlkmyeLqlEtP84}R z2j$=Z%kH`>)DnI2tVWf}Y`1vTLom0ktuKPeC*V@Ujg=Lc!oXd@ z!*%_fi0v7j+ZLPFcV33wwmidgPF_A5JmLo}_lY_>!wf-fPpNkAZJ3$ zwFHDqW81bjdd;~$+aJ*TKbgsoxdXe&;+2q zNIv}Sfi|ICF7*m)>ujfqW!D)VTeu?Q!*xn%rnn4HLufx#a|48I(^u|z+y9osGg9}Pp3O6h*7i2@vfjoiV zzgNPul%^nqe4gI&vy=Wv3qX?~Z?-aS(s;;1eCoI0|5D@fRKtghG}t?5i%ag%GaUn+ zWEOrE!qag2YSQPNJXWzPW(?w93sXn!*FHVU>Gw2beqZR?oo^VD1o=YM4&=`++vXg= zC0{5?S16+wE8XWkB+f1yupK?;8p^;&mrFxsKBJ!{Jd2$jrQqS0;$9zkYgI&t9uM7* zV-rwxjXK#igpE5i__?|L;#k%E{aZ&xP&f}bxq}b-`K`VANKAj8lYh>`*o3__!zO(k zo*1d9$Pt%T)S?<0N*7wcc5ed$J2-e{7ZxjYE(MPu!H?pzA-q+y4rmEi2F-iOo!*%8 zpGKSDcJeToQ5LP5qQTUdY@gIPYVW5Dj9__q=kEhF88uTdS+6hBLI7_2-J~gE=dR_o z#4SAmrOUEoQyF*o8$wUUud=y&BG0;Ha|yOWgIV9jN{3eBR(07B8r$~d!py8qtR^%j z-c0EJ3;7xHu27ZtcanTpx41<2cYm+tvp)y7h$=Bgef~gqqdRfSP8DiR)Ihh(^BT{7 znefv=(xNLcgs3YXL>eEj1K47Sx2&w7Ms;9t>CHb4i&oUH8`sZ<*3}D2v`wCu{n%v+ z))+VVm5uRnTR#GN)cMnu~48H%P6R7nhJKM7W_EjevJ9~7r zoaQuR+6mW7<^9^mFOJQ|vR4UX2oADno5Z`8w=8~-wCxy4t*vjSq@&A0id=w0=hK;6_n`HmB5?e8CMIy&%nyG!;3j@N|k>wicjRvP%Yg@rZ zr`snFK>{*I9w-#bVsa93iG#;BqxQqckA5Kb3~X?)f56WFFyM&K@0x;UCn62~H2JX; z@7WDUDLFZkxI!O7bMN5eQTnKkB-rOpGS`T|%YC=jTQMrH)bHK@9@r9ndd_pO@Mi=z zyx)L}dDRfx7jd%N{P!fVb~KtocDQ}(me=e@W)kcsm}YU~7uK576n zqc@18D}w?nxji3nmn!vhlzmST$kWS3`x3EmaRUWgnj%eRLFWZig0cuDSlIpN<9&7vN64a+V-_d zcvx3aGQp+j`&Fr@f!jvyvhEeEmmgl2xhK}3wniVb-I^X7%QEIEH#852`w3R&N6{98 zwX0I2ONxs-{K@+($&9LKTw+2(dG(hs55O0Kf`dIQZrySV-TzlV(3c~;gbY1S9{kaI zoJ=G>94#WI>o{1B)$FG{cYGLYWT@=P#;E`zee}g~ zu_>5YiAqtl-%eVInBj*495h!a8TYIHnC8r~)(1z%H<`enO+##<%V!8WDFvp=U zJA16+{rfGHVO5El|6*n!lGD-SK;h><|Na#a_4IS{U+DUg)QesEOFHjp;C_`q7tl!X zoBD_h-;bFbzH;;`E6W;TA)@Zm&-y1Iv3!h)5nxFY2TWC-(R(|~V%00g56XKc7Ql=$_&i?#J*(SG-XJb2iH32mah9p=$tc@I)3ys*J8p#aHwrin z=(n7XvW$CZ0ie7*GKe+9+X9&dMbj8eD21v99a8x7z1FF9Z`KdXu8QUw6qjo!D!uL7 zOn<6g#ALAr6LNc{#Hh`|zR+5Ew6aq5ScxGAB^+N%`Ur7io|Ux;NppuMFn2d9?R4!~ zbF*IiN1IAhT*?T}XOvH}e8hsow@W<gA;!Y8gMr-P`D0frn)mL5 zT%e!sFU6{ixjJ%N9QADI?OLxTjhEm3@_O|_X z4W?c|8T*&}R&`5JEb8%c|K6Z8Aybh-=Y?<>(_eQfwFQak-finTp6)^g94x*;l%eq) zgx3$<=+(aHf^fq-{~iD9y)K3_RPkIt)vsdB_MU$SOdat!npVNCh7CopU(RyEN(i`C zA1)suX+ZD^IpveNpd<3ML;St?KFqcQ33MB)9VB8y-eFUFq5SW9^4yEwQ%={E)X2OS zN~M5dZRdVfao8oeK8D==KXJzQF6Iz(v~2`h>_qB5huMqY|ry+GP#7fNDMo?t1N42zR}PwenF`Va7MZQ(K=Uq^+hex z>A$}Mh4_ZM@W?9+M6=agJJq~COn$(3c@${EebJ)ebmu@TE^Vs?xAa#C>!1{;rKFFO zd5C>W|>%<86V`EXtswqcSxa>JQJ3FPj zcXKY^x$_n7>svVE!_W!6pL6RCd5Z&)`uiiZaJbcxqb(#3EF$uhPQwLiR*71NAFc;I zuP-^2Qn`h*`?Tyc9(hP*cT3Mt{W^RDEcwgt%)MRs^5CSxy=Hgwo-HIs@bi}pr{$%% zPJjOzy~eP475vjG5=K;XfJnHoEN`>*KpjV9i5T~G;tKkTn>}%JW@0kJ z>^Ju24Z`JVK7K=JLL!Sj%urKSWp5|o6IeJA_Rrt{i86G(_&d z>fd>&b?S5a)>$u3V(VkJ zoFam5-Msa0xYCbU2}q(j83bff#++7KqNzWQfBiHco;eBn=QV0$u7A_V$-gDjJo_W3 zZ59%^w7Nxb1Sv0@fRn;jFhljBw$mc&bPiFf@{0oDyFPzg`#YmNmMa|KJnkB5RLEC` zM~WIfnQez5VKCUxw-}S2p4FKy=tJ$MfYbXOp9K84iBa@!)>WtYC)&Rflh~%95GK#x zKZ>T)rGGIrS^V|E2Pj-}@;?#u4%L5p>ZhSy?b!psmp+t^isryaOEX96+)tUxi=&lD zW%|lb8y^vob%VWpnFpR-egKGKDLdfOdtfO|Nx3$P=>%*QGlAJQb+o_2JR%MjD}*V$ z5*#dQJgf4MoSUQNJF%>xIjXxh?_%9HI0&w&7$|7us*60S;75b3K<6{ApZ}I?Gcw{D zVoyA@IGCunbGX!y_?I`c*d6=fNuY;s$HVbZW!^`{f`eP1Ka2c_!+9J+*J*&DH95pRpJ!86#9z8Hva=KaIqW@8~iv~zc+qSd8h@fZqK%1 zt_D0Xj-(#PX2r)RwN6j_p064|JtQAQpq1ug_lj@GXElc(6oOre#ZR^|Y-|Nh-Zo-? zrs_{i?>SucEvTv4_pvYsj>nHV)_Hm(OKpIx%R`*Yv2WkzdgFYVl-`5LKR|*z4=kTc znBWrpl?(tXQS@D&i5@8b?4Cw)i4yMKGT}j&Ovu!QioEEWv+BvLUQNxB`@kmM8>Vr@ zA1bzuG4Vz7N}k`~QwYe$Pv}by0$HG`4<>kva7WKL88Y15cFCFPk(8_q{w6EU4n07PW`}R=r?*1GK$u-z0z*uKLCN=>-zmkt3mzCf`|X38nL?Y z6VdjTW)BBZWLP&?P6AiHE>E&N2ekFL1dwcn3BLN|)D-$%T=F9AqTKLBfzsv6rJGDS zkTc9WnAzZ!y=6a<*RLlhU%$~!jD2#9)j527z<{Y6sA%ZiL1oZSjyY?7pZ z+d9*Z?Smthp{pymOVcDqo}_}U7Qj3s{R^&i1;QjDHtSN4oa%)?e-b~nVCWE^&rvSp z#4S^DiZB9#nq~8Gng|ZikS7N0an-^0{{85U`)ISd4E_slCJnnOc{++QaBW?f4k<+% zZASMLAZQ?JieZ-dprnIslk1{!*tdF4x>SIpI55%JO)tT0%XR)S1F6On;sn+WbThvE zlS;jbTW88)S4E7}LW2i4pDf)w4DS^F`*GD|03>%TF7@p@NpU-VmfHD=@Ju$hM>u`yIxB9+l1P%RAF@oOJc=nT2k+H~-|74<4N~VdlYTc%jKZgAVt5Q{B)O0&6 zIQ$Rjcp+{te00~2=~`Wwe#?m*efGe{Y(&RBF94fyi@tg|x!x>KHu*n1s6e6uDjPlDMqkw+5t*y<; zKt>h!l?4Yy_4Pj#;^q5=Jy;CcZjCZ%q=6f4IczE?$6jO!(1B$!#}!T(&QQw03-VwQ z@$_Y8rm>|(MiY$na~jEBsZt#H0lI)a@CCRkFIB>oEu#TzhjQpsD*t$CQq|=FklAIVw z0U~0qBXdE^ZwmkI2OsvnVhOaw7iKi>As!#{W&Yczwu3Jf_GPzjg-Jjxwr< zi%Oq2sT4%hGNlO9aCd6{uip{&D+C83PbMi{;bE&SJ227s???6Xzv6Es;DzU#!)QXD z)8hr{y1lN#PAUKUy);nx;ak$3x`CrgVypp=JmHr1f-#KYtD<3*DK4(Z-7;M#SM2Z1 zq^4^RUNk&geY@s^gdMhifxR>rcy<$f>Haet&g`x_al0%UmHa(uqbDUhP+;KrhKb2R zB%L-7khN*&m&J1PcpmdU?&Os}c4fV@Z6Wdxt&d)-Wfd%)9xeM_DR(i*5M^Srl2a0E z#!~ex5N;cSr_2(d1(_*|KH85|ls%{oL3__)^4@itp@|d`Sy+t7KzA$6@y1wf}NC#c!9`PeaEJ}wK=?no<8?ziw^7XpHHp;bx0 zvaCppdF$%Y+k3N*w!NZ;e}%i$Ub}@PCGd_|GyP5qDjCFdk$7Yaz`t}gRDSif`0w!J zKWE6|3oBShTBdE^6#+raF6RMOwKwFLeS%qk+(6dN{^?8eBksgBSUMr;GxtU#ir2ae zYWYd8zp{;MUuOC67iFmCdGp}=SP^0I8y(Aa{4_7^^jUp;&mGa|zUBc!fuh!+9wemN z7AHz(^VrWBwoZ*Wd*gU`O{mM5`nwlIt%F{CoGMz40ucPh;f0|BZ1mv}gl@%!=I z@$KhhDL8H}pND6jvU|0*agf@Z2dKz=BZZ%!vs2%r{4Lmf-->Um6mA0$q+0PE)wbr~^r2_tXn4ajJ`5r$+}vc2U6WEL;GjU?F1 zD|9wa=$J0kabL#XG7R_zCojs>0DoB7%>8)r*hS!KL~M?cS&w(-;|}w-duxaaBFN5j zy|iz8f9f)Np#?VD*fi9>KvU6eK7ENAG!pG2KH66SS8}@k-H8vG7QE&fDrCU2a5Okp zleX2Q((-s8H(&j*mb)d2-0Fd@tW%K~kmZ!6XNSMTq$3P|iFF}Jt26Y*kfO{JNa*y( z_uXZ2(z4f{&^!cvl57}Tv|OeyJ1o7xWK*oJO}wkK8PT`k~KN~ zii=Fi#%`{&U5DGT8K}{(7CWiD%_TmF)j8Sts6_J35dr%^H#$=7;O7;4W}I^&kCYW* zds$AqgPScj5hvUDxxWHV3WH*G%T)4jnOj3Z{oHTEwUICWyD7y7@n|>8MGH#FU&(oO z-FtW2-~QLIWgWcdK0fS=9Gp>XoN^N(xOL^aOGG&LY~-75*8TJkAKX|tVrb8gGh8&c zze>GigtwC#pZb;F&fY_wac2x5xvUZ4*Hlklr%`H2&h*Ltz`^Jk(EQjS#4*zo?6`Kj&1bYx@uR zmTt&0H_^$nF!1iofGk1ef0AgnFXDRxg#KOAczekM#DmtawI r%~{Lr6*~l2S@4NJuwGcXtfkF!TV!%zT&k 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 literal 16701 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 P9e@;NRb+}@8TtJmzl^lz diff --git a/Samples/Blazor/01CounterSample/CounterSample/CounterSample.csproj b/Samples/Blazor/01CounterSample/CounterSample/FluxorBlazorWeb.CounterSample.csproj similarity index 100% rename from Samples/Blazor/01CounterSample/CounterSample/CounterSample.csproj rename to Samples/Blazor/01CounterSample/CounterSample/FluxorBlazorWeb.CounterSample.csproj diff --git a/Samples/Blazor/01CounterSample/CounterSample/Pages/Counter.razor.cs b/Samples/Blazor/01CounterSample/CounterSample/Pages/Counter.razor.cs index afdefe3d..82bb59b6 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/Pages/Counter.razor.cs +++ b/Samples/Blazor/01CounterSample/CounterSample/Pages/Counter.razor.cs @@ -1,8 +1,8 @@ -using CounterSample.Store.CounterUseCase; +using FluxorBlazorWeb.CounterSample.Store.CounterUseCase; using Fluxor; using Microsoft.AspNetCore.Components; -namespace CounterSample.Pages +namespace FluxorBlazorWeb.CounterSample.Pages { public partial class Counter { diff --git a/Samples/Blazor/01CounterSample/CounterSample/Pages/_Host.cshtml b/Samples/Blazor/01CounterSample/CounterSample/Pages/_Host.cshtml index af6096a4..818e0d7a 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/Pages/_Host.cshtml +++ b/Samples/Blazor/01CounterSample/CounterSample/Pages/_Host.cshtml @@ -1,5 +1,5 @@ @page "/" -@namespace CounterSample.Pages +@namespace FluxorBlazorWeb.CounterSample.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @{ Layout = null; diff --git a/Samples/Blazor/01CounterSample/CounterSample/Program.cs b/Samples/Blazor/01CounterSample/CounterSample/Program.cs index a528a1e1..632f9fe3 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/Program.cs +++ b/Samples/Blazor/01CounterSample/CounterSample/Program.cs @@ -1,15 +1,7 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -namespace CounterSample +namespace FluxorBlazorWeb.CounterSample { public class Program { diff --git a/Samples/Blazor/01CounterSample/CounterSample/Startup.cs b/Samples/Blazor/01CounterSample/CounterSample/Startup.cs index 0b628886..c1cc69e8 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/Startup.cs +++ b/Samples/Blazor/01CounterSample/CounterSample/Startup.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -namespace CounterSample +namespace FluxorBlazorWeb.CounterSample { public class Startup { diff --git a/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/CounterState.cs b/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/CounterState.cs index 6a52221c..2a11e01b 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/CounterState.cs +++ b/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/CounterState.cs @@ -1,4 +1,4 @@ -namespace CounterSample.Store.CounterUseCase +namespace FluxorBlazorWeb.CounterSample.Store.CounterUseCase { public class CounterState { diff --git a/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/Feature.cs b/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/Feature.cs index d731e4da..f1747198 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/Feature.cs +++ b/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/Feature.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace CounterSample.Store.CounterUseCase +namespace FluxorBlazorWeb.CounterSample.Store.CounterUseCase { public class Feature : Feature { diff --git a/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/IncrementCounterAction.cs b/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/IncrementCounterAction.cs index ed4a4ca5..2882fa4e 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/IncrementCounterAction.cs +++ b/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/IncrementCounterAction.cs @@ -1,4 +1,4 @@ -namespace CounterSample.Store.CounterUseCase +namespace FluxorBlazorWeb.CounterSample.Store.CounterUseCase { public class IncrementCounterAction { diff --git a/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/Reducers.cs b/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/Reducers.cs index 0472fd6e..61c2e482 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/Reducers.cs +++ b/Samples/Blazor/01CounterSample/CounterSample/Store/CounterUseCase/Reducers.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace CounterSample.Store.CounterUseCase +namespace FluxorBlazorWeb.CounterSample.Store.CounterUseCase { public static class Reducers { diff --git a/Samples/Blazor/01CounterSample/CounterSample/_Imports.razor b/Samples/Blazor/01CounterSample/CounterSample/_Imports.razor index 79fa8582..91e4d8f7 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/_Imports.razor +++ b/Samples/Blazor/01CounterSample/CounterSample/_Imports.razor @@ -5,5 +5,5 @@ @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web @using Microsoft.JSInterop -@using CounterSample -@using CounterSample.Shared +@using FluxorBlazorWeb.CounterSample +@using FluxorBlazorWeb.CounterSample.Shared \ No newline at end of file diff --git a/Source/Fluxor.Blazor.Web.ReduxDevTools/Fluxor.Blazor.Web.ReduxDevTools.csproj b/Source/Fluxor.Blazor.Web.ReduxDevTools/Fluxor.Blazor.Web.ReduxDevTools.csproj index 48e8f09c..e7c95590 100644 --- a/Source/Fluxor.Blazor.Web.ReduxDevTools/Fluxor.Blazor.Web.ReduxDevTools.csproj +++ b/Source/Fluxor.Blazor.Web.ReduxDevTools/Fluxor.Blazor.Web.ReduxDevTools.csproj @@ -34,7 +34,7 @@ - + True diff --git a/Source/Fluxor.Blazor.Web/Fluxor.Blazor.Web.csproj b/Source/Fluxor.Blazor.Web/Fluxor.Blazor.Web.csproj index ce8744e1..735a9be8 100644 --- a/Source/Fluxor.Blazor.Web/Fluxor.Blazor.Web.csproj +++ b/Source/Fluxor.Blazor.Web/Fluxor.Blazor.Web.csproj @@ -30,12 +30,4 @@ - - - - True - - - - diff --git a/Source/Fluxor.sln b/Source/Fluxor.sln index b7ef4443..323936ba 100644 --- a/Source/Fluxor.sln +++ b/Source/Fluxor.sln @@ -4,12 +4,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 16.0.28809.33 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{1A6663AC-4F1F-40AD-8D03-0B0977ED466D}" + ProjectSection(SolutionItems) = preProject + ..\Samples\README.md = ..\Samples\README.md + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2279CD95-5886-4777-B019-E66683CE32F1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C2B1D7B3-E943-4EA3-88B0-94433B49080C}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + ..\README.md = ..\README.md Upgrade.txt = Upgrade.txt EndProjectSection EndProject @@ -25,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fluxor.Blazor.Web.UnitTests EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01 CounterSample", "01 CounterSample", "{14D676FF-AC1C-4912-81D0-9B98B8B090D8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CounterSample", "..\Samples\Blazor\01CounterSample\CounterSample\CounterSample.csproj", "{E4E667AC-8CFE-4632-99D0-56DD69117DD2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.CounterSample", "..\Samples\Blazor\01CounterSample\CounterSample\FluxorBlazorWeb.CounterSample.csproj", "{E4E667AC-8CFE-4632-99D0-56DD69117DD2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02 EffectsSample", "02 EffectsSample", "{730B26CD-CADC-4CF0-8A1D-3BB174692A40}" EndProject @@ -47,11 +51,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReduxDevToolsSample.Shared" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04 MiddlewareSample", "04 MiddlewareSample", "{F1016E3F-9840-4C96-AC62-C69B0A177005}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiddlewareSample.Server", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Server\MiddlewareSample.Server.csproj", "{C5FEF754-CDCB-453C-924E-58FB3BB5F551}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiddlewareSample.Server", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Server\MiddlewareSample.Server.csproj", "{C5FEF754-CDCB-453C-924E-58FB3BB5F551}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiddlewareSample.Client", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Client\MiddlewareSample.Client.csproj", "{7627287C-4254-4CA1-A4F7-F694B78E80C4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiddlewareSample.Client", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Client\MiddlewareSample.Client.csproj", "{7627287C-4254-4CA1-A4F7-F694B78E80C4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiddlewareSample.Shared", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Shared\MiddlewareSample.Shared.csproj", "{EF468D50-CA42-4589-B37E-8E4EF32C05A7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiddlewareSample.Shared", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Shared\MiddlewareSample.Shared.csproj", "{EF468D50-CA42-4589-B37E-8E4EF32C05A7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Source/Fluxor/Fluxor.csproj b/Source/Fluxor/Fluxor.csproj index 6c5c5d18..59a1109b 100644 --- a/Source/Fluxor/Fluxor.csproj +++ b/Source/Fluxor/Fluxor.csproj @@ -23,7 +23,7 @@ - + True From 37ee0527cff8aeccb77c4f2462742dd7e9f02d45 Mon Sep 17 00:00:00 2001 From: Peter Morris Date: Wed, 18 Mar 2020 13:56:24 +0000 Subject: [PATCH 03/13] Sample 2 --- ...t.csproj => FluxorBlazorWeb.EffectsSample.Client.csproj} | 2 +- .../EffectsSample/Client/Pages/Counter.razor.cs | 4 ++-- .../EffectsSample/Client/Pages/FetchData.razor.cs | 4 ++-- .../Blazor/02EffectsSample/EffectsSample/Client/Program.cs | 2 +- .../Client/Store/CounterUseCase/CounterState.cs | 2 +- .../EffectsSample/Client/Store/CounterUseCase/Feature.cs | 2 +- .../Client/Store/CounterUseCase/IncrementCounterAction.cs | 2 +- .../EffectsSample/Client/Store/CounterUseCase/Reducers.cs | 2 +- .../EffectsSample/Client/Store/WeatherUseCase/Effects.cs | 2 +- .../EffectsSample/Client/Store/WeatherUseCase/Feature.cs | 2 +- .../Client/Store/WeatherUseCase/FetchDataAction.cs | 2 +- .../Client/Store/WeatherUseCase/FetchDataResultAction.cs | 2 +- .../EffectsSample/Client/Store/WeatherUseCase/Reducers.cs | 2 +- .../Client/Store/WeatherUseCase/WeatherState.cs | 3 +-- .../02EffectsSample/EffectsSample/Client/_Imports.razor | 4 ++-- .../Server/Controllers/WeatherForecastController.cs | 2 +- ...r.csproj => FluxorBlazorWeb.EffectsSample.Server.csproj} | 6 +++--- .../Blazor/02EffectsSample/EffectsSample/Server/Program.cs | 2 +- .../Blazor/02EffectsSample/EffectsSample/Server/Startup.cs | 2 +- ...d.csproj => FluxorBlazorWeb.EffectsSample.Shared.csproj} | 0 .../02EffectsSample/EffectsSample/Shared/WeatherForecast.cs | 4 +--- Source/Fluxor.sln | 6 +++--- 22 files changed, 28 insertions(+), 31 deletions(-) rename Samples/Blazor/02EffectsSample/EffectsSample/Client/{EffectsSample.Client.csproj => FluxorBlazorWeb.EffectsSample.Client.csproj} (90%) rename Samples/Blazor/02EffectsSample/EffectsSample/Server/{EffectsSample.Server.csproj => FluxorBlazorWeb.EffectsSample.Server.csproj} (54%) rename Samples/Blazor/02EffectsSample/EffectsSample/Shared/{EffectsSample.Shared.csproj => FluxorBlazorWeb.EffectsSample.Shared.csproj} (100%) diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/EffectsSample.Client.csproj b/Samples/Blazor/02EffectsSample/EffectsSample/Client/FluxorBlazorWeb.EffectsSample.Client.csproj similarity index 90% rename from Samples/Blazor/02EffectsSample/EffectsSample/Client/EffectsSample.Client.csproj rename to Samples/Blazor/02EffectsSample/EffectsSample/Client/FluxorBlazorWeb.EffectsSample.Client.csproj index 06075854..d6406ab1 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/EffectsSample.Client.csproj +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/FluxorBlazorWeb.EffectsSample.Client.csproj @@ -14,7 +14,7 @@ - + diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Pages/Counter.razor.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Pages/Counter.razor.cs index 23330707..62804a79 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Pages/Counter.razor.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Pages/Counter.razor.cs @@ -1,8 +1,8 @@ -using EffectsSample.Client.Store.CounterUseCase; +using FluxorBlazorWeb.EffectsSample.Client.Store.CounterUseCase; using Fluxor; using Microsoft.AspNetCore.Components; -namespace EffectsSample.Client.Pages +namespace FluxorBlazorWeb.EffectsSample.Client.Pages { public partial class Counter { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Pages/FetchData.razor.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Pages/FetchData.razor.cs index 37fd047d..054e96bf 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Pages/FetchData.razor.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Pages/FetchData.razor.cs @@ -1,8 +1,8 @@ -using EffectsSample.Client.Store.WeatherUseCase; +using FluxorBlazorWeb.EffectsSample.Client.Store.WeatherUseCase; using Fluxor; using Microsoft.AspNetCore.Components; -namespace EffectsSample.Client.Pages +namespace FluxorBlazorWeb.EffectsSample.Client.Pages { public partial class FetchData { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Program.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Program.cs index 7ad917d4..454b44c7 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Program.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Program.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Blazor.Hosting; using Fluxor; -namespace EffectsSample.Client +namespace FluxorBlazorWeb.EffectsSample.Client { public class Program { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/CounterState.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/CounterState.cs index d29eaabd..144eb7c9 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/CounterState.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/CounterState.cs @@ -1,4 +1,4 @@ -namespace EffectsSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.EffectsSample.Client.Store.CounterUseCase { public class CounterState { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/Feature.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/Feature.cs index 62d81c95..f1ca8e5a 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/Feature.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/Feature.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace EffectsSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.EffectsSample.Client.Store.CounterUseCase { public class Feature : Feature { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/IncrementCounterAction.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/IncrementCounterAction.cs index beb065bc..a2ca08ea 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/IncrementCounterAction.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/IncrementCounterAction.cs @@ -1,4 +1,4 @@ -namespace EffectsSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.EffectsSample.Client.Store.CounterUseCase { public class IncrementCounterAction { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/Reducers.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/Reducers.cs index 29e58d9f..677d4572 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/Reducers.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/CounterUseCase/Reducers.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace EffectsSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.EffectsSample.Client.Store.CounterUseCase { public static class Reducers { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Effects.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Effects.cs index bd3315ca..04cd25ab 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Effects.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Effects.cs @@ -4,7 +4,7 @@ using System.Net.Http; using System.Threading.Tasks; -namespace EffectsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.EffectsSample.Client.Store.WeatherUseCase { public class Effects { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Feature.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Feature.cs index 6650747e..708d80f8 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Feature.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Feature.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace EffectsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.EffectsSample.Client.Store.WeatherUseCase { public class Feature : Feature { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataAction.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataAction.cs index 8a338f97..548f2ca9 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataAction.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataAction.cs @@ -1,4 +1,4 @@ -namespace EffectsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.EffectsSample.Client.Store.WeatherUseCase { public class FetchDataAction { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs index 44fd24ad..7c651627 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs @@ -1,7 +1,7 @@ using EffectsSample.Shared; using System.Collections.Generic; -namespace EffectsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.EffectsSample.Client.Store.WeatherUseCase { public class FetchDataResultAction { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Reducers.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Reducers.cs index 6ac31565..8f52a698 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Reducers.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Reducers.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace EffectsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.EffectsSample.Client.Store.WeatherUseCase { public static class Reducers { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/WeatherState.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/WeatherState.cs index 989af710..0b2f575b 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/WeatherState.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/WeatherState.cs @@ -1,8 +1,7 @@ using EffectsSample.Shared; -using System; using System.Collections.Generic; -namespace EffectsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.EffectsSample.Client.Store.WeatherUseCase { public class WeatherState { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/_Imports.razor b/Samples/Blazor/02EffectsSample/EffectsSample/Client/_Imports.razor index fc0b5bcb..2c878152 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/_Imports.razor +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/_Imports.razor @@ -3,5 +3,5 @@ @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web @using Microsoft.JSInterop -@using EffectsSample.Client -@using EffectsSample.Client.Shared +@using FluxorBlazorWeb.EffectsSample.Client +@using FluxorBlazorWeb.EffectsSample.Client.Shared diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Server/Controllers/WeatherForecastController.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Server/Controllers/WeatherForecastController.cs index e874cf3b..77998214 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Server/Controllers/WeatherForecastController.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Server/Controllers/WeatherForecastController.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace EffectsSample.Server.Controllers +namespace FluxorBlazorWeb.EffectsSample.Server.Controllers { [ApiController] [Route("[controller]")] diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Server/EffectsSample.Server.csproj b/Samples/Blazor/02EffectsSample/EffectsSample/Server/FluxorBlazorWeb.EffectsSample.Server.csproj similarity index 54% rename from Samples/Blazor/02EffectsSample/EffectsSample/Server/EffectsSample.Server.csproj rename to Samples/Blazor/02EffectsSample/EffectsSample/Server/FluxorBlazorWeb.EffectsSample.Server.csproj index 1a0c2b45..653d9c6e 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Server/EffectsSample.Server.csproj +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Server/FluxorBlazorWeb.EffectsSample.Server.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -9,8 +9,8 @@ - - + + diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Server/Program.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Server/Program.cs index e1e02999..9ab9bd50 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Server/Program.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Server/Program.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; -namespace EffectsSample.Server +namespace FluxorBlazorWeb.EffectsSample.Server { public class Program { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Server/Startup.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Server/Startup.cs index b66c53fb..6f16a57f 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Server/Startup.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Server/Startup.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Hosting; using System.Linq; -namespace EffectsSample.Server +namespace FluxorBlazorWeb.EffectsSample.Server { public class Startup { diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Shared/EffectsSample.Shared.csproj b/Samples/Blazor/02EffectsSample/EffectsSample/Shared/FluxorBlazorWeb.EffectsSample.Shared.csproj similarity index 100% rename from Samples/Blazor/02EffectsSample/EffectsSample/Shared/EffectsSample.Shared.csproj rename to Samples/Blazor/02EffectsSample/EffectsSample/Shared/FluxorBlazorWeb.EffectsSample.Shared.csproj diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Shared/WeatherForecast.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Shared/WeatherForecast.cs index ed229f2d..9179c057 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Shared/WeatherForecast.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Shared/WeatherForecast.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; -namespace EffectsSample.Shared +namespace FluxorBlazorWeb.EffectsSample.Shared { public class WeatherForecast { diff --git a/Source/Fluxor.sln b/Source/Fluxor.sln index 323936ba..06dfbdac 100644 --- a/Source/Fluxor.sln +++ b/Source/Fluxor.sln @@ -33,11 +33,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.CounterSamp EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02 EffectsSample", "02 EffectsSample", "{730B26CD-CADC-4CF0-8A1D-3BB174692A40}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EffectsSample.Server", "..\Samples\Blazor\02EffectsSample\EffectsSample\Server\EffectsSample.Server.csproj", "{01E13581-FD37-4595-A9DC-37BFAA77864F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.EffectsSample.Server", "..\Samples\Blazor\02EffectsSample\EffectsSample\Server\FluxorBlazorWeb.EffectsSample.Server.csproj", "{01E13581-FD37-4595-A9DC-37BFAA77864F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EffectsSample.Client", "..\Samples\Blazor\02EffectsSample\EffectsSample\Client\EffectsSample.Client.csproj", "{2C5214A3-24D8-4A11-8F9E-91964D3ACF2B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.EffectsSample.Client", "..\Samples\Blazor\02EffectsSample\EffectsSample\Client\FluxorBlazorWeb.EffectsSample.Client.csproj", "{2C5214A3-24D8-4A11-8F9E-91964D3ACF2B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EffectsSample.Shared", "..\Samples\Blazor\02EffectsSample\EffectsSample\Shared\EffectsSample.Shared.csproj", "{E776EB53-8E10-4002-A98A-064667E090AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.EffectsSample.Shared", "..\Samples\Blazor\02EffectsSample\EffectsSample\Shared\FluxorBlazorWeb.EffectsSample.Shared.csproj", "{E776EB53-8E10-4002-A98A-064667E090AC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03 ReduxDevToolsSample", "03 ReduxDevToolsSample", "{0555A496-56DB-45D0-9618-BEF456ABA67B}" EndProject From 7420eb3b00542abaa3ef186d29a8adcfd5b639ba Mon Sep 17 00:00:00 2001 From: Peter Morris Date: Wed, 18 Mar 2020 14:13:59 +0000 Subject: [PATCH 04/13] Sample 02 --- .../EffectsSample/Client/Store/WeatherUseCase/Effects.cs | 2 +- .../Client/Store/WeatherUseCase/FetchDataResultAction.cs | 2 +- .../EffectsSample/Client/Store/WeatherUseCase/WeatherState.cs | 2 +- .../Server/Controllers/WeatherForecastController.cs | 3 +-- .../Fluxor.Blazor.Web.ReduxDevTools.csproj | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Effects.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Effects.cs index 04cd25ab..727201f3 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Effects.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/Effects.cs @@ -1,4 +1,4 @@ -using EffectsSample.Shared; +using FluxorBlazorWeb.EffectsSample.Shared; using Fluxor; using Microsoft.AspNetCore.Components; using System.Net.Http; diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs index 7c651627..a5d7f179 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs @@ -1,4 +1,4 @@ -using EffectsSample.Shared; +using FluxorBlazorWeb.EffectsSample.Shared; using System.Collections.Generic; namespace FluxorBlazorWeb.EffectsSample.Client.Store.WeatherUseCase diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/WeatherState.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/WeatherState.cs index 0b2f575b..8154cfef 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/WeatherState.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Store/WeatherUseCase/WeatherState.cs @@ -1,4 +1,4 @@ -using EffectsSample.Shared; +using FluxorBlazorWeb.EffectsSample.Shared; using System.Collections.Generic; namespace FluxorBlazorWeb.EffectsSample.Client.Store.WeatherUseCase diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Server/Controllers/WeatherForecastController.cs b/Samples/Blazor/02EffectsSample/EffectsSample/Server/Controllers/WeatherForecastController.cs index 77998214..5d7a3abb 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Server/Controllers/WeatherForecastController.cs +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Server/Controllers/WeatherForecastController.cs @@ -1,8 +1,7 @@ -using EffectsSample.Shared; +using FluxorBlazorWeb.EffectsSample.Shared; using System; using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; diff --git a/Source/Fluxor.Blazor.Web.ReduxDevTools/Fluxor.Blazor.Web.ReduxDevTools.csproj b/Source/Fluxor.Blazor.Web.ReduxDevTools/Fluxor.Blazor.Web.ReduxDevTools.csproj index e7c95590..5de714ec 100644 --- a/Source/Fluxor.Blazor.Web.ReduxDevTools/Fluxor.Blazor.Web.ReduxDevTools.csproj +++ b/Source/Fluxor.Blazor.Web.ReduxDevTools/Fluxor.Blazor.Web.ReduxDevTools.csproj @@ -34,7 +34,7 @@ - + True From 7fd510a02fe8d14952ccb97ad042488de868a69a Mon Sep 17 00:00:00 2001 From: Peter Morris Date: Wed, 18 Mar 2020 14:18:36 +0000 Subject: [PATCH 05/13] Rename Sample 03 --- ... FluxorBlazorWeb.ReduxDevToolsSample.Client.csproj} | 2 +- .../ReduxDevToolsSample/Client/Pages/Counter.razor.cs | 4 ++-- .../Client/Pages/FetchData.razor.cs | 4 ++-- .../ReduxDevToolsSample/Client/Program.cs | 2 +- .../Client/Store/CounterUseCase/CounterState.cs | 2 +- .../Client/Store/CounterUseCase/Feature.cs | 2 +- .../Store/CounterUseCase/IncrementCounterAction.cs | 2 +- .../Client/Store/CounterUseCase/Reducers.cs | 2 +- .../Client/Store/WeatherUseCase/Effects.cs | 4 ++-- .../Client/Store/WeatherUseCase/Feature.cs | 2 +- .../Client/Store/WeatherUseCase/FetchDataAction.cs | 2 +- .../Store/WeatherUseCase/FetchDataResultAction.cs | 4 ++-- .../Client/Store/WeatherUseCase/Reducers.cs | 2 +- .../Client/Store/WeatherUseCase/WeatherState.cs | 4 ++-- .../ReduxDevToolsSample/Client/_Imports.razor | 4 ++-- .../Server/Controllers/WeatherForecastController.cs | 5 ++--- ... FluxorBlazorWeb.ReduxDevToolsSample.Server.csproj} | 6 +++--- .../ReduxDevToolsSample/Server/Program.cs | 10 ++-------- .../ReduxDevToolsSample/Server/Startup.cs | 5 +---- ... FluxorBlazorWeb.ReduxDevToolsSample.Shared.csproj} | 0 .../ReduxDevToolsSample/Shared/WeatherForecast.cs | 4 +--- Source/Fluxor.sln | 6 +++--- 22 files changed, 33 insertions(+), 45 deletions(-) rename Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/{ReduxDevToolsSample.Client.csproj => FluxorBlazorWeb.ReduxDevToolsSample.Client.csproj} (91%) rename Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/{ReduxDevToolsSample.Server.csproj => FluxorBlazorWeb.ReduxDevToolsSample.Server.csproj} (61%) rename Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Shared/{ReduxDevToolsSample.Shared.csproj => FluxorBlazorWeb.ReduxDevToolsSample.Shared.csproj} (100%) diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/ReduxDevToolsSample.Client.csproj b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/FluxorBlazorWeb.ReduxDevToolsSample.Client.csproj similarity index 91% rename from Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/ReduxDevToolsSample.Client.csproj rename to Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/FluxorBlazorWeb.ReduxDevToolsSample.Client.csproj index 17b3a700..68d4d881 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/ReduxDevToolsSample.Client.csproj +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/FluxorBlazorWeb.ReduxDevToolsSample.Client.csproj @@ -15,7 +15,7 @@ - + diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Pages/Counter.razor.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Pages/Counter.razor.cs index 5a741771..cf414621 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Pages/Counter.razor.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Pages/Counter.razor.cs @@ -1,8 +1,8 @@ using Fluxor; using Microsoft.AspNetCore.Components; -using ReduxDevToolsSample.Client.Store.CounterUseCase; +using FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.CounterUseCase; -namespace ReduxDevToolsSample.Client.Pages +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Pages { public partial class Counter { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Pages/FetchData.razor.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Pages/FetchData.razor.cs index 010ebc06..4561038e 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Pages/FetchData.razor.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Pages/FetchData.razor.cs @@ -1,8 +1,8 @@ -using ReduxDevToolsSample.Client.Store.WeatherUseCase; +using FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.WeatherUseCase; using Fluxor; using Microsoft.AspNetCore.Components; -namespace ReduxDevToolsSample.Client.Pages +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Pages { public partial class FetchData { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Program.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Program.cs index 2569b63d..42650857 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Program.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Program.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Fluxor; -namespace ReduxDevToolsSample.Client +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client { public class Program { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/CounterState.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/CounterState.cs index 9cb531e7..c20f2c48 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/CounterState.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/CounterState.cs @@ -1,4 +1,4 @@ -namespace ReduxDevToolsSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.CounterUseCase { public class CounterState { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/Feature.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/Feature.cs index c3247f62..3a707512 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/Feature.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/Feature.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace ReduxDevToolsSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.CounterUseCase { public class Feature : Feature { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/IncrementCounterAction.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/IncrementCounterAction.cs index 41b13723..d905f675 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/IncrementCounterAction.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/IncrementCounterAction.cs @@ -1,4 +1,4 @@ -namespace ReduxDevToolsSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.CounterUseCase { public class IncrementCounterAction { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/Reducers.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/Reducers.cs index ddf0d835..77dfc142 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/Reducers.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/CounterUseCase/Reducers.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace ReduxDevToolsSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.CounterUseCase { public static class Reducers { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Effects.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Effects.cs index eb57862d..3b91bbc3 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Effects.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Effects.cs @@ -1,10 +1,10 @@ -using ReduxDevToolsSample.Shared; +using FluxorBlazorWeb.ReduxDevToolsSample.Shared; using Fluxor; using Microsoft.AspNetCore.Components; using System.Net.Http; using System.Threading.Tasks; -namespace ReduxDevToolsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.WeatherUseCase { public class Effects { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Feature.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Feature.cs index 5a3a2d10..4c1f93a9 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Feature.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Feature.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace ReduxDevToolsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.WeatherUseCase { public class Feature : Feature { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/FetchDataAction.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/FetchDataAction.cs index 4c45c27d..8e5abd5e 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/FetchDataAction.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/FetchDataAction.cs @@ -1,4 +1,4 @@ -namespace ReduxDevToolsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.WeatherUseCase { public class FetchDataAction { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs index e96079f1..d7e79a3c 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs @@ -1,7 +1,7 @@ -using ReduxDevToolsSample.Shared; +using FluxorBlazorWeb.ReduxDevToolsSample.Shared; using System.Collections.Generic; -namespace ReduxDevToolsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.WeatherUseCase { public class FetchDataResultAction { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Reducers.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Reducers.cs index eb403b0d..c882db9d 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Reducers.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/Reducers.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace ReduxDevToolsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.WeatherUseCase { public static class Reducers { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/WeatherState.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/WeatherState.cs index 510cb9b6..7709c8f9 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/WeatherState.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Store/WeatherUseCase/WeatherState.cs @@ -1,7 +1,7 @@ -using ReduxDevToolsSample.Shared; +using FluxorBlazorWeb.ReduxDevToolsSample.Shared; using System.Collections.Generic; -namespace ReduxDevToolsSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.ReduxDevToolsSample.Client.Store.WeatherUseCase { public class WeatherState { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/_Imports.razor b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/_Imports.razor index 092b5214..b73ae2fa 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/_Imports.razor +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/_Imports.razor @@ -3,5 +3,5 @@ @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web @using Microsoft.JSInterop -@using ReduxDevToolsSample.Client -@using ReduxDevToolsSample.Client.Shared +@using FluxorBlazorWeb.ReduxDevToolsSample.Client +@using FluxorBlazorWeb.ReduxDevToolsSample.Client.Shared diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Controllers/WeatherForecastController.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Controllers/WeatherForecastController.cs index f4bf9449..cd1011ed 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Controllers/WeatherForecastController.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Controllers/WeatherForecastController.cs @@ -1,12 +1,11 @@ -using ReduxDevToolsSample.Shared; +using FluxorBlazorWeb.ReduxDevToolsSample.Shared; using System; using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace ReduxDevToolsSample.Server.Controllers +namespace FluxorBlazorWeb.ReduxDevToolsSample.Server.Controllers { [ApiController] [Route("[controller]")] diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/ReduxDevToolsSample.Server.csproj b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/FluxorBlazorWeb.ReduxDevToolsSample.Server.csproj similarity index 61% rename from Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/ReduxDevToolsSample.Server.csproj rename to Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/FluxorBlazorWeb.ReduxDevToolsSample.Server.csproj index 962bb3f0..e199e3ea 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/ReduxDevToolsSample.Server.csproj +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/FluxorBlazorWeb.ReduxDevToolsSample.Server.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -10,8 +10,8 @@ - - + + diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Program.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Program.cs index ba577a99..52b7a5a9 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Program.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Program.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -namespace ReduxDevToolsSample.Server +namespace FluxorBlazorWeb.ReduxDevToolsSample.Server { public class Program { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Startup.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Startup.cs index e99718ad..63d7329f 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Startup.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Server/Startup.cs @@ -1,13 +1,10 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.ResponseCompression; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using System.Linq; -namespace ReduxDevToolsSample.Server +namespace FluxorBlazorWeb.ReduxDevToolsSample.Server { public class Startup { diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Shared/ReduxDevToolsSample.Shared.csproj b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Shared/FluxorBlazorWeb.ReduxDevToolsSample.Shared.csproj similarity index 100% rename from Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Shared/ReduxDevToolsSample.Shared.csproj rename to Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Shared/FluxorBlazorWeb.ReduxDevToolsSample.Shared.csproj diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Shared/WeatherForecast.cs b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Shared/WeatherForecast.cs index ad9f2fd3..5c95a9ef 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Shared/WeatherForecast.cs +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Shared/WeatherForecast.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; -namespace ReduxDevToolsSample.Shared +namespace FluxorBlazorWeb.ReduxDevToolsSample.Shared { public class WeatherForecast { diff --git a/Source/Fluxor.sln b/Source/Fluxor.sln index 06dfbdac..20a0188f 100644 --- a/Source/Fluxor.sln +++ b/Source/Fluxor.sln @@ -43,11 +43,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03 ReduxDevToolsSample", "0 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fluxor.Blazor.Web.ReduxDevTools", "Fluxor.Blazor.Web.ReduxDevTools\Fluxor.Blazor.Web.ReduxDevTools.csproj", "{E33D5229-FFD7-410B-99E4-5FA2E02CCAFE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReduxDevToolsSample.Server", "..\Samples\Blazor\03ReduxDevToolsSample\ReduxDevToolsSample\Server\ReduxDevToolsSample.Server.csproj", "{69A0F2C5-481B-4B77-954A-E5CDD278D336}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.ReduxDevToolsSample.Server", "..\Samples\Blazor\03ReduxDevToolsSample\ReduxDevToolsSample\Server\FluxorBlazorWeb.ReduxDevToolsSample.Server.csproj", "{69A0F2C5-481B-4B77-954A-E5CDD278D336}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReduxDevToolsSample.Client", "..\Samples\Blazor\03ReduxDevToolsSample\ReduxDevToolsSample\Client\ReduxDevToolsSample.Client.csproj", "{CF6492F5-7E58-4CA7-A950-75CFC4676B6D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.ReduxDevToolsSample.Client", "..\Samples\Blazor\03ReduxDevToolsSample\ReduxDevToolsSample\Client\FluxorBlazorWeb.ReduxDevToolsSample.Client.csproj", "{CF6492F5-7E58-4CA7-A950-75CFC4676B6D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReduxDevToolsSample.Shared", "..\Samples\Blazor\03ReduxDevToolsSample\ReduxDevToolsSample\Shared\ReduxDevToolsSample.Shared.csproj", "{89981135-CA37-4339-963C-1CD17BDE8FBD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.ReduxDevToolsSample.Shared", "..\Samples\Blazor\03ReduxDevToolsSample\ReduxDevToolsSample\Shared\FluxorBlazorWeb.ReduxDevToolsSample.Shared.csproj", "{89981135-CA37-4339-963C-1CD17BDE8FBD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04 MiddlewareSample", "04 MiddlewareSample", "{F1016E3F-9840-4C96-AC62-C69B0A177005}" EndProject From a1e2b83c0fb4946da213dbc008d6cd599cd51d6f Mon Sep 17 00:00:00 2001 From: Peter Morris Date: Wed, 18 Mar 2020 14:40:10 +0000 Subject: [PATCH 06/13] Reference not working --- ... => FluxorBlazorWeb.MiddlewareSample.Client.csproj} | 2 +- .../Client/Middlewares/Logging/LoggingMiddleware.cs | 2 +- .../MiddlewareSample/Client/Pages/Counter.razor.cs | 4 ++-- .../MiddlewareSample/Client/Pages/FetchData.razor.cs | 4 ++-- .../MiddlewareSample/Client/Program.cs | 4 ++-- .../Client/Store/CounterUseCase/CounterState.cs | 2 +- .../Client/Store/CounterUseCase/Feature.cs | 2 +- .../Store/CounterUseCase/IncrementCounterAction.cs | 2 +- .../Client/Store/CounterUseCase/Reducers.cs | 2 +- .../Client/Store/WeatherUseCase/Effects.cs | 4 ++-- .../Client/Store/WeatherUseCase/Feature.cs | 2 +- .../Client/Store/WeatherUseCase/FetchDataAction.cs | 2 +- .../Store/WeatherUseCase/FetchDataResultAction.cs | 4 ++-- .../Client/Store/WeatherUseCase/Reducers.cs | 2 +- .../Client/Store/WeatherUseCase/WeatherState.cs | 4 ++-- .../MiddlewareSample/Client/_Imports.razor | 4 ++-- .../Server/Controllers/WeatherForecastController.cs | 5 ++--- ... => FluxorBlazorWeb.MiddlewareSample.Server.csproj} | 4 ++-- .../MiddlewareSample/Server/Program.cs | 10 ++-------- .../MiddlewareSample/Server/Startup.cs | 5 +---- ... => FluxorBlazorWeb.MiddlewareSample.Shared.csproj} | 0 .../MiddlewareSample/Shared/WeatherForecast.cs | 4 +--- Source/Fluxor.Blazor.Web/Fluxor.Blazor.Web.csproj | 8 ++++++++ Source/Fluxor.sln | 6 +++--- 24 files changed, 42 insertions(+), 46 deletions(-) rename Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/{MiddlewareSample.Client.csproj => FluxorBlazorWeb.MiddlewareSample.Client.csproj} (91%) rename Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/{MiddlewareSample.Server.csproj => FluxorBlazorWeb.MiddlewareSample.Server.csproj} (68%) rename Samples/Blazor/04MiddlewareSample/MiddlewareSample/Shared/{MiddlewareSample.Shared.csproj => FluxorBlazorWeb.MiddlewareSample.Shared.csproj} (100%) diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/MiddlewareSample.Client.csproj b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/FluxorBlazorWeb.MiddlewareSample.Client.csproj similarity index 91% rename from Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/MiddlewareSample.Client.csproj rename to Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/FluxorBlazorWeb.MiddlewareSample.Client.csproj index 2ca65441..dde04eeb 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/MiddlewareSample.Client.csproj +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/FluxorBlazorWeb.MiddlewareSample.Client.csproj @@ -15,7 +15,7 @@ - + diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Middlewares/Logging/LoggingMiddleware.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Middlewares/Logging/LoggingMiddleware.cs index ab69f646..586f7f61 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Middlewares/Logging/LoggingMiddleware.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Middlewares/Logging/LoggingMiddleware.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Threading.Tasks; -namespace MiddlewareSample.Client.Middlewares.Logging +namespace FluxorBlazorWeb.MiddlewareSample.Client.Middlewares.Logging { public class LoggingMiddleware : Middleware { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Pages/Counter.razor.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Pages/Counter.razor.cs index 34db9f2b..f794cc34 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Pages/Counter.razor.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Pages/Counter.razor.cs @@ -1,8 +1,8 @@ using Fluxor; using Microsoft.AspNetCore.Components; -using MiddlewareSample.Client.Store.CounterUseCase; +using FluxorBlazorWeb.MiddlewareSample.Client.Store.CounterUseCase; -namespace MiddlewareSample.Client.Pages +namespace FluxorBlazorWeb.MiddlewareSample.Client.Pages { public partial class Counter { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Pages/FetchData.razor.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Pages/FetchData.razor.cs index e68e0d33..ab244c57 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Pages/FetchData.razor.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Pages/FetchData.razor.cs @@ -1,8 +1,8 @@ -using MiddlewareSample.Client.Store.WeatherUseCase; +using FluxorBlazorWeb.MiddlewareSample.Client.Store.WeatherUseCase; using Fluxor; using Microsoft.AspNetCore.Components; -namespace MiddlewareSample.Client.Pages +namespace FluxorBlazorWeb.MiddlewareSample.Client.Pages { public partial class FetchData { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Program.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Program.cs index 4ca2e2e4..3f6d2d1c 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Program.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Program.cs @@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.DependencyInjection; using Fluxor; -using MiddlewareSample.Client.Middlewares.Logging; +using FluxorBlazorWeb.MiddlewareSample.Client.Middlewares.Logging; -namespace MiddlewareSample.Client +namespace FluxorBlazorWeb.MiddlewareSample.Client { public class Program { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/CounterState.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/CounterState.cs index 3b0f4762..d8314407 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/CounterState.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/CounterState.cs @@ -1,4 +1,4 @@ -namespace MiddlewareSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.MiddlewareSample.Client.Store.CounterUseCase { public class CounterState { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/Feature.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/Feature.cs index 602be989..d9c6962c 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/Feature.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/Feature.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace MiddlewareSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.MiddlewareSample.Client.Store.CounterUseCase { public class Feature : Feature { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/IncrementCounterAction.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/IncrementCounterAction.cs index dced0a01..3b93b00f 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/IncrementCounterAction.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/IncrementCounterAction.cs @@ -1,4 +1,4 @@ -namespace MiddlewareSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.MiddlewareSample.Client.Store.CounterUseCase { public class IncrementCounterAction { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/Reducers.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/Reducers.cs index 51a0461d..10414777 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/Reducers.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/CounterUseCase/Reducers.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace MiddlewareSample.Client.Store.CounterUseCase +namespace FluxorBlazorWeb.MiddlewareSample.Client.Store.CounterUseCase { public static class Reducers { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Effects.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Effects.cs index 057ced96..9f3d412d 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Effects.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Effects.cs @@ -1,10 +1,10 @@ -using MiddlewareSample.Shared; +using FluxorBlazorWeb.MiddlewareSample.Shared; using Fluxor; using Microsoft.AspNetCore.Components; using System.Net.Http; using System.Threading.Tasks; -namespace MiddlewareSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.MiddlewareSample.Client.Store.WeatherUseCase { public class Effects { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Feature.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Feature.cs index d6f11d18..3294c369 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Feature.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Feature.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace MiddlewareSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.MiddlewareSample.Client.Store.WeatherUseCase { public class Feature : Feature { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/FetchDataAction.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/FetchDataAction.cs index ecb066eb..5c4a7c7c 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/FetchDataAction.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/FetchDataAction.cs @@ -1,4 +1,4 @@ -namespace MiddlewareSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.MiddlewareSample.Client.Store.WeatherUseCase { public class FetchDataAction { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs index 3f118a9c..2183bae6 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/FetchDataResultAction.cs @@ -1,7 +1,7 @@ -using MiddlewareSample.Shared; +using FluxorBlazorWeb.MiddlewareSample.Shared; using System.Collections.Generic; -namespace MiddlewareSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.MiddlewareSample.Client.Store.WeatherUseCase { public class FetchDataResultAction { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Reducers.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Reducers.cs index 93df900c..c8656e6c 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Reducers.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/Reducers.cs @@ -1,6 +1,6 @@ using Fluxor; -namespace MiddlewareSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.MiddlewareSample.Client.Store.WeatherUseCase { public static class Reducers { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/WeatherState.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/WeatherState.cs index 6ec2a445..05f85b0f 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/WeatherState.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Store/WeatherUseCase/WeatherState.cs @@ -1,7 +1,7 @@ -using MiddlewareSample.Shared; +using FluxorBlazorWeb.MiddlewareSample.Shared; using System.Collections.Generic; -namespace MiddlewareSample.Client.Store.WeatherUseCase +namespace FluxorBlazorWeb.MiddlewareSample.Client.Store.WeatherUseCase { public class WeatherState { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/_Imports.razor b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/_Imports.razor index a1abfae9..baee3bf3 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/_Imports.razor +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/_Imports.razor @@ -3,5 +3,5 @@ @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web @using Microsoft.JSInterop -@using MiddlewareSample.Client -@using MiddlewareSample.Client.Shared +@using FluxorBlazorWeb.MiddlewareSample.Client +@using FluxorBlazorWeb.MiddlewareSample.Client.Shared diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Controllers/WeatherForecastController.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Controllers/WeatherForecastController.cs index 6af83e8c..0e1761cd 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Controllers/WeatherForecastController.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Controllers/WeatherForecastController.cs @@ -1,12 +1,11 @@ -using MiddlewareSample.Shared; +using FluxorBlazorWeb.MiddlewareSample.Shared; using System; using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace MiddlewareSample.Server.Controllers +namespace FluxorBlazorWeb.MiddlewareSample.Server.Controllers { [ApiController] [Route("[controller]")] diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/MiddlewareSample.Server.csproj b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/FluxorBlazorWeb.MiddlewareSample.Server.csproj similarity index 68% rename from Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/MiddlewareSample.Server.csproj rename to Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/FluxorBlazorWeb.MiddlewareSample.Server.csproj index 5768a72d..a0d6a306 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/MiddlewareSample.Server.csproj +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/FluxorBlazorWeb.MiddlewareSample.Server.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Program.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Program.cs index 8d67e58c..5b6dd784 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Program.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Program.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -namespace MiddlewareSample.Server +namespace FluxorBlazorWeb.MiddlewareSample.Server { public class Program { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Startup.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Startup.cs index d6c3c509..195461c7 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Startup.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/Startup.cs @@ -1,13 +1,10 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.ResponseCompression; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using System.Linq; -namespace MiddlewareSample.Server +namespace FluxorBlazorWeb.MiddlewareSample.Server { public class Startup { diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Shared/MiddlewareSample.Shared.csproj b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Shared/FluxorBlazorWeb.MiddlewareSample.Shared.csproj similarity index 100% rename from Samples/Blazor/04MiddlewareSample/MiddlewareSample/Shared/MiddlewareSample.Shared.csproj rename to Samples/Blazor/04MiddlewareSample/MiddlewareSample/Shared/FluxorBlazorWeb.MiddlewareSample.Shared.csproj diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Shared/WeatherForecast.cs b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Shared/WeatherForecast.cs index f401aef6..7c31d210 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Shared/WeatherForecast.cs +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Shared/WeatherForecast.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; -namespace MiddlewareSample.Shared +namespace FluxorBlazorWeb.MiddlewareSample.Shared { public class WeatherForecast { diff --git a/Source/Fluxor.Blazor.Web/Fluxor.Blazor.Web.csproj b/Source/Fluxor.Blazor.Web/Fluxor.Blazor.Web.csproj index 735a9be8..ce929ffa 100644 --- a/Source/Fluxor.Blazor.Web/Fluxor.Blazor.Web.csproj +++ b/Source/Fluxor.Blazor.Web/Fluxor.Blazor.Web.csproj @@ -30,4 +30,12 @@ + + + + True + + + + diff --git a/Source/Fluxor.sln b/Source/Fluxor.sln index 20a0188f..c2f6ce63 100644 --- a/Source/Fluxor.sln +++ b/Source/Fluxor.sln @@ -51,11 +51,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.ReduxDevToo EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04 MiddlewareSample", "04 MiddlewareSample", "{F1016E3F-9840-4C96-AC62-C69B0A177005}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiddlewareSample.Server", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Server\MiddlewareSample.Server.csproj", "{C5FEF754-CDCB-453C-924E-58FB3BB5F551}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.MiddlewareSample.Server", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Server\FluxorBlazorWeb.MiddlewareSample.Server.csproj", "{C5FEF754-CDCB-453C-924E-58FB3BB5F551}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiddlewareSample.Client", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Client\MiddlewareSample.Client.csproj", "{7627287C-4254-4CA1-A4F7-F694B78E80C4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.MiddlewareSample.Client", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Client\FluxorBlazorWeb.MiddlewareSample.Client.csproj", "{7627287C-4254-4CA1-A4F7-F694B78E80C4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiddlewareSample.Shared", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Shared\MiddlewareSample.Shared.csproj", "{EF468D50-CA42-4589-B37E-8E4EF32C05A7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluxorBlazorWeb.MiddlewareSample.Shared", "..\Samples\Blazor\04MiddlewareSample\MiddlewareSample\Shared\FluxorBlazorWeb.MiddlewareSample.Shared.csproj", "{EF468D50-CA42-4589-B37E-8E4EF32C05A7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 08b848fb4800f80b17ef1338088c061082469c05 Mon Sep 17 00:00:00 2001 From: Peter Morris Date: Wed, 18 Mar 2020 14:52:29 +0000 Subject: [PATCH 07/13] Fixed sample 04 --- .../Client/FluxorBlazorWeb.MiddlewareSample.Client.csproj | 1 + .../MiddlewareSample/Client/Shared/NavMenu.razor | 2 +- .../Server/FluxorBlazorWeb.MiddlewareSample.Server.csproj | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/FluxorBlazorWeb.MiddlewareSample.Client.csproj b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/FluxorBlazorWeb.MiddlewareSample.Client.csproj index dde04eeb..7f74bd56 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/FluxorBlazorWeb.MiddlewareSample.Client.csproj +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/FluxorBlazorWeb.MiddlewareSample.Client.csproj @@ -12,6 +12,7 @@ + diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Shared/NavMenu.razor b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Shared/NavMenu.razor index 98393627..7516e46b 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Shared/NavMenu.razor +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Shared/NavMenu.razor @@ -1,5 +1,5 @@ 
- ReduxDevToolsSample + MiddlewareSample diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/FluxorBlazorWeb.MiddlewareSample.Server.csproj b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/FluxorBlazorWeb.MiddlewareSample.Server.csproj index a0d6a306..297f7599 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/FluxorBlazorWeb.MiddlewareSample.Server.csproj +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Server/FluxorBlazorWeb.MiddlewareSample.Server.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 From 9f663d229f8b5d2bd156c4a47f1de00f0398c185 Mon Sep 17 00:00:00 2001 From: Peter Morris Date: Wed, 18 Mar 2020 15:16:06 +0000 Subject: [PATCH 08/13] Move StoreInitializer into App.Razor --- Samples/Blazor/01CounterSample/CounterSample/App.razor | 2 +- .../01CounterSample/CounterSample/Shared/MainLayout.razor | 1 - Samples/Blazor/02EffectsSample/EffectsSample/Client/App.razor | 3 ++- .../EffectsSample/Client/Shared/MainLayout.razor | 1 - .../03ReduxDevToolsSample/ReduxDevToolsSample/Client/App.razor | 1 + .../ReduxDevToolsSample/Client/Shared/MainLayout.razor | 1 - .../04MiddlewareSample/MiddlewareSample/Client/App.razor | 1 + .../MiddlewareSample/Client/Shared/MainLayout.razor | 1 - 8 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Samples/Blazor/01CounterSample/CounterSample/App.razor b/Samples/Blazor/01CounterSample/CounterSample/App.razor index bf6c7737..2c0de650 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/App.razor +++ b/Samples/Blazor/01CounterSample/CounterSample/App.razor @@ -1,4 +1,4 @@ - + diff --git a/Samples/Blazor/01CounterSample/CounterSample/Shared/MainLayout.razor b/Samples/Blazor/01CounterSample/CounterSample/Shared/MainLayout.razor index b8272d5a..e5110a7d 100644 --- a/Samples/Blazor/01CounterSample/CounterSample/Shared/MainLayout.razor +++ b/Samples/Blazor/01CounterSample/CounterSample/Shared/MainLayout.razor @@ -1,6 +1,5 @@ @inherits LayoutComponentBase -
diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/App.razor b/Samples/Blazor/02EffectsSample/EffectsSample/Client/App.razor index 1c360b71..2c0de650 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/App.razor +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/App.razor @@ -1,4 +1,5 @@ - + + diff --git a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Shared/MainLayout.razor b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Shared/MainLayout.razor index b04c1f84..7472a047 100644 --- a/Samples/Blazor/02EffectsSample/EffectsSample/Client/Shared/MainLayout.razor +++ b/Samples/Blazor/02EffectsSample/EffectsSample/Client/Shared/MainLayout.razor @@ -1,6 +1,5 @@ @inherits LayoutComponentBase -
diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/App.razor b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/App.razor index 6f67a6ea..b996cafe 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/App.razor +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/App.razor @@ -1,3 +1,4 @@ + diff --git a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Shared/MainLayout.razor b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Shared/MainLayout.razor index b04c1f84..7472a047 100644 --- a/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Shared/MainLayout.razor +++ b/Samples/Blazor/03ReduxDevToolsSample/ReduxDevToolsSample/Client/Shared/MainLayout.razor @@ -1,6 +1,5 @@ @inherits LayoutComponentBase -
diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/App.razor b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/App.razor index 6f67a6ea..b996cafe 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/App.razor +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/App.razor @@ -1,3 +1,4 @@ + diff --git a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Shared/MainLayout.razor b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Shared/MainLayout.razor index b04c1f84..7472a047 100644 --- a/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Shared/MainLayout.razor +++ b/Samples/Blazor/04MiddlewareSample/MiddlewareSample/Client/Shared/MainLayout.razor @@ -1,6 +1,5 @@ @inherits LayoutComponentBase -
From de8f12235634b98d5e30cb9471a894b7726608ec Mon Sep 17 00:00:00 2001 From: Peter Morris Date: Wed, 18 Mar 2020 16:09:05 +0000 Subject: [PATCH 09/13] Sample 1 docs --- Samples/Blazor/01CounterSample/README.md | 240 +++++++++++++++++++++++ Source/Fluxor.sln | 3 + 2 files changed, 243 insertions(+) create mode 100644 Samples/Blazor/01CounterSample/README.md diff --git a/Samples/Blazor/01CounterSample/README.md b/Samples/Blazor/01CounterSample/README.md new file mode 100644 index 00000000..304aa80c --- /dev/null +++ b/Samples/Blazor/01CounterSample/README.md @@ -0,0 +1,240 @@ +# Fluxor - Blazor Web Samples + +## State, Actions, and Reducers + +### Goal +This tutorial will recreate the `Counter` page in a standard Blazor app. + +### Steps + +#### Add Fluxor.Blazor.Web and initialize +- First create a new Blazor app, either a Server app or Web Assembly app will do. + +- Add a NuGet package reference to `Fluxor.Blazor.Web`. + +- Edit either `Pages\_Host.cshtml` (Server-side) or `wwwroot\index.html` (Web Assembly) and +just above the `` tag add the following: + +```html + +``` + +- We now need to register Fluxor. Find where the app registers its services +(in a Server-side app this will be in `Startup.ConfigureServices`, in a Web Assembly app this will be +in `Program.Main`). + +```c# +// Server-side +using Fluxor; + +public void ConfigureServices(IServiceCollection services) +{ + ... + + // Add the following + var currentAssembly = typeof(Startup).Assembly; + services.AddFluxor(options => options.ScanAssemblies(currentAssembly)); +} +``` + +```c# +// Web Assembly +using Fluxor; + +public static async Task Main(string[] args) +{ + ... + + // Add the following + var currentAssembly = typeof(Program).Assembly; + builder.Services.AddFluxor(options => options.ScanAssemblies(currentAssembly)); + + // This line already exists and should come last + await builder.Build().RunAsync(); +} +``` + +- Then we need to ensure the store is initialized. Edit `App.razor` and at the top of the file add +- the following mark-up. + +```html + +``` + +#### Adding the Counter to the store + +Note, the folder structure used here is only a recommendation. +- Create a folder named `Store`. +- Within that folder create another folder named `CounterUseCase`. + +*Note: I recommend building your store and your application around use +cases (e.g. FindSupplier, EditSupplier, etc).* + +- Within the `CounterUseCase` folder create a new class named `CounterState`. This is the class that +will hold the values of your state to be displayed in your application. + +```c# +public class CounterState +{ + public int ClickCount { get; } + + public CounterState(int clickCount) + { + ClickCount = clickCount; + } +} +``` + +*Note: State should be immutable* + +- Create a new class named `Feature`. This class describes the state to the store. + +```c# +public class Feature : Feature +{ + public override string GetName() => "Counter"; + protected override CounterState GetInitialState() => + new CounterState(clickCount: 0); +} +``` + +#### Displaying state in a component + +*Note: C# code can be added to the `@code {}` block within Razor files, but I prefer to add a +code-behind file.* + +- Find the `Pages` folder and add a new file named `Counter.razor.cs` +- Mark the class `partial`. +- Add the following `using` declarations + +```c# +using Fluxor; +using Microsoft.AspNetCore.Components; +using YourAppName.Store.CounterUseCase; +``` + +- Next we need to inject the `CounterState` into our component + +```c# +public partial class Counter +{ + [Inject] + private IState CounterState { get; set; } +} +``` + +- Edit `Counter.razor` and change `currentCount` to `@CounterState.Value.ClickCount`. + +```html +

Current count: @CounterState.Value.ClickCount

+``` + +Also, add the following line to the top of the razor file +``` +@inherits Fluxor.Blazor.Web.Components.FluxorComponent +``` + +*Note: This is required to ensure the component re-renders whenever its state changes. If you are unable +to descend from this component, you can instead subcribe to the `IState.StateChanged` event and execute +`InvokeAsync(StateHasChanged)`. If you do use the event, remember to implement `IDisposable` and +unsubscribe from the event too, otherwise your app will leak memory.* + +Running the app will now show a `0` value fo the current count, but clicking the "Click me" button does nothing. + +#### Using an Action and a Reducer to alter state + +- In `Store\CounterUseCase` create a new class `IncrementCounterAction`. This class can remain empty. +- Edit `Counter.Razor` and remove the `@code {}` section. +- In `Counter.razor.cs` we need to inject `IDispatcher` and then use it to dispatch an instance +of our new `IncrementCounterAction` when the button is clicked. + +```c# +public partial class Counter +{ + [Inject] + private IState CounterState { get; set; } + + [Inject] + public IDispatcher Dispatcher { get; set; } + + private void IncrementCount() + { + var action = new IncrementCounterAction(); + Dispatcher.Dispatch(action); + } +} +``` + +*Note: `IncrementCount` is executed when the `