From 489906343542f6a674b9adf7f612a30ceb3330e8 Mon Sep 17 00:00:00 2001
From: Smarak Das <34758667+Thesmader@users.noreply.github.com>
Date: Wed, 27 Jan 2021 22:47:45 +0530
Subject: [PATCH] Implement all Feed UI components (#118)

* Homepage story and schedule UI implementation.

* Fixed tests for feed viewmodel.

Refer feed_viewmodel_test.dart for examples on how to write unit tests
for the functions that use Task to call functions from the API service.
Added test for failure case in stories API call.

* Implemet MM articles UI and improve test coverage.

This commit adds UI implementation for MM articles, changes the story
component widget to match the design spec, and adds tests for Margin,
Failure. Unused code and tests related to API classes have been removed.

* Feed view implemented.

Feed view UI components implemented:
[x] Stories
[x] Schedule
[x] Stories this week
[x] Upcoming Events

Internet permission added to AndroidManifest.xml, Story component has a
border gradient now. Files for exporting the files in some folders are
added to make documentation generation work correctly.

* Implement suggested changes.

- Deleted test/.test_coverage.dart
- Use Future.wait() in FeedViewmodel.initialise().
---
 elaichi/.gitignore                            |   2 +
 elaichi/android/app/build.gradle              |   1 +
 .../android/app/src/main/AndroidManifest.xml  |   1 +
 elaichi/android/build.gradle                  |   1 +
 elaichi/assets/icons/avenue_icons.ttf         | Bin 0 -> 2680 bytes
 elaichi/assets/images/dsc.png                 | Bin 13747 -> 0 bytes
 elaichi/assets/translations/en.json           |   3 +-
 elaichi/lib/app/colors.dart                   |   1 +
 elaichi/lib/app/icons.dart                    |  20 ++
 elaichi/lib/app/locator.config.dart           |   2 -
 elaichi/lib/app/styles.dart                   |   7 +-
 elaichi/lib/datamodels/api_models.dart        |  23 +-
 elaichi/lib/datamodels/datamodels.dart        |   6 +
 elaichi/lib/generated/codegen_loader.g.dart   |   3 +-
 elaichi/lib/generated/locale_keys.g.dart      |   1 +
 elaichi/lib/graphql/schema.graphql            | 230 ++++++++++++++++++
 elaichi/lib/main.dart                         |   2 +
 elaichi/lib/services/api.dart                 |  10 -
 elaichi/lib/services/fake_api.dart            |  59 -----
 elaichi/lib/services/feed_service.dart        |  29 ---
 elaichi/lib/services/services.dart            |   8 +
 elaichi/lib/ui/utils/utils.dart               |   3 +
 elaichi/lib/ui/views/feed/feed_view.dart      |  22 +-
 elaichi/lib/ui/views/feed/feed_viewmodel.dart |   5 +-
 elaichi/lib/ui/views/home/home_view.dart      |  29 ++-
 elaichi/lib/ui/views/home/home_viewmodel.dart |  53 +---
 .../ui/views/startup/startup_viewmodel.dart   |   2 +-
 elaichi/lib/ui/widgets/appbar.dart            |   9 +-
 elaichi/lib/ui/widgets/event_card.dart        |  92 +++++++
 .../ui/widgets/schedule/schedule_card.dart    |  87 +++----
 .../widgets/schedule/schedule_component.dart  |  30 +--
 elaichi/lib/ui/widgets/story/story_bar.dart   |   7 +-
 .../lib/ui/widgets/story/story_component.dart |  54 +++-
 elaichi/lib/ui/widgets/this_week.dart         |  93 +++++++
 elaichi/lib/ui/widgets/widgets.dart           |   7 +
 elaichi/pubspec.yaml                          |  13 +-
 elaichi/test/misc/failure_test.dart           |  12 +
 elaichi/test/misc/margins_test.dart           |  26 ++
 elaichi/test/service_tests/api_test.dart      | 113 +--------
 elaichi/test/setup/test_helpers.dart          |  12 -
 .../viewmodel_tests/feed_viewmodel_test.dart  |  35 +++
 .../viewmodel_tests/home_viewmodel_test.dart  |  12 -
 .../startup_viewmodel_test.dart               |   1 +
 elaichi/test/widget_tests/feed_view_test.dart |  85 +++++++
 .../test/widget_tests/startup_view_test.dart  |  40 ++-
 .../widget_tests/widgets/appbar_test.dart     |  19 ++
 46 files changed, 836 insertions(+), 434 deletions(-)
 create mode 100644 elaichi/assets/icons/avenue_icons.ttf
 delete mode 100644 elaichi/assets/images/dsc.png
 create mode 100644 elaichi/lib/app/icons.dart
 create mode 100644 elaichi/lib/datamodels/datamodels.dart
 create mode 100644 elaichi/lib/graphql/schema.graphql
 delete mode 100644 elaichi/lib/services/feed_service.dart
 create mode 100644 elaichi/lib/services/services.dart
 create mode 100644 elaichi/lib/ui/utils/utils.dart
 create mode 100644 elaichi/lib/ui/widgets/event_card.dart
 create mode 100644 elaichi/lib/ui/widgets/this_week.dart
 create mode 100644 elaichi/lib/ui/widgets/widgets.dart
 create mode 100644 elaichi/test/misc/failure_test.dart
 create mode 100644 elaichi/test/misc/margins_test.dart
 create mode 100644 elaichi/test/widget_tests/feed_view_test.dart
 create mode 100644 elaichi/test/widget_tests/widgets/appbar_test.dart

diff --git a/elaichi/.gitignore b/elaichi/.gitignore
index 2d31149f..593ad30f 100644
--- a/elaichi/.gitignore
+++ b/elaichi/.gitignore
@@ -16,6 +16,8 @@ doc/api/
 # If you don't generate coverage info locally you can remove this line.
 coverage/
 
+test/.test_coverage.dart
+
 # Avoid committing generated Javascript files:
 *.dart.js
 *.info.json      # Produced by the --dump-info flag.
diff --git a/elaichi/android/app/build.gradle b/elaichi/android/app/build.gradle
index c689f653..2de9cf85 100644
--- a/elaichi/android/app/build.gradle
+++ b/elaichi/android/app/build.gradle
@@ -24,6 +24,7 @@ if (flutterVersionName == null) {
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+apply plugin: 'com.google.gms.google-services'
 
 def keyStoreProperties = new Properties()
 def keyStorePropertiesFile = rootProject.file('key.properties')
diff --git a/elaichi/android/app/src/main/AndroidManifest.xml b/elaichi/android/app/src/main/AndroidManifest.xml
index 33400217..1ddf2b0d 100644
--- a/elaichi/android/app/src/main/AndroidManifest.xml
+++ b/elaichi/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dscnitrourkela.elaichi">
+    <uses-permission android:name="android.permission.INTERNET" />
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/elaichi/android/build.gradle b/elaichi/android/build.gradle
index 3100ad2d..9319192f 100644
--- a/elaichi/android/build.gradle
+++ b/elaichi/android/build.gradle
@@ -8,6 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.google.gms:google-services:4.3.4'
     }
 }
 
diff --git a/elaichi/assets/icons/avenue_icons.ttf b/elaichi/assets/icons/avenue_icons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..47addb1dc4b0da0eb3c02ab393d72c922d9e5ae2
GIT binary patch
literal 2680
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
RPY_c!m8W+l|6BT$@gK&6iKYMm

literal 0
HcmV?d00001

diff --git a/elaichi/assets/images/dsc.png b/elaichi/assets/images/dsc.png
deleted file mode 100644
index fa57321c4d6b2ce8c51604bf2820e9d20f28434c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13747
zcmeIZ^-~;O)HNCi1bYa<3GSZ30t62UuEE_cIKc)OEF_TN!GgQH>oB;x%fR4Hn863<
zoA<4I|Ap_Dd%NmXSD)%5y}HlZXYai_{EM1AJ}xEhix)5O6%}MOU%WtD{hxyU3RUBu
zPj!Vl;kYRnc)WOlNBlnp?L}G!1*#IwLsS0Ki>e9gL(~O^owTa-ix;)Acn=nsFJ1^L
zD9T7{`=Fh`2t0LmlWra#GdwP^h(1jPPg_!nT?#jRF4oTt1$tgZd^t=^b-;_L_Qqj~
zX`3TV79Dy)%pW{QXy)0V#r?%CNtfhaNnW&acl{*(sQ}YxPY=qkWvJCp`BI69NC6Jn
zU+&z;Xf$Ma7=^SVGZ1#~cGpNahat#+7yll`L6NAL{r|`RMFdXCm_B|7ainrrAFOLQ
z6JU9Dm}#<6KD1H@Xv;W0T_VelXqk#;DG{9y^h+KJuil&dQEJ4-HLR0NUD6P4DUvA=
z!dA)TTVq>2)`ve8ZwB3gbPA>)!TpbSAS5MXBvC<Y@X|{ao#X>L05`sk{yuCyuvX{7
z_l((I`)C!j$xtmxDS@wU1#>I$W)JjP2)@L^PBC9zr5rKNI)7j%qe@}yxSN<thTKQC
zV2MRT5ltPd8S!D-y20q5yJWku_39pt|6KJMAFripnKW=Go7!Fb$z`kA)vt^2TwP>_
zw3i!t%~Rm49v`Qc!=mTxF_wt=0QtF&EH&%)0ZAK?J<?sW*&sn*4b@WD0Wj$Vw;+E{
z00)DJooMtD-B)uuDsG*0m54}p0RGca;)thIP#!4S)jc&LQdP~RXpQao$p~beX)$dO
z*m)H_s|UoL`i0$cpj9196_8mz|L#q`*Nku-T&rgM@qU7VV`jYd3&g=e^QFnZBe+#T
zH3iIOPJGq97dnrANr(=(>vJ5|7?$ZV+Hfc*SN`r+o-4?TO&L}Y*rew+V4PD~uS@q$
zSUaJ>{D76qv^SS3Yl-z^7NJ|5-uSTkYk>}AFf9aopTWz&OeFz~)3TrOPHX{NO}S<J
z#%@1bc-hChbf-WLWV;Hg7N|ITWy+fl8y{jr2b^!2^BZKUdX9Zb5^)y=M_+K2>(Yr;
zV8J`+=M`WGlK)Hv3!6s$lvm5H9XN)l%7C-1dRl=sS4l;`mh?mY={FenO*{W-=~3ig
zx!Ch*Muf*@ZecC{=Nm(EF<f%DmuSIyBDF~y6K|P!<bd3RFT8aW#{2Ub!+1yK;^#CI
zOzB$(A;NulvTAOvxJ}PrAoKz(QEn<|Q=tEBpoc}rDO(~oUUAnz3h4|ONC0CFp`io(
zOqLq*mc{(5DKdB0%=_PdU3WBlV+{}yZY<Y0m9(pFv-J_GnT+7;Ef{L0dZpK!JUDqh
zy6+K%4T%npG$j_QD!F`ZQapfn+~7sTFi@Bbt~1elt@@Z95CY6-e2Dz~vf4ABIv>;O
z+brwkfdp32di&oyfFB+jImGh$Mnh4@wHEy43T7~xF?&KpoyE(1RqowAZA-TMq|4Ei
zc2de4&%eAe@wd}VUJ=bMDmYTWomZp|aGcETCRj5pYg8;jDo00?QQ0nVomtw%O03f<
zX4iP=()-pKFurO(Cus^Tyg;sx@G)jcq65@Mm51BT1D}>JB+d}OWpe_^%dZEZ?|7>I
zP?Q^fyK){#k!Lm)?G=D#tv43g-1)J7*-RvK`=-<*>Ks&URkuHEV(2vJ?-!}0m5dJ%
zkt(7oZ4*{BxDNsQlic|pt@5@hqt}1^lIQ=Ds@#oJ98FErXKWC2<!WF^*ow;Ovz)`I
zzm!Wk7>J>pJSemjHW%foH{s<9WjcOU^`Pl_ym;VM;r8v*=KE}-b^m^dNmX(Pf;Le~
z?lP@A9axn_QEKQru7V8UA@w}2LPP}4H;4aPYd<skXD%O$-SPpDELjE5K1i{cTipe`
z!(1e8u5R^PTMN`3)Gag>r|0AKnQwqLNSwEWok$*iS4{2NCJ}&#ol(`;!Vhvkx9JO`
zkki)uXLmN_CK_=EK5Hf7A8RCptj21XvQ+-2D6CARVytX`DfKE(mJfRBhLXRk$k5~^
zuKA*`zquum7N0NYgLCm49L$W#R%Gk?OEtEGzL9GNtcxWsR63xn{REY$Ak0XKD~`q?
zYgE~P06hIB1+)o1Uky5>^MDT+)`cgDoz%ZiTab1<vxI+;ntm2#SjrMl8g_Wx$Es+z
z{dTojRYLqxe{;Z8zxX8ipk-XE^>a&37HvK#%n5p{5nkffaWX0833oM~Zc}qRDnV?$
z!&pthJ#H9(%2gcj!CQshV0XV&1i5cc{Z=Cpb-Zn~Lg(?3b}RCZ;6XO2S^Z~j9H$wR
zE2VNXSMnGh6D`+nhus9pe?K*;EQ6T^F`c54Q>0HX>)^XuhJOqDO{3ewcP@86`}w6*
z%lPkBMcJ*D7J6ZCZ;X4MR{D90(uvQT!68-d&zQj6je!baqY+=MA<w<rpy!>yASTyp
z%2!(9qoyu|%b;+ic{(vu8RTLj?)PCCCtfUA#_7^jy5v#@p{oCUTb86ZPSS^N@`I7P
zVzy(iIa-|}sJ5?_)G9C$n0l#?JVvm5QV|t1ZBg5q;njm0h`RO9FGkLT44<D$RYQg>
zL#Z@WvuOmkg4a6$3{UkKD-Wmh{)UVLHlHOKh9s=yA`k&V8xf9K2hFIJiW%3J>DWiD
z!dfoyv<YJQa@62k#Ohb7XSF(>hI`J$AXof1ZRU)HtJ?39yZZT2g(-qeNL6;|cpK2R
zEU;#Y?o6j)PhDp-h)G1~RbG@t*O1B6`m5pkA60aj=skDmx*xjh`!{Zp#=!OMzBrAJ
zSAeOsnqOQ7ksTiN#7nV(^o+g#mFcNgYB>hN*KAh1t~g*j;m$XGqxa3TAM#r?df!=M
zC0HF@-_wjrG){ue(@8>{&6ItJw3TEqEJtAdSxD_{f$hp0svx1ujQJm(qM=To37Iy?
za+BkS&tGoK@eJK`zeakdz4?k4#$#%2iYK)q!NSQe{6@BF)n^atnfe@ggo3-mR4}^Y
zGa=&!S=`>vAZI$@{&Ehtb9-@N$T%1IE%zI_bT2MOt5tzqzfqZ=^>Np(mX!b{KPPsJ
z?AH8b3=JS~*HCZNw@0Fqn1tC%+$`8wOF%P9lFw~-o=Q=GoIo=Uv+6!2c2R>z+O7UR
zF$oXXpt!67_Yc9q&qc)9q5CrnxerxcmWgWmP|pBv^T*J`?Z<6NL8fiGwapm?0h}h;
zT!B9-p0B3a+R41u6LO|n9e)@YTSB5=>KY3$iBGVwD`2dm&xu=HDkxsAm&hf9KZ>aY
zOIjF3QJ}lTec@vg2abRE8Y?d5wwo-6gZp~l4R6SCn9r+&&c9#cA^s1XM{?THUn5}3
z`^oUDzlOhdy~7ygw7JGglotpS^Lwz-3sY57?F5CJ=C|`kp_zlSD$NAT?H&~}LtRN)
zy}_dmIa^*`Wvf9=W>4&}vO8LiUCB8Z%TZlq75f>42C%e%*WFaonz%+APJxs-AtI@#
zoE&<Ibv1<dqa*N&xl}z~<oGkjs^rZ3rv$6(`;$qkvn;}xTbU4@0F6Ak6L0A=ErFT4
zz2)z86<$}c(mCKgHc-s>8rsL_Wy;#JQew>Gc@`e;)ao~>Ja=<PT&tbMXq|VzzlB;z
z)e1{}KU~*tDg#2=Eke`T00G8p;x2Q}fviiL05glqzvfg7WzdxA>vg3*jJ#+#`GmKe
zav`CB!0A7{mwGChEJIW-CLR@HQ+_lF(QH6IY{`*-M-1s^8301<#;r70%KSx~JcrmN
zbJOFF$Kz0Y8IgWm;a{fUe_9FGY@*&2OzX@`a_NG1DKd$Esce`ULdN1jur7kk`h36n
zIcBPI_g}&3FUON(X%_sKix+P5)LTA^eR|_{KQXL(lK5M6g?edcZ7?q7ERwe5ZK<x1
zZop}Vt8Qh=r`}9z`oh&nXgv9Rfdt~U;~1>LGKz4%^>fodV`f6#tLV~Lilh~c+8hhm
z+E7FtQ}^S&tH~nZfD~iZ^i5W=^EH9`c@#jmQ1RoKr{8x-4eOQV&csHCQOg$Jz;kQO
zGLH)-OO0?-2Q(wE1GJ~Wk)6A@a}bC1fFemxnr@-MsOfnPf~MSN=*y>%Z-l+JK<jiq
zfhY9^sgu-PtFt@k&XtNo+&aBW?MpL%RdTGP-uwur5{16$+`-&@2sEZ~Bec4r*OH7C
ziYxvV42m#ST1Y~wX9T1duTksmmyq=(AAPR!1{L=yTtzt2YUTs6Eyo&4l2#ynarp0M
z7v=4!ZD`-PscY&N2lTqCmz^1B>h>~8uI>(|Dp?Icr(L|L%3)wqvrNr&c0|=Kzcl-v
z@##|0cjuO=d7#!DP#qTy$xN*hQ##5kL=cpC^)l1X+hHHb9QLXz<7kBa{P(FrutJLA
znz?vuvCSP+P8wxvC9ntgZaZ36h!L-k8hp|<OoV(!CybZ}%Kn-`27LAm(LQmW08&;F
zWUO4GMb-JF2jAYf#pa6K)+(Kiuu*OExOqWy(I2KKRLrHwo3+ogQPzn3*DKRQISXCD
znqxIr>-hZ+SGAOC+U+BDOHiKuL-8O5{$ENyD-0h3=eVvI+W5O=Q|S~#+FcigY#=#d
zozxA}e1%WlI0eXV^wMigE07!=Zj_dgP0iZTy!5ERigy}#A~eP2s3j(hvqtz@u(`uv
zmv#aB)Wu?h)Bu*m7b)tR+d&l((1m~8z=GqES(3_R{NC+9O78@sR6d`J7+0J%yN!r)
zS0bywIBqIMvMgUu+b@q==$InBic24p1N<Dq5uF<$Cz=dPTNFL!$0K;c#7?o*SCgh@
zhezH5u+I+OA6``oZN1ZZ7qnU7ssb^z<o?UG`Z%l}O=Lz6jy&{1i;*uhk;wF(DDt6w
z7SYiet!|s}*&_rR<TCshqa5vYs=~_?a|P4KTt#uRLx1&6#C=osUJ8L<9w#_zT!k(k
z+Ful_#p|}K17}^pn>?rky&WW98>2KK^tpceK*JOv+l3F7p*el6?!j|v$>0@5JX0+2
zeT@j2FI8NAKlF#gcWB<LllkN1b&I>q=M@zCG{5X+;s{#q2V)i6LLN1N@`9Sdv@JxR
zt$Ge%b_t*0q&i&HX@?F#AdcPgH%2+FET}J*tA4X8BX=Dda(t(R&|n=;*xgw9jzVIV
zOi$mCwP|~kq10@erI`H6DDY&8h$m$m@O}}e-gCO%8!2L3zO}wCWTnbH*(MLzXuJG&
z`y?}{lFuJ$FZlt7gX-X<u{0BmDdN$f7zTK62_VnGg15nTs@4hc&qwKEpcGw07^^jE
z;C0u|p804p>>nGbIeB9(n_st<W;?&x8C<Zo>{8xWxts%a1z6rjZOL5gH`WtCX4)Az
zuV5&PQMAK0c+){gd!dLsReuWiRRoV$w9_|68e|3Jxaib9<Yajy>kG`9d|&GOon;LJ
zS*Jrc2AbX;M@Wtv&!HhVP|k;du3fl~-j`z8SZxz$T|K)B@gewj&zDBa5#DWIJz}44
zpX6f+B~CD}H~)6>tX+U*-@2`!IE(rW0y2>}SO8){_W~Q;m#P#0*3}m@URD4DgS_rk
z-!5GhX<M(@xUqpOw+4P!4Zm9U-7oSM#Kl#k@aezV94NC#zhrkJw%60M79)dr&xYlJ
zzX8gEsTS<hAu*`~Llx@;6uK9qM{#w{NBQT!p6C(>(0bL5o_iNRhIzL$?|Zd#Gp#Q%
zc+r4tzTPXt%;a|p_`hfF>o&wmI=mr$*%>(Ra|Q7OYP9JG)7mFcBC_gLmS_7LYRlNs
z;mX6-zIM+uXVtp?1y994o*m|@UqvTA?l#7sDebBxEj47!H=4;I)>-qfpY<hYuDL>7
zrv*TjwZQCz%7-jPzJ&UepI0#9A0D<8vl1!=y20C{WkcRfrk{`T*8ve6rkHeY&&Wio
zu*ZF0vy!03XRK;a;TF0c{ES7fXXAde>G`j+={j?^?+F%cQbVPI<x73tsx8@T%g@>x
z<@$n!Lb*>SRo>)Th3eRD)bdzS2Y%bB%kO6KK>wL{zgo3^>^|z29(|aI4;1!d=Dg@&
z;H<b(dxCBA-*pKcA{;u|-8dclUtLhVrh7MEUbIj;UkKOq3Vk7QK$~yB`_z>tPXN1=
zkzN4e0XA5V1vitM)OGprR%a8q#`dOuL6IZmREtB!=|RlwA34Dl`{Ppa0gtVCn$dBh
z%(3}xv4qP|M;*^1LV-`gStrC?K+~3L`+%~p2?UvTmnr~GZTtRSFh5jKh^OK(u)!u-
z<rxu_KtLU6FokSG*hU8yvKskzmd_G>wKA_!7AWrTG_4#1k^^GUwr;fREyw(lGusRQ
zcngrLbV2@gG;wJ^RJYP;ce^BFzeLznOL7HWoF`E89En-DnGj<<<#}kWP+`^*F909A
zg1RVDIp=`W^^lI*X2>m2U4jiWXY!>>%BO23Q5TP(1l~|%lJRk@qV+_cho=>OIKeZ=
zZa1NH$JY^kfuPd`njIv={Ae-jd`h8ZqN4eMA~+&*(YsfRK#}fvHuyNixz)`3Yibz~
zLXs=0w+=Z1uK!V|^^yJ~R#r6q2wJlMKii|MN^_ge><Gatlg0Al3lokAE13^M$(G*T
z@bY)n?SVkEYa4idaC$}1Fy=}cDcsVplBBhE+^7xsUTgitxoDQuaUZy}_Y0@tV7koO
zw{bx-r);qmiLce;rUEZ=Qf)K~v@#PMJxB;%fz-V_^wEx9r6(k$rAgay0Hc7>%2=21
z$dtP}1US-Cr$IFu0<_|SNX@eO`QuLaOGcQ5bT{=^?=8I=^#Ya6FktOitCs3a*+VP#
zd+P0HTB5p{uYkF$NvC5FJJ&mVX(#uO-zZO`%h_7z$1GzAQBCn5^WO<%wVRxC1D(@j
zwtKe`SzH6)&x~b-m)y5!BFV$9<zZlw3od^4$FPk)?VVu4dxFnSyOod44>!W-8Q(8~
zLAO%-rXqgx7OKrHIrn_XLQb@&gM?i(inznOShKyxNk3D)mSotX&~T+wc3g_nE)QPJ
z5Q{3+?#O_kyZ2&XckS26^6hHgrtNMNCx2VOg;Z^oYdJi+3+VNMhuxyET{ZYJaj1;%
z_M+9Dlf{RPx>OgM7yWF`+wTGQ?I7)r&|X5odUMA;JK>tu4}4E=XNP?kG<T<sk<$EC
zOxIHWXl%rk+;*z+#rzKu9yDQbM@J>mEI~O|rKn8c%`V(Uht6@C6meG-2V*U7CQv(3
z!TDpCG+L~3t!nvtANVb?$~oZnif4bj<qw<hMl$Nfgg8q#I{w4kTwUvDLL>)0j@}oP
zK4US5U57(KVs)v?*i8pqC&E>rwgxUx_-GUCI7@Tjw^-7!4jrX?>W=h;Udv{cb@jhf
zR~fI84VstymFKBN`#VSLRZ;zXjHCgggg3yf%)4PpG+dea2#($;MQ%65RB6Z!e_Qz#
zBCGw2JNG^saJA<e1PijM-ALiAJAv8nX<#+U)~Oay*28R1{&^To=LO?G-05uhBYTeL
z*rmBKk4$DIw^tlle!2T`v$qyh4q)t+!#52=tVVna&u1Buhn}^cLo?=mKRUFfnPi!<
zpkJ3l4Ol<;t2-ZcKFJ58FI@fO30m~B7%vNadEeaXHDsm~cj+aMIO}^Yh8&rWZT1K1
zO*piQm~6%vEq$vuDhpC|)9jgZUrN4hgN#P_Qfd@)(Q%LJn_PaMi^LScpgb5h814M<
zemi+g(4nf>NT;2mQLkyt#{sgVFoEuZB*~eH$p-)O^b?V_aJY3f3;e{|ajpU!9b&9o
zxFE(Cl=8QTeIe_zQCFJZAaewhb&sbfn;W`rS{F8nFQ*w5QRaAF?gI_9jvc5B&#E1;
z5Bss4k4lq|JWJYT=qLQ~AV4JWudrZp`dd9s>8J87>53cI`Wn^0Ae?HnK+;V>>h@9r
zrAvnq;(~Hxzc4lQwAMQR-J4JaK4J}j&!}|cG4lDEO6ifX5tZq&qjMXC1R&P*b-wHa
zb-az#_p|=jq+G#<xajwf62i+aCR6{ty$HtZ$Y}Y^TVA&_71fATc)i2D5o0t*d(B@#
zcp1Sv6$9<8{CEV0ZXGq4anyEO{m=v(V*CzAi&ZT<BTi~Ih%=Z2GC8Ur<2y=miu_3k
z7PHW}S7?5H-<q=sF<GZU{z52vEvCo24y4$m&4)3R(!Brgqmxc`nqjdnd3g#KcKfuI
zcq={m39W~w8NPU{@gL&MKq=p&kj{iV^{4cLiA?tI!=qhn$$*8EDz)^A;p@&!^T-xF
zo`FhXao_0s8&!9XJ!d~po|lY_R6bVBSnfn_(Sjnkqg%122qc<;<b#WW=O)o@fDL?4
zx&==$|Et^fM$UPBw-NB+x8b`}`O4V^7nh4P)|<T9xhYnDPH`(KCXuOQj$OEJOd$<V
z%dhvZCKGBpKxal)FC1grIU&sA>R?{0E53<YbT*-ll>~>exCjw=p6IxVVL7I(vQAU>
zZn7ElLx5NDW!@S=i!#)qy#a~W{JxBIN5{t&c&=Q|atrk+4hq!kf0Ty3S?c@uzow;&
zqx9)6G4ANzW3_iU#IkYHCzH-KwWC8%IP^NO%f!E6qP|->MAE}_aFoCG?AvXS>AJg8
zkeUt<+_03{m=1IydQn{IGT(46{G+Ns1ZrQc_QhDc-eim5IOFVOU72S@y30BHz~Htc
zXEOT3O`g9mg8z0Z7s7Uv3Ehg!TqkS4UBWCKFjdWcQQIV#TJi+@Bf_~h4u5OV$(WaR
zqp%Vs$kyhQ6~DIrKB>_uj^_;+%VZ9cetQ<X%K5HvFolk=C{{;T!CXEYa%)FG?DXB#
z+n#g9y;lqW`w@m7xpDsH8a4@LW9sJ2C{c(4UMyk2^TTjm{hnp&<%kyl)BN+nn)R;a
z19;A_d9En1&g8|8_I(r^5Ny^VetN7YF+tJAxM^QKD1S#i*!L9JSa%fk_+ypNJK8_!
zV2AYisk@U_xd!tb#YEZAxx3Ax+UC~}h$}iZl6iBYOLTOXF>3beq`~LKN`b8BA*n!t
zf7q-q&RHLO<Kqm#C*eV*PyKy#b1rd4<xlb>Dri^o@@j-`R?2MP*xQ9~cq_@Q$14ZE
z_&a}GlG4VC`iLfH$&E$q>dJTjX73gkT1-91?Hg}AI(05GTWG&=hS0hZTYj}Q6EEu@
zQqkIbv|P=*KJIxtfS$A1@-f}59GYG)y|oBGH1Uh-7-dp2+Fkh^$h}V6t}6GJmW1Rt
z{lQi18mf=_aGCs^l9YT^CEe7SnCRhqs9%5`?Hl=D!hfT1-q%k1!0f)Mr^r$+BD`*0
zPGYS$b4=V_wtnXzenM&m0u8D=u_4)-*FW4=#L8E<5_lOE)gjrjU>+3#VLjYnts<k*
z<GS?6-9owMvZS5Thh^M^r1bLZ5s!VRxS*0dSLt=P#hxPfXSedpI@DK8L%O*D4hXT-
zfx94V{R$t=-XeLN1&q^Dvue5&-43_U#|HXVo&G#FmZj#}@irmEn|mJjr91yr?z<#T
zCJJk<j|=F)^xn-w0&PXvE>Ju*cNP_4%E0ai$FI|hG9mHAU;5*~tAdOEBt!A_M^|=<
z<q>R_aAx!ozs_MtiXfW}&rlM;W1}d(`vVLyfO+>q4`)W*8<dv|Fyc1WeDbv+b`LYX
z$MKOy9>Q2}*gqXsvM~LiKl_Q-G&wYlV-M*#<28moIro<n(K6uz1wEqJ3B+M6D83?f
zakm&`pFDUiJ@=F8{_hgebM0KkQzHHwqc*RPstdHK+m@T-cJZQ;G~?2(b94`*a2;1H
zEIju-E|{<M{<~wU!sK1njRnUZu9GF6&01m^jeH%58GjO&f&i16r=yn_>&myx{X^=L
zZNdU6I5qdP*^2zGynGn8U))FsDmOEkOg*HiB+`xz7TyM8YUu30z4)yxAeCKUL~6-c
z&lflL>VztKTK-OSDeS4tzti9GRLH>ZI+A}%8P8AN{L+3nF2gJBJiz3HY)S>?`}~ZE
z`R1CFZRTw@IIz>x6p8tpp8V^eoe)bF@V2W`)BH2mNOTg9UI(+31OjUg2$KFVK713N
zfw`JdkoeiPFsT>L>C_O8qwZ<2P)|@~OYm?0ZTv^GsY;vPkS>6m@L#P$g$5{5D{>sK
z6p;l;N>pYu;}nUn52m7QKAm#j(u@tc`C?C0ORyrH8C&E+)ANCZB(tgVrNc;_Jp5Xs
zwYxATvTpKb<qCGXc&bmR7Jn3tT9L*KBJs1Em`!s(l`md~-0)U4*|hf;H9lW#lhZ!M
zzmP3(Opt2LKJo7s;4jzz;e2p%2Vb0A1JJ2>Vylf6CLsSizpsp=9=WZYYzd|D=s!T0
z=6)-fjy^o5HeR{L@$tKoEB9NgD1aBiphBPL(ogZ#>;1a(sqEH7kJ60~bE~VO+u?)E
zzualvdZ%4YQ=5BXl5;p)oX1LdqfUBLe;i5}x4(zv8gV()OYcJlQg{QX4~5h^hqXsK
zo1Q|&K|bvEds3Ua&7jHiG|9CO5=pbs9lp1vU_<!0>%4pE*5HaM(88$hHk;Gkj~pi>
z>eALVjO~e9r!pZ0`{jvxn}hX4xB3wLy)#i;scq%R&SzoC)QkKIU!0cB7#ppbvnW1(
z#Wx^$K+UlJN{zkCyb#(sx48OomA^$QSCjm5PZzi;Uyas@22gFy#XMnbYo)pp)oAut
ze8|Xjv;OLroVBv5PfX=kVa6O`uk2}4$5~s`vhPB1Ly!r&M118$41yLsC!cNgrg8gv
z7Wbgh!L}c+J_YPy*ItEUJj1e7gI2?ijL&tU@>M#-JD%he5m8~_rISY?fei+z3?sQ`
zxwf72)@xvG`eDdB-#M!rRomclM4(F6;gF(yZwTq{)YZUV;`KQ3VbJcwjO;I3K}#1R
zIPV#4(X>`->iB!9WQUgE*ER>Fhjf3(css`2eLqv4X8fe1mDGbfK1TY?0i!3JAHi(o
zinP0z)bQG`ZRak?XqPt|5)BiSCay|h70Li{m2`y+q2@eQR5+9q%uzdiaY-0*GJNm!
zyto5u<S=-D&}sd9okhcDzJguClJ2kgaROv>n8jHz5NdR#`wsI)E3@pb#nuxr_}h)s
zxTX@n!mQfC7Tcgf;M~2bliTGj!z8t&l;+@XZBMP07obApMgSu7^zL7AO2wkP*1}nZ
z##^4QS{k?V1m7k`u#ne&4jEcZFDBGouNX3FqH2drB>>V{qCM~U+j$_Vru{GKAdC!g
z#Sy=K(KPssK;~Kpcoga_Aky>pa8d076q>Mf$qV;%G$Oh{2MgUvhdEw(b|L+6(N9Mo
z<a?yCpMwT(&s{5nP<$9!E%iHW9H_nEU=A1eoFxwUD|mb%F71BU?SN1y1q;l#qEnj{
zYXksJi3POk?*(x!c{27A@avReHc>O$S?{rS>ncu|&X;m6W(qq<@c!RDARSjqpFdET
zlkW;Pj`+Sk>aEVC1X9+-Pf`t8!dc<7<v$D^n018Bx=XKx4*q`Xp9c!lid0V>gR#(S
zg`3w;wbx>vE(>x3H8<aQtouX?4$zpp#YfrKQI7q+q;eFIBO$QJ6tYq-^0Vw!)$j_D
zyz)*TN_92XcC+8(4Rz9P!h8#XJpN?^Dt~8hF-m}wc*t*w@~ypu4-UY%{C1AOE9j1t
znirhHIE-BNe0*z=rASz>Mo0*e8k6B{pfqxztcSv{`dyVwYstK8U_-T#JdJwy9(w%M
zNn?@BKGn8~`bK|vs*R8ZS)uJTE58!d<gP_rfk$V$G$e$qDa;>iq@#a4-t2BAW>V>G
zz<MIF>OKmU<M@af)WX?%u%W;dE+0iPGj@=wEC7B#(?bt?=7Y+R3BwFcGRK=Hc}>3&
zgv92fgc7^q*KP2pu}y<DW2F{?huiSiw?4z&bH_!Ndj!Q#r=11Cr2Y1Lr(;!S3%4vu
z=Hbc{^`*EH?!tCr(LP9*v{~2soRXg=c_Cfd1q0k}*;j-id8Ac7y_AR`>Zf4;=Tl#Z
z=tE#m^50JQGuEx=;dcq*JK^#BkM{R|9;GA?s@@un1UN6N_1p_g`_!z21=RW~ql8N0
zd`m@=z!;c3PJ>^?1G*$sa2Z)v&95vMm(TO77+{@YT<fRV2_lBtw&=I!TQ&X#JAaI|
z@4})ur0DaN)}78&csu)=V_QEOy-#P2tTWSdpUx%BN;&-pCj~?gT@qXtz#yY^jjZ~q
zX%cSLIUAnN?`SMS%)|Kh{4CPcxqn)riOnBZU3EyrA_=5}e3{r!)Cl!Jsqkui4{0Ie
z@wU4PZLc6zG1>8a=|2G#{&^&@{nipH>#!>mb*23la*Mhb5_p3zsu~W_%)VWjpkNQa
zM(E7_O)fqL3(F9Gon~^@i^G>@O@SdiX4qxR4#YIU?>#;dRVq#@a|6|nF%FhpsD>U(
zgQ~0n9&|X9vu&a$q*ZF*M2WW_7?MtihT7x9m-D3V$Wsa5SZrJ=L0!E$_P{^8B8gXa
z?cJ1xv>Fp=#&0hce4&`|O$s!>0#)6e2~8<|GZimrmW<urj8Xj6c%!Movw@{o7+y#J
zq7BvU4tk}5)vW2~vhPo0tp!H+`1npjPPPJyIyc67SWrvt1@EFCVIz~u1<+<Wz(z;q
z{X-RpZ}3^r2L`75ReY$GkcT;rGb1QjnNH94f2cOMHTh#?LX9M$^?vGTp*fWAx@hRt
zYBLKtP1;fDXF{1Uys3KFK-zNpz7FrJ8ggslTfN^t7Re=|XnuKhT)d)SfB(~$;Wa~8
zt6%D#%p1)Ny&+1x>j9(x!ej_kitn{6YD^A&OJ9YpWxs}r=CBe|XCYiXUB49F=Ey^L
zT!!|N+wD7Ts^Y!FTl6tjo4txt8?C?d@lQ*<`w3WK|H5foTvWeUK=}a-;_MM<G|gG}
zl<JN{(NK%Vx6gT8pvZ9j%qF&4+!j}5fJ^4VN*_AVu78K{vY=l-wJudrhK=Rkc$xX?
zhgVM-nZ!y}8l>Jc#3?x?+@=ek<v5+|QKrA~=+GGHS@L3V0e;kG=IsT$3bDeyr?Yb!
zc9v_%dPVjDFb@HMZ<2)9|I4B#`f+(y+b6Wq@y;N~r$o=e)q}te$Bmm4tKuket{sh|
z`yPc)f(dS5CaS;EGA^YU4E#OU-Wb<2()-~1rkw!i-hg9?ydv;7(JPboUm&x8TImpe
z!DheW4VuGf7OSY~XgGs>;At@`t0Y{4PpKru_1_ypbU5fItn8ugnyVtMAC4uU5)2e5
z8fFy*s61}}S#ml*P+asVWK!t~TxVx_+dc`X<rmP1fBeQ5H9m?;%<wTMH_R&(3y<U3
zxkuEYVIaOFCEC7zRxPto;CB4t>fyC=<n#wyugOWg5BxPj8B4<F)ZE*^__#rWVdHw^
z;1(7yuf2oIU=s#Ru`$}yUS;H)mtbCNn+!b~N2eyuG7EY?{ny00ie#di4hxmrGWJ`K
zoAg<j(8*WK?ZDGZuM@g&ooheRrzQ7uOqe6?u|tzTZs2HK`xhTS2ACO?VA{xH)?0r^
z-Wd?TpN{p@UgpiR)$Bb_lo4VVKJ6!T7SFHCbFJMlP29SO{DFA$RXv9714rqr+0?sz
zH1!qF{=v%W(5e)9DDzsF^5KRUvn~3u)W@1=F=wE1BS`sSBR~ACI{{-QVGtMjo&_Ps
zySjMpr?;NTU9hk<4D&RQ0$Dg*=g5Vl!3_EN9buHodt`itCvZQcr=n<z-IL)pj@nyP
zRx$CeI88#jZEJMl2!n7Ur9Yl;-t>zfq)*0tS2x62#eOMfI{k~NWQtmiL_mcbNE&$y
z>)SjQR1u__ajwmqu@?Ac@=h3P=W*3KgG$tN(EnSAO{!5l)@?*4MiXR_W$@{?K)U9E
z^{7==(ZI6y6-ZFu15p+UA|v0#*H!E^V%e(8f~a9P@#VdfyPBpaHdd-Rk*IL<pl_`?
zv9x+Xh1w~kssAnW7oX=7SuBr-KbC1S{qCq~jZ6b6Nu}pT+w)k3roSw0)meEDdnR)H
zm-Hz>_;nZ?Ikl3KjE(T^BB7I2*Svk@K~lJkH+r{_Fm{UwQBkVavv%WJ5tkel*X(LC
zg*B~37Mq^3j6vKaUY@d7HC}_3607xK+vS;G%<ax=j$Lt_6&XJpmd*AldpL)f1e2UB
z(&26>RO7g|!l;n7hDA)fQSA+%-^aNM5qD;A3Fn^G#d&COx?OgqD^(T;-$gWEoC#sS
z_CnGdNq8M4i1`!05iz+k{Ujb^|8IlzaofElb>@q|>II1x|9;`?fSM*~c;^jMbLN2g
z%$t$VdPIC_f+{Z~{yGC_1Q_@vJ@C7Qp0Qg3m<6ld6N(7TEc?<+9a5?((aMC}yN3nN
zaiq@#+7^GSDYwUGZa6g7QnzVfqi$!fKssm5K5y2k_*GC`lwhZmMx;i(1rTmK%ras2
zR|tr!rypPsunu6wrXLcOTTq3DQM#Zh0wneALgIG^6f_SejiV@=$4c8jGJa~-)x+w}
zH3L)Ov=x&wSb3@n5x@T<3ZSlV!&6wo2s&OJ!O?}FGzF2GUUeNJpSnxyp_nV~(%&?e
zcXb;R9+Q7i;WUMY1{(!ydfW%e&!#HFu=drEi6?imh0OeDoC!E(Cb&_-M&hr1ED>t|
zMq^Y}usc5AwVb|j!_zLa_%iypHHpB0M*u2evP~r8?-TLqP3ntX&3Knk<*s+=20)Jv
z=1n`Pqu6EwqOW-5Xw6-r_O|I&DK3I3=GtGIb(hLi4f;jUcP70XZJmaH{*&0#tg{G>
z2{yuLTalTlgpyfv0&3-F$5fcmEh|7yS%Si>ro*O6>)Tt>UGEqHr`|<9?>$640+AFS
zr^%$zroEHKj?s72iYdS~J73&#@fx@k=*Y>@T?mh=5EG>>(`CZlCOeCG`#`*(!%BK@
zQt@(BeJnnc)p1}-i}g<WrAVszG<6$utU8f1O!$%2&aFo9CVASR9By)PtK=5ECtm6G
z>C=HhxxKw&?e+<$pB>qjg`A+dp?_}iu?qC;rWI~XU6^YKsORor|A9EtGdstX!d_i4
zgC;jS$S&c~)F9XO0F6|jo;eP3`n5*3mT5yyMt>c4uKtqDkjEn&e9l8WGv-^&7)`{m
zr+Mf}?tkaMpV{>DgaX_a5}O<|DNfz-Iz)kfLvC!^O6JkEnX;uzxw*`r-@#kCuY?_u
z`=C^M#mdZz(X1C}+Oix@;m|@zLd)dd=>&W>PBESf%mkOG?b61+*-32djwBM)4Pwkn
zWgU8#1p7X{yu1Aa|9|CG-%$H4M<-DgfziiL=|jdxi8=SIY?cq$f$E_$=`tq|GN5as
z5a&x&ylLZrFK+}?Ngm~;u7~HBS-uV@^v%~`EGl50{TgLYaw)1uM^Jnl^)9uGFT2HD
z-0VLV@`hO9tT{0Gv!yiR%f-RpR?=o=3>)ElGc7@3JU`_T*%e<F;yRSFqX$<w?0<I5
z_I}S88W5O?!g9(qUWIih3t>|2o>+*0ou}(3PlujKHTtCiVwCz!`N<JfnH=Y6vH@A4
zu$j6!{IU$OaoHVY$@45v#QIM6I<J~IgP#;;r%mVL+RXJTPBcakC3s7|8ysQPTMzgm
zVB1h8$@;-Y*Ct#>AL(l>*e<O0gRq_vMjGYq1!ci7s_E$meOZ?fbg<6$UdGeH*NIz0
zgX^{mF4LdkA^&g>4d<#wA}vBAkv_#8T;8HrFk%5+JsF9mur|BOG85K=)bd#rjgijT
zf8$0;B8_2Jum)gqB&R?qD+eN<5hUn5IKZ$G25nYyZZ+C%LxAN@*&6x_#f&qB?%$MJ
zQ4^q%vn3k)*G$wGD#Loi;XRsw16va^dck6c#y*7_5x&v+icUtKUwmzh={RtnY<3Xl
z0UC!*#+RjR-_eW+u4w!s3O-NTcz9;<3X6n!bYB$G{n{c|9?0&L-8KvJibk5fc41rE
zvPL~8hvEWV#r3FCweEZ<(aKz2lMy~Z^?xE0e2L2`3T<42^>B;AKCJ}9l`oo>dM!{P
ztyZ@glwR}Q@LdyS^_&^KLvdS%VPjwT(TUOCYaeaP3P-Cg)5#&raMBY`#1#t;N;ZgO
z<=-Gd2~p+Z@r(v<;#2bF*c8PpnhqnV*3*Vaj4TAAoc{R8wH@DS6mN<{@uh`QRF5d^
zLQrDazbGG;L&U$;?ver7pvI_VGOjlJi$_)PKYMb8dt^aV!(7lBg@6j<NRrxhSrTXj
zK(K)47KRdC3j$7A+h=0LjIG;NAoYw3^wLOZgK??@#hX@!3%j05&tEp^LFI%3+KjU4
ztNq`q5LoNDV$L{Ic&N5s!*_dzoej^H&5RjGS!B<Aj7h9q%bnrJtfj=mPAbOSa*M5_
ziWn|+4YLr}#aF30x$FA{8o{PAU9uC*<V_|{;?-*<QOTC1uZ-p$H7{NjU<@X$v0Ftc
zIwe}JwN}(A3W|X*>wBU}-BFL2fr=1#*4vG7b2OpSX^<vmfTE!G%+@)xrvzKC1W)b6
z<Eoqjp+*wS!P9iv=cr-m9i<ulzNQBjcl}|nmCj{3qwF^qz6Y_YS`&*EIaFYQ6Ks6V
z%)dPOcA62#*g{OsV8)jj#L-Q5+l5Q+n`FGiKjIVKkC|Z$PwbjlIiJ*tqis!AZqwm(
z-hf&6<E7`5SmH~y=R!B0VlGAi>h(CUeNoc-Y=t%8*E$V>K?s_>lEqLNUwXswP-baZ
znnZ{|krema)T>K0WX&I!D(?te1V<`82iiGG>nxd2;aYX6biaPI7Ag#$GtIorG|?UR
zAHIAxU8OR-6l#X57R)|bPYPVYy=VaeeTA)5CYjy_dE=6{DSJO8KcU7|M&&K<9xoln
zM;`o}!nMi2nwZ=MD$?m^qXIMae?>^Vi*V7O@hI1pcKA-)7J=EL1r-Vnc66*$dDVn&
z8oWINZ#5SJLu>a~n;G9G<!^wxB76-i0^;)}1DM2{9i!G9WC0VZz5ktfK6gqDMO1NL
z{7`*g^)Z)zBX7eK%hdku(e0DZ8KhJ51iolwKX#aLrrlh|r<!M*Fux(falD#(H^}f$
z9Pq;VnL*IT=E-M0VY21!mI7&r?@>K}*gkLqhkWZQbJF8l=Nf;-amc2saxR_Afa*LH
zlBTS@@~g1&?Gb1#yBwpp-*5Nm5F~6|3LYxMtCBOSIB<<lz6njcEH7PtY5&0tLo|rK
z_hF_FOWZNcXkL{3r=zS_i!VYAWx%hRg&R-K#lgZu7@hAPf4omStguG=zxdP0|7V8^
zrhSXXxVM*Xw}6?Y-FffG67O<{40=Yg{y*ruy?WxIA|eV=(#eMX4@io#YBE)y%tQVU
DG95zv

diff --git a/elaichi/assets/translations/en.json b/elaichi/assets/translations/en.json
index 14f25f3e..4b359918 100644
--- a/elaichi/assets/translations/en.json
+++ b/elaichi/assets/translations/en.json
@@ -3,5 +3,6 @@
     "welcome": "Welcome to NITR Central",
     "homeTitle": "Your Feed",
     "timeTable": "Timetable",
-    "openCalendar": "Open Calendar"
+    "openCalendar": "Open Calendar",
+    "thisWeekTitle": "Stories This Week"
 }
diff --git a/elaichi/lib/app/colors.dart b/elaichi/lib/app/colors.dart
index 2a6a9a08..2da6be24 100644
--- a/elaichi/lib/app/colors.dart
+++ b/elaichi/lib/app/colors.dart
@@ -18,6 +18,7 @@ class AppColors {
   static const Color darkAnnouncementDocBackground =
       Color.fromRGBO(238, 109, 109, 0.05);
   static const Color unselectedIconColor = Color.fromRGBO(196, 196, 196, 1.0);
+  static const Color cardHeader = Color.fromRGBO(79, 79, 79, 1.0);
 
   //icons
   static const Color calendarIcon = Color.fromRGBO(47, 128, 237, 1.0);
diff --git a/elaichi/lib/app/icons.dart b/elaichi/lib/app/icons.dart
new file mode 100644
index 00000000..ac7ff220
--- /dev/null
+++ b/elaichi/lib/app/icons.dart
@@ -0,0 +1,20 @@
+import 'package:flutter/widgets.dart';
+
+/// Contains all custom icons used in the app.
+class AppIcons {
+  AppIcons._();
+
+  static const _kAvenueFont = 'Avenue';
+
+  /// Monday Morning icon data.
+  static const IconData mmIcon = IconData(0xe500, fontFamily: _kAvenueFont);
+
+  /// Feed icon for BottomNavigationBar.
+  static const IconData feed = IconData(0xe902, fontFamily: _kAvenueFont);
+
+  /// Explore icon for BottomNavigationBar.
+  static const IconData explore = IconData(0xe901, fontFamily: _kAvenueFont);
+
+  /// Campus icon for BottomNavigationBar.
+  static const IconData campus = IconData(0xe900, fontFamily: _kAvenueFont);
+}
diff --git a/elaichi/lib/app/locator.config.dart b/elaichi/lib/app/locator.config.dart
index 1ade8565..acef915c 100644
--- a/elaichi/lib/app/locator.config.dart
+++ b/elaichi/lib/app/locator.config.dart
@@ -11,7 +11,6 @@ import 'package:stacked_themes/stacked_themes.dart';
 
 import '../services/api.dart';
 import '../services/fake_api.dart';
-import '../services/feed_service.dart';
 import '../services/local_db.dart';
 import '../services/third_party_services_module.dart';
 
@@ -30,7 +29,6 @@ GetIt $initGetIt(
   final thirdPartyServicesModule = _$ThirdPartyServicesModule();
   gh.lazySingleton<Api>(() => FakeApi(), registerFor: {_dev});
   gh.lazySingleton<DialogService>(() => thirdPartyServicesModule.dialogService);
-  gh.lazySingleton<FeedService>(() => FeedService());
   gh.lazySingleton<NavigationService>(
       () => thirdPartyServicesModule.navigationService);
   gh.lazySingleton<SnackbarService>(
diff --git a/elaichi/lib/app/styles.dart b/elaichi/lib/app/styles.dart
index cc08efc2..9daa8262 100644
--- a/elaichi/lib/app/styles.dart
+++ b/elaichi/lib/app/styles.dart
@@ -17,8 +17,11 @@ class TextStyles {
       fontSize: 16.0, fontWeight: FontWeight.w600, height: 1.225);
 
   /// Used in Smaller section headers, TabBar, subject/event title in schedule.
-  static TextStyle get heading2 =>
-      const TextStyle(fontSize: 14.0, height: 1.4, fontWeight: FontWeight.w600);
+  static TextStyle get heading2 => const TextStyle(
+      fontSize: 14.0,
+      height: 1.4,
+      fontWeight: FontWeight.w600,
+      color: AppColors.bodyText);
 
   /// Used for Bold/grey/colored text paired with body1, course code/club,
   /// time name in schedule, desgination of club members
diff --git a/elaichi/lib/datamodels/api_models.dart b/elaichi/lib/datamodels/api_models.dart
index d76cc25a..5647feac 100644
--- a/elaichi/lib/datamodels/api_models.dart
+++ b/elaichi/lib/datamodels/api_models.dart
@@ -2,6 +2,8 @@
 
 import 'package:flutter/widgets.dart';
 
+import 'user.dart';
+
 class Club {
   ///
   Club(
@@ -72,25 +74,6 @@ class Event {
   final String picture;
 }
 
-/// Defines data model for login response.
-class LoginResponse {
-  /// Creates an instance of [LoginResponse].
-  LoginResponse({
-    this.success = true,
-    this.userId,
-    this.message,
-  });
-
-  /// The boolean value specifying if login was successful.
-  final bool success;
-
-  /// The firebase user ID.
-  final String userId;
-
-  /// The error/success message.
-  final String message;
-}
-
 ///
 class ScheduleEvent {
   ///
@@ -106,5 +89,3 @@ class ScheduleEvent {
   final String title;
   final String contact;
 }
-
-class User {}
diff --git a/elaichi/lib/datamodels/datamodels.dart b/elaichi/lib/datamodels/datamodels.dart
new file mode 100644
index 00000000..e0e7618f
--- /dev/null
+++ b/elaichi/lib/datamodels/datamodels.dart
@@ -0,0 +1,6 @@
+library datamodels;
+
+export 'api_models.dart';
+export 'auth_user.dart';
+export 'data.dart';
+export 'user.dart';
diff --git a/elaichi/lib/generated/codegen_loader.g.dart b/elaichi/lib/generated/codegen_loader.g.dart
index d1ec50ec..e8d52cd1 100644
--- a/elaichi/lib/generated/codegen_loader.g.dart
+++ b/elaichi/lib/generated/codegen_loader.g.dart
@@ -19,7 +19,8 @@ class CodegenLoader extends AssetLoader{
   "welcome": "Welcome to NITR Central",
   "homeTitle": "Your Feed",
   "timeTable": "Timetable",
-  "openCalendar": "Open Calendar"
+  "openCalendar": "Open Calendar",
+  "thisWeekTitle": "Stories This Week"
 };
 static const Map<String, Map<String,dynamic>> mapLocales = {"en": en};
 }
diff --git a/elaichi/lib/generated/locale_keys.g.dart b/elaichi/lib/generated/locale_keys.g.dart
index da8f016c..1c98e3be 100644
--- a/elaichi/lib/generated/locale_keys.g.dart
+++ b/elaichi/lib/generated/locale_keys.g.dart
@@ -6,5 +6,6 @@ abstract class  LocaleKeys {
   static const homeTitle = 'homeTitle';
   static const timeTable = 'timeTable';
   static const openCalendar = 'openCalendar';
+  static const thisWeekTitle = 'thisWeekTitle';
 
 }
diff --git a/elaichi/lib/graphql/schema.graphql b/elaichi/lib/graphql/schema.graphql
new file mode 100644
index 00000000..b4e2a08c
--- /dev/null
+++ b/elaichi/lib/graphql/schema.graphql
@@ -0,0 +1,230 @@
+directive @cacheControl(
+  maxAge: Int
+  scope: CacheControlScope
+) on FIELD_DEFINITION | OBJECT | INTERFACE
+# Exposes a URL that specifies the behaviour of this scalar.
+directive @specifiedBy(
+  # The URL that specifies the behaviour of this scalar.
+  url: String!
+) on SCALAR
+type AccessLevel {
+  id: ID
+  level: String
+  name: String
+  relation: String
+  club: Club
+  user: User
+}
+
+input AccessLevelInputType {
+  level: String
+  name: String
+  relation: String
+  club: ID
+  user: ID
+}
+
+type ActiveStory {
+  id: ID
+  assetType: String
+  storyAsset: String
+  authorName: String
+  authorLogo: String
+}
+
+enum CacheControlScope {
+  PUBLIC
+  PRIVATE
+}
+
+type Club {
+  id: ID
+  clubName: String
+  memberAccess: [AccessLevel]
+  facAd: String
+  logo: String
+  events: [Event]
+  society: String
+  domain: String
+}
+
+input ClubInputType {
+  clubName: String
+  memberAccess: [AccessLevelInputType]
+  facAd: String
+  logo: String
+  events: [ID]
+  society: String
+  domain: String
+}
+
+# A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the
+# `date-time` format outlined in section 5.6 of the RFC 3339 profile of the ISO
+# 8601 standard for representation of dates and times using the Gregorian calendar.
+scalar DateTime
+
+type Error {
+  code: String
+  message: String
+  token: String
+}
+
+type ErrorClass {
+  message: String!
+  code: String!
+}
+
+type Event {
+  id: ID
+  organizer: Club
+  eventName: String
+  startDateTime: String
+  venue: Venue
+  endDateTime: String
+  registrationPrice: Int
+  registrationCount: Int
+  otherDescription: String
+  attendees: [User]
+  announcements: String
+  link: String
+  picture: String
+}
+
+input EventInputType {
+  organizer: ID
+  eventName: String
+  startDateTime: String
+  venue: ID
+  endDateTime: String
+  registrationPrice: Int
+  registrationCount: Int
+  otherDescription: String
+  attendees: [ID]
+  announcements: String
+  link: String
+  picture: String
+}
+
+type Mutation {
+  authUser(user: UserInputType): User
+  updateUser(user: UserInputType): User
+  deleteUser(id: ID): User
+  addEvent(event: EventInputType): Event
+  updateEvent(id: ID, event: EventInputType): Event
+  deleteEvent(id: ID): Event
+  addClub(club: ClubInputType): Club
+  updateClub(id: ID, club: ClubInputType): Club
+  deleteClub(id: ID): Club
+  addVenue(venue: VenueInputType): Venue
+  updateVenue(id: ID, venue: VenueInputType): Venue
+  deleteVenue(id: ID): Venue
+  addStory(story: StoryInputType): StoryResult
+}
+
+type Query {
+  users(
+    name: String
+    username: String
+    gmailAuthMail: String
+    instituteId: String
+    mobile: String
+    emergencyContact: String
+  ): [UserResult]
+  userByUsername(username: String): UserResult
+  userById(id: String): UserResult
+  events(
+    id: ID
+    eventName: String
+    facAd: String
+    logo: String
+    society: String
+    domain: String
+  ): [Event]
+  eventByName(name: String): Event
+  eventById(id: String): Event
+  clubs(
+    id: ID
+    clubName: String
+    facAd: String
+    logo: String
+    society: String
+    domain: String
+  ): [Club]
+  clubByName(name: String): Club
+  clubById(id: String): Club
+  venues(venue: VenueInputType): [Venue]
+  venueByName(name: String): Venue
+  venueById(id: String): Venue
+  currentStories: [ActiveStory]
+  storiesByField(
+    id: ID
+    author: ID
+    event: ID
+    asset: String
+    assetType: String
+    description: String
+  ): [Story]
+  deleteStory(id: ID): Response
+}
+
+type Response {
+  success: Boolean
+}
+
+type Story {
+  id: ID
+  author: Club
+  event: Event
+  asset: String
+  assetType: String
+  description: String
+  createdAt: DateTime
+}
+
+input StoryInputType {
+  author: ID
+  event: ID
+  asset: String
+  assetType: String
+  description: String
+}
+
+union StoryResult = Story | ErrorClass
+# The `Upload` scalar type represents a file upload.
+scalar Upload
+
+type User {
+  id: ID
+  name: String
+  username: String
+  gmailAuthMail: String
+  clubAccess: [AccessLevel]
+  instituteId: String
+  mobile: String
+  emergencyContact: String
+  displayPicture: String
+}
+
+input UserInputType {
+  name: String
+  username: String
+  gmailAuthMail: String
+  instituteId: String
+  mobile: String
+  emergencyContact: String
+  displayPicture: String
+}
+
+union UserOrError = User | Error
+union UserResult = User | ErrorClass
+type Venue {
+  id: ID
+  name: String
+  description: String
+}
+
+input VenueInputType {
+  name: String
+  description: String
+}
+
diff --git a/elaichi/lib/main.dart b/elaichi/lib/main.dart
index 2c586866..081d04c3 100644
--- a/elaichi/lib/main.dart
+++ b/elaichi/lib/main.dart
@@ -5,6 +5,7 @@ import 'package:elaichi/app/themes/base_theme.dart';
 import 'package:elaichi/generated/codegen_loader.g.dart';
 import 'package:elaichi/generated/locale_keys.g.dart';
 import 'package:elaichi/ui/utils/no_over_scroll.dart';
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -18,6 +19,7 @@ Future<void> main() async {
     final license = await rootBundle.loadString('fonts/OFL.txt');
     yield LicenseEntryWithLineBreaks(['google_fonts'], license);
   });
+  await Firebase.initializeApp();
   Logger.level = Level.debug;
   setupLocator(environment: Env.dev);
   WidgetsFlutterBinding.ensureInitialized();
diff --git a/elaichi/lib/services/api.dart b/elaichi/lib/services/api.dart
index a6e93180..5c3ad445 100644
--- a/elaichi/lib/services/api.dart
+++ b/elaichi/lib/services/api.dart
@@ -1,17 +1,7 @@
 import 'package:elaichi/datamodels/api_models.dart';
-import 'package:flutter/foundation.dart';
 
 /// Defines the interface used by the API services.
 abstract class Api {
-  /// Provides interface for login functionality.
-  /// The parameters [username] and [password] must be non-null.
-  Future<LoginResponse> login(
-      {@required String username, @required String password});
-
-  /// Provides interface for getting user details.
-  /// The parameter [userId] must be non null.
-  Future<String> getUser(String userId, {int errorMode = 0});
-
   /// Provides interface for getting current stories.
   Future<List<CurrentStory>> getCurrentStories();
 
diff --git a/elaichi/lib/services/fake_api.dart b/elaichi/lib/services/fake_api.dart
index 56251637..0fd7ff17 100644
--- a/elaichi/lib/services/fake_api.dart
+++ b/elaichi/lib/services/fake_api.dart
@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:elaichi/app/locator.dart';
 import 'package:elaichi/datamodels/api_models.dart';
 import 'package:elaichi/services/api.dart';
@@ -10,64 +9,6 @@ import 'package:injectable/injectable.dart';
 
 @LazySingleton(as: Api, env: [Env.dev])
 class FakeApi implements Api {
-  /// Mocks an user API call.
-  ///
-  /// The optional integer parameter [errorMode] can be utilised to return
-  /// errors.
-  /// It is 0 by default.
-  ///
-  /// The following errors are available in the function call:
-  ///
-  /// * 0 -> No error(default)
-  ///
-  /// * 1 -> Throws a [SocketException] to simulate internet connection error.
-  ///
-  /// * 2 -> Throws an HttpExcepiton to simulate an Http error.
-  ///
-  /// * 3 -> Returns invalid JSON string that leads to a [FormatException].
-  @override
-  Future<String> getUser(String userId, {int errorMode = 0}) async {
-    await Future.delayed(const Duration(seconds: 1));
-
-    switch (errorMode) {
-      case 1:
-        throw const SocketException('No internet connection');
-        break;
-      case 2:
-        throw const HttpException('User not found');
-        break;
-      case 3:
-        return 'abcd';
-        break;
-      case 0:
-        if (userId == 'test') {
-          return '''
-            {
-              "userId":"test",
-              "name":"John Doe",
-              "email":"john.doe@example.com"
-            }''';
-        } else {
-          return null;
-        }
-        break;
-      default:
-        return null;
-    }
-  }
-
-  @override
-  Future<LoginResponse> login({String username, String password}) async {
-    await Future.delayed(const Duration(seconds: 1));
-
-    if (username == 'test') {
-      return LoginResponse(
-          userId: 'test', message: 'Login successful for user: $username');
-    }
-
-    return LoginResponse(success: false, message: 'Login unsuccesful');
-  }
-
   @override
   Future<List<CurrentStory>> getCurrentStories() {
     final story = CurrentStory(
diff --git a/elaichi/lib/services/feed_service.dart b/elaichi/lib/services/feed_service.dart
deleted file mode 100644
index f3a41ad8..00000000
--- a/elaichi/lib/services/feed_service.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// ignore_for_file: public_member_api_docs
-
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:elaichi/app/failure.dart';
-import 'package:elaichi/app/locator.dart';
-// import 'package:elaichi/datamodels/api_models.dart';
-import 'package:elaichi/datamodels/user.dart';
-import 'package:elaichi/services/api.dart';
-import 'package:injectable/injectable.dart';
-
-@lazySingleton
-class FeedService {
-  final Api _apiClient = locator<Api>();
-
-  Future<User> getUser() async {
-    try {
-      final user = await _apiClient.getUser('test');
-      return User.fromMap(json.decode(user));
-    } on SocketException {
-      throw Failure(0, 'No Internet Connection');
-    } on HttpException {
-      throw Failure(1, 'Could not find user');
-    } on FormatException {
-      throw Failure(2, 'Bad Response Format');
-    }
-  }
-}
\ No newline at end of file
diff --git a/elaichi/lib/services/services.dart b/elaichi/lib/services/services.dart
new file mode 100644
index 00000000..75207dbc
--- /dev/null
+++ b/elaichi/lib/services/services.dart
@@ -0,0 +1,8 @@
+library services;
+
+export 'api.dart';
+export 'auth.dart';
+export 'fake_api.dart';
+export 'graphql.dart';
+export 'local_db.dart';
+export 'third_party_services_module.dart';
diff --git a/elaichi/lib/ui/utils/utils.dart b/elaichi/lib/ui/utils/utils.dart
new file mode 100644
index 00000000..7bcf4d96
--- /dev/null
+++ b/elaichi/lib/ui/utils/utils.dart
@@ -0,0 +1,3 @@
+library utils;
+
+export 'no_over_scroll.dart';
diff --git a/elaichi/lib/ui/views/feed/feed_view.dart b/elaichi/lib/ui/views/feed/feed_view.dart
index cd22a05c..f03799af 100644
--- a/elaichi/lib/ui/views/feed/feed_view.dart
+++ b/elaichi/lib/ui/views/feed/feed_view.dart
@@ -2,21 +2,26 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:elaichi/generated/locale_keys.g.dart';
 import 'package:elaichi/ui/views/feed/feed_viewmodel.dart';
 import 'package:elaichi/ui/widgets/appbar.dart';
+import 'package:elaichi/ui/widgets/event_card.dart';
 import 'package:elaichi/ui/widgets/schedule/schedule_card.dart';
 import 'package:elaichi/ui/widgets/story/story_bar.dart';
+import 'package:elaichi/ui/widgets/this_week.dart';
 import 'package:flutter/material.dart';
 import 'package:stacked/stacked.dart';
 
 /// Landing feed page.
 class FeedView extends StatelessWidget {
-  /// Constructor for [FeedView]
-  const FeedView({Key key}) : super(key: key);
+  /// Constructor for [FeedView].
+  const FeedView({Key key, this.model}) : super(key: key);
+
+  /// Optional viewModel instance, used for tests.
+  final FeedViewModel model;
 
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<FeedViewModel>.reactive(
-      viewModelBuilder: () => FeedViewModel(),
-      onModelReady: (FeedViewModel model) => model.initialise(),
+      viewModelBuilder: () => model ?? FeedViewModel(),
+      onModelReady: (FeedViewModel model) async => await model.initialise(),
       builder: (BuildContext context, FeedViewModel model, Widget child) {
         return SafeArea(
           child: Scaffold(
@@ -25,13 +30,16 @@ class FeedView extends StatelessWidget {
               appbarHeight: 76,
             ),
             body: model.isBusy
-                ? const Center(
-                    child: CircularProgressIndicator(),
-                  )
+                ? const Center(child: CircularProgressIndicator())
                 : ListView(
                     children: <Widget>[
                       const StoryBar(),
+                      const SizedBox(
+                        height: 7.52,
+                      ),
                       const ScheduleCard(),
+                      const ThisWeek(),
+                      const EventCard(),
                     ],
                   ),
           ),
diff --git a/elaichi/lib/ui/views/feed/feed_viewmodel.dart b/elaichi/lib/ui/views/feed/feed_viewmodel.dart
index daa440f4..c2dc3bc9 100644
--- a/elaichi/lib/ui/views/feed/feed_viewmodel.dart
+++ b/elaichi/lib/ui/views/feed/feed_viewmodel.dart
@@ -18,10 +18,9 @@ class FeedViewModel extends BaseViewModel {
   Either<Failure, List<ScheduleEvent>> get scheduleEvents => _scheduleEvents;
 
   /// Calls the required functions to initialise the view model.
-  void initialise() async {
+  Future<void> initialise() async {
     setBusy(true);
-    // Future.wait([fetchCurrentStories(), getSchedule()]);
-    await fetchCurrentStories();
+    await Future.wait([fetchCurrentStories(), getSchedule()]);
     setBusy(false);
   }
 
diff --git a/elaichi/lib/ui/views/home/home_view.dart b/elaichi/lib/ui/views/home/home_view.dart
index c61e1eed..3d4ae9ca 100644
--- a/elaichi/lib/ui/views/home/home_view.dart
+++ b/elaichi/lib/ui/views/home/home_view.dart
@@ -1,4 +1,6 @@
 import 'package:elaichi/app/colors.dart';
+import 'package:elaichi/app/icons.dart';
+import 'package:elaichi/app/styles.dart';
 import 'package:elaichi/ui/views/feed/feed_view.dart';
 import 'package:elaichi/ui/views/home/home_viewmodel.dart';
 import 'package:flutter/material.dart';
@@ -17,24 +19,41 @@ class HomeView extends StatelessWidget {
       disposeViewModel: false,
       builder: (context, model, child) => Scaffold(
         bottomNavigationBar: BottomNavigationBar(
-          currentIndex: model.currentIndex,
           type: BottomNavigationBarType.fixed,
+          currentIndex: model.currentIndex,
           onTap: model.setIndex,
+          selectedLabelStyle: TextStyles.subtitle,
           selectedItemColor: AppColors.bodyText,
           unselectedItemColor: AppColors.overlineText,
           items: const [
             BottomNavigationBarItem(
-                label: 'Feed', icon: Icon(Icons.dynamic_feed)),
+              label: 'Feed',
+              icon: Icon(
+                AppIcons.feed,
+              ),
+            ),
+            BottomNavigationBarItem(
+              label: 'Explore',
+              icon: Icon(
+                AppIcons.explore,
+              ),
+            ),
             BottomNavigationBarItem(
-                label: 'Explore', icon: Icon(Icons.explore)),
+              label: 'Campus',
+              icon: Icon(
+                AppIcons.campus,
+              ),
+            ),
             BottomNavigationBarItem(
-                label: 'Profile', icon: Icon(Icons.account_circle)),
+              label: 'Profile',
+              icon: Icon(Icons.account_circle_outlined),
+            ),
           ],
         ),
         body: SafeArea(
           child: IndexedStack(
             index: model.currentIndex,
-            children: const [FeedView(), FeedView(), FeedView()],
+            children: const [FeedView(), FeedView(), FeedView(), FeedView()],
           ),
         ),
       ),
diff --git a/elaichi/lib/ui/views/home/home_viewmodel.dart b/elaichi/lib/ui/views/home/home_viewmodel.dart
index 7fb8e6e4..f55c2bcc 100644
--- a/elaichi/lib/ui/views/home/home_viewmodel.dart
+++ b/elaichi/lib/ui/views/home/home_viewmodel.dart
@@ -1,60 +1,11 @@
-import 'package:dartz/dartz.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:elaichi/app/failure.dart';
-import 'package:elaichi/app/locator.dart';
-import 'package:elaichi/datamodels/user.dart';
 import 'package:elaichi/generated/locale_keys.g.dart';
-import 'package:elaichi/services/feed_service.dart';
 import 'package:stacked/stacked.dart';
 
 /// ViewModel class for HomeView
 class HomeViewModel extends IndexTrackingViewModel {
-  String _title = LocaleKeys.welcome.tr();
+  final String _title = LocaleKeys.welcome.tr();
 
-  /// Returns [_title] followed by [_counter].
+  /// Returns welcome message.
   String get title => _title;
-
-  // Counter example using stacked.
-  int _counter = 0;
-
-  /// Returns [_counter] value.
-  int get counter => _counter;
-
-  Either<Failure, User> _user;
-
-  /// Returns the value of [_user]. It can be either an instance of [Failure]
-  /// or an instance of [User].
-  ///
-  /// Use following syntax to fold the value and work with it:
-  /// ```dart
-  ///   model.user.fold(
-  ///     (failure) => Text(failure.toString()), // first argument is [Failure]
-  ///     (user) => Text(user.toString())
-  ///   );
-  /// ```
-  Either<Failure, User> get user => _user;
-
-  final FeedService _feedService = locator<FeedService>();
-
-  /// Called when '+' button is tapped on HomeView.
-  void updateCounter() {
-    _counter++;
-    notifyListeners();
-  }
-
-  void _setUser(Either<Failure, User> user) {
-    _user = user;
-    notifyListeners();
-  }
-
-  /// Fetches user info from API
-  Future fetchUser() async {
-    setBusy(true);
-    await Task(_feedService.getUser)
-        .attempt()
-        .map((either) => either.leftMap((obj) => obj as Failure))
-        .run()
-        .then(_setUser);
-    setBusy(false);
-  }
 }
diff --git a/elaichi/lib/ui/views/startup/startup_viewmodel.dart b/elaichi/lib/ui/views/startup/startup_viewmodel.dart
index 57a6380c..d7508638 100644
--- a/elaichi/lib/ui/views/startup/startup_viewmodel.dart
+++ b/elaichi/lib/ui/views/startup/startup_viewmodel.dart
@@ -10,7 +10,7 @@ import 'package:stacked_themes/stacked_themes.dart';
 class StartupViewModel extends BaseViewModel {
   /// [Logger] for [StartupViewModel].
   final Logger log = getLogger('StartupViewModel');
-  String _title = 'Click on the forward button to view the home page';
+  final String _title = 'Click on the forward button to view the home page';
 
   final ThemeService _themeService = locator<ThemeService>();
 
diff --git a/elaichi/lib/ui/widgets/appbar.dart b/elaichi/lib/ui/widgets/appbar.dart
index 99783113..3908e285 100644
--- a/elaichi/lib/ui/widgets/appbar.dart
+++ b/elaichi/lib/ui/widgets/appbar.dart
@@ -1,5 +1,5 @@
+import 'package:elaichi/app/styles.dart';
 import 'package:flutter/material.dart';
-import 'package:elaichi/app/extensions.dart';
 
 /// Themed appbar widget for the app.
 class ElaichiAppbar extends StatelessWidget with PreferredSizeWidget {
@@ -35,12 +35,7 @@ class ElaichiAppbar extends StatelessWidget with PreferredSizeWidget {
     return AppBar(
       title: Text(
         title,
-        style: context.textTheme.headline6.copyWith(
-            fontWeight: FontWeight.bold,
-            fontStyle: FontStyle.normal,
-            letterSpacing: -0.02,
-            height: 1.21,
-            fontSize: 22.0),
+        style: TextStyles.title,
       ),
       toolbarHeight: appbarHeight,
       backgroundColor: backgroundColor,
diff --git a/elaichi/lib/ui/widgets/event_card.dart b/elaichi/lib/ui/widgets/event_card.dart
new file mode 100644
index 00000000..8c6f7915
--- /dev/null
+++ b/elaichi/lib/ui/widgets/event_card.dart
@@ -0,0 +1,92 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:elaichi/app/styles.dart';
+import 'package:elaichi/ui/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+
+/// Widget for upcoming events UI.
+class EventCard extends StatelessWidget {
+  /// Constructor for EventCard.
+  const EventCard({Key key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 16.0),
+      child: AspectRatio(
+        aspectRatio: 410 / 260,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Flexible(
+              flex: 2,
+              fit: FlexFit.tight,
+              child: Padding(
+                padding: const EdgeInsets.only(left: 29.0, top: 25),
+                child: Text('Upcoming Events', style: TextStyles.heading1),
+              ),
+            ),
+            Flexible(
+              flex: 6,
+              child: ListView.builder(
+                scrollDirection: Axis.horizontal,
+                itemCount: 5,
+                itemBuilder: (context, index) => AspectRatio(
+                  aspectRatio: 155 / 200,
+                  child: Padding(
+                    padding: const EdgeInsets.only(left: 12.0, right: 6.0),
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(6.0),
+                      child: Stack(
+                        fit: StackFit.expand,
+                        children: [
+                          CachedNetworkImage(
+                            imageUrl: 'https://i.ibb.co/R9NBqPr/sanitizer.jpg',
+                            fit: BoxFit.cover,
+                          ),
+                          Container(
+                            child: Align(
+                              alignment: const Alignment(0.0, 0.7),
+                              child: Column(
+                                mainAxisAlignment: MainAxisAlignment.end,
+                                children: [
+                                  const StoryComponent(
+                                    width: 39,
+                                    height: 39,
+                                    unviewedBorderColor: Colors.white,
+                                  ),
+                                  const SizedBox(height: 7.5),
+                                  Text(
+                                    'DSC NITR',
+                                    style: TextStyles.subtitle
+                                        .copyWith(color: Colors.white),
+                                  ),
+                                  const SizedBox(height: 10),
+                                ],
+                              ),
+                            ),
+                            decoration: BoxDecoration(
+                              gradient: LinearGradient(
+                                colors: [
+                                  Colors.black.withOpacity(1),
+                                  Colors.black.withOpacity(0)
+                                ],
+                                begin: FractionalOffset.bottomCenter,
+                                end: FractionalOffset.topCenter,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/elaichi/lib/ui/widgets/schedule/schedule_card.dart b/elaichi/lib/ui/widgets/schedule/schedule_card.dart
index fd0f2a5b..eeeecf51 100644
--- a/elaichi/lib/ui/widgets/schedule/schedule_card.dart
+++ b/elaichi/lib/ui/widgets/schedule/schedule_card.dart
@@ -1,3 +1,4 @@
+import 'package:elaichi/app/styles.dart';
 import 'package:elaichi/generated/locale_keys.g.dart';
 import 'package:elaichi/ui/views/feed/feed_viewmodel.dart';
 import 'package:elaichi/ui/widgets/schedule/schedule_component.dart';
@@ -15,55 +16,57 @@ class ScheduleCard extends ViewModelWidget<FeedViewModel> {
 
   @override
   Widget build(BuildContext context, FeedViewModel viewModel) {
-    return AspectRatio(
-      aspectRatio: 410 / 240,
-      child: Column(
-        children: [
-          Flexible(
-            fit: FlexFit.tight,
-            child: Row(
-              children: [
-                Expanded(
-                  child: Padding(
-                    padding: const EdgeInsets.only(left: 29.0),
-                    child: Text(
-                      LocaleKeys.timeTable.tr(),
-                      textAlign: TextAlign.left,
-                      style: context.textTheme.bodyText1,
+    return Container(
+      color: context.theme.colorScheme.surface,
+      child: AspectRatio(
+        aspectRatio: 410 / 240,
+        child: Column(
+          children: [
+            Flexible(
+              fit: FlexFit.tight,
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Padding(
+                      padding: const EdgeInsets.only(left: 29.0),
+                      child: Text(LocaleKeys.timeTable.tr(),
+                          textAlign: TextAlign.left,
+                          style: TextStyles.heading1),
                     ),
                   ),
-                ),
-                FlatButton.icon(
-                  onPressed: () {},
-                  label: Text(LocaleKeys.openCalendar.tr(),
-                      style: context.textTheme.bodyText1),
-                  icon: const Icon(
-                    Icons.arrow_forward_ios,
-                    size: 14,
-                    color: Colors.black,
+                  FlatButton.icon(
+                    onPressed: () {},
+                    label: Text(LocaleKeys.openCalendar.tr(),
+                        style:
+                            TextStyles.heading2.copyWith(color: Colors.blue)),
+                    icon: const Icon(
+                      Icons.arrow_forward_ios,
+                      size: 14,
+                      color: Colors.blue,
+                    ),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
-          ),
-          Flexible(
-            flex: 3,
-            child: viewModel.scheduleEvents.fold(
-              (failure) => Text(failure.toString()),
-              (scheduleEvents) => ListView.builder(
-                shrinkWrap: true,
-                scrollDirection: Axis.horizontal,
-                itemCount: scheduleEvents.length,
-                itemBuilder: (context, index) => ScheduleComponent(
-                  contact: scheduleEvents[index].contact,
-                  time: scheduleEvents[index].time,
-                  title: scheduleEvents[index].title,
-                  identifier: scheduleEvents[index].identifier,
+            Flexible(
+              flex: 3,
+              child: viewModel.scheduleEvents.fold(
+                (failure) => Text(failure.toString()),
+                (scheduleEvents) => ListView.builder(
+                  shrinkWrap: true,
+                  scrollDirection: Axis.horizontal,
+                  itemCount: scheduleEvents.length,
+                  itemBuilder: (context, index) => ScheduleComponent(
+                    contact: scheduleEvents[index].contact,
+                    time: scheduleEvents[index].time,
+                    title: scheduleEvents[index].title,
+                    identifier: scheduleEvents[index].identifier,
+                  ),
                 ),
               ),
             ),
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }
diff --git a/elaichi/lib/ui/widgets/schedule/schedule_component.dart b/elaichi/lib/ui/widgets/schedule/schedule_component.dart
index 2d8020c7..00bfb1c5 100644
--- a/elaichi/lib/ui/widgets/schedule/schedule_component.dart
+++ b/elaichi/lib/ui/widgets/schedule/schedule_component.dart
@@ -1,5 +1,6 @@
+import 'package:elaichi/app/colors.dart';
+import 'package:elaichi/app/styles.dart';
 import 'package:flutter/material.dart';
-import 'package:elaichi/app/extensions.dart';
 
 /// Schedule event widget.
 class ScheduleComponent extends StatelessWidget {
@@ -41,37 +42,27 @@ class ScheduleComponent extends StatelessWidget {
                 borderRadius: BorderRadius.circular(8.0)),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
               children: <Widget>[
                 Flexible(
                   fit: FlexFit.tight,
                   flex: 2,
                   child: Text(
                     time,
-                    style: context.textTheme.bodyText1.copyWith(
-                        fontWeight: FontWeight.w600, height: 1.4, fontSize: 12),
+                    style: TextStyles.subtitle,
                   ),
                 ),
-                Flexible(
-                  fit: FlexFit.tight,
-                  child: Text(
-                    identifier,
-                    style: context.textTheme.caption.copyWith(
-                      fontSize: 12,
-                      height: 1.4,
-                    ),
-                  ),
+                Text(
+                  identifier,
+                  style: TextStyles.subtitle
+                      .copyWith(color: AppColors.bodyText.withOpacity(0.6)),
                 ),
                 Flexible(
                   fit: FlexFit.tight,
                   flex: 4,
                   child: Text(
                     title,
-                    style: context.textTheme.headline6.copyWith(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      height: 1.4,
-                      letterSpacing: -0.02,
-                    ),
+                    style: TextStyles.heading2,
                   ),
                 ),
                 Flexible(
@@ -81,7 +72,8 @@ class ScheduleComponent extends StatelessWidget {
                     contact,
                     overflow: TextOverflow.ellipsis,
                     maxLines: 2,
-                    style: context.textTheme.bodyText1.copyWith(fontSize: 14),
+                    style: TextStyles.subtitle
+                        .copyWith(fontWeight: FontWeight.w400),
                   ),
                 )
               ],
diff --git a/elaichi/lib/ui/widgets/story/story_bar.dart b/elaichi/lib/ui/widgets/story/story_bar.dart
index 0b61d1bf..9510a481 100644
--- a/elaichi/lib/ui/widgets/story/story_bar.dart
+++ b/elaichi/lib/ui/widgets/story/story_bar.dart
@@ -21,7 +21,12 @@ class StoryBar extends ViewModelWidget<FeedViewModel> {
             scrollDirection: Axis.horizontal,
             itemCount: currentStories.length,
             itemBuilder: (BuildContext context, int index) {
-              return StoryComponent(story: currentStories[index]);
+              return StoryComponent(
+                story: currentStories[index],
+                height: 66.0,
+                width: 66.0,
+                borderWidth: 4.0,
+              );
             },
           ),
         ),
diff --git a/elaichi/lib/ui/widgets/story/story_component.dart b/elaichi/lib/ui/widgets/story/story_component.dart
index d5ae4ca3..f0ea1cf4 100644
--- a/elaichi/lib/ui/widgets/story/story_component.dart
+++ b/elaichi/lib/ui/widgets/story/story_component.dart
@@ -1,3 +1,4 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:elaichi/app/config/size_config.dart';
 import 'package:elaichi/datamodels/api_models.dart';
 import 'package:flutter/material.dart';
@@ -5,21 +6,60 @@ import 'package:flutter/material.dart';
 /// Cirular story widget.
 class StoryComponent extends StatelessWidget {
   /// Constructor for [StoryComponent].
-  const StoryComponent({Key key, this.story}) : super(key: key);
+  const StoryComponent(
+      {Key key,
+      this.story,
+      @required this.height,
+      @required this.width,
+      this.viewedBorderColor = Colors.white,
+      this.unviewedBorderColor = Colors.blue,
+      this.borderWidth = 2.0})
+      : super(key: key);
 
   /// Data for [StoryComponent].
   final CurrentStory story;
 
+  /// Height of the circle container of [StoryComponent].
+  final double height;
+
+  /// Width of the circle container of [StoryComponent].
+  final double width;
+
+  /// Color of the border when the story/component has been viewed.
+  final Color viewedBorderColor;
+
+  /// Color of the border when the story/component has not been viewed.
+  final Color unviewedBorderColor;
+
+  /// Border width of [StoryComponent].
+  final double borderWidth;
+
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: EdgeInsets.symmetric(horizontal: Margins(context.display).small),
-      child: const CircleAvatar(
-        backgroundColor: Colors.transparent,
-        backgroundImage: AssetImage(
-          'assets/images/dsc.png',
+      margin: EdgeInsets.symmetric(horizontal: Margins(context.display).small),
+      decoration: const BoxDecoration(
+          shape: BoxShape.circle,
+          gradient: LinearGradient(
+              colors: [
+                Color.fromRGBO(0, 88, 219, 1),
+                Color.fromRGBO(0, 163, 255, 1)
+              ],
+              begin: FractionalOffset.bottomCenter,
+              end: FractionalOffset.topCenter)),
+      child: Container(
+        height: height,
+        width: width,
+        margin: const EdgeInsets.symmetric(horizontal: 4.0),
+        padding: EdgeInsets.symmetric(
+            horizontal: Margins(context.display).small - 4),
+        decoration: const BoxDecoration(
+          color: Colors.white,
+          shape: BoxShape.circle,
+        ),
+        child: CachedNetworkImage(
+          imageUrl: 'https://i.ibb.co/Ltgq2C3/dsc.png',
         ),
-        radius: 40.0,
       ),
     );
   }
diff --git a/elaichi/lib/ui/widgets/this_week.dart b/elaichi/lib/ui/widgets/this_week.dart
new file mode 100644
index 00000000..0fda0a14
--- /dev/null
+++ b/elaichi/lib/ui/widgets/this_week.dart
@@ -0,0 +1,93 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:elaichi/app/icons.dart';
+import 'package:elaichi/app/styles.dart';
+import 'package:elaichi/generated/locale_keys.g.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+/// Widget for current week's Monday Morning articles.
+class ThisWeek extends StatelessWidget {
+  /// Constructor for ThisWeek.
+  const ThisWeek({Key key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return AspectRatio(
+      aspectRatio: 410 / 260,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Flexible(
+            fit: FlexFit.tight,
+            child: Row(
+              children: [
+                const Padding(
+                  padding: EdgeInsets.only(left: 29.0),
+                  child: Icon(
+                    AppIcons.mmIcon,
+                    size: 30,
+                  ),
+                ),
+                Expanded(
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                    child: Text(LocaleKeys.thisWeekTitle.tr(),
+                        style: TextStyles.heading1),
+                  ),
+                )
+              ],
+            ),
+          ),
+          Flexible(
+            flex: 3,
+            child: ListView.builder(
+              scrollDirection: Axis.horizontal,
+              itemCount: 3,
+              itemBuilder: (context, index) => AspectRatio(
+                aspectRatio: 16 / 9.68,
+                child: Padding(
+                  padding: const EdgeInsets.only(left: 12.0, right: 6.0),
+                  child: ClipRRect(
+                    borderRadius: BorderRadius.circular(10.0),
+                    child: Stack(
+                      fit: StackFit.expand,
+                      children: [
+                        CachedNetworkImage(
+                            imageUrl: 'https://i.ibb.co/R9NBqPr/sanitizer.jpg',
+                            fit: BoxFit.cover),
+                        Container(
+                          child: Align(
+                            alignment: const Alignment(0.0, 0.7),
+                            child: Text(
+                              '''
+A Noble Breakthrough: NIT Rourkela produces alcohol-based sanitizers''',
+                              textAlign: TextAlign.center,
+                              style: TextStyles.heading2.copyWith(
+                                  color: Colors.white,
+                                  fontWeight: FontWeight.w700),
+                            ),
+                          ),
+                          decoration: BoxDecoration(
+                            gradient: LinearGradient(
+                              colors: [
+                                Colors.black.withOpacity(1),
+                                Colors.black.withOpacity(0)
+                              ],
+                              begin: FractionalOffset.bottomLeft,
+                              end: FractionalOffset.topRight,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}
diff --git a/elaichi/lib/ui/widgets/widgets.dart b/elaichi/lib/ui/widgets/widgets.dart
new file mode 100644
index 00000000..b56cbd13
--- /dev/null
+++ b/elaichi/lib/ui/widgets/widgets.dart
@@ -0,0 +1,7 @@
+library widgets;
+
+export 'appbar.dart';
+export 'schedule/schedule_card.dart';
+export 'schedule/schedule_component.dart';
+export 'story/story_bar.dart';
+export 'story/story_component.dart';
diff --git a/elaichi/pubspec.yaml b/elaichi/pubspec.yaml
index e307224f..34bdaf59 100644
--- a/elaichi/pubspec.yaml
+++ b/elaichi/pubspec.yaml
@@ -12,6 +12,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  
+  # Image caching
+  cached_network_image: ^2.5.0
 
   # Logging
   logger: ^0.9.2
@@ -28,8 +31,6 @@ dependencies:
   injectable: ^1.0.5
   dartz: ^0.9.1
 
-  shimmer: ^1.1.2
-
   # Themeing
   stacked_themes: ^0.2.2+1
   google_fonts: ^1.1.1
@@ -43,7 +44,7 @@ dependencies:
 
   # GraphQL client library
   graphql: ^4.0.0-beta.6
-  
+
   # Authentications
   firebase_core: ^0.5.3
   firebase_auth: ^0.18.4+1
@@ -55,6 +56,7 @@ dev_dependencies:
   lint: ^1.2.0
   mockito: ^4.1.1
   very_good_analysis: ^1.0.0
+  test_coverage: ^0.5.0
 
   build_runner: ^1.10.3
   auto_route_generator: ^0.6.6
@@ -63,10 +65,13 @@ dev_dependencies:
   # Local database
   hive_generator: ^0.7.1
 
-
 flutter:
   uses-material-design: true
   assets:
     - assets/translations/
     - assets/images/
     - assets/fonts/
+  fonts:
+    - family: Avenue
+      fonts:
+        - asset: assets/icons/avenue_icons.ttf  
diff --git a/elaichi/test/misc/failure_test.dart b/elaichi/test/misc/failure_test.dart
new file mode 100644
index 00000000..f67d0a39
--- /dev/null
+++ b/elaichi/test/misc/failure_test.dart
@@ -0,0 +1,12 @@
+import 'package:elaichi/app/failure.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  test(
+    'Failure - toString test',
+    () {
+      final failure = Failure(1, 'Test message');
+      expect(failure.toString(), equals('Test message'));
+    },
+  );
+}
diff --git a/elaichi/test/misc/margins_test.dart b/elaichi/test/misc/margins_test.dart
new file mode 100644
index 00000000..c025b4d0
--- /dev/null
+++ b/elaichi/test/misc/margins_test.dart
@@ -0,0 +1,26 @@
+import 'package:elaichi/app/config/display.dart';
+import 'package:elaichi/app/config/margins.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group(
+    'Margins - ',
+    () {
+      test(
+        'Margins are 8 for small displays',
+        () {
+          final margins = Margins(Display(size: DisplaySize.small));
+          final marginValue = margins.small;
+          expect(marginValue, 8.0);
+        },
+      );
+      test(
+        'Margins are 8 for xsmall displays',
+        () {
+          final margins = Margins(Display(size: DisplaySize.xsmall));
+          expect(margins.small, 8.0);
+        },
+      );
+    },
+  );
+}
diff --git a/elaichi/test/service_tests/api_test.dart b/elaichi/test/service_tests/api_test.dart
index dda2a4a8..ab73b3a2 100644
--- a/elaichi/test/service_tests/api_test.dart
+++ b/elaichi/test/service_tests/api_test.dart
@@ -1,112 +1 @@
-import 'dart:convert';
-import 'dart:io';
-import 'package:elaichi/services/fake_api.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/mockito.dart';
-
-import '../setup/test_helpers.dart';
-
-void main() {
-  group('Api -', () {
-    setUp(() async {
-      await registerServices();
-    });
-    tearDown(unregisterServices);
-
-    // test('Calling factory constructor of Api class should not return null',
-    // () {
-    //   final api = Api();
-    //   expect(api, isNotNull);
-    // });
-
-    test('Constructing Service should find correct dependencies', () {
-      final fakeApiService = MockApi();
-      expect(fakeApiService != null, true);
-    });
-
-    test('Given userId "test", should return user with name and email',
-        () async {
-      final fakeApiService = MockApi();
-
-      when(fakeApiService.getUser('test')).thenAnswer(
-        (_) => Future.value(
-          '''
-            {
-              "userId": "test",
-              "email": "john.doe@example.com",
-              "name": "John Doe"
-            }
-          ''',
-        ),
-      );
-
-      await fakeApiService.getUser('test');
-      verify(fakeApiService.getUser('test'));
-    });
-
-    test('Given a userId that does not exist, should return correct error', () {
-      final fakeApiService = MockApi();
-      when(fakeApiService.getUser('userId')).thenAnswer(
-        (_) => Future.value('error'),
-      );
-    });
-
-    test('Given errorMode 1, should throw SocketException', () async {
-      final fakeApiService = MockApi();
-      try {
-        await fakeApiService.getUser('test', errorMode: 1);
-      } catch (e) {
-        expect(e, isInstanceOf<SocketException>());
-      }
-    });
-
-    test('Given errorMode 2, should throw HttpExcpetion', () async {
-      final fakeApiService = MockApi();
-      try {
-        await fakeApiService.getUser('test', errorMode: 2);
-      } catch (e) {
-        expect(e, isInstanceOf<HttpException>());
-      }
-    });
-
-    test('Given errorMode 3, should return wrong json', () async {
-      final fakeApiService = FakeApi();
-      final result = await fakeApiService.getUser('test', errorMode: 3);
-      expect(result, isNotNull);
-      try {
-        json.decode(result);
-      } catch (e) {
-        expect(e, isInstanceOf<FormatException>());
-      }
-    });
-  });
-
-  test('Given errorMode 1, should throw SocketException', () async {
-    final fakeApiService = MockApi();
-    try {
-      await fakeApiService.getUser('test', errorMode: 1);
-    } catch (e) {
-      expect(e, isInstanceOf<SocketException>());
-    }
-  });
-
-  test('Given errorMode 2, should throw HttpExcpetion', () async {
-    final fakeApiService = MockApi();
-    try {
-      await fakeApiService.getUser('test', errorMode: 2);
-    } catch (e) {
-      expect(e, isInstanceOf<HttpException>());
-    }
-  });
-
-  test('Given errorMode 3, should return wrong json', () async {
-    final fakeApiService = FakeApi();
-    final result = await fakeApiService.getUser('test', errorMode: 3);
-    expect(result, isNotNull);
-    try {
-      json.decode(result);
-    } catch (e) {
-      expect(e, isInstanceOf<FormatException>());
-    }
-  });
-}
+void main() {}
diff --git a/elaichi/test/setup/test_helpers.dart b/elaichi/test/setup/test_helpers.dart
index 5c78f7bd..f2af1a00 100644
--- a/elaichi/test/setup/test_helpers.dart
+++ b/elaichi/test/setup/test_helpers.dart
@@ -9,7 +9,6 @@ import 'package:elaichi/services/auth.dart';
 import 'package:elaichi/services/graphql.dart';
 import 'package:elaichi/services/local_db.dart';
 import 'package:elaichi/services/api.dart';
-import 'package:elaichi/services/feed_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:mockito/mockito.dart';
@@ -33,8 +32,6 @@ class LocalDbMock extends Mock implements LocalDb {}
 
 class MockApi extends Mock implements Api {}
 
-class FeedServiceMock extends Mock implements FeedService {}
-
 class GraphQLMock extends Mock implements GraphQL {}
 
 class AuthMock extends Mock implements Auth {}
@@ -60,13 +57,6 @@ Api getAndRegisterApiMock() {
   return service;
 }
 
-FeedService getAndRegisterFeedServiceMock() {
-  _removeRegistrationIfExists<FeedService>();
-  final service = FeedServiceMock();
-  locator.registerSingleton<FeedService>(service);
-  return service;
-}
-
 NavigationService getAndRegisterNavigationServiceMock() {
   _removeRegistrationIfExists<NavigationService>();
   final service = NavigationServiceMock();
@@ -122,7 +112,6 @@ Future<void> registerServices() async {
   getAndRegisterThemeServiceMock();
   getAndRegisterLocalDbMock();
   getAndRegisterApiMock();
-  getAndRegisterFeedServiceMock();
   getAndRegisterGraphQLMock();
   getAndRegisterAuthMock();
 }
@@ -140,7 +129,6 @@ void unregisterServices() {
   if (locator.isRegistered<ThemeService>()) locator.unregister<ThemeService>();
   if (locator.isRegistered<LocalDb>()) locator.unregister<LocalDb>();
   if (locator.isRegistered<Api>()) locator.unregister<Api>();
-  if (locator.isRegistered<FeedService>()) locator.unregister<FeedService>();
   if (locator.isRegistered<GraphQL>()) locator.unregister<GraphQL>();
   if (locator.isRegistered<Auth>()) locator.unregister<Auth>();
 }
diff --git a/elaichi/test/viewmodel_tests/feed_viewmodel_test.dart b/elaichi/test/viewmodel_tests/feed_viewmodel_test.dart
index 00a6c135..b8784446 100644
--- a/elaichi/test/viewmodel_tests/feed_viewmodel_test.dart
+++ b/elaichi/test/viewmodel_tests/feed_viewmodel_test.dart
@@ -17,6 +17,41 @@ void main() {
   });
   tearDown(unregisterServices);
   group('FeedViewmodel Test - ', () {
+    test(
+      'Intialise -',
+      () async {
+        final model = FeedViewModel();
+        final mockApi = locator<Api>();
+        final stories = List<CurrentStory>.generate(
+          10,
+          (index) => CurrentStory(
+            asset: '',
+            id: '',
+            description: '',
+            event: null,
+            assetType: '',
+            createdAt: null,
+            club: null,
+          ),
+        );
+        when(mockApi.getCurrentStories()).thenAnswer((_) async => stories);
+        final events = List<ScheduleEvent>.generate(
+          6,
+          (index) => ScheduleEvent(
+            time: '4.30 PM',
+            identifier: 'MA-3002',
+            title: 'Computational Mathematics',
+            contact: 'Prof. Nihar Patra',
+          ),
+        );
+        when(mockApi.fetchSchedule()).thenAnswer(
+          (_) async => events,
+        );
+        await model.initialise();
+        expect(model.isBusy, false);
+        expect(model.currentStories, Right(stories));
+      },
+    );
     group('API calls - ', () {
       group('Stories', () {
         test(
diff --git a/elaichi/test/viewmodel_tests/home_viewmodel_test.dart b/elaichi/test/viewmodel_tests/home_viewmodel_test.dart
index 47481039..cf436942 100644
--- a/elaichi/test/viewmodel_tests/home_viewmodel_test.dart
+++ b/elaichi/test/viewmodel_tests/home_viewmodel_test.dart
@@ -15,17 +15,5 @@ void main() {
         expect(model.title != null, true);
       });
     });
-    group('counter -', () {
-      test('When constructed, counter should return 0', () {
-        final model = HomeViewModel();
-        expect(model.counter, 0);
-      });
-
-      test('When called, counter should increase', () {
-        final model = HomeViewModel()..updateCounter();
-        // model.updateCounter();
-        expect(model.counter, 1);
-      });
-    });
   });
 }
diff --git a/elaichi/test/viewmodel_tests/startup_viewmodel_test.dart b/elaichi/test/viewmodel_tests/startup_viewmodel_test.dart
index 3708d763..a4a7b730 100644
--- a/elaichi/test/viewmodel_tests/startup_viewmodel_test.dart
+++ b/elaichi/test/viewmodel_tests/startup_viewmodel_test.dart
@@ -32,6 +32,7 @@ void main() {
         final themeService = getAndRegisterThemeServiceMock();
         final model = StartupViewModel()
           ..changeTheme();
+        expect(model.isBusy, false);
         verify(themeService.toggleDarkLightTheme());
       });
     });
diff --git a/elaichi/test/widget_tests/feed_view_test.dart b/elaichi/test/widget_tests/feed_view_test.dart
new file mode 100644
index 00000000..efc8c794
--- /dev/null
+++ b/elaichi/test/widget_tests/feed_view_test.dart
@@ -0,0 +1,85 @@
+import 'package:elaichi/app/locator.dart';
+import 'package:elaichi/datamodels/api_models.dart';
+import 'package:elaichi/services/api.dart';
+import 'package:elaichi/ui/views/feed/feed_view.dart';
+import 'package:elaichi/ui/views/feed/feed_viewmodel.dart';
+import 'package:elaichi/ui/widgets/appbar.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/mockito.dart';
+
+import '../setup/test_helpers.dart';
+
+class FeedViewModelMock extends Mock implements FeedViewModel {}
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+  setUp(registerServices);
+  group('FeedView - ', () {
+    testWidgets('Constructing FeedView renders feed view correctly',
+        (WidgetTester tester) async {
+      final model = FeedViewModelMock();
+      final mockApi = locator<Api>();
+      final stories = List<CurrentStory>.generate(
+        10,
+        (index) => CurrentStory(
+          asset: '',
+          id: '',
+          description: '',
+          event: Event(
+              announcements: '',
+              organizer: Club(
+                logo: '',
+                society: '',
+                clubName: '',
+                id: '',
+                domain: '',
+                facAd: '',
+              ),
+              endDateTime: '',
+              registrationPrice: 20,
+              registrationCount: 20,
+              link: '',
+              otherDescription: '',
+              picture: '',
+              id: '',
+              attendees: [],
+              startDateTime: '',
+              eventName: ''),
+          assetType: '',
+          createdAt: DateTime(2021),
+          club: Club(
+            logo: '',
+            society: '',
+            clubName: '',
+            id: '',
+            domain: '',
+            facAd: '',
+          ),
+        ),
+      );
+      final events = List<ScheduleEvent>.generate(
+          4,
+          (index) => ScheduleEvent(
+              time: 'testTime',
+              contact: 'testContact',
+              title: 'testTitle',
+              identifier: 'test'));
+      when(mockApi.fetchSchedule()).thenAnswer((_) async => events);
+      when(mockApi.getCurrentStories()).thenAnswer((_) async => stories);
+      await tester.runAsync(
+        () async {
+          await tester.pumpWidget(
+            wrappedWidget(
+              const FeedView(),
+            ),
+          );
+          await tester.pumpAndSettle();
+          await tester.idle();
+          model.setInitialised(true);
+          await tester.pump();
+          expect(find.byType(ElaichiAppbar), findsOneWidget);
+        },
+      );
+    });
+  });
+}
diff --git a/elaichi/test/widget_tests/startup_view_test.dart b/elaichi/test/widget_tests/startup_view_test.dart
index 5c439fd4..d8ded40d 100644
--- a/elaichi/test/widget_tests/startup_view_test.dart
+++ b/elaichi/test/widget_tests/startup_view_test.dart
@@ -1,7 +1,9 @@
+import 'package:elaichi/app/router.gr.dart';
 import 'package:elaichi/ui/views/startup/startup_view.dart';
 import 'package:elaichi/ui/views/startup/startup_viewmodel.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/mockito.dart';
 
 import '../setup/test_helpers.dart';
 
@@ -24,30 +26,16 @@ void main() {
     expect(buttonFinder, findsOneWidget);
   });
 
-  // TODO: Implement navigation test - use NavigatorObservers
-
-  // testWidgets("when forward button is tapped, should navigate to home view",
-  //     (WidgetTester tester) async {
-  //   await tester.pumpWidget(Directionality(
-  //       textDirection: TextDirection.ltr,
-  //       child: MediaQuery(
-  //         data: const MediaQueryData(),
-  //         child: StartupView(),
-  //       )));
-
-  //   final startupViewModel = StartupViewModel();
-  //   final homeViewModel = HomeViewModel();
-
-  //   final buttonFinder = find.byIcon(Icons.arrow_forward);
-
-  //   final navigationService = getAndRegisterNavigationServiceMock();
-
-  //   expect(find.text(startupViewModel.title), findsOneWidget);
-  //   expect(find.text(homeViewModel.title), findsNothing);
-  //   await tester.tap(buttonFinder);
-  //   await tester.pumpAndSettle();
-
-  //   expect(find.text(startupViewModel.title), findsNothing);
-  //   expect(find.text(homeViewModel.title), findsOneWidget);
-  // });
+  testWidgets(
+    'When forward button is tapped, should navigate to home view',
+    (WidgetTester tester) async {
+      final navigationService = getAndRegisterNavigationServiceMock();
+      await tester.pumpWidget(wrappedWidget(StartupView()));
+      await tester.pumpAndSettle();
+      await tester.tap(find.byIcon(Icons.arrow_forward));
+      verify(navigationService.navigateTo(Routes.homeView));
+      // await tester.pumpAndSettle();
+      // expect(find.byType(ElaichiAppbar), findsOneWidget);
+    },
+  );
 }
diff --git a/elaichi/test/widget_tests/widgets/appbar_test.dart b/elaichi/test/widget_tests/widgets/appbar_test.dart
new file mode 100644
index 00000000..abe76850
--- /dev/null
+++ b/elaichi/test/widget_tests/widgets/appbar_test.dart
@@ -0,0 +1,19 @@
+import 'package:elaichi/ui/widgets/appbar.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../setup/test_helpers.dart';
+
+void main() {
+  testWidgets(
+    'Appbar is rendered with correct title',
+    (WidgetTester tester) async {
+      const title = 'Test Title';
+      await tester.pumpWidget(wrappedWidget(const ElaichiAppbar(
+        title: title,
+        centerTitle: true,
+        appbarHeight: 80,
+      )));
+      expect(find.text(title), findsOneWidget);
+    },
+  );
+}